From afba2655f3daf3a503f661dd73b798fae754c1e7 Mon Sep 17 00:00:00 2001
From: Andrew Kapuscinski <akapusci@nrao.edu>
Date: Thu, 26 May 2022 13:48:29 -0600
Subject: [PATCH] add build arg for WS_VERSION in order to build the static
site with the version correctly set
---
apps/web/Dockerfile | 7 ++++++-
ci/build.template.yml | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
index 44387361c..cd41f7145 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 975e097ac..c4e768c9e 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:
--
GitLab