code updates for dependency bump

Author: Corey Daley

pkg/docker/docker.go

@@ -122,12 +122,12 @@ type Docker interface {
 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)
-	ContainerCreate(ctx context.Context, config *dockercontainer.Config, hostConfig *dockercontainer.HostConfig, networkingConfig *dockernetwork.NetworkingConfig, platform *v1.Platform, containerName string) (dockercontainer.ContainerCreateCreatedBody, 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
 	ContainerKill(ctx context.Context, container, signal string) error
-	ContainerWait(ctx context.Context, container string, condition dockercontainer.WaitCondition) (<-chan dockercontainer.ContainerWaitOKBody, <-chan 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)
@@ -809,7 +809,7 @@ func determineCommandBaseDir(opts RunContainerOptions, imageMetadata *api.Image,
 }
 
 // dumpContainerInfo dumps information about a running container (port/IP/etc).
-func dumpContainerInfo(container dockercontainer.ContainerCreateCreatedBody, d *stiDocker, image string) {
+func dumpContainerInfo(container dockercontainer.CreateResponse, d *stiDocker, image string) {
 	ctx, cancel := getDefaultContext()
 	defer cancel()
 

pkg/docker/test/client.go

@@ -130,9 +130,9 @@ func (d *FakeDockerClient) CopyFromContainer(ctx context.Context, container, src
 }
 
 // ContainerWait pauses execution until a container exits.
-func (d *FakeDockerClient) ContainerWait(ctx context.Context, containerID string, condition dockercontainer.WaitCondition) (<-chan dockercontainer.ContainerWaitOKBody, <-chan error) {
+func (d *FakeDockerClient) ContainerWait(ctx context.Context, containerID string, condition dockercontainer.WaitCondition) (<-chan dockercontainer.WaitResponse, <-chan error) {
 	d.WaitContainerID = containerID
-	resultC := make(chan dockercontainer.ContainerWaitOKBody)
+	resultC := make(chan dockercontainer.WaitResponse)
 	errC := make(chan error, 1)
 
 	go func() {
@@ -141,7 +141,7 @@ func (d *FakeDockerClient) ContainerWait(ctx context.Context, containerID string
 			return
 		}
 
-		resultC <- dockercontainer.ContainerWaitOKBody{StatusCode: int64(d.WaitContainerResult)}
+		resultC <- dockercontainer.WaitResponse{StatusCode: int64(d.WaitContainerResult)}
 	}()
 
 	return resultC, errC
@@ -169,11 +169,11 @@ func (d *FakeDockerClient) ImageBuild(ctx context.Context, buildContext io.Reade
 }
 
 // ContainerCreate creates a new container based in the given configuration.
-func (d *FakeDockerClient) ContainerCreate(ctx context.Context, config *dockercontainer.Config, hostConfig *dockercontainer.HostConfig, networkingConfig *dockernetwork.NetworkingConfig, platform *v1.Platform, containerName string) (dockercontainer.ContainerCreateCreatedBody, error) {
+func (d *FakeDockerClient) ContainerCreate(ctx context.Context, config *dockercontainer.Config, hostConfig *dockercontainer.HostConfig, networkingConfig *dockernetwork.NetworkingConfig, platform *v1.Platform, containerName string) (dockercontainer.CreateResponse, error) {
 	d.Calls = append(d.Calls, "create")
 
 	d.Containers[containerName] = *config
-	return dockercontainer.ContainerCreateCreatedBody{}, nil
+	return dockercontainer.CreateResponse{}, nil
 }
 
 // ContainerInspect returns the container information.

pkg/docker/util.go

@@ -14,8 +14,8 @@ import (
 	"strings"
 
 	"github.com/docker/distribution/reference"
-	cliconfig "github.com/docker/docker/cli/config"
 	"github.com/docker/docker/client"
+	"github.com/docker/docker/pkg/homedir"
 
 	"github.com/openshift/source-to-image/pkg/api"
 	"github.com/openshift/source-to-image/pkg/api/constants"
@@ -39,6 +39,18 @@ type AuthConfigurations struct {
 	Configs map[string]api.AuthConfig
 }
 
+// Dir returns the path to the configuration directory as specified by the DOCKER_CONFIG environment variable.
+// If DOCKER_CONFIG is unset, Dir returns ~/.docker .
+// Dir ignores XDG_CONFIG_HOME (same as the docker client).
+// TODO: this was copied from github.com/docker/docker/cli/[email protected]
+func Dir() string {
+	configDir := os.Getenv("DOCKER_CONFIG")
+	if len(configDir) == 0 {
+		configDir = filepath.Join(homedir.Get(), ".docker")
+	}
+	return configDir
+}
+
 type dockerConfig struct {
 	Auth  string `json:"auth"`
 	Email string `json:"email"`
@@ -427,7 +439,7 @@ func GetDefaultDockerConfig() *api.DockerConfig {
 
 	certPath := os.Getenv("DOCKER_CERT_PATH")
 	if certPath == "" {
-		certPath = cliconfig.Dir()
+		certPath = Dir()
 	}
 
 	cfg.CertFile = filepath.Join(certPath, "cert.pem")

pkg/docker/util_test.go

@@ -4,8 +4,6 @@ import (
 	"os"
 	"testing"
 
-	cliconfig "github.com/docker/docker/cli/config"
-
 	"github.com/openshift/source-to-image/pkg/api"
 	"github.com/openshift/source-to-image/pkg/api/constants"
 	"github.com/openshift/source-to-image/pkg/util/user"
@@ -229,7 +227,7 @@ func TestGetDefaultDockerConfig(t *testing.T) {
 			envTLS:       "",
 
 			expectedHost:      "unix:///var/run/docker.sock",
-			expectedCertFile:  cliconfig.Dir() + "/cert.pem",
+			expectedCertFile:  Dir() + "/cert.pem",
 			expectedTLSVerify: false,
 			expectedTLS:       false,
 		},