diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c6ea258d602919d2a474743c7c0e660a7cb03c4..dd10f4e12b2a057a7fce3f31ff6df79bee79b0ef 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 235c843f8857c0c0a16a28c28ba9f48410640c82..c82b439d1c3551568ae08cf6a7eb1f7a10e8d23d 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 685b7d09f815ee8099a191b22c849ff5cb4be3a9..870ff001581d3c79d57e18274cb463f8362b1fb2 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"