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

Merge pull request #1068 from nalind/default-store

Browse source 
libpod: set the default Store to match a Runtime
This commit is contained in:
Daniel J Walsh 2017-10-24 21:40:56 -07:00 committed by GitHub
commit 2f43183c35
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 ( import (
"sync" "sync"
is "github.com/containers/image/storage"
"github.com/containers/image/types" "github.com/containers/image/types"
"github.com/containers/storage" "github.com/containers/storage"
"github.com/kubernetes-incubator/cri-o/server/apparmor" "github.com/kubernetes-incubator/cri-o/server/apparmor"
@ -80,6 +81,7 @@ func NewRuntime(options ...RuntimeOption) (*Runtime, error) {
return nil, err return nil, err
} }
runtime.store = store runtime.store = store
is.Transport.SetStore(store)
// Set up containers/image // Set up containers/image
runtime.imageContext = &types.SystemContext{ runtime.imageContext = &types.SystemContext{

2
test/kpod_push.bats
View file

@ -12,7 +12,7 @@ function teardown() {
run ${KPOD_BINARY} $KPOD_OPTIONS pull "$IMAGE" run ${KPOD_BINARY} $KPOD_OPTIONS pull "$IMAGE"
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$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" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run ${KPOD_BINARY} $KPOD_OPTIONS rmi "$IMAGE" busybox:test run ${KPOD_BINARY} $KPOD_OPTIONS rmi "$IMAGE" busybox:test