Merge branch '124-use-projects-container-reg' into 'master'

124 continued - exported variables updated for consistency

See merge request !350

.gitlab-ci.yml

@@ -12,7 +12,8 @@ variables:
   DATA_PORT: "2060"
   DATA_TYPE: "edge"
   UPSTREAM_PATH: ghsc/geomag/geomag-algorithms
-
+  BRANCH_OR_TAG: :${CI_COMMIT_REF_SLUG} # format looks like ':feature-branch'
+  BRANCH_OR_TAG: ${BRANCH_OR_TAG/:master/:latest} #replaces ':master' with ':latest'
 # Do not run in upstream for merge requests
 workflow:
   rules:
@@ -25,10 +26,8 @@ workflow:
 
 .adjust_image_names:
   before_script:
-    - IMAGE_NAME=${APP_NAME}:${CI_COMMIT_REF_SLUG}
-    - IMAGE_NAME=${IMAGE_NAME/:master/:latest}
-    - PROJECT_IMAGE_NAME=$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-    - PROJECT_IMAGE_NAME=${PROJECT_IMAGE_NAME/:master/:latest}
+    - IMAGE_NAME=${APP_NAME}${BRANCH_OR_TAG}
+    - PROJECT_IMAGE_NAME=${CI_REGISTRY_IMAGE}${BRANCH_OR_TAG}
 
 .deploy:
   extends:
@@ -41,8 +40,8 @@ workflow:
       /container-deploy/deploy.sh
       scripts/.
     - export APP_NAME=${APP_NAME}
-    - export IMAGE_NAME=${IMAGE_NAME}
-    - export REGISTRY=${CI_REGISTRY_IMAGE}
+    - export IMAGE_TAG=${BRANCH_OR_TAG} 
+    - export REGISTRY_IMAGE=${CI_REGISTRY_IMAGE}
     - export STACK_NAME=${APP_NAME}
     - ./scripts/deploy.sh
   stage: deploy

scripts/custom.funcs.sh

@@ -84,7 +84,7 @@ services:
   # custom.funcs.sh and the custom.config.sh as well. Probably just do not
   # ever do this...
   web:
-    image: ${REGISTRY}/${IMAGE_NAME}
+    image: ${REGISTRY_IMAGE}${IMAGE_TAG}
     deploy:
       restart_policy:
         condition: any