Skip to content

Commit

Permalink
DO NOT MERGE: Test containers/image#2613
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 30, 2024
1 parent 80d0f26 commit a17988e
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 24 deletions.
4 changes: 3 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/containers/libhvee v0.7.1
github.com/containers/ocicrypt v1.2.0
github.com/containers/psgo v1.9.0
github.com/containers/storage v1.55.1-0.20241017155235-4db236377c55
github.com/containers/storage v1.55.2-0.20241023191550-717b332e4c6c
github.com/containers/winquit v1.1.0
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09
github.com/coreos/stream-metadata-go v0.4.4
Expand Down Expand Up @@ -229,3 +229,5 @@ require (
)

replace github.com/containers/storage => github.com/mtrmac/storage v0.0.0-20241030144250-6c95f6eebe5d

replace github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241030145807-090e94d1fb11
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6J
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
github.com/containers/gvisor-tap-vsock v0.7.5 h1:bTy4u3DOmmUPwurL6me2rsgfypAFDhyeJleUcQmBR/E=
github.com/containers/gvisor-tap-vsock v0.7.5/go.mod h1:GW9jOqAEEGdaS20XwTYdm6KCYDHIulOE/yEEOabkoE4=
github.com/containers/image/v5 v5.32.3-0.20241016192323-a66152c1cdf6 h1:kDsMVMhEFmWFLN6QEn0ul0MbpXCxLiIL5pqxADOqB8g=
github.com/containers/image/v5 v5.32.3-0.20241016192323-a66152c1cdf6/go.mod h1:Ulwf/jQO4757C/uOJyNiZ10dRiXRwVnyhF9wYFno3GQ=
github.com/containers/libhvee v0.7.1 h1:dWGF5GLq9DZvXo3P8aDp3cNieL5eCaSell4UmeA/jY4=
github.com/containers/libhvee v0.7.1/go.mod h1:fRKB3AyIqHMvq6xaeYhTpckM2cdoq0oecolyoiuLP7M=
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
Expand Down Expand Up @@ -382,6 +380,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-20241030145807-090e94d1fb11 h1:VgCYZpEnS4r1BITy1TRFD49n12o8Gu/3VjlHi++ebbQ=
github.com/mtrmac/image/v5 v5.0.0-20241030145807-090e94d1fb11/go.mod h1:IjXJLPmVmdHol69Yghcis1cKU0roXiOgWySMMYwSci4=
github.com/mtrmac/storage v0.0.0-20241030144250-6c95f6eebe5d h1:fYGkRzT7Nl66NPePY/8NYabz9MrRumHXRsJrw+0OMFs=
github.com/mtrmac/storage v0.0.0-20241030144250-6c95f6eebe5d/go.mod h1:jlFSQ5COnXuLo1qZcKnWMAa7nYLXq2GKBwt0AVodgtE=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/containers/image/v5/copy/single.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/image/v5/docker/body_reader.go
View file

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

14 changes: 12 additions & 2 deletions vendor/github.com/containers/image/v5/pkg/compression/compression.go
View file

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

9 changes: 9 additions & 0 deletions vendor/github.com/containers/image/v5/pkg/compression/internal/types.go
View file

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

44 changes: 29 additions & 15 deletions vendor/github.com/containers/image/v5/storage/storage_dest.go
View file

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

5 changes: 3 additions & 2 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ github.com/containers/conmon/runner/config
# github.com/containers/gvisor-tap-vsock v0.7.5
## explicit; go 1.21
github.com/containers/gvisor-tap-vsock/pkg/types
# github.com/containers/image/v5 v5.32.3-0.20241016192323-a66152c1cdf6
# github.com/containers/image/v5 v5.32.3-0.20241016192323-a66152c1cdf6 => github.com/mtrmac/image/v5 v5.0.0-20241030145807-090e94d1fb11
## explicit; go 1.22.6
github.com/containers/image/v5/copy
github.com/containers/image/v5/directory
Expand Down Expand Up @@ -356,7 +356,7 @@ github.com/containers/psgo/internal/dev
github.com/containers/psgo/internal/host
github.com/containers/psgo/internal/proc
github.com/containers/psgo/internal/process
# github.com/containers/storage v1.55.1-0.20241017155235-4db236377c55 => github.com/mtrmac/storage v0.0.0-20241030144250-6c95f6eebe5d
# github.com/containers/storage v1.55.2-0.20241023191550-717b332e4c6c => github.com/mtrmac/storage v0.0.0-20241030144250-6c95f6eebe5d
## explicit; go 1.22.0
github.com/containers/storage
github.com/containers/storage/drivers
Expand Down Expand Up @@ -1387,3 +1387,4 @@ tags.cncf.io/container-device-interface/pkg/parser
## explicit; go 1.19
tags.cncf.io/container-device-interface/specs-go
# github.com/containers/storage => github.com/mtrmac/storage v0.0.0-20241030144250-6c95f6eebe5d
# github.com/containers/image/v5 => github.com/mtrmac/image/v5 v5.0.0-20241030145807-090e94d1fb11

0 comments on commit a17988e

Please sign in to comment.