Merge pull request #2223 from amazeeio/2222-LAGOON_ENVIRONMENT-openshift

Fix #2222 by adding LAGOON_ENVIRONMENT variable
uselagoon · Dec 23, 2020 · 9b85f9a · 9b85f9a
2 parents 849397a + 8ababcd
commit 9b85f9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/images/oc-build-deploy-dind/build-deploy-docker-compose.sh b/images/oc-build-deploy-dind/build-deploy-docker-compose.sh
@@ -372,6 +372,7 @@ if [[ ( "$TYPE" == "pullrequest"  ||  "$TYPE" == "branch" ) && ! $THIS_IS_TUG ==
   BUILD_ARGS+=(--build-arg LAGOON_GIT_BRANCH="${BRANCH}")
   BUILD_ARGS+=(--build-arg LAGOON_GIT_SAFE_BRANCH="${SAFE_BRANCH}")
   BUILD_ARGS+=(--build-arg LAGOON_PROJECT="${PROJECT}")
+  BUILD_ARGS+=(--build-arg LAGOON_ENVIRONMENT="${SAFE_BRANCH}")
   BUILD_ARGS+=(--build-arg LAGOON_SAFE_PROJECT="${SAFE_PROJECT}")
   BUILD_ARGS+=(--build-arg LAGOON_BUILD_TYPE="${TYPE}")
   BUILD_ARGS+=(--build-arg LAGOON_GIT_SOURCE_REPOSITORY="${SOURCE_REPOSITORY}")

diff --git a/images/oc-build-deploy-dind/openshift-templates/configmap.yml b/images/oc-build-deploy-dind/openshift-templates/configmap.yml
@@ -52,6 +52,7 @@ objects:
     LAGOON_GIT_BRANCH: ${BRANCH}
     LAGOON_SAFE_PROJECT: ${SAFE_PROJECT}
     LAGOON_PROJECT: ${PROJECT}
+    LAGOON_ENVIRONMENT: ${SAFE_BRANCH}
     LAGOON_ENVIRONMENT_TYPE: ${ENVIRONMENT_TYPE}
     LAGOON_ROUTE: ${ROUTE}
     LAGOON_ROUTES: ${ROUTES}