Skip to content

Commit 910d0db

Browse files
dnm: Vendor changes from containers/container-libs#411
1 parent e0e108c commit 910d0db

File tree

8 files changed

+27
-21
lines changed

8 files changed

+27
-21
lines changed

go.mod

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,9 @@ require (
137137
sigs.k8s.io/yaml v1.6.0 // indirect
138138
tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
139139
)
140+
141+
replace go.podman.io/common => github.com/inknos/container-libs/common v0.0.0-20251023123555-6f2b11e2c6f7
142+
143+
replace go.podman.io/storage => github.com/inknos/container-libs/storage v0.0.0-20251023123555-6f2b11e2c6f7
144+
145+
replace go.podman.io/image/v5 => github.com/inknos/container-libs/image/v5 v5.0.0-20251023123555-6f2b11e2c6f7

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,12 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
134134
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
135135
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
136136
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
137+
github.com/inknos/container-libs/common v0.0.0-20251023123555-6f2b11e2c6f7 h1:XqleK6ycYGktovFHMFloWAK6brN43yu1FSSbv+WnNnw=
138+
github.com/inknos/container-libs/common v0.0.0-20251023123555-6f2b11e2c6f7/go.mod h1:kv0yXx/yrT60lUcVb86hezMGz/lXmyx3epvdFlM9du4=
139+
github.com/inknos/container-libs/image/v5 v5.0.0-20251023123555-6f2b11e2c6f7 h1:1Ka/MGrW3JBZeu2jUwuNCdeOfNDm2K3c3e2fDz1Q69g=
140+
github.com/inknos/container-libs/image/v5 v5.0.0-20251023123555-6f2b11e2c6f7/go.mod h1:rzI7vFUroTWKtAAVuYCoT2wy8LbcepZgEuhzzRzfui4=
141+
github.com/inknos/container-libs/storage v0.0.0-20251023123555-6f2b11e2c6f7 h1:2/9dADKnPJZGu/WaEF1X5P6kcOGTh8nHIdU0QcjY46M=
142+
github.com/inknos/container-libs/storage v0.0.0-20251023123555-6f2b11e2c6f7/go.mod h1:A3UBK0XypjNZ6pghRhuxg62+2NIm5lcUGv/7XyMhMUI=
137143
github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
138144
github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
139145
github.com/jmhodges/clock v1.2.0 h1:eq4kys+NI0PLngzaHEe7AmPT90XMGIEySD1JfV1PDIs=
@@ -317,12 +323,6 @@ go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKr
317323
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
318324
go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
319325
go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
320-
go.podman.io/common v0.66.0 h1:KElE3HKLFdMdJL+jv5ExBiX2Dh4Qcv8ovmzaBGRsyZM=
321-
go.podman.io/common v0.66.0/go.mod h1:aNd2a0S7pY+fx1X5kpQYuF4hbwLU8ZOccuVrhu7h1Xc=
322-
go.podman.io/image/v5 v5.38.0 h1:aUKrCANkPvze1bnhLJsaubcfz0d9v/bSDLnwsXJm6G4=
323-
go.podman.io/image/v5 v5.38.0/go.mod h1:hSIoIUzgBnmc4DjoIdzk63aloqVbD7QXDMkSE/cvG90=
324-
go.podman.io/storage v1.61.0 h1:5hD/oyRYt1f1gxgvect+8syZBQhGhV28dCw2+CZpx0Q=
325-
go.podman.io/storage v1.61.0/go.mod h1:A3UBK0XypjNZ6pghRhuxg62+2NIm5lcUGv/7XyMhMUI=
326326
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
327327
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
328328
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=

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

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/common/pkg/config/default.go

Lines changed: 5 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/common/version/version.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/version/version.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/VERSION

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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ go.opentelemetry.io/otel/trace
464464
go.opentelemetry.io/otel/trace/embedded
465465
go.opentelemetry.io/otel/trace/internal/telemetry
466466
go.opentelemetry.io/otel/trace/noop
467-
# go.podman.io/common v0.66.0
467+
# go.podman.io/common v0.66.0 => github.com/inknos/container-libs/common v0.0.0-20251023123555-6f2b11e2c6f7
468468
## explicit; go 1.24.2
469469
go.podman.io/common/internal
470470
go.podman.io/common/internal/attributedstring
@@ -518,7 +518,7 @@ go.podman.io/common/pkg/umask
518518
go.podman.io/common/pkg/util
519519
go.podman.io/common/pkg/version
520520
go.podman.io/common/version
521-
# go.podman.io/image/v5 v5.38.0
521+
# go.podman.io/image/v5 v5.38.0 => github.com/inknos/container-libs/image/v5 v5.0.0-20251023123555-6f2b11e2c6f7
522522
## explicit; go 1.24.0
523523
go.podman.io/image/v5/copy
524524
go.podman.io/image/v5/directory
@@ -586,7 +586,7 @@ go.podman.io/image/v5/transports
586586
go.podman.io/image/v5/transports/alltransports
587587
go.podman.io/image/v5/types
588588
go.podman.io/image/v5/version
589-
# go.podman.io/storage v1.61.0
589+
# go.podman.io/storage v1.61.0 => github.com/inknos/container-libs/storage v0.0.0-20251023123555-6f2b11e2c6f7
590590
## explicit; go 1.24.0
591591
go.podman.io/storage
592592
go.podman.io/storage/drivers
@@ -826,3 +826,6 @@ tags.cncf.io/container-device-interface/pkg/parser
826826
# tags.cncf.io/container-device-interface/specs-go v1.0.0
827827
## explicit; go 1.19
828828
tags.cncf.io/container-device-interface/specs-go
829+
# go.podman.io/common => github.com/inknos/container-libs/common v0.0.0-20251023123555-6f2b11e2c6f7
830+
# go.podman.io/storage => github.com/inknos/container-libs/storage v0.0.0-20251023123555-6f2b11e2c6f7
831+
# go.podman.io/image/v5 => github.com/inknos/container-libs/image/v5 v5.0.0-20251023123555-6f2b11e2c6f7

0 commit comments

Comments
 (0)