vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

libpod: set the default Store to match a Runtime

Browse source 
When initializing a Runtime, set the default Store for the
containers-storage transport in the image library to the same one that
we're using, so that the calling process sees the same set of images
in the Runtime that it sees when going through the image library.

Update the kpod_push test so that it no longer has to specify a location
in the destination image reference, since the default should already be
passed to kpod as global options.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2017-10-24 18:40:50 -04:00
parent 7ab9c55a12
commit a5fb2b4b11
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libpod/runtime.go
View file

@ -3,6 +3,7 @@ package libpod
import (
"sync"
is "github.com/containers/image/storage"
"github.com/containers/image/types"
"github.com/containers/storage"
"github.com/kubernetes-incubator/cri-o/server/apparmor"
@ -80,6 +81,7 @@ func NewRuntime(options ...RuntimeOption) (*Runtime, error) {
return nil, err
}
runtime.store = store
is.Transport.SetStore(store)
// Set up containers/image
runtime.imageContext = &types.SystemContext{

2
test/kpod_push.bats
View file

@ -12,7 +12,7 @@ function teardown() {
run ${KPOD_BINARY} $KPOD_OPTIONS pull "$IMAGE"
echo "$output"
[ "$status" -eq 0 ]
run ${KPOD_BINARY} $KPOD_OPTIONS push "$IMAGE" containers-storage:[${TESTDIR}/crio]busybox:test
run ${KPOD_BINARY} $KPOD_OPTIONS push "$IMAGE" containers-storage:busybox:test
echo "$output"
[ "$status" -eq 0 ]
run ${KPOD_BINARY} $KPOD_OPTIONS rmi "$IMAGE" busybox:test