Merge pull request #1623 from getodk/next

Release v2025.4.2

Author: ktuite

.github/workflows/test.yml

@@ -14,6 +14,7 @@ jobs:
     - uses: actions/checkout@v4
     - run: sudo apt-get install shellcheck
     - run: ./test/check-scripts.sh
+    - run: ./test/check-for-large-files.sh
     - run: ./test/check-dockerfiles.sh
   test-envsub:
     timeout-minutes: 2
@@ -36,7 +37,7 @@ jobs:
         submodules: recursive
     - uses: actions/setup-node@v4
       with:
-        node-version: 22.21.1
+        node-version: 22.22.0
     - run: cd test/nginx && npm clean-install
     - run: cd test/nginx && npm run lint
     - run: cd test/nginx && ./setup-tests.sh

client

@@ -27,37 +27,39 @@ node ./lib/bin/log-upgrade
 echo "starting cron.."
 cron -f &
 
-get_cgroup_version() {
-  # The max memory calculation is different between cgroup v1 & v2
-  local cgroup_type
-  cgroup_type=$(stat -fc %T /sys/fs/cgroup/)
-  if [ "$cgroup_type" == "cgroup2fs" ]; then
-    echo "v2"
-  else
-    echo "v1"
-  fi
+is_cgroup2() {
+  [ -f /sys/fs/cgroup/cgroup.controllers ]
 }
 
 get_memory_limit() {
-  local cgroup_version
-  cgroup_version=$(get_cgroup_version)
+  local memtot fallback_memtot
+
+  if [ -r /proc/meminfo ]; then
+    fallback_memtot=$(awk '/MemTotal/ {print $2 * 1024}' /proc/meminfo)
+  else
+    fallback_memtot=0
+  fi
 
-  if [ "$cgroup_version" == "v2" ]; then
-    local memtot
-    memtot=$(cat /sys/fs/cgroup/memory.max)
-    if [ "$memtot" == "max" ]; then
-      # No cgroup memory limit; fallback to system's total memory
-      memtot=$(grep MemTotal /proc/meminfo | awk '{print $2 * 1024}')
+  if is_cgroup2; then
+    if [ -r /sys/fs/cgroup/memory.max ]; then
+      memtot=$(cat /sys/fs/cgroup/memory.max)
+    else
+      memtot="max"
+    fi
+    if [ "$memtot" = "max" ]; then
+      memtot=$fallback_memtot
     fi
-    # Force memtot to be an integer (not scientific notation e+09)
-    printf "%.0f\n" "$memtot"
   else
     # cgroup v1
-    local memtot
-    memtot=$(cat /sys/fs/cgroup/memory/memory.limit_in_bytes)
-    # Force memtot to be an integer
-    printf "%.0f\n" "$memtot"
+    if [ -r /sys/fs/cgroup/memory/memory.limit_in_bytes ]; then
+      memtot=$(cat /sys/fs/cgroup/memory/memory.limit_in_bytes)
+    else
+      memtot=$fallback_memtot
+    fi
   fi
+
+  # Force memtot to be an integer (not scientific notation e+09)
+  printf "%.0f\n" "$memtot"
 }
 
 determine_worker_count() {

files/service/scripts/start-odk.sh

@@ -1,4 +1,4 @@
-FROM node:22.21.1-slim AS intermediate
+FROM node:22.22.0-slim AS intermediate
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \

nginx.dockerfile

@@ -1,3 +1,3 @@
-FROM node:22.21.1-slim
+FROM node:22.22.0-slim
 
 COPY files/enketo/generate-secrets.sh ./

secrets.dockerfile

@@ -1,4 +1,4 @@
-ARG node_version=22.21.1
+ARG node_version=22.22.0
 
 
 

server

@@ -0,0 +1,25 @@
+#!/bin/bash -eu
+set -o pipefail
+shopt -s inherit_errexit
+
+git ls-files -z \
+| xargs -0 ls -l -- \
+| awk '
+  BEGIN {
+    print "[check-for-large-files] Checking for large files...";
+  }
+
+  $5 > 1000000 {
+    ++n;
+    print $5 "\t" $9;
+  }
+
+  END {
+    if(n>0) {
+      print "[check-for-large-files] !!! " n " LARGE FILE(S) FOUND";
+      exit 1;
+    } else {
+      print "[check-for-large-files] No large files found ✅";
+    }
+  }
+'

service.dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.21.1-slim
+FROM node:22.22.0-slim
 
 WORKDIR /workspace
 

test/check-for-large-files.sh

@@ -1,4 +1,4 @@
-FROM node:22.21.1-slim
+FROM node:22.22.0-slim
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \