Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2019-02-16 02:56:40 +0300
committerDylan Griffith <dyl.griffith@gmail.com>2019-02-19 19:50:28 +0300
commit2d300104c16c025406c890089b36a4c16fd8ff40 (patch)
treed6cc5ff19913d134e2e3d12806f87c584cfbfc0c /lib/gitlab
parent459276846372d8309220a5667cb4389dcfc66281 (diff)
Fix Auto DevOps check domain is blank
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
index 527a432d72d..8ecd522573e 100644
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -828,7 +828,7 @@ rollout 100%:
# Function to ensure backwards compatibility with AUTO_DEVOPS_DOMAIN
function ensure_kube_ingress_base_domain() {
- if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ]; then
+ if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ] && [ -n "$AUTO_DEVOPS_DOMAIN" ] ; then
export KUBE_INGRESS_BASE_DOMAIN=$AUTO_DEVOPS_DOMAIN
fi
}