Skip to content

Commit 21fe6dc

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #5929 from Luap99/vendor
vendor to latest c/{common,image,storage}
2 parents 865427c + 2119c8d commit 21fe6dc

File tree

16 files changed

+103
-39
lines changed

16 files changed

+103
-39
lines changed

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ go 1.22.8
77
require (
88
github.com/containerd/platforms v1.0.0-rc.1
99
github.com/containernetworking/cni v1.2.3
10-
github.com/containers/common v0.61.1
11-
github.com/containers/image/v5 v5.33.2-0.20250122193521-b10f5bdaa76f
10+
github.com/containers/common v0.61.1-0.20250121185748-34a90afcdc6d
11+
github.com/containers/image/v5 v5.33.2-0.20250122233652-b5c6aff95ca7
1212
github.com/containers/luksy v0.0.0-20250106202729-a3a812db5b72
1313
github.com/containers/ocicrypt v1.2.1
14-
github.com/containers/storage v1.56.2-0.20250121150636-c2cdd500e4ef
14+
github.com/containers/storage v1.56.2-0.20250123125217-80d3c0e77d29
1515
github.com/cyphar/filepath-securejoin v0.3.6
1616
github.com/docker/distribution v2.8.3+incompatible
1717
github.com/docker/docker v27.5.1+incompatible
@@ -144,7 +144,7 @@ require (
144144
go.opentelemetry.io/otel v1.31.0 // indirect
145145
go.opentelemetry.io/otel/metric v1.31.0 // indirect
146146
go.opentelemetry.io/otel/trace v1.31.0 // indirect
147-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
147+
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
148148
golang.org/x/mod v0.22.0 // indirect
149149
golang.org/x/net v0.34.0 // indirect
150150
golang.org/x/text v0.21.0 // indirect

‎go.sum

+16-16
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@ github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8F
6363
github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
6464
github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+E5J/EcKOE4gQ=
6565
github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM=
66-
github.com/containers/common v0.61.1 h1:jpk385ZFEx3MAX+sjwOoTZElvpgsGi0YJHuRmrhF/j8=
67-
github.com/containers/common v0.61.1/go.mod h1:C+TfkhTV+ADp1Hu+BMIAYPvSFix21swYo9PZuCKoSUM=
68-
github.com/containers/image/v5 v5.33.2-0.20250122193521-b10f5bdaa76f h1:FaiD3V2pf05ZUm1yJgpy4/G76l521Yuy90eZPEK/aQA=
69-
github.com/containers/image/v5 v5.33.2-0.20250122193521-b10f5bdaa76f/go.mod h1:Rr2CLGIej/53j1vkqWm+oDutG6ug+z/1lerSzbhXoEg=
66+
github.com/containers/common v0.61.1-0.20250121185748-34a90afcdc6d h1:O5B7AeW6T/MD6HgRt5HDWcyryVwSOkYo9eX7wCvtJP8=
67+
github.com/containers/common v0.61.1-0.20250121185748-34a90afcdc6d/go.mod h1:mWhwkYaWR5bXeOwq3ruzdmH9gaT2pex00C6pd4VXuvM=
68+
github.com/containers/image/v5 v5.33.2-0.20250122233652-b5c6aff95ca7 h1:dTKluTTlijEdQmTZPK1wTX39qXb4F93/GPHhq+vlC3U=
69+
github.com/containers/image/v5 v5.33.2-0.20250122233652-b5c6aff95ca7/go.mod h1:NyH4/AlLW8cvPgtwbCMzz71dr9SOh8/WP9ua5c9Akc8=
7070
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
7171
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
7272
github.com/containers/luksy v0.0.0-20250106202729-a3a812db5b72 h1:hdBIFaml6hO+Bal8CdQSQPTF305gwsJfubs4NoOV53A=
7373
github.com/containers/luksy v0.0.0-20250106202729-a3a812db5b72/go.mod h1:UpMgEjd9XelIA/iK+qD3hWIrZY/M3eaepn+gm5U8OYE=
7474
github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=
7575
github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ=
76-
github.com/containers/storage v1.56.2-0.20250121150636-c2cdd500e4ef h1:mzC7dl6SRdqyMd22kLuljhJTdoqqd4gW8m4LTNetBCo=
77-
github.com/containers/storage v1.56.2-0.20250121150636-c2cdd500e4ef/go.mod h1:KbGwnyB0b3cwwiPuAiB9XqSYfsEhRb/ALIPgfqpmLLA=
76+
github.com/containers/storage v1.56.2-0.20250123125217-80d3c0e77d29 h1:3L1QCfh72xytLizQeswDaKcB5ajq54DuFRcAy/C3P3c=
77+
github.com/containers/storage v1.56.2-0.20250123125217-80d3c0e77d29/go.mod h1:i/Hb4lu7YgFr9G0K6BMjqW0BLJO1sFsnWQwj2UoWCUM=
7878
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
7979
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
8080
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -92,8 +92,8 @@ github.com/disiqueira/gotree/v3 v3.0.2 h1:ik5iuLQQoufZBNPY518dXhiO5056hyNBIK9lWh
9292
github.com/disiqueira/gotree/v3 v3.0.2/go.mod h1:ZuyjE4+mUQZlbpkI24AmruZKhg3VHEgPLDY8Qk+uUu8=
9393
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
9494
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
95-
github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvDaFkLctbGM=
96-
github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
95+
github.com/docker/cli v27.5.1+incompatible h1:JB9cieUT9YNiMITtIsguaN55PLOHhBSz3LKVc6cqWaY=
96+
github.com/docker/cli v27.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
9797
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
9898
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
9999
github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
@@ -183,8 +183,8 @@ github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEva
183183
github.com/google/go-intervals v0.0.2 h1:FGrVEiUnTRKR8yE04qzXYaJMtnIYqobR5QbblK3ixcM=
184184
github.com/google/go-intervals v0.0.2/go.mod h1:MkaR3LNRfeKLPmqgJYs4E66z5InYjmCjbbr4TQlcT6Y=
185185
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
186-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
187-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
186+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
187+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
188188
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
189189
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
190190
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -265,10 +265,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
265265
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
266266
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
267267
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
268-
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
269-
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
270-
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
271-
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
268+
github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
269+
github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
270+
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
271+
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
272272
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
273273
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
274274
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
@@ -405,8 +405,8 @@ golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ss
405405
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
406406
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
407407
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
408-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
409-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
408+
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 h1:9kj3STMvgqy3YA4VQXBrN7925ICMxD5wzMRcgA30588=
409+
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
410410
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
411411
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
412412
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

‎tests/run.bats

+1-1
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ _EOF
971971

972972
run_buildah from --quiet --pull=false $WITH_POLICY_JSON alpine
973973
cid=$output
974-
for mask in /proc/acpi /proc/kcore /proc/keys /proc/latency_stats /proc/sched_debug /proc/scsi /proc/timer_list /proc/timer_stats /sys/dev/block /sys/devices/virtual/powercap /sys/firmware /sys/fs/selinux; do
974+
for mask in /proc/acpi /proc/kcore /proc/keys /proc/latency_stats /proc/sched_debug /proc/scsi /proc/timer_list /proc/timer_stats /sys/devices/virtual/powercap /sys/firmware /sys/fs/selinux; do
975975
if test -d $mask; then
976976
run_buildah run $cid ls $mask
977977
expect_output "" "Directories should be empty"

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

+11-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/common/libnetwork/netavark/config.go

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/common/libnetwork/netavark/network.go

+15-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/common/libnetwork/types/const.go

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/common/libnetwork/types/network.go

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/common/pkg/config/config.go

+15-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/common/pkg/config/containers.conf

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/common/pkg/config/containers.conf-freebsd

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/common/pkg/config/default.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/common/version/version.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/storage/pkg/chrootarchive/archive.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/storage/pkg/ioutils/writers.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ github.com/containernetworking/cni/pkg/version
9999
# github.com/containernetworking/plugins v1.5.1
100100
## explicit; go 1.20
101101
github.com/containernetworking/plugins/pkg/ns
102-
# github.com/containers/common v0.61.1
103-
## explicit; go 1.22.6
102+
# github.com/containers/common v0.61.1-0.20250121185748-34a90afcdc6d
103+
## explicit; go 1.22.8
104104
github.com/containers/common/internal
105105
github.com/containers/common/internal/attributedstring
106106
github.com/containers/common/libimage
@@ -152,7 +152,7 @@ github.com/containers/common/pkg/umask
152152
github.com/containers/common/pkg/util
153153
github.com/containers/common/pkg/version
154154
github.com/containers/common/version
155-
# github.com/containers/image/v5 v5.33.2-0.20250122193521-b10f5bdaa76f
155+
# github.com/containers/image/v5 v5.33.2-0.20250122233652-b5c6aff95ca7
156156
## explicit; go 1.22.8
157157
github.com/containers/image/v5/copy
158158
github.com/containers/image/v5/directory
@@ -245,7 +245,7 @@ github.com/containers/ocicrypt/keywrap/pkcs7
245245
github.com/containers/ocicrypt/spec
246246
github.com/containers/ocicrypt/utils
247247
github.com/containers/ocicrypt/utils/keyprovider
248-
# github.com/containers/storage v1.56.2-0.20250121150636-c2cdd500e4ef
248+
# github.com/containers/storage v1.56.2-0.20250123125217-80d3c0e77d29
249249
## explicit; go 1.22.0
250250
github.com/containers/storage
251251
github.com/containers/storage/drivers
@@ -766,7 +766,7 @@ golang.org/x/crypto/ssh/agent
766766
golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
767767
golang.org/x/crypto/twofish
768768
golang.org/x/crypto/xts
769-
# golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
769+
# golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
770770
## explicit; go 1.22.0
771771
golang.org/x/exp/maps
772772
# golang.org/x/mod v0.22.0

0 commit comments

Comments
 (0)