Merge pull request #418 from getodk/next

Release v2023.2.1

enketo.dockerfile

@@ -19,4 +19,4 @@ RUN apt-get update && \
 
 EXPOSE 8005
 
-CMD ./start-enketo.sh
+CMD ["./start-enketo.sh"]

files/enketo/start-enketo.sh

@@ -12,4 +12,4 @@ envsubst '$DOMAIN $BASE_URL $SECRET $LESS_SECRET $API_KEY $SUPPORT_EMAIL' \
     > "$CONFIG_PATH"
 
 echo "starting pm2/enketo.."
-pm2 start --no-daemon app.js -n enketo
+exec pm2-runtime app.js -n enketo

files/nginx/setup-odk.sh

@@ -40,5 +40,5 @@ else
     perl -i -ne 'print if $. < 7 || $. > 14' /etc/nginx/conf.d/redirector.conf
     echo "starting nginx for custom ssl and self-signed certs..."
   fi
-  nginx -g "daemon off;"
+  exec nginx -g "daemon off;"
 fi

files/service/scripts/start-odk.sh

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

service.dockerfile

@@ -1,4 +1,5 @@
-FROM node:16.19.1 as intermediate
+ARG node_version=16.19.1
+FROM node:${node_version} as intermediate
 
 COPY . .
 RUN mkdir /tmp/sentry-versions
@@ -8,7 +9,7 @@ RUN git describe --tags --dirty > /tmp/sentry-versions/server
 WORKDIR ../client
 RUN git describe --tags --dirty > /tmp/sentry-versions/client
 
-FROM node:16.17.0
+FROM node:${node_version}
 
 WORKDIR /usr/odk