github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[tmp] Use amd64 test image

Browse Source 
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 <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-09-13 13:31:52 -04:00
parent a2aa4ecdc0
commit ca3f16c510
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client_unix_test.go
View File

@ -33,6 +33,7 @@ func init() {
case "s390x": case "s390x":
testImage = "docker.io/s390x/alpine:latest" testImage = "docker.io/s390x/alpine:latest"
default: default:
testImage = "docker.io/library/alpine:latest" // FIXME: change this back after multiplatform support is added to pull
testImage = "docker.io/amd64/alpine:latest"
} }
} }

4
container_linux_test.go
View File

@ -730,7 +730,9 @@ func TestShimSigkilled(t *testing.T) {
defer cancel() defer cancel()
// redis unset its PDeathSignal making it a good candidate // 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 { if err != nil {
t.Fatal(err) t.Fatal(err)
} }