Skip to content

Commit 081269d

Browse files
chore(deps): bump github.com/moby/buildkit from 0.11.6 to 0.12.5, github.com/docker/docker from 24.0.7+incompatible to 25.0.2+incompatible, and other deps (#2995)
1 parent 11e2e9f commit 081269d

File tree

400 files changed

+6730
-10746
lines changed

Some content is hidden

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

400 files changed

+6730
-10746
lines changed

Diff for: go.mod

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231213181459-b0fcec718dc6
1818
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589
1919
github.com/containerd/cgroups v1.1.0 // indirect
20-
github.com/docker/docker v24.0.7+incompatible
20+
github.com/docker/docker v25.0.3+incompatible
2121
github.com/go-git/go-billy/v5 v5.5.0
2222
github.com/go-git/go-git/v5 v5.11.0
2323
github.com/golang/mock v1.6.0
@@ -27,7 +27,7 @@ require (
2727
github.com/google/slowjam v1.1.0
2828
github.com/karrick/godirwalk v1.16.1
2929
github.com/minio/highwayhash v1.0.2
30-
github.com/moby/buildkit v0.11.6
30+
github.com/moby/buildkit v0.12.5
3131
github.com/otiai10/copy v1.14.0
3232
github.com/pkg/errors v0.9.1
3333
github.com/sirupsen/logrus v1.9.3
@@ -85,7 +85,6 @@ require (
8585
github.com/containerd/continuity v0.4.2 // indirect
8686
github.com/containerd/fifo v1.1.0 // indirect
8787
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
88-
github.com/containerd/typeurl v1.0.2 // indirect
8988
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
9089
github.com/dimchansky/utfbom v1.1.1 // indirect
9190
github.com/docker/cli v24.0.7+incompatible // indirect
@@ -112,7 +111,7 @@ require (
112111
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
113112
github.com/jmespath/go-jmespath v0.4.0 // indirect
114113
github.com/kevinburke/ssh_config v1.2.0 // indirect
115-
github.com/klauspost/compress v1.17.0 // indirect
114+
github.com/klauspost/compress v1.17.2 // indirect
116115
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
117116
github.com/mitchellh/go-homedir v1.1.0 // indirect
118117
github.com/moby/locker v1.0.1 // indirect
@@ -131,11 +130,11 @@ require (
131130
github.com/opencontainers/selinux v1.11.0 // indirect
132131
github.com/prometheus/client_golang v1.14.0 // indirect
133132
github.com/prometheus/client_model v0.3.0 // indirect
134-
github.com/prometheus/common v0.37.0 // indirect
135-
github.com/prometheus/procfs v0.8.0 // indirect
133+
github.com/prometheus/common v0.42.0 // indirect
134+
github.com/prometheus/procfs v0.9.0 // indirect
136135
github.com/rootless-containers/rootlesskit v1.1.0 // indirect
137136
github.com/sergi/go-diff v1.3.1 // indirect
138-
github.com/tonistiigi/fsutil v0.0.0-20230105215944-fb433841cbfa // indirect
137+
github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect
139138
github.com/vbatts/tar-split v0.11.3 // indirect
140139
github.com/xanzy/ssh-agent v0.3.3 // indirect
141140
go.etcd.io/etcd/raft/v3 v3.5.6 // indirect
@@ -169,6 +168,7 @@ require (
169168
github.com/containerd/ttrpc v1.2.2 // indirect
170169
github.com/containerd/typeurl/v2 v2.1.1 // indirect
171170
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
171+
github.com/distribution/reference v0.5.0 // indirect
172172
github.com/felixge/httpsnoop v1.0.4 // indirect
173173
github.com/fsnotify/fsnotify v1.7.0 // indirect
174174
github.com/go-logr/logr v1.4.1 // indirect

Diff for: go.sum

+14-311
Large diffs are not rendered by default.

Diff for: pkg/commands/healthcheck.go

+12-1
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,29 @@ package commands
1818

1919
import (
2020
"github.com/GoogleContainerTools/kaniko/pkg/dockerfile"
21+
"github.com/docker/docker/api/types/container"
2122
v1 "github.com/google/go-containerregistry/pkg/v1"
2223
"github.com/moby/buildkit/frontend/dockerfile/instructions"
2324
)
2425

26+
func convertDockerHealthConfigToContainerRegistryFormat(dockerHealthcheck container.HealthConfig) v1.HealthConfig {
27+
return v1.HealthConfig{
28+
Test: dockerHealthcheck.Test,
29+
Interval: dockerHealthcheck.Interval,
30+
Timeout: dockerHealthcheck.Timeout,
31+
StartPeriod: dockerHealthcheck.StartPeriod,
32+
Retries: dockerHealthcheck.Retries,
33+
}
34+
}
35+
2536
type HealthCheckCommand struct {
2637
BaseCommand
2738
cmd *instructions.HealthCheckCommand
2839
}
2940

3041
// ExecuteCommand handles command processing similar to CMD and RUN,
3142
func (h *HealthCheckCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfile.BuildArgs) error {
32-
check := v1.HealthConfig(*h.cmd.Health)
43+
check := convertDockerHealthConfigToContainerRegistryFormat(*h.cmd.Health)
3344
config.Healthcheck = &check
3445

3546
return nil

Diff for: vendor/github.com/containerd/typeurl/.gitignore

-2
This file was deleted.

Diff for: vendor/github.com/containerd/typeurl/LICENSE

-191
This file was deleted.

Diff for: vendor/github.com/containerd/typeurl/README.md

-20
This file was deleted.

Diff for: vendor/github.com/containerd/typeurl/doc.go

-83
This file was deleted.

0 commit comments

Comments
 (0)