From d3f59bedb393521986e645bc48c47938f321b643 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Tue, 1 Oct 2019 22:15:58 +0200 Subject: Update c/image to v4.0.1 and buildah to 1.11.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This requires updating all import paths throughout, and a matching buildah update to interoperate. I can't figure out the reason for go.mod tracking github.com/containers/image v3.0.2+incompatible // indirect ((go mod graph) lists it as a direct dependency of libpod, but (go list -json -m all) lists it as an indirect dependency), but at least looking at the vendor subdirectory, it doesn't seem to be actually used in the built binaries. Signed-off-by: Miloslav Trmač --- cmd/podman/login.go | 6 +++--- cmd/podman/logout.go | 4 ++-- cmd/podman/pull.go | 8 ++++---- cmd/podman/push.go | 6 +++--- cmd/podman/runlabel.go | 2 +- cmd/podman/search.go | 2 +- cmd/podman/shared/container.go | 2 +- cmd/podman/shared/create.go | 2 +- cmd/podman/sign.go | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 36262fd4d..96b4ac2a2 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/containers/image/docker" - "github.com/containers/image/pkg/docker/config" - "github.com/containers/image/types" + "github.com/containers/image/v4/docker" + "github.com/containers/image/v4/pkg/docker/config" + "github.com/containers/image/v4/types" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod/image" diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index 66dc82363..6d6db4b41 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/containers/image/docker" - "github.com/containers/image/pkg/docker/config" + "github.com/containers/image/v4/docker" + "github.com/containers/image/v4/pkg/docker/config" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod/image" diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go index 53f133929..f8a658297 100644 --- a/cmd/podman/pull.go +++ b/cmd/podman/pull.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/containers/image/docker" - dockerarchive "github.com/containers/image/docker/archive" - "github.com/containers/image/transports/alltransports" - "github.com/containers/image/types" + "github.com/containers/image/v4/docker" + dockerarchive "github.com/containers/image/v4/docker/archive" + "github.com/containers/image/v4/transports/alltransports" + "github.com/containers/image/v4/types" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod/image" diff --git a/cmd/podman/push.go b/cmd/podman/push.go index 52fbc652e..36c4988a1 100644 --- a/cmd/podman/push.go +++ b/cmd/podman/push.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/containers/image/directory" - "github.com/containers/image/manifest" - "github.com/containers/image/types" + "github.com/containers/image/v4/directory" + "github.com/containers/image/v4/manifest" + "github.com/containers/image/v4/types" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod/image" diff --git a/cmd/podman/runlabel.go b/cmd/podman/runlabel.go index db6d390d5..0369612b9 100644 --- a/cmd/podman/runlabel.go +++ b/cmd/podman/runlabel.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/containers/image/types" + "github.com/containers/image/v4/types" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/cmd/podman/shared" diff --git a/cmd/podman/search.go b/cmd/podman/search.go index f4c51bff1..9dad69297 100644 --- a/cmd/podman/search.go +++ b/cmd/podman/search.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/containers/buildah/pkg/formats" - "github.com/containers/image/types" + "github.com/containers/image/v4/types" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod/image" diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go index 5122d37d1..022377b1f 100644 --- a/cmd/podman/shared/container.go +++ b/cmd/podman/shared/container.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/containers/image/types" + "github.com/containers/image/v4/types" "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/image" diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index fc8197721..c9b05d2c4 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -12,7 +12,7 @@ import ( "syscall" "time" - "github.com/containers/image/manifest" + "github.com/containers/image/v4/manifest" "github.com/containers/libpod/cmd/podman/shared/parse" "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/image" diff --git a/cmd/podman/sign.go b/cmd/podman/sign.go index 79bc3f02b..b6e82ba0b 100644 --- a/cmd/podman/sign.go +++ b/cmd/podman/sign.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/containers/image/signature" - "github.com/containers/image/transports" - "github.com/containers/image/transports/alltransports" + "github.com/containers/image/v4/signature" + "github.com/containers/image/v4/transports" + "github.com/containers/image/v4/transports/alltransports" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod/image" -- cgit v1.2.3-54-g00ecf