diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-09-17 09:12:50 -0500 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-09-17 09:19:47 -0500 |
commit | 2f46c902ff03d57f7200b18f6ce18938deaddaad (patch) | |
tree | b6028a3760c58c11a2a5b7163f68fdc67c6060d9 | |
parent | 50cb63533ff4d90ae317b20157c3fd824783fd61 (diff) | |
download | gitlab-ce-2f46c902ff03d57f7200b18f6ce18938deaddaad.tar.gz |
Vendor Auto-DevOps.gitlab-ci from gitlab-ci-yml
Uses curl instead of wget on install_dependencies, as wget does not
support https through http proxy on alpine:latest
-rw-r--r-- | changelogs/unreleased/vendor-gitlab-ci-auto-devops-yml.yml | 5 | ||||
-rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/vendor-gitlab-ci-auto-devops-yml.yml b/changelogs/unreleased/vendor-gitlab-ci-auto-devops-yml.yml new file mode 100644 index 00000000000..98d0e24c00a --- /dev/null +++ b/changelogs/unreleased/vendor-gitlab-ci-auto-devops-yml.yml @@ -0,0 +1,5 @@ +--- +title: Make AutoDevOps work behind proxy +merge_request: 21775 +author: Sergej - @kinolaev +type: other diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index a191f1f59bf..33ae9c6ad7e 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -635,8 +635,8 @@ rollout 100%: function install_dependencies() { apk add -U openssl curl tar gzip bash ca-certificates git - wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub - wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk + curl -L -o /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub + curl -L -O https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk apk add glibc-2.28-r0.apk rm glibc-2.28-r0.apk |