diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2018-12-03 22:55:20 +0100 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2018-12-06 23:34:59 +0100 |
| commit | 93e14b619897dff4157785f9366663db5d0df3b6 (patch) | |
| tree | 93081e1656adf7636a1b3b4819795449b5d6f7a8 /cmd/podman/shared/container.go | |
| parent | 1b893be71c82edf3b1ed3239026cc7f6df3e3560 (diff) | |
| download | podman-93e14b619897dff4157785f9366663db5d0df3b6.tar.gz podman-93e14b619897dff4157785f9366663db5d0df3b6.tar.bz2 podman-93e14b619897dff4157785f9366663db5d0df3b6.zip | |
Remove the forceSecure parameter on the pull call stack
DockerRegistryOptions.DockerInsecureSkipTLSVerify as an types.OptionalBool
can now represent that value, so forceSecure is redundant.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'cmd/podman/shared/container.go')
| -rw-r--r-- | cmd/podman/shared/container.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go index 90ce193f7..6236d19b4 100644 --- a/cmd/podman/shared/container.go +++ b/cmd/podman/shared/container.go @@ -4,11 +4,6 @@ import ( "context" "encoding/json" "fmt" - "github.com/containers/image/types" - "github.com/containers/libpod/libpod/image" - "github.com/containers/libpod/pkg/util" - "github.com/cri-o/ocicni/pkg/ocicni" - "github.com/docker/go-units" "io" "os" "path/filepath" @@ -18,9 +13,14 @@ import ( "sync" "time" + "github.com/containers/image/types" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/inspect" cc "github.com/containers/libpod/pkg/spec" + "github.com/containers/libpod/pkg/util" + "github.com/cri-o/ocicni/pkg/ocicni" + "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -620,7 +620,7 @@ func GetRunlabel(label string, runlabelImage string, ctx context.Context, runtim registryCreds = creds } dockerRegistryOptions.DockerRegistryCreds = registryCreds - newImage, err = runtime.ImageRuntime().New(ctx, runlabelImage, signaturePolicyPath, authfile, output, &dockerRegistryOptions, image.SigningOptions{}, false, false) + newImage, err = runtime.ImageRuntime().New(ctx, runlabelImage, signaturePolicyPath, authfile, output, &dockerRegistryOptions, image.SigningOptions{}, false) } else { newImage, err = runtime.ImageRuntime().NewFromLocal(runlabelImage) } |