Update to containers/image/v5

> gomove github.com/containers/image/v4 github.com/containers/image/v5 > GO111MODULE=on go mod edit -replace github.com/containers/image/v5=github.com/mtrmac/image/v5@release-5 > GO111MODULE=on go get github.com/containers/image/v5 > make vendor Also add make vendor-in-container, to allow golang 1.13 vendoring. Signed-off-by: Miloslav Trmač <mitr@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
containers · Oct 26, 2019 · 4fd80c9 · 4fd80c9
1 parent 4b6a5da
commit 4fd80c9
Show file tree

Hide file tree

Showing 159 changed files with 385 additions and 8,059 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,10 @@ matrix:
      sudo: required
      services:
        - docker
+     before_install:
+         - sudo add-apt-repository -y ppa:projectatomic/ppa
+	 - sudo apt-get update
+	 - sudo podman
   -  os: osx
 
 notifications:
@@ -22,4 +26,4 @@ install:
 
 script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then hack/travis_osx.sh ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make vendor && ./hack/tree_status.sh && make check ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make vendor-in-container && ./hack/tree_status.sh && make check ; fi
diff --git a/Makefile b/Makefile
@@ -177,6 +177,9 @@ validate-local:
 test-unit-local:
 	$(GPGME_ENV) $(GO) test -tags "$(BUILDTAGS)" $$($(GO) list -tags "$(BUILDTAGS)" -e ./... | grep -v '^github\.com/containers/skopeo/\(integration\|vendor/.*\)$$')
 
+vendor-in-container:
+	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src golang make vendor
+
 vendor:
 	export GO111MODULE=on \
 		$(GO) mod tidy && \

diff --git a/cmd/skopeo/copy.go b/cmd/skopeo/copy.go
@@ -6,11 +6,11 @@ import (
 	"io"
 	"strings"
 
-	"github.com/containers/image/v4/copy"
-	"github.com/containers/image/v4/docker/reference"
-	"github.com/containers/image/v4/manifest"
-	"github.com/containers/image/v4/transports"
-	"github.com/containers/image/v4/transports/alltransports"
+	"github.com/containers/image/v5/copy"
+	"github.com/containers/image/v5/docker/reference"
+	"github.com/containers/image/v5/manifest"
+	"github.com/containers/image/v5/transports"
+	"github.com/containers/image/v5/transports/alltransports"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/urfave/cli"
 )

diff --git a/cmd/skopeo/delete.go b/cmd/skopeo/delete.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/containers/image/v4/transports"
-	"github.com/containers/image/v4/transports/alltransports"
+	"github.com/containers/image/v5/transports"
+	"github.com/containers/image/v5/transports/alltransports"
 	"github.com/urfave/cli"
 )
 

diff --git a/cmd/skopeo/inspect.go b/cmd/skopeo/inspect.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/image/v4/docker"
-	"github.com/containers/image/v4/image"
-	"github.com/containers/image/v4/manifest"
-	"github.com/containers/image/v4/transports"
+	"github.com/containers/image/v5/docker"
+	"github.com/containers/image/v5/image"
+	"github.com/containers/image/v5/manifest"
+	"github.com/containers/image/v5/transports"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

diff --git a/cmd/skopeo/layers.go b/cmd/skopeo/layers.go
@@ -7,10 +7,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containers/image/v4/directory"
-	"github.com/containers/image/v4/image"
-	"github.com/containers/image/v4/pkg/blobinfocache"
-	"github.com/containers/image/v4/types"
+	"github.com/containers/image/v5/directory"
+	"github.com/containers/image/v5/image"
+	"github.com/containers/image/v5/pkg/blobinfocache"
+	"github.com/containers/image/v5/types"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"

diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/containers/image/v4/signature"
+	"github.com/containers/image/v5/signature"
 	"github.com/containers/skopeo/version"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/sirupsen/logrus"

diff --git a/cmd/skopeo/manifest.go b/cmd/skopeo/manifest.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/containers/image/v4/manifest"
+	"github.com/containers/image/v5/manifest"
 	"github.com/urfave/cli"
 )
 

diff --git a/cmd/skopeo/signing.go b/cmd/skopeo/signing.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/containers/image/v4/signature"
+	"github.com/containers/image/v5/signature"
 	"github.com/urfave/cli"
 )
 

diff --git a/cmd/skopeo/signing_test.go b/cmd/skopeo/signing_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containers/image/v4/signature"
+	"github.com/containers/image/v5/signature"
 	"github.com/opencontainers/go-digest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/cmd/skopeo/unshare_linux.go b/cmd/skopeo/unshare_linux.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"github.com/containers/buildah/pkg/unshare"
