Merge pull request #291 from jericop/update-docker-go-containerregistry

Update docker and go-containerregistry

Author: jabrown85

acceptance/reproducibility_test.go

@@ -131,6 +131,7 @@ func testReproducibility(t *testing.T, _ spec.G, it spec.S) {
 		img2, err := local.NewImage(imageName2, dockerClient, local.FromBaseImage(runnableBaseImageName))
 		h.AssertNil(t, err)
 		mutateAndSave(t, img2)
+
 		h.PushImage(t, dockerClient, imageName2)
 
 		compare(t, imageName1, imageName2)
@@ -170,6 +171,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())

go.mod

@@ -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

go.sum

@@ -1040,7 +1040,7 @@ func testImage(t *testing.T, when spec.G, it spec.S) {
 			inspect, err := dockerClient.ImageInspect(context.TODO(), repoName)
 			h.AssertNil(t, err)
 
-			h.AssertEq(t, []string(inspect.Config.Entrypoint), []string{"some", "entrypoint"})
+			h.AssertEq(t, inspect.Config.Entrypoint, []string{"some", "entrypoint"})
 		})
 	})
 
@@ -1063,7 +1063,7 @@ func testImage(t *testing.T, when spec.G, it spec.S) {
 			inspect, err := dockerClient.ImageInspect(context.TODO(), repoName)
 			h.AssertNil(t, err)
 
-			h.AssertEq(t, []string(inspect.Config.Cmd), []string{"some", "cmd"})
+			h.AssertEq(t, inspect.Config.Cmd, []string{"some", "cmd"})
 		})
 	})
 

local/local_test.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	cerrdefs "github.com/containerd/errdefs"
 	"github.com/docker/docker/api/types/image"
-	"github.com/docker/docker/client"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 
 	"github.com/buildpacks/imgutil"
@@ -121,7 +121,7 @@ func processImageOption(repoName string, dockerClient DockerClient, downloadLaye
 func getInspectAndHistory(repoName string, dockerClient DockerClient) (*image.InspectResponse, []image.HistoryResponseItem, error) {
 	inspect, err := dockerClient.ImageInspect(context.Background(), repoName)
 	if err != nil {
-		if client.IsErrNotFound(err) {
+		if cerrdefs.IsNotFound(err) {
 			return nil, nil, nil
 		}
 		return nil, nil, fmt.Errorf("inspecting image %q: %w", repoName, err)

local/new.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 	"sync"
 
+	cerrdefs "github.com/containerd/errdefs"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/system"
@@ -190,7 +191,7 @@ func (s *Store) doSave(img v1.Image, withName string) (image.InspectResponse, er
 
 	inspect, err := s.dockerClient.ImageInspect(context.Background(), withName)
 	if err != nil {
-		if client.IsErrNotFound(err) {
+		if cerrdefs.IsNotFound(err) {
 			return image.InspectResponse{}, fmt.Errorf("saving image %q: %w", withName, err)
 		}
 		return image.InspectResponse{}, err

local/store.go

@@ -6,12 +6,12 @@ import (
 	"io"
 	"time"
 
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/image"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/empty"
 	"github.com/google/go-containerregistry/pkg/v1/mutate"
 	v1types "github.com/google/go-containerregistry/pkg/v1/types"
+	dockerspec "github.com/moby/docker-image-spec/specs-go/v1"
 
 	"github.com/buildpacks/imgutil"
 )
@@ -132,7 +132,7 @@ func toV1History(history []image.HistoryResponseItem) []v1.History {
 	return v1History
 }
 
-func toV1Config(dockerCfg *container.Config) v1.Config {
+func toV1Config(dockerCfg *dockerspec.DockerOCIImageConfig) v1.Config {
 	if dockerCfg == nil {
 		return v1.Config{}
 	}
@@ -148,32 +148,21 @@ func toV1Config(dockerCfg *container.Config) v1.Config {
 	}
 	exposedPorts := make(map[string]struct{}, len(dockerCfg.ExposedPorts))
 	for key, val := range dockerCfg.ExposedPorts {
-		exposedPorts[string(key)] = val
+		exposedPorts[key] = val
 	}
 	return v1.Config{
-		AttachStderr:    dockerCfg.AttachStderr,
-		AttachStdin:     dockerCfg.AttachStdin,
-		AttachStdout:    dockerCfg.AttachStdout,
-		Cmd:             dockerCfg.Cmd,
-		Healthcheck:     healthcheck,
-		Domainname:      dockerCfg.Domainname,
-		Entrypoint:      dockerCfg.Entrypoint,
-		Env:             dockerCfg.Env,
-		Hostname:        dockerCfg.Hostname,
-		Image:           dockerCfg.Image,
-		Labels:          dockerCfg.Labels,
-		OnBuild:         dockerCfg.OnBuild,
-		OpenStdin:       dockerCfg.OpenStdin,
-		StdinOnce:       dockerCfg.StdinOnce,
-		Tty:             dockerCfg.Tty,
-		User:            dockerCfg.User,
-		Volumes:         dockerCfg.Volumes,
-		WorkingDir:      dockerCfg.WorkingDir,
-		ExposedPorts:    exposedPorts,
-		ArgsEscaped:     dockerCfg.ArgsEscaped,
-		NetworkDisabled: dockerCfg.NetworkDisabled,
-		StopSignal:      dockerCfg.StopSignal,
-		Shell:           dockerCfg.Shell,
+		Cmd:          dockerCfg.Cmd,
+		Healthcheck:  healthcheck,
+		Entrypoint:   dockerCfg.Entrypoint,
+		Env:          dockerCfg.Env,
+		Labels:       dockerCfg.Labels,
+		OnBuild:      dockerCfg.OnBuild,
+		User:         dockerCfg.User,
+		Volumes:      dockerCfg.Volumes,
+		WorkingDir:   dockerCfg.WorkingDir,
+		ExposedPorts: exposedPorts,
+		StopSignal:   dockerCfg.StopSignal,
+		Shell:        dockerCfg.Shell,
 	}
 }
 

local/v1_facade.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 	"time"
 
+	cerrdefs "github.com/containerd/errdefs"
 	"github.com/docker/docker/api/types/image"
 	dockercli "github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/jsonmessage"
@@ -176,7 +177,7 @@ func PullIfMissing(t *testing.T, docker dockercli.APIClient, ref string) {
 	if err == nil {
 		return
 	}
-	if !dockercli.IsErrNotFound(err) {
+	if !cerrdefs.IsNotFound(err) {
 		t.Fatalf("failed inspecting image '%s': %s", ref, err)
 	}