From ca3f16c510c0f5e2fb4f9889e2bfbefc4e4a39ad Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Wed, 13 Sep 2017 13:31:52 -0400 Subject: [PATCH] [tmp] Use amd64 test image This is a workaround because official images were pushed with multi-arch support recently and the current Pull code is not accounting for this. Signed-off-by: Michael Crosby --- client_unix_test.go | 3 ++- container_linux_test.go | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client_unix_test.go b/client_unix_test.go index 27fe7fab1..dbd5dda64 100644 --- a/client_unix_test.go +++ b/client_unix_test.go @@ -33,6 +33,7 @@ func init() { case "s390x": testImage = "docker.io/s390x/alpine:latest" default: - testImage = "docker.io/library/alpine:latest" + // FIXME: change this back after multiplatform support is added to pull + testImage = "docker.io/amd64/alpine:latest" } } diff --git a/container_linux_test.go b/container_linux_test.go index 093225884..8c78afbd4 100644 --- a/container_linux_test.go +++ b/container_linux_test.go @@ -730,7 +730,9 @@ func TestShimSigkilled(t *testing.T) { defer cancel() // redis unset its PDeathSignal making it a good candidate - image, err = client.Pull(ctx, "docker.io/library/redis:alpine", WithPullUnpack) + // + // FIXME: change this back after multiplatform support is added to pull + image, err = client.Pull(ctx, "docker.io/amd64/redis:alpine", WithPullUnpack) if err != nil { t.Fatal(err) }