Merge pull request #1146 from matejvasek/update-docker-v26

chore: update docker to v26

Author: openshift-merge-bot[bot]

go.mod

@@ -4,8 +4,8 @@ go 1.20
 
 require (
 	github.com/containers/image/v5 v5.29.0
-	github.com/docker/distribution v2.8.3+incompatible
-	github.com/docker/docker v25.0.3+incompatible
+	github.com/distribution/reference v0.5.0
+	github.com/docker/docker v26.1.3+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/go-imports-organizer/goio v1.3.3
 	github.com/moby/buildkit v0.12.4
@@ -30,7 +30,7 @@ require (
 	github.com/containers/ocicrypt v1.1.9 // indirect
 	github.com/containers/storage v1.51.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
-	github.com/distribution/reference v0.5.0 // indirect
+	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
@@ -52,6 +52,7 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-shellwords v1.0.12 // indirect
 	github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/sys/mountinfo v0.7.1 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

go.sum

@@ -47,8 +47,8 @@ github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5
 github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v25.0.3+incompatible h1:D5fy/lYmY7bvZa0XTZ5/UJPljor41F+vdyJG5luQLfQ=
-github.com/docker/docker v25.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v26.1.3+incompatible h1:lLCzRbrVZrljpVNobJu1J2FHk8V0s4BawoZippkc+xo=
+github.com/docker/docker v26.1.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
 github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
@@ -133,6 +133,8 @@ github.com/mistifyio/go-zfs/v3 v3.0.1 h1:YaoXgBePoMA12+S1u/ddkv+QqxcfiZK4prI6HPn
 github.com/mistifyio/go-zfs/v3 v3.0.1/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
 github.com/moby/buildkit v0.12.4 h1:yKZDsObXLKarXqUx7YMnaB+TKv810bBhq0XLFWbkjT0=
 github.com/moby/buildkit v0.12.4/go.mod h1:XG74uz06nPWQpnxYwgCryrVidvor0+ElUxGosbZPQG4=
+github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
+github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g=
 github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=

pkg/api/validation/validation.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 
 	"github.com/openshift/source-to-image/pkg/api"
 )

pkg/docker/docker.go

@@ -21,6 +21,7 @@ import (
 
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/image"
 	dockernetwork "github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/registry"
 	dockerapi "github.com/docker/docker/client"
@@ -122,20 +123,20 @@ type Docker interface {
 
 // Client contains all methods used when interacting directly with docker engine-api
 type Client interface {
-	ContainerAttach(ctx context.Context, container string, options dockertypes.ContainerAttachOptions) (dockertypes.HijackedResponse, error)
-	ContainerCommit(ctx context.Context, container string, options dockertypes.ContainerCommitOptions) (dockertypes.IDResponse, error)
+	ContainerAttach(ctx context.Context, container string, options dockercontainer.AttachOptions) (dockertypes.HijackedResponse, error)
+	ContainerCommit(ctx context.Context, container string, options dockercontainer.CommitOptions) (dockertypes.IDResponse, error)
 	ContainerCreate(ctx context.Context, config *dockercontainer.Config, hostConfig *dockercontainer.HostConfig, networkingConfig *dockernetwork.NetworkingConfig, platform *v1.Platform, containerName string) (dockercontainer.CreateResponse, error)
 	ContainerInspect(ctx context.Context, container string) (dockertypes.ContainerJSON, error)
-	ContainerRemove(ctx context.Context, container string, options dockertypes.ContainerRemoveOptions) error
-	ContainerStart(ctx context.Context, container string, options dockertypes.ContainerStartOptions) error
+	ContainerRemove(ctx context.Context, container string, options dockercontainer.RemoveOptions) error
+	ContainerStart(ctx context.Context, container string, options dockercontainer.StartOptions) error
 	ContainerKill(ctx context.Context, container, signal string) error
 	ContainerWait(ctx context.Context, container string, condition dockercontainer.WaitCondition) (<-chan dockercontainer.WaitResponse, <-chan error)
 	CopyToContainer(ctx context.Context, container, path string, content io.Reader, opts dockertypes.CopyToContainerOptions) error
 	CopyFromContainer(ctx context.Context, container, srcPath string) (io.ReadCloser, dockertypes.ContainerPathStat, error)
 	ImageBuild(ctx context.Context, buildContext io.Reader, options dockertypes.ImageBuildOptions) (dockertypes.ImageBuildResponse, error)
 	ImageInspectWithRaw(ctx context.Context, image string) (dockertypes.ImageInspect, []byte, error)
 	ImagePull(ctx context.Context, ref string, options dockertypes.ImagePullOptions) (io.ReadCloser, error)
-	ImageRemove(ctx context.Context, image string, options dockertypes.ImageRemoveOptions) ([]dockertypes.ImageDeleteResponseItem, error)
+	ImageRemove(ctx context.Context, image string, options dockertypes.ImageRemoveOptions) ([]image.DeleteResponse, error)
 	ServerVersion(ctx context.Context) (dockertypes.Version, error)
 }
 
@@ -260,8 +261,8 @@ func (rco RunContainerOptions) asDockerCreateContainerOptions() configWrapper {
 
 // asDockerAttachToContainerOptions converts a RunContainerOptions into a
 // ContainerAttachOptions understood by the docker client
-func (rco RunContainerOptions) asDockerAttachToContainerOptions() dockertypes.ContainerAttachOptions {
-	return dockertypes.ContainerAttachOptions{
+func (rco RunContainerOptions) asDockerAttachToContainerOptions() dockercontainer.AttachOptions {
+	return dockercontainer.AttachOptions{
 		Stdin:  rco.Stdin != nil,
 		Stdout: rco.Stdout != nil,
 		Stderr: rco.Stderr != nil,
@@ -631,7 +632,7 @@ func updateImageWithInspect(image *api.Image, inspect *dockertypes.ImageInspect)
 func (d *stiDocker) RemoveContainer(id string) error {
 	ctx, cancel := getDefaultContext()
 	defer cancel()
-	opts := dockertypes.ContainerRemoveOptions{
+	opts := dockercontainer.RemoveOptions{
 		RemoveVolumes: true,
 	}
 	return d.client.ContainerRemove(ctx, id, opts)
@@ -1040,7 +1041,7 @@ func (d *stiDocker) RunContainer(opts RunContainerOptions) error {
 		log.V(2).Infof("Starting container %q ...", container.ID)
 		ctx, cancel = getDefaultContext()
 		defer cancel()
-		err = d.client.ContainerStart(ctx, container.ID, dockertypes.ContainerStartOptions{})
+		err = d.client.ContainerStart(ctx, container.ID, dockercontainer.StartOptions{})
 		if err != nil {
 			return err
 		}
@@ -1115,7 +1116,7 @@ func (d *stiDocker) GetImageID(name string) (string, error) {
 // CommitContainer commits a container to an image with a specific tag.
 // The new image ID is returned
 func (d *stiDocker) CommitContainer(opts CommitContainerOptions) (string, error) {
-	dockerOpts := dockertypes.ContainerCommitOptions{
+	dockerOpts := dockercontainer.CommitOptions{
 		Reference: opts.Repository,
 	}
 	if opts.Command != nil || opts.Entrypoint != nil {

pkg/docker/docker_test.go

@@ -78,7 +78,7 @@ func TestCommitContainer(t *testing.T) {
 			ContainerID: tst.containerID,
 			Repository:  tst.containerTag,
 		}
-		param := dockertypes.ContainerCommitOptions{
+		param := dockercontainer.CommitOptions{
 			Reference: tst.containerTag,
 		}
 		resp := dockertypes.IDResponse{

pkg/docker/test/client.go

@@ -12,6 +12,7 @@ import (
 
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/image"
 	dockernetwork "github.com/docker/docker/api/types/network"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"golang.org/x/net/context"
@@ -79,7 +80,7 @@ type FakeDockerClient struct {
 	WaitContainerErrInspectJSON dockertypes.ContainerJSON
 
 	ContainerCommitID       string
-	ContainerCommitOptions  dockertypes.ContainerCommitOptions
+	ContainerCommitOptions  dockercontainer.CommitOptions
 	ContainerCommitResponse dockertypes.IDResponse
 	ContainerCommitErr      error
 
@@ -148,14 +149,14 @@ func (d *FakeDockerClient) ContainerWait(ctx context.Context, containerID string
 }
 
 // ContainerCommit applies changes into a container and creates a new tagged image.
-func (d *FakeDockerClient) ContainerCommit(ctx context.Context, container string, options dockertypes.ContainerCommitOptions) (dockertypes.IDResponse, error) {
+func (d *FakeDockerClient) ContainerCommit(ctx context.Context, container string, options dockercontainer.CommitOptions) (dockertypes.IDResponse, error) {
 	d.ContainerCommitID = container
 	d.ContainerCommitOptions = options
 	return d.ContainerCommitResponse, d.ContainerCommitErr
 }
 
 // ContainerAttach attaches a connection to a container in the server.
-func (d *FakeDockerClient) ContainerAttach(ctx context.Context, container string, options dockertypes.ContainerAttachOptions) (dockertypes.HijackedResponse, error) {
+func (d *FakeDockerClient) ContainerAttach(ctx context.Context, container string, options dockercontainer.AttachOptions) (dockertypes.HijackedResponse, error) {
 	d.Calls = append(d.Calls, "attach")
 	return dockertypes.HijackedResponse{Conn: FakeConn{}, Reader: bufio.NewReader(&bytes.Buffer{})}, nil
 }
@@ -183,7 +184,7 @@ func (d *FakeDockerClient) ContainerInspect(ctx context.Context, containerID str
 }
 
 // ContainerRemove kills and removes a container from the docker host.
-func (d *FakeDockerClient) ContainerRemove(ctx context.Context, containerID string, options dockertypes.ContainerRemoveOptions) error {
+func (d *FakeDockerClient) ContainerRemove(ctx context.Context, containerID string, options dockercontainer.RemoveOptions) error {
 	d.Calls = append(d.Calls, "remove")
 
 	if _, exists := d.Containers[containerID]; exists {
@@ -199,7 +200,7 @@ func (d *FakeDockerClient) ContainerKill(ctx context.Context, containerID, signa
 }
 
 // ContainerStart sends a request to the docker daemon to start a container.
-func (d *FakeDockerClient) ContainerStart(ctx context.Context, containerID string, options dockertypes.ContainerStartOptions) error {
+func (d *FakeDockerClient) ContainerStart(ctx context.Context, containerID string, options dockercontainer.StartOptions) error {
 	d.Calls = append(d.Calls, "start")
 	return nil
 }
@@ -216,14 +217,14 @@ func (d *FakeDockerClient) ImagePull(ctx context.Context, ref string, options do
 }
 
 // ImageRemove removes an image from the docker host.
-func (d *FakeDockerClient) ImageRemove(ctx context.Context, imageID string, options dockertypes.ImageRemoveOptions) ([]dockertypes.ImageDeleteResponseItem, error) {
+func (d *FakeDockerClient) ImageRemove(ctx context.Context, imageID string, options dockertypes.ImageRemoveOptions) ([]image.DeleteResponse, error) {
 	d.Calls = append(d.Calls, "remove_image")
 
 	if _, exists := d.Images[imageID]; exists {
 		delete(d.Images, imageID)
-		return []dockertypes.ImageDeleteResponseItem{}, nil
+		return []image.DeleteResponse{}, nil
 	}
-	return []dockertypes.ImageDeleteResponseItem{}, errors.New("image does not exist")
+	return []image.DeleteResponse{}, errors.New("image does not exist")
 }
 
 // ServerVersion returns information of the docker client and server host.

pkg/docker/util.go

@@ -13,7 +13,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/reference"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/homedir"