Skip to content

Commit fea79ee

Browse files
committed
DO NOT MERGE: Test against containers/common#2254
Signed-off-by: George Joseph <g.devel@wxy78.net>
1 parent 2385257 commit fea79ee

File tree

7 files changed

+30
-4
lines changed

7 files changed

+30
-4
lines changed

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,3 +231,5 @@ require (
231231
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
232232
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
233233
)
234+
235+
replace github.com/containers/common => github.com/gtjoseph/common v0.0.0-20241128203536-2a3e1c1d0ac4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+
7878
github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM=
7979
github.com/containers/buildah v1.38.1-0.20241119213149-52437ef15d33 h1:Ih6KuyByK7ZGGzkS0M5rVBPLWIyeDvdL5klhsKBo8vA=
8080
github.com/containers/buildah v1.38.1-0.20241119213149-52437ef15d33/go.mod h1:RxIuKhwTpRl3ma4d4BF6QzSSeg9zNNvo/xhYJOKeDQs=
81-
github.com/containers/common v0.61.1-0.20241125172552-a801fac4edc0 h1:Vh8IytxprODmjd4sALcSVUzhT28vT537UWsfCXcahWk=
82-
github.com/containers/common v0.61.1-0.20241125172552-a801fac4edc0/go.mod h1:3mUU2/PxkOwvL46fmaRVj0YfBDBxNPOMctIvBHWo4Ak=
8381
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
8482
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
8583
github.com/containers/gvisor-tap-vsock v0.8.0 h1:Z8ZEWb+Lio0d+lXexONdUWT4rm9lF91vH0g3ARnMy7o=
@@ -272,6 +270,8 @@ github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E=
272270
github.com/gorilla/schema v1.4.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM=
273271
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys=
274272
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I=
273+
github.com/gtjoseph/common v0.0.0-20241128203536-2a3e1c1d0ac4 h1:+6WrHX0TsCrB8ggqx3NZHpZ2ibmSIATAGzttp7e/hMc=
274+
github.com/gtjoseph/common v0.0.0-20241128203536-2a3e1c1d0ac4/go.mod h1:ySiyZ85+F3xk7kcQvaZo0Ii67Hma7T4JEeILEQPWEKY=
275275
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
276276
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
277277
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=

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

Lines changed: 3 additions & 1 deletion
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

Lines changed: 7 additions & 0 deletions
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

Lines changed: 8 additions & 0 deletions
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

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

vendor/modules.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ github.com/containers/buildah/pkg/sshagent
178178
github.com/containers/buildah/pkg/util
179179
github.com/containers/buildah/pkg/volumes
180180
github.com/containers/buildah/util
181-
# github.com/containers/common v0.61.1-0.20241125172552-a801fac4edc0
181+
# github.com/containers/common v0.61.1-0.20241125172552-a801fac4edc0 => github.com/gtjoseph/common v0.0.0-20241128203536-2a3e1c1d0ac4
182182
## explicit; go 1.22.6
183183
github.com/containers/common/internal
184184
github.com/containers/common/internal/attributedstring
@@ -1398,3 +1398,4 @@ tags.cncf.io/container-device-interface/pkg/parser
13981398
# tags.cncf.io/container-device-interface/specs-go v0.8.0
13991399
## explicit; go 1.19
14001400
tags.cncf.io/container-device-interface/specs-go
1401+
# github.com/containers/common => github.com/gtjoseph/common v0.0.0-20241128203536-2a3e1c1d0ac4

0 commit comments

Comments
 (0)