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

Merge pull request #1540 from estesp/revert-temp-image-ref

Browse Source 
Revert temp image reference change/fix WithCheckpoint()
This commit is contained in:
Derek McGowan 2017-09-21 13:06:59 -07:00 committed by GitHub
commit 90d74528ed
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client_unix_test.go
View File

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

4
container_linux_test.go
View File

@ -730,9 +730,7 @@ 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)
} }

2
container_opts_unix.go
View File

@ -38,7 +38,7 @@ func WithCheckpoint(desc v1.Descriptor, snapshotKey string) NewContainerOpts {
case v1.MediaTypeImageLayer: case v1.MediaTypeImageLayer:
fk := m fk := m
rw = &fk rw = &fk
case images.MediaTypeDockerSchema2Manifest: case images.MediaTypeDockerSchema2Manifest, images.MediaTypeDockerSchema2ManifestList:
config, err := images.Config(ctx, store, m, platforms.Default()) config, err := images.Config(ctx, store, m, platforms.Default())
if err != nil { if err != nil {
return err return err