Set the curator version from the Docker environment at build time #2289

dev/docker-compose.yml

@@ -40,6 +40,7 @@ services:
       AWS_SES_SENDER: "${AWS_SES_SENDER}"
       AWS_ACCESS_KEY_ID: "${AWS_ACCESS_KEY_ID}"
       AWS_SECRET_ACCESS_KEY: "${AWS_SECRET_ACCESS_KEY}"
+      CURATOR_VERSION: "${CURATOR_VERSION}"
       DB_CONNECTION_STRING: "mongodb://mongo:27017/covid19"
       DATASERVER_URL: "http://data:3000"
       EMAIL_USER_ADDRESS: "${EMAIL_USER_ADDRESS}"

dev/run_full_stack.sh

@@ -3,6 +3,6 @@ set -e
 # Store current directory.
 # We have to run docker compose from this directory for it to pick up the .env file.
 pushd `dirname "$0"`
-docker compose -f docker-compose.yml -f docker-compose.dev.full.yml up --build --force-recreate --renew-anon-volumes
+CURATOR_VERSION=`git rev-parse HEAD` docker compose -f docker-compose.yml -f docker-compose.dev.full.yml up --build --force-recreate --renew-anon-volumes
 # Restore directory.
 popd

dev/run_stack.sh

@@ -4,6 +4,7 @@ set -e
 pushd `pwd`
 # We have to run docker compose from this directory for it to pick up the .env file.
 cd `dirname "$0"`
+export CURATOR_VERSION=`git rev-parse HEAD`
 docker compose -f docker-compose.yml -f docker-compose.dev.yml up --build --force-recreate --renew-anon-volumes
 # Restore directory.
 popd

verification/curator-service/api/Dockerfile

@@ -1,6 +1,8 @@
 # Dev docker file for curator service.
 FROM node:14.17.1
 
+# set the version (this should be set from outside)
+ENV CURATOR_VERSION=${CURATOR_VERSION:-unset}
 # Build the curator service.
 WORKDIR /usr/src/app/verification/curator-service/api
 # Install app dependencies