Skip to content

Commit

Permalink
DO NOT MERGE: Vendor containers/common#2209
Browse files Browse the repository at this point in the history 
> go mod edit -replace github.com/containers/common=github.com/mtrmac/common@precise-pull-id

Signed-off-by: Miloslav Trmač <[email protected]>
  • Loading branch information
@mtrmac
mtrmac committed Nov 4, 2024
1 parent 05da1ff commit f55c51d
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 93 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,6 @@ require (
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
)

replace github.com/containers/common => github.com/Luap99/common v0.20.3-0.20241104152339-f0f87a93a145
replace github.com/containers/common => github.com/mtrmac/common v0.8.2-0.20241104185608-da3fcb834311

replace github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241104162921-6ba898f74fd4
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg6
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/Luap99/common v0.20.3-0.20241104152339-f0f87a93a145 h1:XkBLGr/7QH5E2Kv7wHb7B+X5t00+VnuAYchh9zZqC+k=
github.com/Luap99/common v0.20.3-0.20241104152339-f0f87a93a145/go.mod h1:t79zzhVKgiLNv0KpBYPKXO/H0NFxbBkmyduIH9AWAlM=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/Microsoft/hcsshim v0.12.9 h1:2zJy5KA+l0loz1HzEGqyNnjd3fyZA31ZBCGKacp6lLg=
Expand Down Expand Up @@ -384,6 +382,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
github.com/mtrmac/common v0.8.2-0.20241104185608-da3fcb834311 h1:iD34V33LS/1Gk0j7aI95M30ZMe3rufJ9/Idwe9JVVJE=
github.com/mtrmac/common v0.8.2-0.20241104185608-da3fcb834311/go.mod h1:nbQLPYlTTZDE+yBDCo+exSmuNYAPnkky9B3XeDiKct8=
github.com/mtrmac/image/v5 v5.0.0-20241104162921-6ba898f74fd4 h1:sJtBTSqAR+NbEK02XHYXm7jJSwxXBbDaCOEL6e5oydE=
github.com/mtrmac/image/v5 v5.0.0-20241104162921-6ba898f74fd4/go.mod h1:qsONoo3ZvAnrwa2+49bY6m3ewtJO5+A1AaELCtGuDKc=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
Expand Down
7 changes: 4 additions & 3 deletions vendor/github.com/containers/common/libimage/copier.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/common/libimage/import.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/common/libimage/manifest_list.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 45 additions & 79 deletions vendor/github.com/containers/common/libimage/pull.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/common/libimage/push.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/containers/common/libimage/save.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ github.com/containers/buildah/pkg/sshagent
github.com/containers/buildah/pkg/util
github.com/containers/buildah/pkg/volumes
github.com/containers/buildah/util
# github.com/containers/common v0.60.1-0.20241101112026-fb1a5d5980ab => github.com/Luap99/common v0.20.3-0.20241104152339-f0f87a93a145
## explicit; go 1.22.0
# github.com/containers/common v0.60.1-0.20241101112026-fb1a5d5980ab => github.com/mtrmac/common v0.8.2-0.20241104185608-da3fcb834311
## explicit; go 1.22.6
github.com/containers/common/internal
github.com/containers/common/internal/attributedstring
github.com/containers/common/libimage
Expand Down Expand Up @@ -1391,5 +1391,5 @@ tags.cncf.io/container-device-interface/pkg/parser
# tags.cncf.io/container-device-interface/specs-go v0.8.0
## explicit; go 1.19
tags.cncf.io/container-device-interface/specs-go
# github.com/containers/common => github.com/Luap99/common v0.20.3-0.20241104152339-f0f87a93a145
# github.com/containers/common => github.com/mtrmac/common v0.8.2-0.20241104185608-da3fcb834311
# github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241104162921-6ba898f74fd4

0 comments on commit f55c51d

Please sign in to comment.