Skip to content

Commit

Permalink
DO NOT MERGE: Include UNMERGED containers/image#2595
Browse files Browse the repository at this point in the history 
Signed-off-by: Miloslav Trmač <[email protected]>
  • Loading branch information
@mtrmac
mtrmac committed Oct 25, 2024
1 parent 7fa215e commit 015dbda
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 2 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,5 @@ require (
google.golang.org/grpc v1.66.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
)

replace github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241025210653-3a743783a632
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G
github.com/containerd/stargz-snapshotter/estargz v0.15.1/go.mod h1:gr2RNwukQ/S9Nv33Lt6UC7xEx58C+LHRdoqbEKjz1Kk=
github.com/containers/common v0.60.4 h1:H5+LAMHPZEqX6vVNOQ+IguVsaFl8kbO/SZ/VPXjxhy0=
github.com/containers/common v0.60.4/go.mod h1:I0upBi1qJX3QmzGbUOBN1LVP6RvkKhd3qQpZbQT+Q54=
github.com/containers/image/v5 v5.32.3-0.20241025210258-94e0c4fd8e9d h1:85nEVd7gWGP2I35hHHjF/3zYPnLI+VKvsxRsYKBOb9k=
github.com/containers/image/v5 v5.32.3-0.20241025210258-94e0c4fd8e9d/go.mod h1:mMysUPpcUwWuq2EgENF+GLr4nrKBPOUcKZnJ0SpdxEA=
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
github.com/containers/ocicrypt v1.2.0 h1:X14EgRK3xNFvJEfI5O4Qn4T3E25ANudSOZz/sirVuPM=
Expand Down Expand Up @@ -229,6 +227,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/image/v5 v5.0.0-20241025210653-3a743783a632 h1:OR/PD40jPL0Q1vqjwxg2bvodZwybwKonhvSxBN/JhmQ=
github.com/mtrmac/image/v5 v5.0.0-20241025210653-3a743783a632/go.mod h1:mMysUPpcUwWuq2EgENF+GLr4nrKBPOUcKZnJ0SpdxEA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
Expand Down
4 changes: 3 additions & 1 deletion vendor/github.com/containers/image/v5/storage/storage_reference.go
View file

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

3 changes: 2 additions & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ github.com/containers/common/pkg/password
github.com/containers/common/pkg/report
github.com/containers/common/pkg/report/camelcase
github.com/containers/common/pkg/retry
# github.com/containers/image/v5 v5.32.3-0.20241025210258-94e0c4fd8e9d
# github.com/containers/image/v5 v5.32.3-0.20241025210258-94e0c4fd8e9d => github.com/mtrmac/image/v5 v5.0.0-20241025210653-3a743783a632
## explicit; go 1.22.6
github.com/containers/image/v5/copy
github.com/containers/image/v5/directory
Expand Down Expand Up @@ -774,3 +774,4 @@ google.golang.org/protobuf/types/known/timestamppb
# gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3
# github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241025210653-3a743783a632

0 comments on commit 015dbda

Please sign in to comment.