Skip to content

Update docker and go-containerregistry #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jericop wants to merge 5 commits into from
Closed

Update docker and go-containerregistry #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95aab00
Update docker and go-containerregistry
jericop Jun 26, 2025
9dbda49
Troubleshooting
jericop Jun 26, 2025
9126250
Skip assertEq for images for testing and print configs
jericop Jun 26, 2025
25f1da9
fix hopefully
jericop Jun 26, 2025
ee1d88f
Bump docker to 28.3.0
jericop Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions acceptance/reproducibility_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ func TestAcceptance(t *testing.T) {

dockerRegistry := h.NewDockerRegistry(h.WithAuth(dockerConfigDir))
dockerRegistry.Start(t)
t.Log("Not stopping crane registry")
defer dockerRegistry.Stop(t)

registryHost = dockerRegistry.Host
registryPort = dockerRegistry.Port
t.Logf("Using registry %s:%s\n", registryHost, registryPort)

os.Setenv("DOCKER_CONFIG", dockerRegistry.DockerDirectory)
defer os.Unsetenv("DOCKER_CONFIG")
Expand Down Expand Up @@ -73,9 +75,11 @@ func testReproducibility(t *testing.T, _ spec.G, it spec.S) {

layer1, err = h.CreateSingleFileLayerTar(fmt.Sprintf("/new-layer-%s.txt", h.RandString(10)), "new-layer-"+h.RandString(10), daemonOS)
h.AssertNil(t, err)
t.Logf("layer1: %s", layer1)

layer2, err = h.CreateSingleFileLayerTar(fmt.Sprintf("/new-layer-%s.txt", h.RandString(10)), "new-layer-"+h.RandString(10), daemonOS)
h.AssertNil(t, err)
t.Logf("layer2: %s", layer2)

mutateAndSave = func(t *testing.T, img imgutil.Image) {
h.AssertNil(t, img.AddLayer(layer1))
Expand All @@ -91,8 +95,10 @@ func testReproducibility(t *testing.T, _ spec.G, it spec.S) {

it.After(func() {
// clean up any local images
h.DockerRmi(dockerClient, imageName1)
h.DockerRmi(dockerClient, imageName2)
t.Logf("Not cleaning up local images %s and %s", imageName1, imageName2)
// h.DockerRmi(dockerClient, imageName1)
// h.DockerRmi(dockerClient, imageName2)
// t.Logf("Not cleaning up layers %s and %s", layer1, layer2)
h.AssertNil(t, os.Remove(layer1))
h.AssertNil(t, os.Remove(layer2))
})
Expand Down Expand Up @@ -124,13 +130,20 @@ func testReproducibility(t *testing.T, _ spec.G, it spec.S) {
})

it("remote/local", func() {
t.Logf("imageName1: %s", imageName1)
t.Logf("imageName2: %s", imageName2)
img1, err := remote.NewImage(imageName1, authn.DefaultKeychain, remote.FromBaseImage(runnableBaseImageName))
h.AssertNil(t, err)
mutateAndSave(t, img1)
t.Logf("img1: %#v", img1)

img2, err := local.NewImage(imageName2, dockerClient, local.FromBaseImage(runnableBaseImageName))
t.Logf("img2: %#v", img2)
h.AssertNil(t, err)
mutateAndSave(t, img2)

t.Log("Sleeping")
// time.Sleep(120 * time.Second)
h.PushImage(t, dockerClient, imageName2)

compare(t, imageName1, imageName2)
Expand Down Expand Up @@ -170,6 +183,10 @@ func compare(t *testing.T, img1, img2 string) {
cfg1.Config.Image = ""
cfg2.Config.Image = ""

// ArgsEscaped is deprecated by docker/moby and is no longer set by imgutil, so we set it to false
cfg1.Config.ArgsEscaped = false
cfg2.Config.ArgsEscaped = false

h.AssertEq(t, cfg1, cfg2)

h.AssertEq(t, ref1.Identifier(), ref2.Identifier())
Expand Down
49 changes: 26 additions & 23 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,53 @@
module github.com/buildpacks/imgutil

require (
github.com/docker/docker v28.1.1+incompatible
github.com/containerd/errdefs v1.0.0
github.com/docker/docker v28.3.0+incompatible
github.com/google/go-cmp v0.7.0
github.com/google/go-containerregistry v0.19.1
github.com/google/go-containerregistry v0.20.6
github.com/moby/docker-image-spec v1.3.1
github.com/pkg/errors v0.9.1
github.com/sclevine/spec v1.4.0
golang.org/x/sync v0.7.0
golang.org/x/sync v0.15.0
)

require (
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v28.1.1+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/cli v28.2.2+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.9.3 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/sys/atomicwriter v0.1.0 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/vbatts/tar-split v0.11.3 // indirect
github.com/vbatts/tar-split v0.12.1 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
go.opentelemetry.io/otel v1.36.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
go.opentelemetry.io/otel/metric v1.36.0 // indirect
go.opentelemetry.io/otel/sdk v1.25.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/tools v0.9.1 // indirect
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/sys v0.33.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/grpc v1.68.1 // indirect
)

go 1.24.0
Loading
Loading