root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dmitriy Zaporozhets 2018-11-02 07:42:37 +00:00
parent 88224ccea6 2d75626aad
commit a0ca86e5a3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/kinolaev-master-patch-91872.yml Normal file
View File

@ -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

2
lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
View File

@ -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}"