Skip to content

Commit 4071c56

Browse files
committed
vendor: test giuseppe/container-libs fix-map-handling
and bump container-libs/common too Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
1 parent c4821ef commit 4071c56

10 files changed

Lines changed: 119 additions & 74 deletions

File tree

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ require (
6464
github.com/vbauerster/mpb/v8 v8.12.0
6565
github.com/vishvananda/netlink v1.3.1
6666
go.podman.io/buildah v1.42.1-0.20260501153811-377cf64e213b
67-
go.podman.io/common v0.67.2-0.20260506114327-35c76125c5b5
67+
go.podman.io/common v0.67.2-0.20260506125647-380549a2bd33
6868
go.podman.io/image/v5 v5.39.3-0.20260506114327-35c76125c5b5
6969
go.podman.io/storage v1.62.1-0.20260506114327-35c76125c5b5
7070
golang.org/x/crypto v0.50.0
@@ -188,3 +188,5 @@ require (
188188
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
189189
tags.cncf.io/container-device-interface/specs-go v1.1.0 // indirect
190190
)
191+
192+
replace go.podman.io/storage => github.com/giuseppe/container-libs/storage v0.0.0-20260506142622-85fbda68b9bc

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx5
123123
github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
124124
github.com/fsouza/go-dockerclient v1.13.1 h1:HbkJO8UPUhuQ1wHIgX+ho7AUucBmjtOfzSWYUgmWL/8=
125125
github.com/fsouza/go-dockerclient v1.13.1/go.mod h1:0gx0SIFGV1F+79sM9p5K+UCc8enYKA8DBp7BlwlixpM=
126+
github.com/giuseppe/container-libs/storage v0.0.0-20260506142622-85fbda68b9bc h1:flN6JDz4sR+NCNfIla2jzEk39FTPQyOcdcl07CJV+Xs=
127+
github.com/giuseppe/container-libs/storage v0.0.0-20260506142622-85fbda68b9bc/go.mod h1:eZIqDigffFi9NlPezLvUVw/nsUIruaui436E5E4GmXs=
126128
github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BNhXs=
127129
github.com/gkampitakis/ciinfo v0.3.2/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo=
128130
github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZdC4M=
@@ -431,12 +433,10 @@ go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09
431433
go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
432434
go.podman.io/buildah v1.42.1-0.20260501153811-377cf64e213b h1:i8ntFzITajbJA3ojnA0ZdpbC+I+ccweZvZaGIhQb4i8=
433435
go.podman.io/buildah v1.42.1-0.20260501153811-377cf64e213b/go.mod h1:hPvgsjBU09C+15fKoIZJvKvNaxR+c0QvMg/n4NgBS7A=
434-
go.podman.io/common v0.67.2-0.20260506114327-35c76125c5b5 h1:rjsl4OiSteuD58lb76F9f0e3VOapd7cKdpL6sc+77PI=
435-
go.podman.io/common v0.67.2-0.20260506114327-35c76125c5b5/go.mod h1:TYI+ocF4gfL8QCBo5GqOSUAOA3QnVgkjjg/nQZRG3o0=
436+
go.podman.io/common v0.67.2-0.20260506125647-380549a2bd33 h1:fn6ct2NUsMqMC6J+p2HKjikC8cm8THTzdkYlavT+0ww=
437+
go.podman.io/common v0.67.2-0.20260506125647-380549a2bd33/go.mod h1:TYI+ocF4gfL8QCBo5GqOSUAOA3QnVgkjjg/nQZRG3o0=
436438
go.podman.io/image/v5 v5.39.3-0.20260506114327-35c76125c5b5 h1:xkEpeE5/HO2MryNXLk443DJhXayWGJC7mku9CjRqHrg=
437439
go.podman.io/image/v5 v5.39.3-0.20260506114327-35c76125c5b5/go.mod h1:D+09OPzsrFuzeKqsJEaaxtItkSd12+eZyOdFyuJF8TY=
438-
go.podman.io/storage v1.62.1-0.20260506114327-35c76125c5b5 h1:yPIjkKjl5VTjz66zg8pStN2ysvd2OFMIzCvsO3CJYn0=
439-
go.podman.io/storage v1.62.1-0.20260506114327-35c76125c5b5/go.mod h1:eZIqDigffFi9NlPezLvUVw/nsUIruaui436E5E4GmXs=
440440
go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
441441
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
442442
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=

vendor/go.podman.io/storage/containers.go

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/storage/drivers/driver.go

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/storage/drivers/overlay/overlay.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/storage/layers.go

Lines changed: 15 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/storage/store.go

Lines changed: 61 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/storage/types/idmappings.go

Lines changed: 25 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/storage/userns.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ go.podman.io/buildah/pkg/sshagent
735735
go.podman.io/buildah/pkg/util
736736
go.podman.io/buildah/pkg/volumes
737737
go.podman.io/buildah/util
738-
# go.podman.io/common v0.67.2-0.20260506114327-35c76125c5b5
738+
# go.podman.io/common v0.67.2-0.20260506125647-380549a2bd33
739739
## explicit; go 1.25.6
740740
go.podman.io/common/internal
741741
go.podman.io/common/libimage
@@ -878,7 +878,7 @@ go.podman.io/image/v5/transports
878878
go.podman.io/image/v5/transports/alltransports
879879
go.podman.io/image/v5/types
880880
go.podman.io/image/v5/version
881-
# go.podman.io/storage v1.62.1-0.20260506114327-35c76125c5b5
881+
# go.podman.io/storage v1.62.1-0.20260506114327-35c76125c5b5 => github.com/giuseppe/container-libs/storage v0.0.0-20260506142622-85fbda68b9bc
882882
## explicit; go 1.25.0
883883
go.podman.io/storage
884884
go.podman.io/storage/drivers
@@ -1182,3 +1182,4 @@ tags.cncf.io/container-device-interface/pkg/parser
11821182
# tags.cncf.io/container-device-interface/specs-go v1.1.0
11831183
## explicit; go 1.19
11841184
tags.cncf.io/container-device-interface/specs-go
1185+
# go.podman.io/storage => github.com/giuseppe/container-libs/storage v0.0.0-20260506142622-85fbda68b9bc

0 commit comments

Comments
 (0)