Merge pull request #423 from getodk/next

Release v2023.3

.circleci/config.yml

@@ -37,4 +37,4 @@ jobs:
               appropriate/curl -4 --insecure --retry 20 --retry-delay 2 --retry-connrefused https://localhost/v1/projects \
               | tee /dev/tty \
               | grep -q '\[\]'
-            docker compose exec -T service pm2 list | grep -c "online" | grep -q 4 || exit 1
+            docker compose exec -T service npx pm2 list | grep -c "online" | grep -q 4 || exit 1

.gitignore

@@ -2,6 +2,7 @@
 *.swp
 *.swo
 /.env
+/docker-compose.override.yml
 /version.txt
 
 /files/allow-postgres14-upgrade

docker-compose.yml

@@ -96,7 +96,7 @@ services:
       options:
         max-file: "30"
   pyxform:
-    image: 'ghcr.io/getodk/pyxform-http:v1.12.0'
+    image: 'ghcr.io/getodk/pyxform-http:v1.12.1'
     restart: always
   secrets:
     volumes:
@@ -121,7 +121,7 @@ services:
       - SUPPORT_EMAIL=${SYSADMIN_EMAIL}
       - HTTPS_PORT=${HTTPS_PORT:-443}
   enketo_redis_main:
-    image: redis:7.0.8
+    image: redis:7.0
     volumes:
       - ./files/enketo/redis-enketo-main.conf:/usr/local/etc/redis/redis.conf:ro
       - enketo_redis_main:/data
@@ -130,7 +130,7 @@ services:
       - /usr/local/etc/redis/redis.conf
     restart: always
   enketo_redis_cache:
-    image: redis:7.0.8
+    image: redis:7.0
     volumes:
       - ./files/enketo/redis-enketo-cache.conf:/usr/local/etc/redis/redis.conf:ro
       - enketo_redis_cache:/data

enketo.dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/enketo/enketo-express:6.0.0
+FROM ghcr.io/enketo/enketo-express:6.1.0
 
 ENV ENKETO_SRC_DIR=/srv/src/enketo_express
 WORKDIR ${ENKETO_SRC_DIR}

files/postgres/upgrade-postgres.sh

@@ -19,26 +19,6 @@ if [[ -f "$flag_upgradeCompletedOk" ]]; then
   if [[ -f "$flag_deleteOldData_internal" ]]; then
     log "Deleting old data..."
     rm "$flag_deleteOldData_internal"
-    # We cannot run ./delete_old_cluster.sh here, as it will try to:
-    #
-    #   rm -rf '/var/lib/postgresql/data'
-    #
-    # This will fail with:
-    #
-    #   rm: cannot remove '/var/lib/postgresql/data': Device or resource busy
-    #
-    # This is because that is the root of a docker volume.  Instead,
-    # we must do our own manual equivalent:
-    if ! [[ -f ./delete_old_cluster.sh ]]; then
-      log "!!!"
-      log "!!! ERROR: file missing: delete_old_cluster.sh"
-      log "!!!"
-      log "!!! Upgrade may not have completed successfully."
-      log "!!!"
-      log "!!! Old data will not be deleted."
-      log "!!!"
-      exit 1
-    fi
     rm -rf /var/lib/postgresql/data/*
     touch "$flag_oldDataDeleted"
     log "Old data deleted."

files/postgres14/upgrade/check-available-space

@@ -31,7 +31,7 @@ if [[ "$volume" = "" ]]; then
   exit 1
 fi
 mountpoint="$(docker volume inspect --format='{{.Mountpoint}}' "$volume")"
-used="$(du -s "$mountpoint" | cut -f1)"
+used="$(( $(du -s "$mountpoint" | cut -f1) + 5000000 ))" # add 5G of buffer
 
 log
 log "    Free space: $(numfmt --to=si "$((free*1000))")B"

files/service/scripts/start-odk.sh

@@ -40,4 +40,5 @@ fi
 echo "using $WORKER_COUNT worker(s) based on available memory ($MEMTOT).."
 
 echo "starting server."
-exec pm2-runtime ./pm2.config.js
+exec npx pm2-runtime ./pm2.config.js
+

nginx.dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.19.1 as intermediate
+FROM node:16.20 as intermediate
 
 COPY ./ ./
 RUN files/prebuild/write-version.sh

postgres14.dockerfile

@@ -1,4 +1,4 @@
-FROM postgres:14
+FROM postgres:14.8
 
 COPY files/postgres14/start-postgres.sh /usr/local/bin/
 

secrets.dockerfile

@@ -1,2 +1,2 @@
-FROM node:16.19.1
+FROM node:16.20
 COPY files/enketo/generate-secrets.sh ./

service.dockerfile

@@ -1,4 +1,4 @@
-ARG node_version=16.19.1
+ARG node_version=16.20
 FROM node:${node_version} as intermediate
 
 COPY . .
@@ -23,11 +23,9 @@ COPY files/service/crontab /etc/cron.d/odk
 COPY server/package*.json ./
 
 RUN npm clean-install --omit=dev --legacy-peer-deps --no-audit --fund=false --update-notifier=false
-RUN npm install [email protected] -g
 
 COPY server/ ./
 COPY files/service/scripts/ ./
-COPY files/service/pm2.config.js ./
 
 COPY files/service/config.json.template /usr/share/odk/
 COPY files/service/odk-cmd /usr/bin/