diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-11-02 07:42:37 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-11-02 07:42:37 +0000 |
| commit | a0ca86e5a3777bc4800fc96765d8536091671ef3 (patch) | |
| tree | d92c0b3c0d74fc26373b31d257d7acd0f1564d83 | |
| parent | 88224ccea67290e1bfa600379715ab278984ccdf (diff) | |
| parent | 2d75626aadc906223ae8d88d6ac157cff8569d3e (diff) | |
| download | gitlab-ce-a0ca86e5a3777bc4800fc96765d8536091671ef3.tar.gz | |
Merge branch 'kinolaev-master-patch-91872' into 'master'
Change HELM_HOST in Auto-DevOps to work behind proxy
See merge request gitlab-org/gitlab-ce!22596
| -rw-r--r-- | changelogs/unreleased/kinolaev-master-patch-91872.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/kinolaev-master-patch-91872.yml b/changelogs/unreleased/kinolaev-master-patch-91872.yml new file mode 100644 index 00000000000..053e9101e39 --- /dev/null +++ b/changelogs/unreleased/kinolaev-master-patch-91872.yml @@ -0,0 +1,5 @@ +--- +title: Change HELM_HOST in Auto-DevOps template to work behind proxy +merge_request: 22596 +author: Sergej Nikolaev <kinolaev@gmail.com> +type: fixed diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index db48b187e5e..734af5eba59 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -823,7 +823,7 @@ rollout 100%: function initialize_tiller() { echo "Checking Tiller..." - export HELM_HOST=":44134" + export HELM_HOST="localhost:44134" tiller -listen ${HELM_HOST} -alsologtostderr > /dev/null 2>&1 & echo "Tiller is listening on ${HELM_HOST}" |