Merge pull request #10823 from vrothberg/vendor-common

vendor containers/common@7482cf851d

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/containernetworking/cni v0.8.1
 	github.com/containernetworking/plugins v0.9.1
 	github.com/containers/buildah v1.21.1-0.20210628174543-eadb10a12336
-	github.com/containers/common v0.40.2-0.20210624120009-b1d3c4dc2515
+	github.com/containers/common v0.40.2-0.20210630092122-7482cf851dcc
 	github.com/containers/conmon v2.0.20+incompatible
 	github.com/containers/image/v5 v5.13.2
 	github.com/containers/ocicrypt v1.1.2

go.sum

@@ -221,8 +221,8 @@ github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRD
 github.com/containers/buildah v1.21.1-0.20210628174543-eadb10a12336 h1:LAjAsDE6sxZnDoSzE384o/cRuTGGn1OMjkd9YIPT2bg=
 github.com/containers/buildah v1.21.1-0.20210628174543-eadb10a12336/go.mod h1:HZ2k0W/EREpNxr+AnRZQzjjBdhXLItp9yuzwAaVa6zM=
 github.com/containers/common v0.40.1/go.mod h1:X4F+6vmeAWKMMTNHlOBwOnkf5TQAkQACcuNsKjfcodw=
-github.com/containers/common v0.40.2-0.20210624120009-b1d3c4dc2515 h1:ih6akqzrwgKFRxLzdoRBFRUlIGbDWPoDYxhn5GihfXM=
+github.com/containers/common v0.40.2-0.20210630092122-7482cf851dcc h1:7fqEcoNUaEHmg7gIFui2BDGU8sFpEU6xDxABxhYPOPw=
-github.com/containers/common v0.40.2-0.20210624120009-b1d3c4dc2515/go.mod h1:J23CfuhN1fAg85q5HxS6SKYhKbGqmqieKQqoHaQbEI8=
+github.com/containers/common v0.40.2-0.20210630092122-7482cf851dcc/go.mod h1:H3H/223r/e2uAVUdwZxuiRkWPvxynORzh5iChjFJ43o=
 github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
 github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
 github.com/containers/image/v5 v5.13.2 h1:AgYunV/9d2fRkrmo23wH2MkqeHolFd6oQCkK+1PpuFA=
@@ -238,7 +238,6 @@ github.com/containers/psgo v1.5.2 h1:3aoozst/GIwsrr/5jnFy3FrJay98uujPCu9lTuSZ/Cw
 github.com/containers/psgo v1.5.2/go.mod h1:2ubh0SsreMZjSXW1Hif58JrEcFudQyIy9EzPUWfawVU=
 github.com/containers/storage v1.23.5/go.mod h1:ha26Q6ngehFNhf3AWoXldvAvwI4jFe3ETQAf/CeZPyM=
 github.com/containers/storage v1.32.2/go.mod h1:YIBxxjfXZTi04Ah49sh1uSGfmT1V89+I5i3deRobzQo=
-github.com/containers/storage v1.32.3/go.mod h1:s1xFaWvj8qwm1+OnlbPE8RBzdTTpIWuHzVivOqzRKiQ=
 github.com/containers/storage v1.32.5 h1:DXgmyA+oOs7YAzKkEqgC5O8l2UuDGJcwEFbdt49qiak=
 github.com/containers/storage v1.32.5/go.mod h1:8/DVVDqniaUlUV0D0q7cEnXK6Bs2uU3FPqNZVPumwEs=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=

vendor/github.com/containers/common/libimage/image.go

@@ -298,7 +298,7 @@ func (i *Image) remove(ctx context.Context, rmMap map[string]*RemoveImageReport,
 	}
 
 	if i.runtime.eventChannel != nil {
-		i.runtime.writeEvent(&Event{ID: i.ID(), Name: referencedBy, Time: time.Now(), Type: EventTypeImageRemove})
+		defer i.runtime.writeEvent(&Event{ID: i.ID(), Name: referencedBy, Time: time.Now(), Type: EventTypeImageRemove})
 	}
 
 	// Check if already visisted this image.
