diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-19 09:32:53 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-19 09:32:53 +0000 |
| commit | 617a723bb934e38f1467a1184e722415ecd6aec4 (patch) | |
| tree | f13d5b8721ecca49d2639a63174e4ae035c1a3a8 | |
| parent | e23d08c72a0abae9c5aef91b76e3e21f2c5d0fea (diff) | |
| parent | 2f46c902ff03d57f7200b18f6ce18938deaddaad (diff) | |
| download | gitlab-ce-617a723bb934e38f1467a1184e722415ecd6aec4.tar.gz | |
Merge branch 'vendor-gitlab-ci-auto-devops-yml' into 'master'
Vendor Auto-DevOps.gitlab-ci from gitlab-ci-yml
See merge request gitlab-org/gitlab-ce!21775
| -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 |