Merge pull request containers#3358 from vrothberg/vendor-common

vendor containers/common@main

cmd/buildah/main.go

@@ -78,6 +78,8 @@ func init() {
 	}
 
 	cobra.OnInitialize(initConfig)
+	// Disable the implicit `completion` command in cobra.
+	rootCmd.CompletionOptions.DisableDefaultCmd = true
 	//rootCmd.TraverseChildren = true
 	rootCmd.Version = fmt.Sprintf("%s (image-spec %s, runtime-spec %s)", define.Version, ispecs.Version, rspecs.Version)
 	rootCmd.PersistentFlags().BoolVar(&globalFlagResults.Debug, "debug", false, "print debugging information")

cmd/buildah/tag.go

@@ -35,8 +35,7 @@ func tagCmd(c *cobra.Command, args []string) error {
 		return err
 	}
 
-	lookupOptions := libimage.LookupImageOptions{IgnorePlatform: true}
-	image, _, err := runtime.LookupImage(args[0], &lookupOptions)
+	image, _, err := runtime.LookupImage(args[0], nil)
 	if err != nil {
 		return err
 	}

contrib/cirrus/test.sh

@@ -51,6 +51,11 @@ else
             showrun make test-conformance
             ;;
         integration)
+            # FIXME: drop the `rm` below once containers.conf has been fixed.
+            # It complains about failing to "to decode the keys ["secret"
+            # "secret.opts"]" which is in process of getting fixed but will
+            # take a while until it hits all distributions.
+            showrun rm /usr/share/containers/containers.conf
             showrun make test-integration
             ;;
         *)

go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/containernetworking/cni v0.8.1
-	github.com/containers/common v0.40.1
+	github.com/containers/common v0.40.2-0.20210707094508-0a4a1906d4b2
 	github.com/containers/image/v5 v5.13.2
 	github.com/containers/ocicrypt v1.1.2
 	github.com/containers/storage v1.32.5
@@ -29,13 +29,13 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/seccomp/libseccomp-golang v0.9.2-0.20200616122406-847368b35ebf
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/cobra v1.1.3
+	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
 	go.etcd.io/bbolt v1.3.6
 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
-	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20210603125802-9665404d3644
 	k8s.io/klog v1.0.0 // indirect
 )

util/util.go

@@ -163,7 +163,7 @@ func FindImage(store storage.Store, firstRegistry string, systemContext *types.S
 		return nil, nil, err
 	}
 
-	localImage, _, err := runtime.LookupImage(image, &libimage.LookupImageOptions{IgnorePlatform: true})
+	localImage, _, err := runtime.LookupImage(image, nil)
 	if err != nil {
 		return nil, nil, err
 	}