diff options
| author | walkafwalka <aaron.walker@goldenhippo.com> | 2019-01-14 11:39:40 -0800 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-01-15 12:56:58 +1300 |
| commit | 00158325eef5f576371e59e5b2dc8053e91d3d67 (patch) | |
| tree | dfb37856853c7d908a8bebfefb63c51133186ebc | |
| parent | 7d896b38841a90fed3e6def3cd4ed020aa5f8599 (diff) | |
| download | gitlab-ce-auto-devops-custom-domains-walkafwalka.tar.gz | |
Changed ADDITIONAL_HOSTS default to empty variableauto-devops-custom-domains-walkafwalka
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index fff953131ab..4704f435871 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -670,9 +670,9 @@ rollout 100%: env_slug=$(echo ${CI_ENVIRONMENT_SLUG//-/_} | tr -s '[:lower:]' '[:upper:]') eval env_ADDITIONAL_HOSTS=\$${env_slug}_ADDITIONAL_HOSTS if [[ -n "$env_ADDITIONAL_HOSTS" ]]; then - additional_hosts="$env_ADDITIONAL_HOSTS" - else - additional_hosts="$ADDITIONAL_HOSTS" + additional_hosts="{$env_ADDITIONAL_HOSTS}" + elif [[ -n "$ADDITIONAL_HOSTS" ]]; then + additional_hosts="{$ADDITIONAL_HOSTS}" fi if [[ -n "$DB_INITIALIZE" && -z "$(helm ls -q "^$name$")" ]]; then @@ -689,7 +689,7 @@ rollout 100%: --set application.database_url="$DATABASE_URL" \ --set application.secretName="$APPLICATION_SECRET_NAME" \ --set service.url="$CI_ENVIRONMENT_URL" \ - --set service.additionalHosts="{$additional_hosts}" \ + --set service.additionalHosts="$additional_hosts" \ --set replicaCount="$replicas" \ --set postgresql.enabled="$postgres_enabled" \ --set postgresql.nameOverride="postgres" \ @@ -723,7 +723,7 @@ rollout 100%: --set application.database_url="$DATABASE_URL" \ --set application.secretName="$APPLICATION_SECRET_NAME" \ --set service.url="$CI_ENVIRONMENT_URL" \ - --set service.additionalHosts="{$additional_hosts}" \ + --set service.additionalHosts="$additional_hosts" \ --set replicaCount="$replicas" \ --set postgresql.enabled="$postgres_enabled" \ --set postgresql.nameOverride="postgres" \ |