From cadee0374b1866c6d2d3b9ece2af8a7d393bc909 Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Thu, 21 Sep 2017 15:25:34 -0400 Subject: [PATCH 1/2] Revert "Merge pull request #1502 from crosbymichael/test-image" This reverts commit 558b46f26e8e8a54dbb98bf86987587690ac9edb, reversing changes made to 0e616f4d7ad726d47574ae05894dd5dc5d1d96ec. Signed-off-by: Phil Estes --- client_unix_test.go | 3 +-- container_linux_test.go | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/client_unix_test.go b/client_unix_test.go index dbd5dda64..27fe7fab1 100644 --- a/client_unix_test.go +++ b/client_unix_test.go @@ -33,7 +33,6 @@ func init() { case "s390x": testImage = "docker.io/s390x/alpine:latest" default: - // FIXME: change this back after multiplatform support is added to pull - testImage = "docker.io/amd64/alpine:latest" + testImage = "docker.io/library/alpine:latest" } } diff --git a/container_linux_test.go b/container_linux_test.go index 8c78afbd4..093225884 100644 --- a/container_linux_test.go +++ b/container_linux_test.go @@ -730,9 +730,7 @@ func TestShimSigkilled(t *testing.T) { defer cancel() // redis unset its PDeathSignal making it a good candidate - // - // FIXME: change this back after multiplatform support is added to pull - image, err = client.Pull(ctx, "docker.io/amd64/redis:alpine", WithPullUnpack) + image, err = client.Pull(ctx, "docker.io/library/redis:alpine", WithPullUnpack) if err != nil { t.Fatal(err) } From e2f3e310c322853e12f990f1cc87fc25d794fe1f Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Thu, 21 Sep 2017 15:26:21 -0400 Subject: [PATCH 2/2] Make WithCheckpoint() work with manifest list images Simple change to allow checkpoint image references to be manifest list images. Signed-off-by: Phil Estes --- container_opts_unix.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_opts_unix.go b/container_opts_unix.go index 961ce720d..51fca9df5 100644 --- a/container_opts_unix.go +++ b/container_opts_unix.go @@ -38,7 +38,7 @@ func WithCheckpoint(desc v1.Descriptor, snapshotKey string) NewContainerOpts { case v1.MediaTypeImageLayer: fk := m rw = &fk - case images.MediaTypeDockerSchema2Manifest: + case images.MediaTypeDockerSchema2Manifest, images.MediaTypeDockerSchema2ManifestList: config, err := images.Config(ctx, store, m, platforms.Default()) if err != nil { return err