diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index 44387361ccd2168fffe6c0addcb99db31c05b304..cd41f7145567e505f23210dd424c87a8a0965a2d 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -1,10 +1,15 @@ FROM ssa-containers.aoc.nrao.edu/ops/base:nodejs-14 as base-build -# Requies build-arg $env +# Requires build-arg $env # Build arg that sets environment; sets to "dev" if no build arg is given ARG env=dev ENV ENV=${env} +# Requires build-arg WS_VERSION +# Build arg that sets Workspaces Version; defaults to "dev" if no build arg is given +ARG WS_VERSION=dev +ENV NG_APP_WS_VERSION=${WS_VERSION} + # Switch to vlapipe USER vlapipe diff --git a/ci/build.template.yml b/ci/build.template.yml index 975e097ac0fea4ff8f2f12ea830c803bdcce5b91..c4e768c9e3f4989100d431a9086007603b52d468 100644 --- a/ci/build.template.yml +++ b/ci/build.template.yml @@ -3,7 +3,7 @@ script: - echo "Building branch or tag -- ${IMAGE_TAG}" - NAME="${REGISTRY_URL}/${PROJECT_NAME}/${SERVICE_NAME}" - - docker build -t ${NAME}:${CI_COMMIT_SHORT_SHA} -f ${PATH_PREFIX}${SERVICE_NAME}/Dockerfile . --build-arg env=${DEPLOY_ENV} --build-arg TAGNAME=${CI_COMMIT_SHORT_SHA} + - docker build -t ${NAME}:${CI_COMMIT_SHORT_SHA} -f ${PATH_PREFIX}${SERVICE_NAME}/Dockerfile . --build-arg env=${DEPLOY_ENV} --build-arg TAGNAME=${CI_COMMIT_SHORT_SHA} --build-arg WS_VERSION=${IMAGE_TAG} - docker tag ${NAME}:${CI_COMMIT_SHORT_SHA} ${NAME}:${IMAGE_TAG} - echo "TAG=${IMAGE_TAG}" >> build.env artifacts: