chore: changes required because of docker API incompatibilities

Author: plumpy

pkg/skaffold/actions/docker/task.go

@@ -196,10 +196,9 @@ func (t Task) containerName(ctx context.Context, name string) string {
 }
 
 func (t Task) containerConfigFromImage(ctx context.Context) (*container.Config, error) {
-	config, _, err := t.client.ImageInspectWithRaw(ctx, t.artifact.Tag)
+	ociConfig, _, err := t.client.ImageInspectWithRaw(ctx, t.artifact.Tag)
 	if err != nil {
 		return nil, err
 	}
-	config.Config.Image = t.artifact.Tag // the client replaces this with an image ID. put back the originally provided tagged image
-	return config.Config, err
+	return dockerutil.OCIImageConfigToContainerConfig(t.artifact.Tag, ociConfig.Config), nil
 }

pkg/skaffold/build/local/local_test.go

@@ -25,10 +25,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/client"
+	dockerspec "github.com/moby/docker-image-spec/specs-go/v1"
 
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/build"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/build/bazel"
@@ -575,10 +575,10 @@ type fakeDockerDaemon struct {
 	mu           sync.Mutex
 }
 
-func (fd *fakeDockerDaemon) ImageInspectWithRaw(_ context.Context, image string) (types.ImageInspect, []byte, error) {
-	imageID := fd.ImageIds[image]
-	return types.ImageInspect{
-		Config: &container.Config{},
+func (fd *fakeDockerDaemon) ImageInspectWithRaw(_ context.Context, img string) (image.InspectResponse, []byte, error) {
+	imageID := fd.ImageIds[img]
+	return image.InspectResponse{
+		Config: &dockerspec.DockerOCIImageConfig{},
 		ID:     imageID,
 	}, []byte{}, nil
 }

pkg/skaffold/deploy/docker/deploy.go

@@ -318,15 +318,15 @@ func (d *Deployer) createMount(v volume.Volume, labels map[string]string) mount.
 }
 
 func (d *Deployer) containerConfigFromImage(ctx context.Context, taggedImage string) (*container.Config, error) {
-	config, _, err := d.client.ImageInspectWithRaw(ctx, taggedImage)
+	ociConfig, _, err := d.client.ImageInspectWithRaw(ctx, taggedImage)
 	if err != nil {
 		return nil, err
 	}
 
-	config.Config.Labels = d.labeller.Labels()
-	config.Config.Image = taggedImage // the client replaces this with an image ID. put back the originally provided tagged image
+	config := dockerutil.OCIImageConfigToContainerConfig(taggedImage, ociConfig.Config)
+	config.Labels = d.labeller.Labels()
 
-	return config.Config, err
+	return config, nil
 }
 
 func (d *Deployer) getContainerName(ctx context.Context, name string) string {

pkg/skaffold/docker/client.go

@@ -29,8 +29,11 @@ import (
 	"sync"
 
 	"github.com/docker/cli/cli/connhelper"
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
+	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-connections/tlsconfig"
+	dockerspec "github.com/moby/docker-image-spec/specs-go/v1"
 
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/cluster"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/config"
@@ -250,3 +253,31 @@ func getMinikubeDockerEnv(ctx context.Context, minikubeProfile string) (map[stri
 
 	return env, nil
 }
+
+// This was copied from api/server/router/image/image_routes.go, since it's not
+// exported. The ImageInspect API now returns a dockerspec.DockerOCIImageConfig,
+// whereas before it used to return a container.Config, so we need to convert it
+// before using it to call ContainerCreate.
+func OCIImageConfigToContainerConfig(img string, cfg *dockerspec.DockerOCIImageConfig) *container.Config {
+	exposedPorts := make(nat.PortSet, len(cfg.ExposedPorts))
+	for k, v := range cfg.ExposedPorts {
+		exposedPorts[nat.Port(k)] = v
+	}
+
+	return &container.Config{
+		Image:        img,
+		Entrypoint:   cfg.Entrypoint,
+		Env:          cfg.Env,
+		Cmd:          cfg.Cmd,
+		User:         cfg.User,
+		WorkingDir:   cfg.WorkingDir,
+		ExposedPorts: exposedPorts,
+		Volumes:      cfg.Volumes,
+		Labels:       cfg.Labels,
+		ArgsEscaped:  cfg.ArgsEscaped, //nolint:staticcheck // Ignore SA1019. Need to keep it in image.
+		StopSignal:   cfg.StopSignal,
+		Healthcheck:  cfg.Healthcheck,
+		OnBuild:      cfg.OnBuild,
+		Shell:        cfg.Shell,
+	}
+}

pkg/skaffold/docker/image.go

@@ -97,7 +97,7 @@ type LocalDaemon interface {
 	Tag(ctx context.Context, image, ref string) error
 	TagWithImageID(ctx context.Context, ref string, imageID string) (string, error)
 	ImageID(ctx context.Context, ref string) (string, error)
-	ImageInspectWithRaw(ctx context.Context, image string) (types.ImageInspect, []byte, error)
+	ImageInspectWithRaw(ctx context.Context, image string) (image.InspectResponse, []byte, error)
 	ImageRemove(ctx context.Context, image string, opts image.RemoveOptions) ([]image.DeleteResponse, error)
 	ImageExists(ctx context.Context, ref string) bool
 	ImageList(ctx context.Context, ref string) ([]image.Summary, error)
@@ -530,7 +530,7 @@ func (l *localDaemon) Pull(ctx context.Context, out io.Writer, ref string, platf
 
 // Load loads an image from a tar file. Returns the imageID for the loaded image.
 func (l *localDaemon) Load(ctx context.Context, out io.Writer, input io.Reader, ref string) (string, error) {
-	resp, err := l.apiClient.ImageLoad(ctx, input, false)
+	resp, err := l.apiClient.ImageLoad(ctx, input)
 	if err != nil {
 		return "", fmt.Errorf("loading image into docker daemon: %w", err)
 	}

pkg/skaffold/verify/docker/verify.go

@@ -299,12 +299,11 @@ func (v *Verifier) createAndRunContainer(ctx context.Context, out io.Writer, art
 }
 
 func (v *Verifier) containerConfigFromImage(ctx context.Context, taggedImage string) (*container.Config, error) {
-	config, _, err := v.client.ImageInspectWithRaw(ctx, taggedImage)
+	ociConfig, _, err := v.client.ImageInspectWithRaw(ctx, taggedImage)
 	if err != nil {
 		return nil, err
 	}
-	config.Config.Image = taggedImage // the client replaces this with an image ID. put back the originally provided tagged image
-	return config.Config, err
+	return dockerutil.OCIImageConfigToContainerConfig(taggedImage, ociConfig.Config), nil
 }
 
 func (v *Verifier) getContainerName(ctx context.Context, imageName string, containerName string) string {

pkg/skaffold/verify/docker/verify_test.go

@@ -24,6 +24,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
+	dockerspec "github.com/moby/docker-image-spec/specs-go/v1"
 
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/deploy/label"
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/docker"
@@ -65,7 +66,7 @@ func (fd *fakeDockerDaemon) Run(ctx context.Context, out io.Writer, opts docker.
 
 func (fd *fakeDockerDaemon) ImageInspectWithRaw(ctx context.Context, image string) (types.ImageInspect, []byte, error) {
 	return types.ImageInspect{
-		Config: &container.Config{},
+		Config: &dockerspec.DockerOCIImageConfig{},
 	}, []byte{}, nil
 }
 

testutil/fake_image_api.go

@@ -36,6 +36,7 @@ import (
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/random"
 	"github.com/google/go-containerregistry/pkg/v1/tarball"
+	dockerspec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/opencontainers/go-digest"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )
@@ -158,6 +159,12 @@ func (f *FakeAPIClient) ImageRemove(_ context.Context, _ string, _ image.RemoveO
 	return []image.DeleteResponse{}, nil
 }
 
+func (fd *FakeAPIClient) ImageInspect(ctx context.Context, _ string, opts ...client.ImageInspectOption) (image.InspectResponse, error) {
+	return image.InspectResponse{
+		Config: &dockerspec.DockerOCIImageConfig{},
+	}, nil
+}
+
 func (f *FakeAPIClient) ImageInspectWithRaw(_ context.Context, refOrID string) (types.ImageInspect, []byte, error) {
 	if f.ErrImageInspect {
 		return types.ImageInspect{}, nil, fmt.Errorf("")
@@ -258,17 +265,17 @@ func (f *FakeAPIClient) Info(context.Context) (system.Info, error) {
 	}, nil
 }
 
-func (f *FakeAPIClient) ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error) {
+func (f *FakeAPIClient) ImageLoad(ctx context.Context, input io.Reader, _ ...client.ImageLoadOption) (image.LoadResponse, error) {
 	ref, err := ReadRefFromFakeTar(input)
 	if err != nil {
-		return types.ImageLoadResponse{}, fmt.Errorf("reading tar")
+		return image.LoadResponse{}, fmt.Errorf("reading tar")
 	}
 
 	next := atomic.AddInt32(&f.nextImageID, 1)
 	imageID := fmt.Sprintf("sha256:%d", next)
 	f.Add(ref, imageID)
 
-	return types.ImageLoadResponse{
+	return image.LoadResponse{
 		Body: f.body(imageID),
 	}, nil
 }
@@ -289,7 +296,7 @@ func (f *FakeAPIClient) ImageList(ctx context.Context, ops image.ListOptions) ([
 	return rt, nil
 }
 
-func (f *FakeAPIClient) ImageHistory(ctx context.Context, image string) ([]image.HistoryResponseItem, error) {
+func (f *FakeAPIClient) ImageHistory(ctx context.Context, image string, _ ...client.ImageHistoryOption) ([]image.HistoryResponseItem, error) {
 	return nil, nil
 }