Skip to content

Commit 36e58b7

Browse files
dnm: Vendor changes from containers/container-libs#489
1 parent d3b2619 commit 36e58b7

File tree

10 files changed

+145
-38
lines changed

10 files changed

+145
-38
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/QiWang19/container-libs/common v0.0.0-20251124194041-48f7b34b33e1
146+
147+
replace go.podman.io/storage => github.com/QiWang19/container-libs/storage v0.0.0-20251124194041-48f7b34b33e1
148+
149+
replace go.podman.io/image/v5 => github.com/QiWang19/container-libs/image/v5 v5.0.0-20251124194041-48f7b34b33e1

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1
1212
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
1313
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
1414
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
15+
github.com/QiWang19/container-libs/common v0.0.0-20251124194041-48f7b34b33e1 h1:YjwZGIB+ZtosVCxzZ7JBimOxk1ysHNplrI+hGfboiF4=
16+
github.com/QiWang19/container-libs/common v0.0.0-20251124194041-48f7b34b33e1/go.mod h1:8qbjUhjwp4i5u1O19vzwYW2qwIuPdFXIuv4nl3Z8px8=
17+
github.com/QiWang19/container-libs/image/v5 v5.0.0-20251124194041-48f7b34b33e1 h1:fzKIwzl//7RjmBleo7exZbMlqx3FkSpspKJSgqtqz8w=
18+
github.com/QiWang19/container-libs/image/v5 v5.0.0-20251124194041-48f7b34b33e1/go.mod h1:9DniP9NaGH03kzwNKYEtOXgRJwO+cQHENH+G4sOwLNc=
19+
github.com/QiWang19/container-libs/storage v0.0.0-20251124194041-48f7b34b33e1 h1:8fYelVpU+AkjI5jZN0H57StMjXM/g+v1k/mixfv2AZA=
20+
github.com/QiWang19/container-libs/storage v0.0.0-20251124194041-48f7b34b33e1/go.mod h1:4p18A5ymiiJTllTu2Eo7CX88SO+V110TMzi31pXsb1s=
1521
github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
1622
github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
1723
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
@@ -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/signature/mechanism.go

Lines changed: 2 additions & 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/signature/mechanism_gpgme_only.go

Lines changed: 37 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/signature/mechanism_openpgp.go

Lines changed: 4 additions & 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/signature/mechanism_sequoia.go

Lines changed: 5 additions & 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/signature/policy_eval_signedby.go

Lines changed: 55 additions & 3 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/QiWang19/container-libs/common v0.0.0-20251124194041-48f7b34b33e1
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/QiWang19/container-libs/image/v5 v5.0.0-20251124194041-48f7b34b33e1
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/QiWang19/container-libs/storage v0.0.0-20251124194041-48f7b34b33e1
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/QiWang19/container-libs/common v0.0.0-20251124194041-48f7b34b33e1
876+
# go.podman.io/storage => github.com/QiWang19/container-libs/storage v0.0.0-20251124194041-48f7b34b33e1
877+
# go.podman.io/image/v5 => github.com/QiWang19/container-libs/image/v5 v5.0.0-20251124194041-48f7b34b33e1

0 commit comments

Comments
 (0)