Merge pull request #595 from getodk/next

Release v2024.1
getodk · Apr 29, 2024 · f21b33a · f21b33a
2 parents 20dcbf4 + 281df7c
commit f21b33a
Show file tree

Hide file tree

Showing 11 changed files with 209 additions and 213 deletions.
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/client b/client
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   postgres14:
     build:
@@ -102,7 +101,7 @@ services:
       options:
         max-file: "30"
   pyxform:
-    image: 'ghcr.io/getodk/pyxform-http:v2.0.2'
+    image: 'ghcr.io/getodk/pyxform-http:v2.0.3'
     restart: always
   secrets:
     volumes:

diff --git a/enketo.dockerfile b/enketo.dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/enketo/enketo:7.1.0
+FROM ghcr.io/enketo/enketo:7.2.0
 
 ENV ENKETO_SRC_DIR=/srv/src/enketo/packages/enketo-express
 WORKDIR ${ENKETO_SRC_DIR}

diff --git a/files/nginx/odk.conf.template b/files/nginx/odk.conf.template
@@ -24,6 +24,11 @@ server {
   gzip_http_version 1.1;
   gzip_types text/plain text/css application/json application/x-javascript text/xml text/csv;
 
+  location = /robots.txt {
+    add_header Content-Type text/plain;
+    return 200 "User-agent: *\nDisallow: /\n";
+  }
+
   location /- {
     proxy_pass http://enketo:8005;
     proxy_redirect off;

diff --git a/files/postgres14/upgrade/check-available-space b/files/postgres14/upgrade/check-available-space
@@ -17,7 +17,7 @@ free="$(df --output=avail "$dockerRootDir/volumes" | tail -n+2)"
 
 # Support both Docker Compose v1 & v2 container names.
 # See: https://docs.docker.com/compose/migrate/#service-container-names
-if ! docker compose version >/dev/null 2>/dev/null; then
+if docker ps -a --format '{{.Names}}' | grep -q "central_postgres_1"; then
   containerName="central_postgres_1"
 else
   containerName="central-postgres-1"

diff --git a/files/service/scripts/start-odk.sh b/files/service/scripts/start-odk.sh
@@ -30,7 +30,7 @@ fi
 echo "starting cron.."
 cron -f &
 
-MEMTOT=$(vmstat -s | grep 'total memory' | awk '{ print $1 }')
+MEMTOT=$(cat /sys/fs/cgroup/memory/memory.limit_in_bytes)
 if [ "$MEMTOT" -gt "1100000" ]
 then
   export WORKER_COUNT=4

diff --git a/nginx.dockerfile b/nginx.dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.10-slim as intermediate
+FROM node:20.12.2-slim as intermediate
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
@@ -14,7 +14,7 @@ RUN OIDC_ENABLED="$OIDC_ENABLED" files/prebuild/build-frontend.sh
 
 # when upgrading, look for upstream changes to redirector.conf
 # also, confirm setup-odk.sh strips out HTTP-01 ACME challenge location
-FROM jonasal/nginx-certbot:5.0.0
+FROM jonasal/nginx-certbot:5.0.1
 
 EXPOSE 80
 EXPOSE 443

diff --git a/secrets.dockerfile b/secrets.dockerfile
@@ -1,3 +1,3 @@
-FROM node:20.10-slim
+FROM node:20.12.2-slim
 
 COPY files/enketo/generate-secrets.sh ./
diff --git a/server b/server
diff --git a/service.dockerfile b/service.dockerfile
@@ -1,4 +1,4 @@
-ARG node_version=20.10
+ARG node_version=20.12.2