From f512b3fb812345e651f9da288e8d51e69a8d2614 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Wed, 11 May 2022 16:22:31 +0200
Subject: [PATCH] fixed app_env
---
.gitlab-ci.yml | 1 +
.gitlab/deployment_scripts/update_deployment.sh | 1 +
.gitlab/review.yaml | 3 ---
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c6ea258d..dd10f4e12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ workflow:
DOCKER_COMPOSER_IMAGE_TAG: $CI_COMMIT_REF_SLUG-composer-$CI_COMMIT_SHA
DOCKER_FPM_IMAGE_TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHA
DOCKER_NGINX_IMAGE_TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHA
+ APP_ENV: development
stages:
- build_composer
- build_dependencies
diff --git a/.gitlab/deployment_scripts/update_deployment.sh b/.gitlab/deployment_scripts/update_deployment.sh
index 235c843f8..c82b439d1 100755
--- a/.gitlab/deployment_scripts/update_deployment.sh
+++ b/.gitlab/deployment_scripts/update_deployment.sh
@@ -4,6 +4,7 @@ helm -n $KUBE_NAMESPACE upgrade --install \
review-${CI_COMMIT_REF_SLUG} \
chart/ \
-f $DEPLOYMENT_HELM_VALUES \
+ --set environment=$APP_ENV
--set ingress.hosts[0].host=$DEPLOYMENT_URL \
--set image.fpm.tag=$DOCKER_FPM_IMAGE_TAG \
--set image.nginx.tag=$DOCKER_NGINX_IMAGE_TAG \
diff --git a/.gitlab/review.yaml b/.gitlab/review.yaml
index 685b7d09f..870ff0015 100644
--- a/.gitlab/review.yaml
+++ b/.gitlab/review.yaml
@@ -1,6 +1,3 @@
-# Which App Environment to set on startup
-environment: development
-
ingress:
annotations:
kubernetes.io/tls-acme: "true"
--
GitLab