diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-15 06:53:46 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-15 06:53:46 +0000 |
| commit | 92d4da1d31283c491a0fecfa7b1deb902a0d9134 (patch) | |
| tree | 276d2f2aa999634eaa48c8aa1e9634fa418c4a6b | |
| parent | c206d15b7dc093fdce706f02e11b910ddb5fb3f4 (diff) | |
| parent | 7b5409d58b207c33527359bf55200cf576d76b35 (diff) | |
| download | gitlab-ce-92d4da1d31283c491a0fecfa7b1deb902a0d9134.tar.gz | |
Merge branch 'auto-devops-gitlab-ci-glic-228' into 'master'
Vendor in Auto-DevOps.gitlab-ci.yml to update glibc to 2.28
Closes #50294
See merge request gitlab-org/gitlab-ce!21191
| -rw-r--r-- | changelogs/unreleased/auto-devops-gitlab-ci-glic-228.yml | 5 | ||||
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/auto-devops-gitlab-ci-glic-228.yml b/changelogs/unreleased/auto-devops-gitlab-ci-glic-228.yml new file mode 100644 index 00000000000..a1625193189 --- /dev/null +++ b/changelogs/unreleased/auto-devops-gitlab-ci-glic-228.yml @@ -0,0 +1,5 @@ +--- +title: 'Auto-DevOps.gitlab-ci.yml: update glibc package to 2.28' +merge_request: 21191 +author: sgerrand +type: fixed diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index 39876805ffa..ffcf5648075 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -642,9 +642,9 @@ 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.23-r3/glibc-2.23-r3.apk - apk add glibc-2.23-r3.apk - rm glibc-2.23-r3.apk + wget 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 curl "https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar zx mv linux-amd64/helm /usr/bin/ |