diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-03-13 17:17:07 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2019-03-29 08:27:33 -0400 |
| commit | c37589f503913ac85622cc9110e2eb983b1b38f3 (patch) | |
| tree | 9061248749f167ec6a5674efa97fef55d2890a95 /cmd | |
| parent | 6ab27c6355a4df228ed6d527162d5251d867b9b3 (diff) | |
| download | podman-c37589f503913ac85622cc9110e2eb983b1b38f3.tar.gz podman-c37589f503913ac85622cc9110e2eb983b1b38f3.tar.bz2 podman-c37589f503913ac85622cc9110e2eb983b1b38f3.zip | |
Set blob cache directory based on GraphDriver
Currently in rootless containers, we end up not using the blob cache.
We also don't store the blob cache based on the users specified graph
storage. This change will cause the cache directory to be stored with
the rest of the containe images.
While doing this patch, I found that we had duplicated GetSystemContext in
two places in libpod. I cleaned this up.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/login.go | 4 | ||||
| -rw-r--r-- | cmd/podman/logout.go | 4 | ||||
| -rw-r--r-- | cmd/podman/pull.go | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 4e96b43cb..8a1687278 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -10,7 +10,7 @@ import ( "github.com/containers/image/pkg/docker/config" "github.com/containers/image/types" "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/libpod/common" + "github.com/containers/libpod/libpod/image" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" @@ -64,7 +64,7 @@ func loginCmd(c *cliconfig.LoginValues) error { server := registryFromFullName(scrubServer(args[0])) authfile := getAuthFile(c.Authfile) - sc := common.GetSystemContext("", authfile, false) + sc := image.GetSystemContext("", authfile, false) if c.Flag("tls-verify").Changed { sc.DockerInsecureSkipTLSVerify = types.NewOptionalBool(!c.TlsVerify) } diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index 268e6b44c..069153e0b 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -5,7 +5,7 @@ import ( "github.com/containers/image/pkg/docker/config" "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/libpod/common" + "github.com/containers/libpod/libpod/image" "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -54,7 +54,7 @@ func logoutCmd(c *cliconfig.LogoutValues) error { } authfile := getAuthFile(c.Authfile) - sc := common.GetSystemContext("", authfile, false) + sc := image.GetSystemContext("", authfile, false) if c.All { if err := config.RemoveAllAuthentication(sc); err != nil { diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go index 8888c5e28..eeb9f3ff3 100644 --- a/cmd/podman/pull.go +++ b/cmd/podman/pull.go @@ -11,7 +11,6 @@ import ( "github.com/containers/image/transports/alltransports" "github.com/containers/image/types" "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/libpod/common" image2 "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/adapter" "github.com/containers/libpod/pkg/util" @@ -127,7 +126,7 @@ func pullCmd(c *cliconfig.PullValues) error { } else { authfile := getAuthFile(c.String("authfile")) spec := image - systemContext := common.GetSystemContext("", authfile, false) + systemContext := image2.GetSystemContext("", authfile, false) srcRef, err := alltransports.ParseImageName(spec) if err != nil { dockerTransport := "docker://" |