Skip to content

Commit 84dc031

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

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

go.mod

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

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+
8181
github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM=
8282
github.com/containers/buildah v1.38.1-0.20241119213149-52437ef15d33 h1:Ih6KuyByK7ZGGzkS0M5rVBPLWIyeDvdL5klhsKBo8vA=
8383
github.com/containers/buildah v1.38.1-0.20241119213149-52437ef15d33/go.mod h1:RxIuKhwTpRl3ma4d4BF6QzSSeg9zNNvo/xhYJOKeDQs=
84-
github.com/containers/common v0.61.1-0.20241125104856-ceceb404e9aa h1:XetqxHBrm3klRHIe8L1QIOr57B0HUVdihxY1wop0KXg=
85-
github.com/containers/common v0.61.1-0.20241125104856-ceceb404e9aa/go.mod h1:3mUU2/PxkOwvL46fmaRVj0YfBDBxNPOMctIvBHWo4Ak=
8684
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
8785
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
8886
github.com/containers/gvisor-tap-vsock v0.8.0 h1:Z8ZEWb+Lio0d+lXexONdUWT4rm9lF91vH0g3ARnMy7o=
@@ -275,6 +273,8 @@ github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E=
275273
github.com/gorilla/schema v1.4.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM=
276274
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys=
277275
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I=
276+
github.com/gtjoseph/common v0.0.0-20241125154636-31b6f9e9f225 h1:0McC2EJWEmOkrbuzNpFSfTmuJmvqtmJXmUXV4iKbrcY=
277+
github.com/gtjoseph/common v0.0.0-20241125154636-31b6f9e9f225/go.mod h1:NGRISq2vTFPSbhNqj6MLwyes4tWSlCnqbJg7R77B8xc=
278278
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
279279
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
280280
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: 3 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
@@ -174,7 +174,7 @@ github.com/containers/buildah/pkg/sshagent
174174
github.com/containers/buildah/pkg/util
175175
github.com/containers/buildah/pkg/volumes
176176
github.com/containers/buildah/util
177-
# github.com/containers/common v0.61.1-0.20241125104856-ceceb404e9aa
177+
# github.com/containers/common v0.61.1-0.20241125104856-ceceb404e9aa => github.com/gtjoseph/common v0.0.0-20241125154636-31b6f9e9f225
178178
## explicit; go 1.22.6
179179
github.com/containers/common/internal
180180
github.com/containers/common/internal/attributedstring
@@ -1392,3 +1392,4 @@ tags.cncf.io/container-device-interface/pkg/parser
13921392
# tags.cncf.io/container-device-interface/specs-go v0.8.0
13931393
## explicit; go 1.19
13941394
tags.cncf.io/container-device-interface/specs-go
1395+
# github.com/containers/common => github.com/gtjoseph/common v0.0.0-20241125154636-31b6f9e9f225

0 commit comments

Comments
 (0)