From b61a4c3d29450b69b2e1b48885a82ac0c27fadff Mon Sep 17 00:00:00 2001 From: tomsweeneyredhat Date: Fri, 1 Aug 2025 15:44:37 -0400 Subject: [PATCH] [DO NOT MERGE] Test c/image #2907 Do a quick vendor test of c/image with a proposed PR for cherry picking into c/image v5.35.*. Proposed PR: https://github.com/containers/image/pull/2907 Signed-off-by: tomsweeneyredhat --- go.mod | 4 +++- go.sum | 4 ++-- vendor/modules.txt | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 1f79b487..c5fd7f63 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ go 1.23.3 require ( github.com/Masterminds/semver/v3 v3.4.0 github.com/containers/common v0.64.0 - github.com/containers/image/v5 v5.36.0 + github.com/containers/image/v5 v5.36.1-0.20250724133842-4b4473bb78d5 github.com/containers/ocicrypt v1.2.1 github.com/containers/storage v1.59.0 github.com/docker/distribution v2.8.3+incompatible @@ -114,3 +114,5 @@ require ( google.golang.org/grpc v1.72.2 // indirect google.golang.org/protobuf v1.36.6 // indirect ) + +replace github.com/containers/image/v5 => github.com/TomSweeneyRedHat/image/v5 v5.0.0-20250801220556-40d10270ef5e diff --git a/go.sum b/go.sum index fa99c5e0..81a0bc6b 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Microsoft/hcsshim v0.13.0 h1:/BcXOiS6Qi7N9XqUcv27vkIuVOkBEcWstd2pMlWSeaA= github.com/Microsoft/hcsshim v0.13.0/go.mod h1:9KWJ/8DgU+QzYGupX4tzMhRQE8h6w90lH6HAaclpEok= +github.com/TomSweeneyRedHat/image/v5 v5.0.0-20250801220556-40d10270ef5e h1:NE7hOuw8GoZiNUTfe07XiRqposkOJiOXw31JYcWLA1o= +github.com/TomSweeneyRedHat/image/v5 v5.0.0-20250801220556-40d10270ef5e/go.mod h1:VZ6cyDHbxZoOt4dklUJ+WNEH9FrgSgfH3qUBYKFlcT0= github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow= github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8= @@ -39,8 +41,6 @@ github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++ github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk= github.com/containers/common v0.64.0 h1:Jdjq1e5tqrLov9tcAVc/AfvQCgX4krhcfDBgOXwrSfw= github.com/containers/common v0.64.0/go.mod h1:bq2UIiFP8vUJdgM+WN8E8jkD7wF69SpDRGzU7epJljg= -github.com/containers/image/v5 v5.36.0 h1:Zh+xFcLjRmicnOT5AFPHH/xj+e3s9ojDN/9X2Kx1+Jo= -github.com/containers/image/v5 v5.36.0/go.mod h1:VZ6cyDHbxZoOt4dklUJ+WNEH9FrgSgfH3qUBYKFlcT0= 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.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM= diff --git a/vendor/modules.txt b/vendor/modules.txt index acebb0b4..9619ae19 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -79,7 +79,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.36.0 +# github.com/containers/image/v5 v5.36.1-0.20250724133842-4b4473bb78d5 => github.com/TomSweeneyRedHat/image/v5 v5.0.0-20250801220556-40d10270ef5e ## explicit; go 1.23.3 github.com/containers/image/v5/copy github.com/containers/image/v5/directory @@ -711,3 +711,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/TomSweeneyRedHat/image/v5 v5.0.0-20250801220556-40d10270ef5e