@@ -450,7 +450,7 @@ func (i *Image) Tag(name string) error {
 
 	logrus.Debugf("Tagging image %s with %q", i.ID(), ref.String())
 	if i.runtime.eventChannel != nil {
-		i.runtime.writeEvent(&Event{ID: i.ID(), Name: name, Time: time.Now(), Type: EventTypeImageTag})
+		defer i.runtime.writeEvent(&Event{ID: i.ID(), Name: name, Time: time.Now(), Type: EventTypeImageTag})
 	}
 
 	newNames := append(i.Names(), ref.String())
@@ -484,7 +484,7 @@ func (i *Image) Untag(name string) error {
 
 	logrus.Debugf("Untagging %q from image %s", ref.String(), i.ID())
 	if i.runtime.eventChannel != nil {
-		i.runtime.writeEvent(&Event{ID: i.ID(), Name: name, Time: time.Now(), Type: EventTypeImageUntag})
+		defer i.runtime.writeEvent(&Event{ID: i.ID(), Name: name, Time: time.Now(), Type: EventTypeImageUntag})
 	}
 
 	removedName := false
@@ -626,7 +626,7 @@ func (i *Image) RepoDigests() ([]string, error) {
 // evaluated path to the mount point.
 func (i *Image) Mount(ctx context.Context, mountOptions []string, mountLabel string) (string, error) {
 	if i.runtime.eventChannel != nil {
-		i.runtime.writeEvent(&Event{ID: i.ID(), Name: "", Time: time.Now(), Type: EventTypeImageMount})
+		defer i.runtime.writeEvent(&Event{ID: i.ID(), Name: "", Time: time.Now(), Type: EventTypeImageMount})
 	}
 
 	mountPoint, err := i.runtime.store.MountImage(i.ID(), mountOptions, mountLabel)
@@ -671,7 +671,7 @@ func (i *Image) Mountpoint() (string, error) {
 // unmount.
 func (i *Image) Unmount(force bool) error {
 	if i.runtime.eventChannel != nil {
-		i.runtime.writeEvent(&Event{ID: i.ID(), Name: "", Time: time.Now(), Type: EventTypeImageUnmount})
+		defer i.runtime.writeEvent(&Event{ID: i.ID(), Name: "", Time: time.Now(), Type: EventTypeImageUnmount})
 	}
 	logrus.Debugf("Unmounted image %s", i.ID())
 	_, err := i.runtime.store.UnmountImage(i.ID(), force)

vendor/github.com/containers/common/libimage/load.go

@@ -25,7 +25,7 @@ func (r *Runtime) Load(ctx context.Context, path string, options *LoadOptions) (
 	logrus.Debugf("Loading image from %q", path)
 
 	if r.eventChannel != nil {
-		r.writeEvent(&Event{ID: "", Name: path, Time: time.Now(), Type: EventTypeImageLoad})
+		defer r.writeEvent(&Event{ID: "", Name: path, Time: time.Now(), Type: EventTypeImageLoad})
 	}
 
 	var (

vendor/github.com/containers/common/libimage/manifest_list.go

@@ -374,7 +374,7 @@ func (m *ManifestList) Push(ctx context.Context, destination string, options *Ma
 	}
 
 	if m.image.runtime.eventChannel != nil {
-		m.image.runtime.writeEvent(&Event{ID: m.ID(), Name: destination, Time: time.Now(), Type: EventTypeImagePush})
+		defer m.image.runtime.writeEvent(&Event{ID: m.ID(), Name: destination, Time: time.Now(), Type: EventTypeImagePush})
 	}
 
 	// NOTE: we're using the logic in copier to create a proper

vendor/github.com/containers/common/libimage/pull.go

@@ -102,7 +102,7 @@ func (r *Runtime) Pull(ctx context.Context, name string, pullPolicy config.PullP
 	}
 
 	if r.eventChannel != nil {
-		r.writeEvent(&Event{ID: "", Name: name, Time: time.Now(), Type: EventTypeImagePull})
+		defer r.writeEvent(&Event{ID: "", Name: name, Time: time.Now(), Type: EventTypeImagePull})
 	}
 
 	// Some callers may set the platform via the system context at creation
@@ -384,18 +384,22 @@ func (r *Runtime) copySingleImageFromRegistry(ctx context.Context, imageName str
 		}
 	}
 
-	// Unless the pull policy is "always", we must pessimistically assume
+	customPlatform := false
-	// that the local image has an invalid architecture (see
+	if len(options.Architecture)+len(options.OS)+len(options.Variant) > 0 {
-	// containers/podman/issues/10682).  Hence, whenever the user requests
+		customPlatform = true
-	// a custom platform, set the pull policy to "always" to make sure
+		// Unless the pull policy is "always", we must pessimistically assume
-	// we're pulling down the image.
+		// that the local image has an invalid architecture (see
-	//
+		// containers/podman/issues/10682).  Hence, whenever the user requests
-	// NOTE that this is will even override --pull={false,never}.  This is
+		// a custom platform, set the pull policy to "always" to make sure
-	// very likely a bug but a consistent one in Podman/Buildah and should
+		// we're pulling down the image.
-	// be addressed at a later point.
+		//
-	if pullPolicy != config.PullPolicyAlways && len(options.Architecture)+len(options.OS)+len(options.Variant) > 0 {
+		// NOTE that this is will even override --pull={false,never}.  This is
-		logrus.Debugf("Enforcing pull policy to %q to support custom platform (arch: %q, os: %q, variant: %q)", "always", options.Architecture, options.OS, options.Variant)
+		// very likely a bug but a consistent one in Podman/Buildah and should
-		pullPolicy = config.PullPolicyAlways
+		// be addressed at a later point.
+		if pullPolicy != config.PullPolicyAlways {
+			logrus.Debugf("Enforcing pull policy to %q to support custom platform (arch: %q, os: %q, variant: %q)", "always", options.Architecture, options.OS, options.Variant)
+			pullPolicy = config.PullPolicyAlways
+		}
 	}
 
 	if pullPolicy == config.PullPolicyNever {
@@ -422,8 +426,15 @@ func (r *Runtime) copySingleImageFromRegistry(ctx context.Context, imageName str
 	}
 
 	// If we found a local image, we should use it's locally resolved name
-	// (see containers/buildah #2904).
+	// (see containers/buildah/issues/2904).  An exception is if a custom
-	if localImage != nil {
+	// platform is specified (e.g., `--arch=arm64`).  In that case, we need
+	// to pessimistically pull the image since some images declare wrong
+	// platforms making platform checks absolutely unreliable (see
+	// containers/podman/issues/10682).
+	//
+	// In other words: multi-arch support can only be as good as the images
+	// in the wild.
+	if localImage != nil && !customPlatform {
 		if imageName != resolvedImageName {
 			logrus.Debugf("Image %s resolved to local image %s which will be used for pulling", imageName, resolvedImageName)
 		}

vendor/github.com/containers/common/libimage/push.go

@@ -65,7 +65,7 @@ func (r *Runtime) Push(ctx context.Context, source, destination string, options
 	}
 
 	if r.eventChannel != nil {
-		r.writeEvent(&Event{ID: image.ID(), Name: destination, Time: time.Now(), Type: EventTypeImagePush})
+		defer r.writeEvent(&Event{ID: image.ID(), Name: destination, Time: time.Now(), Type: EventTypeImagePush})
 	}
 
 	// Buildah compat: Make sure to tag the destination image if it's a

vendor/github.com/containers/common/libimage/save.go

@@ -80,7 +80,7 @@ func (r *Runtime) saveSingleImage(ctx context.Context, name, format, path string
 	}
 
 	if r.eventChannel != nil {
-		r.writeEvent(&Event{ID: image.ID(), Name: path, Time: time.Now(), Type: EventTypeImageSave})
+		defer r.writeEvent(&Event{ID: image.ID(), Name: path, Time: time.Now(), Type: EventTypeImageSave})
 	}
 
 	// Unless the image was referenced by ID, use the resolved name as a
@@ -183,7 +183,7 @@ func (r *Runtime) saveDockerArchive(ctx context.Context, names []string, path st
 		}
 		localImages[image.ID()] = local
 		if r.eventChannel != nil {
-			r.writeEvent(&Event{ID: image.ID(), Name: path, Time: time.Now(), Type: EventTypeImageSave})
+			defer r.writeEvent(&Event{ID: image.ID(), Name: path, Time: time.Now(), Type: EventTypeImageSave})
 		}
 	}
 

vendor/github.com/containers/common/pkg/sysinfo/numcpu_linux.go

@@ -23,7 +23,6 @@ func numCPU() int {
 	if err != 0 {
 		return 0
 	}
-
 	// For every available thread a bit is set in the mask.
 	ncpu := 0
 	for _, e := range mask {

vendor/github.com/containers/common/pkg/sysinfo/nummem_linux.go

@@ -0,0 +1,30 @@
+// +build linux
+
+package sysinfo
+
+import (
+	"unsafe"
+
+	"golang.org/x/sys/unix"
+)
+
+// NUMANodeCount queries the system for the count of Memory Nodes available
+// for use to this process.
+func NUMANodeCount() int {
+	MPOL_F_MEMS_ALLOWED := (1 << 2)
+	var mask [1024 / 64]uintptr
+	_, _, err := unix.RawSyscall6(unix.SYS_GET_MEMPOLICY, 0, uintptr(unsafe.Pointer(&mask[0])), uintptr(len(mask)*8), 0, uintptr(MPOL_F_MEMS_ALLOWED), 0)
+	if err != 0 {
+		return 0
+	}
+
+	// For every available thread a bit is set in the mask.
+	nmem := 0
+	for _, e := range mask {
+		if e == 0 {
+			continue
+		}
+		nmem += int(popcnt(uint64(e)))
+	}
+	return nmem
+}

vendor/github.com/containers/common/pkg/sysinfo/nummem_unsupported.go

@@ -0,0 +1,9 @@
+// +build windows, osx
+
+package sysinfo
+
+// NUMANodeCount queries the system for the count of Memory Nodes available
+// for use to this process. Returns 0 on non NUMAs systems.
+func NUMANodeCount() int {
+	return 0
+}

vendor/modules.txt

@@ -93,7 +93,7 @@ github.com/containers/buildah/pkg/overlay
 github.com/containers/buildah/pkg/parse
 github.com/containers/buildah/pkg/rusage
 github.com/containers/buildah/util
-# github.com/containers/common v0.40.2-0.20210624120009-b1d3c4dc2515
+# github.com/containers/common v0.40.2-0.20210630092122-7482cf851dcc
 github.com/containers/common/libimage
 github.com/containers/common/libimage/manifests
 github.com/containers/common/pkg/apparmor