Skip to content

Commit 67b9ba0

Browse files
github-actions[bot]github-actions[bot]
committed
dnm: Vendor changes from containers/container-libs#488 
1 parent d3b2619 commit 67b9ba0

File tree

9 files changed

+56
-43
lines changed

9 files changed

+56
-43
lines changed

‎go.mod‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,9 @@ require (
141141
sigs.k8s.io/yaml v1.6.0 // indirect
142142
tags.cncf.io/container-device-interface/specs-go v1.0.1-0.20251120202831-139ffec09210 // indirect
143143
)
144+
145+
replace go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251124161153-8e0a92fa516e
146+
147+
replace go.podman.io/storage => github.com/lsm5/container-libs/storage v0.0.0-20251124161153-8e0a92fa516e
148+
149+
replace go.podman.io/image/v5 => github.com/lsm5/container-libs/image/v5 v5.0.0-20251124161153-8e0a92fa516e

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,12 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
156156
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
157157
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2TSgRbAhD7yjZzTQmcN25sDRPEeinR51yQ=
158158
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk=
159+
github.com/lsm5/container-libs/common v0.0.0-20251124161153-8e0a92fa516e h1:ONLQ9PNFMyOIjm+lKIdFWRThFSYI7EW9SykREZAJF8o=
160+
github.com/lsm5/container-libs/common v0.0.0-20251124161153-8e0a92fa516e/go.mod h1:8qbjUhjwp4i5u1O19vzwYW2qwIuPdFXIuv4nl3Z8px8=
161+
github.com/lsm5/container-libs/image/v5 v5.0.0-20251124161153-8e0a92fa516e h1:OhL+t06C38I/qkWqj48oXXW7QmONk34yynNJYtN2dKk=
162+
github.com/lsm5/container-libs/image/v5 v5.0.0-20251124161153-8e0a92fa516e/go.mod h1:9DniP9NaGH03kzwNKYEtOXgRJwO+cQHENH+G4sOwLNc=
163+
github.com/lsm5/container-libs/storage v0.0.0-20251124161153-8e0a92fa516e h1:0wsrSEhvJJjcvrP3hCb9ZBCD8eT/RLrZMU2JgU8Nw7Y=
164+
github.com/lsm5/container-libs/storage v0.0.0-20251124161153-8e0a92fa516e/go.mod h1:4p18A5ymiiJTllTu2Eo7CX88SO+V110TMzi31pXsb1s=
159165
github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
160166
github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
161167
github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
@@ -322,12 +328,6 @@ go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJr
322328
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
323329
go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4=
324330
go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
325-
go.podman.io/common v0.66.1-0.20251120131032-23712697ddda h1:Ib1vIEYB5eCSz3G09sROyY/j09jztFlWRm4G52vWj3k=
326-
go.podman.io/common v0.66.1-0.20251120131032-23712697ddda/go.mod h1:8qbjUhjwp4i5u1O19vzwYW2qwIuPdFXIuv4nl3Z8px8=
327-
go.podman.io/image/v5 v5.38.1-0.20251120131032-23712697ddda h1:YySc/E4bpD5b5y4kFN/7ZDo5JcXnOpPfwU78kH9D+EU=
328-
go.podman.io/image/v5 v5.38.1-0.20251120131032-23712697ddda/go.mod h1:9DniP9NaGH03kzwNKYEtOXgRJwO+cQHENH+G4sOwLNc=
329-
go.podman.io/storage v1.61.1-0.20251120131032-23712697ddda h1:bC4fEguil4pwVp2U2zKWUC5ouqIwRDdtyJxtX1bPY+0=
330-
go.podman.io/storage v1.61.1-0.20251120131032-23712697ddda/go.mod h1:4p18A5ymiiJTllTu2Eo7CX88SO+V110TMzi31pXsb1s=
331331
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
332332
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
333333
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=

‎vendor/go.podman.io/common/pkg/config/containers.conf‎

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

‎vendor/go.podman.io/common/pkg/config/containers.conf-freebsd‎

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

‎vendor/go.podman.io/image/v5/docker/reference/normalize.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/image/v5/docker/wwwauthenticate.go‎

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

‎vendor/go.podman.io/image/v5/pkg/shortnames/shortnames.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/.golangci.yml‎

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

‎vendor/modules.txt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ go.opentelemetry.io/otel/trace
510510
go.opentelemetry.io/otel/trace/embedded
511511
go.opentelemetry.io/otel/trace/internal/telemetry
512512
go.opentelemetry.io/otel/trace/noop
513-
# go.podman.io/common v0.66.1-0.20251120131032-23712697ddda
513+
# go.podman.io/common v0.66.1-0.20251120131032-23712697ddda => github.com/lsm5/container-libs/common v0.0.0-20251124161153-8e0a92fa516e
514514
## explicit; go 1.24.2
515515
go.podman.io/common/internal
516516
go.podman.io/common/internal/attributedstring
@@ -564,7 +564,7 @@ go.podman.io/common/pkg/umask
564564
go.podman.io/common/pkg/util
565565
go.podman.io/common/pkg/version
566566
go.podman.io/common/version
567-
# go.podman.io/image/v5 v5.38.1-0.20251120131032-23712697ddda
567+
# go.podman.io/image/v5 v5.38.1-0.20251120131032-23712697ddda => github.com/lsm5/container-libs/image/v5 v5.0.0-20251124161153-8e0a92fa516e
568568
## explicit; go 1.24.0
569569
go.podman.io/image/v5/copy
570570
go.podman.io/image/v5/directory
@@ -632,7 +632,7 @@ go.podman.io/image/v5/transports
632632
go.podman.io/image/v5/transports/alltransports
633633
go.podman.io/image/v5/types
634634
go.podman.io/image/v5/version
635-
# go.podman.io/storage v1.61.1-0.20251120131032-23712697ddda
635+
# go.podman.io/storage v1.61.1-0.20251120131032-23712697ddda => github.com/lsm5/container-libs/storage v0.0.0-20251124161153-8e0a92fa516e
636636
## explicit; go 1.24.0
637637
go.podman.io/storage
638638
go.podman.io/storage/drivers
@@ -872,3 +872,6 @@ tags.cncf.io/container-device-interface/pkg/parser
872872
# tags.cncf.io/container-device-interface/specs-go v1.0.1-0.20251120202831-139ffec09210
873873
## explicit; go 1.19
874874
tags.cncf.io/container-device-interface/specs-go
875+
# go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251124161153-8e0a92fa516e
876+
# go.podman.io/storage => github.com/lsm5/container-libs/storage v0.0.0-20251124161153-8e0a92fa516e
877+
# go.podman.io/image/v5 => github.com/lsm5/container-libs/image/v5 v5.0.0-20251124161153-8e0a92fa516e

0 commit comments

Comments
 (0)