Skip to content

Commit a798fc9

Browse files
chore(deps): bump github.com/docker/docker from 25.0.4+incompatible to 26.0.0+incompatible (#3085)
1 parent 279053e commit a798fc9

File tree

97 files changed

+1374
-965
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1374
-965
lines changed

Diff for: .github/workflows/integration-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
remove-haskell: 'true'
3535
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3636
with:
37-
go-version: '1.20'
37+
go-version: '1.22'
3838
- uses: actions/checkout@b0e28b5ac45a892f91e7d036f8200cf5ed489415 # v3
3939
- uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v1
4040

Diff for: .github/workflows/unit-tests.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
steps:
1616
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v4.01
1717
with:
18-
go-version: '1.20'
18+
go-version: '1.22'
1919
- uses: actions/checkout@b0e28b5ac45a892f91e7d036f8200cf5ed489415 # v3
20-
2120
- run: make test

Diff for: go.mod

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleContainerTools/kaniko
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
cloud.google.com/go/storage v1.39.1
@@ -12,7 +12,7 @@ require (
1212
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231213181459-b0fcec718dc6
1313
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589
1414
github.com/containerd/cgroups v1.1.0 // indirect
15-
github.com/docker/docker v25.0.4+incompatible
15+
github.com/docker/docker v26.0.0+incompatible
1616
github.com/go-git/go-billy/v5 v5.5.0
1717
github.com/go-git/go-git/v5 v5.11.0
1818
github.com/golang/mock v1.6.0
@@ -174,6 +174,7 @@ require (
174174
github.com/hashicorp/hcl v1.0.0 // indirect
175175
github.com/magiconair/properties v1.8.7 // indirect
176176
github.com/mitchellh/mapstructure v1.5.0 // indirect
177+
github.com/moby/docker-image-spec v1.3.1 // indirect
177178
github.com/moby/swarmkit/v2 v2.0.0-20230315203717-e28e8ba9bc83 // indirect
178179
github.com/moby/sys/user v0.1.0 // indirect
179180
github.com/pelletier/go-toml/v2 v2.1.1 // indirect

Diff for: go.sum

+4-2
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ github.com/docker/cli v25.0.3+incompatible h1:KLeNs7zws74oFuVhgZQ5ONGZiXUUdgsdy6
180180
github.com/docker/cli v25.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
181181
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
182182
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
183-
github.com/docker/docker v25.0.4+incompatible h1:XITZTrq+52tZyZxUOtFIahUf3aH367FLxJzt9vZeAF8=
184-
github.com/docker/docker v25.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
183+
github.com/docker/docker v26.0.0+incompatible h1:Ng2qi+gdKADUa/VM+6b6YaY2nlZhk/lVJiKR/2bMudU=
184+
github.com/docker/docker v26.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
185185
github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
186186
github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40=
187187
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -352,6 +352,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
352352
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
353353
github.com/moby/buildkit v0.13.0 h1:reVR1Y+rbNIUQ9jf0Q1YZVH5a/nhOixZsl+HJ9qQEGI=
354354
github.com/moby/buildkit v0.13.0/go.mod h1:aNmNQKLBFYAOFuzQjR3VA27/FijlvtBD1pjNwTSN37k=
355+
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
356+
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
355357
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
356358
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
357359
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=

Diff for: scripts/test.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ GREEN='\033[0;32m'
2323
RESET='\033[0m'
2424

2525
echo "Running go tests..."
26-
go test -cover -coverprofile=out/coverage.out -v -timeout 60s `go list ./... | grep -v vendor | grep -v integration` | sed ''/PASS/s//$(printf "${GREEN}PASS${RESET}")/'' | sed ''/FAIL/s//$(printf "${RED}FAIL${RESET}")/''
26+
go test -cover -coverprofile=out/coverage.out -v -timeout 120s `go list ./... | grep -v vendor | grep -v integration` | sed ''/PASS/s//$(printf "${GREEN}PASS${RESET}")/'' | sed ''/FAIL/s//$(printf "${RED}FAIL${RESET}")/''
2727
GO_TEST_EXIT_CODE=${PIPESTATUS[0]}
2828
if [[ $GO_TEST_EXIT_CODE -ne 0 ]]; then
2929
exit $GO_TEST_EXIT_CODE
@@ -33,7 +33,6 @@ echo "Running validation scripts..."
3333
scripts=(
3434
"$DIR/../hack/boilerplate.sh"
3535
"$DIR/../hack/gofmt.sh"
36-
"$DIR/../hack/linter.sh"
3736
)
3837
fail=0
3938
for s in "${scripts[@]}"

Diff for: vendor/github.com/docker/docker/api/common.go

+11-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/docker/docker/api/swagger.yaml

+9-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/docker/docker/api/types/backend/backend.go

+7-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/docker/docker/api/types/client.go

-47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/docker/docker/api/types/container/config.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/docker/docker/api/types/image/opts.go

+53-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/docker/docker/api/types/mount/mount.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/docker/docker/api/types/registry/registry.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/docker/docker/api/types/types.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)