Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:paddg
gitlab-runner
4249.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 4249.patch of Package gitlab-runner
From 785fb9a6b9421096febc10b72ea2fee0443f6db4 Mon Sep 17 00:00:00 2001 From: sword <ruili@jihulab.com> Date: Thu, 27 Jul 2023 08:22:17 +0000 Subject: [PATCH 1/3] Update docker/cli and docker/docker version --- go.mod | 7 ++----- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index d93029df76..e4d89d2c9d 100644 --- a/go.mod +++ b/go.mod @@ -15,12 +15,9 @@ require ( github.com/bmatcuk/doublestar/v4 v4.4.0 github.com/creack/pty v1.1.17 github.com/denisbrodbeck/machineid v1.0.1 - github.com/docker/cli v23.0.1+incompatible + github.com/docker/cli v24.0.5+incompatible github.com/docker/distribution v2.8.2+incompatible - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0 - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 - github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.11.0 - github.com/docker/docker v23.0.6+incompatible + github.com/docker/docker v24.0.5+incompatible github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.5.0 github.com/docker/machine v0.7.1-0.20170120224952-7b7a141da844 diff --git a/go.sum b/go.sum index fba5228daf..0a9d36befe 100644 --- a/go.sum +++ b/go.sum @@ -497,8 +497,8 @@ github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/ github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v23.0.1+incompatible h1:LRyWITpGzl2C9e9uGxzisptnxAn1zfZKXy13Ul2Q5oM= -github.com/docker/cli v23.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v24.0.5+incompatible h1:WeBimjvS0eKdH4Ygx+ihVq1Q++xg36M/rMi4aXAvodc= +github.com/docker/cli v24.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -507,8 +507,8 @@ github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v23.0.6+incompatible h1:aBD4np894vatVX99UTx/GyOUOK4uEcROwA3+bQhEcoU= -github.com/docker/docker v23.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= +github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -- GitLab From e49850b8e151b1ad83a17fb3c21db711d455aa04 Mon Sep 17 00:00:00 2001 From: "Georgi N. Georgiev" <ggeorgiev@gitlab.com> Date: Wed, 19 Jul 2023 09:10:35 +0000 Subject: [PATCH 2/3] Update golang Docker tag to v1.20.6 --- .gitlab/ci/_common.gitlab-ci.yml | 2 +- .tool-versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/_common.gitlab-ci.yml b/.gitlab/ci/_common.gitlab-ci.yml index dc22e3a8b5..308191b8a0 100644 --- a/.gitlab/ci/_common.gitlab-ci.yml +++ b/.gitlab/ci/_common.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: # renovate: datasource=docker depName=golang allowedVersions=/1\.20\..+/ - GO_VERSION: "1.20.5" + GO_VERSION: "1.20.6" # Sometimes the FIPS repo lags behind the official releases GO_FIPS_VERSION: "1.20.5" CI_IMAGE: "registry.gitlab.com/gitlab-org/gitlab-runner/ci:$GO_VERSION-1" diff --git a/.tool-versions b/.tool-versions index 87b469b8f2..1331520636 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ # renovate: datasource=docker depName=golang allowedVersions=/1\.20\..+/ -golang 1.20.5 +golang 1.20.6 -- GitLab From 776efca310fe6059c2649afbdca7110155ddc2b5 Mon Sep 17 00:00:00 2001 From: sword <ruili@jihulab.com> Date: Thu, 27 Jul 2023 23:56:07 +0000 Subject: [PATCH 3/3] Update GO_VERSION in docs/development/index.md --- docs/development/index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/development/index.md b/docs/development/index.md index fcdd0b5fa2..c6b487f2b1 100644 --- a/docs/development/index.md +++ b/docs/development/index.md @@ -74,7 +74,7 @@ asdf install ```shell sudo apt-get install -y mercurial git-core wget make build-essential -wget https://storage.googleapis.com/golang/go1.20.5.linux-amd64.tar.gz +wget https://storage.googleapis.com/golang/go1.20.6.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go*-*.tar.gz export PATH="$(go env GOBIN):$PATH" ``` @@ -84,7 +84,7 @@ export PATH="$(go env GOBIN):$PATH" ```shell sudo yum install mercurial wget make sudo yum groupinstall 'Development Tools' -wget https://storage.googleapis.com/golang/go1.20.5.linux-amd64.tar.gz +wget https://storage.googleapis.com/golang/go1.20.6.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go*-*.tar.gz export PATH="$(go env GOBIN):$PATH" ``` @@ -94,7 +94,7 @@ export PATH="$(go env GOBIN):$PATH" Using binary package: ```shell -wget https://storage.googleapis.com/golang/go1.20.5.darwin-amd64.tar.gz +wget https://storage.googleapis.com/golang/go1.20.6.darwin-amd64.tar.gz sudo tar -C /usr/local -xzf go*-*.tar.gz export PATH="$(go env GOBIN):$PATH" ``` @@ -102,7 +102,7 @@ export PATH="$(go env GOBIN):$PATH" Using installation package: ```shell -wget https://storage.googleapis.com/golang/go1.20.5.darwin-amd64.pkg +wget https://storage.googleapis.com/golang/go1.20.6.darwin-amd64.pkg open go*-*.pkg export PATH="$(go env GOBIN):$PATH" ``` -- GitLab
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
