Speed up stopping Enketo, NGINX, service containers (#417)

getodk · Mar 24, 2023 · 4b818de · 4b818de
1 parent 6099c98
commit 4b818de
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/enketo.dockerfile b/enketo.dockerfile
@@ -19,4 +19,4 @@ RUN apt-get update && \
 
 EXPOSE 8005
 
-CMD ./start-enketo.sh
+CMD ["./start-enketo.sh"]
diff --git a/files/enketo/start-enketo.sh b/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-runtime app.js -n enketo
+exec pm2-runtime app.js -n enketo
diff --git a/files/nginx/setup-odk.sh b/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
diff --git a/files/service/scripts/start-odk.sh b/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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ RUN apt-get update && \

		EXPOSE 8005

		CMD ./start-enketo.sh
		CMD ["./start-enketo.sh"]