Merge pull request #9099 from bitoku/release-1.28-fips

bitoku · web-flow · commit c0d9f2b49514 · 2025-04-09T09:46:57.000+01:00
OCPBUGS-53457: [release-1.28] Cherry-pick changes from containers/common project
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/containernetworking/cni v1.1.2
 	github.com/containernetworking/plugins v1.3.0
 	github.com/containers/buildah v1.31.2
-	github.com/containers/common v0.55.5-0.20241001151746-9148450afb7b
+	github.com/containers/common v0.55.5-0.20250403130720-5f05bf794d17
 	github.com/containers/conmon v2.0.20+incompatible
 	github.com/containers/conmon-rs v0.5.1
 	github.com/containers/image/v5 v5.27.1-0.20240528120211-942a2226c1cd
diff --git a/go.sum b/go.sum
@@ -899,8 +899,8 @@ github.com/containernetworking/plugins v1.3.0 h1:QVNXMT6XloyMUoO2wUOqWTC1hWFV62Q
 github.com/containernetworking/plugins v1.3.0/go.mod h1:Pc2wcedTQQCVuROOOaLBPPxrEXqqXBFt3cZ+/yVg6l0=
 github.com/containers/buildah v1.31.2 h1:Pfbuzq5dtbLYtj95zDu1rLbVo9bnboknv18ZmlfXVA4=
 github.com/containers/buildah v1.31.2/go.mod h1:EnrujxgRtUi0+2DrxXAzyQ/GybLliqT0+06PMLSTlvw=
-github.com/containers/common v0.55.5-0.20241001151746-9148450afb7b h1:6TBgJNVg+qpjYZOA8+VTxgaGDEUw0Bvsh3LhBBmoENw=
-github.com/containers/common v0.55.5-0.20241001151746-9148450afb7b/go.mod h1:5mVCpfMBWyO+zaD7Fw+DBHFa42YFKROwle1qpEKcX3U=
+github.com/containers/common v0.55.5-0.20250403130720-5f05bf794d17 h1:l2Dz2Ce2SCOvhTIiq1fcSxbfCqVSim1gDnMpN/cYB/E=
+github.com/containers/common v0.55.5-0.20250403130720-5f05bf794d17/go.mod h1:5mVCpfMBWyO+zaD7Fw+DBHFa42YFKROwle1qpEKcX3U=
 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/conmon-rs v0.5.1 h1:Qquw9pE0KOeJkb3MhuUIFTvUzI08m9f4SpkuSY0kVSs=
diff --git a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -258,7 +258,7 @@ github.com/containers/buildah/pkg/rusage
 github.com/containers/buildah/pkg/sshagent
 github.com/containers/buildah/pkg/util
 github.com/containers/buildah/util
-# github.com/containers/common v0.55.5-0.20241001151746-9148450afb7b
+# github.com/containers/common v0.55.5-0.20250403130720-5f05bf794d17
 ## explicit; go 1.18
 github.com/containers/common/libimage
 github.com/containers/common/libimage/define