-	"github.com/containers/image/v4/storage"
-	"github.com/containers/image/v4/transports/alltransports"
+	"github.com/containers/image/v5/storage"
+	"github.com/containers/image/v5/transports/alltransports"
 	"github.com/pkg/errors"
 	"github.com/syndtr/gocapability/capability"
 )

diff --git a/cmd/skopeo/utils.go b/cmd/skopeo/utils.go
@@ -6,9 +6,9 @@ import (
 	"io"
 	"strings"
 
-	"github.com/containers/image/v4/pkg/compression"
-	"github.com/containers/image/v4/transports/alltransports"
-	"github.com/containers/image/v4/types"
+	"github.com/containers/image/v5/pkg/compression"
+	"github.com/containers/image/v5/transports/alltransports"
+	"github.com/containers/image/v5/types"
 	"github.com/urfave/cli"
 )
 

diff --git a/cmd/skopeo/utils_test.go b/cmd/skopeo/utils_test.go
@@ -4,7 +4,7 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/containers/image/v4/types"
+	"github.com/containers/image/v5/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/containers/buildah v1.8.4
-	github.com/containers/image/v4 v4.0.2-0.20191021195858-69340234bfc6
+	github.com/containers/image/v5 v5.0.0
 	github.com/containers/storage v1.13.4
 	github.com/docker/docker v0.0.0-20180522102801-da99009bbb11
 	github.com/dsnet/compress v0.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -17,6 +17,8 @@ github.com/containers/image/v4 v4.0.1 h1:idNGHChj0Pyv3vLrxul2oSVMZLeFqpoq3CjLeVg
 github.com/containers/image/v4 v4.0.1/go.mod h1:0ASJH1YgJiX/eqFZObqepgsvIA4XjCgpyfwn9pDGafA=
 github.com/containers/image/v4 v4.0.2-0.20191021195858-69340234bfc6 h1:sFL2cwC0xjphJHpa6DXhka2jTLGI5HwbnAUSAKFhg2M=
 github.com/containers/image/v4 v4.0.2-0.20191021195858-69340234bfc6/go.mod h1:0ASJH1YgJiX/eqFZObqepgsvIA4XjCgpyfwn9pDGafA=
+github.com/containers/image/v5 v5.0.0 h1:arnXgbt1ucsC/ndtSpiQY87rA0UjhF+/xQnPzqdBDn4=
+github.com/containers/image/v5 v5.0.0/go.mod h1:MgiLzCfIeo8lrHi+4Lb8HP+rh513sm0Mlk6RrhjFOLY=
 github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b h1:Q8ePgVfHDplZ7U33NwHZkrVELsZP5fYj9pM5WBZB2GE=
 github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
 github.com/containers/storage v1.13.4 h1:j0bBaJDKbUHtAW1MXPFnwXJtqcH+foWeuXK1YaBV5GA=
@@ -93,6 +95,8 @@ github.com/mtrmac/image/v4 v4.0.0-20191003181245-f4c983e93262 h1:HMUEnWU3OPT09JR
 github.com/mtrmac/image/v4 v4.0.0-20191003181245-f4c983e93262/go.mod h1:0ASJH1YgJiX/eqFZObqepgsvIA4XjCgpyfwn9pDGafA=
 github.com/mtrmac/image/v4 v4.0.0-20191003205427-4e53c7e04270 h1:pDOlOCB9naHCcv/RXWO129Dd03r710hQ2N83egZIf7A=
 github.com/mtrmac/image/v4 v4.0.0-20191003205427-4e53c7e04270/go.mod h1:0ASJH1YgJiX/eqFZObqepgsvIA4XjCgpyfwn9pDGafA=
+github.com/mtrmac/image/v5 v5.0.0-20191025204748-a40e6b800d77 h1:IEMiKX2ItzlU/YUTcx5420htf+xKGvVLhXUqNs3csjs=
+github.com/mtrmac/image/v5 v5.0.0-20191025204748-a40e6b800d77/go.mod h1:MgiLzCfIeo8lrHi+4Lb8HP+rh513sm0Mlk6RrhjFOLY=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 h1:yN8BPXVwMBAm3Cuvh1L5XE8XpvYRMdsVLd82ILprhUU=

diff --git a/integration/copy_test.go b/integration/copy_test.go
@@ -11,9 +11,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/image/v4/manifest"
-	"github.com/containers/image/v4/signature"
-	"github.com/containers/image/v4/types"
+	"github.com/containers/image/v5/manifest"
+	"github.com/containers/image/v5/signature"
+	"github.com/containers/image/v5/types"
 	"github.com/go-check/check"
 	digest "github.com/opencontainers/go-digest"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"

diff --git a/integration/signing_test.go b/integration/signing_test.go
@@ -8,7 +8,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/containers/image/v4/signature"
+	"github.com/containers/image/v5/signature"
 	"github.com/go-check/check"
 )