From 3d227c4b2544a3a69b1b577745bbdf1eaebc6576 Mon Sep 17 00:00:00 2001 From: Jerico Pena Date: Wed, 1 Nov 2023 12:27:50 -0400 Subject: [PATCH 1/3] Add ServerVersion to docker client interface which is needed by imgutil Signed-off-by: Jerico Pena --- pkg/client/docker.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/client/docker.go b/pkg/client/docker.go index f637066e11..dfdf2c6139 100644 --- a/pkg/client/docker.go +++ b/pkg/client/docker.go @@ -21,6 +21,7 @@ type DockerClient interface { ImageRemove(ctx context.Context, image string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error) ImagePull(ctx context.Context, ref string, options types.ImagePullOptions) (io.ReadCloser, error) Info(ctx context.Context) (types.Info, error) + ServerVersion(ctx context.Context) (types.Version, error) VolumeRemove(ctx context.Context, volumeID string, force bool) error ContainerCreate(ctx context.Context, config *containertypes.Config, hostConfig *containertypes.HostConfig, networkingConfig *networktypes.NetworkingConfig, platform *specs.Platform, containerName string) (containertypes.CreateResponse, error) CopyFromContainer(ctx context.Context, container, srcPath string) (io.ReadCloser, types.ContainerPathStat, error) From 6fae7c7803218cb748358b8ecd3826a03a27df64 Mon Sep 17 00:00:00 2001 From: Jerico Pena Date: Wed, 1 Nov 2023 23:32:25 -0400 Subject: [PATCH 2/3] Use imgutil fork to verify platform changes Signed-off-by: Jerico Pena --- go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.mod b/go.mod index 95378c7be6..8046101adf 100644 --- a/go.mod +++ b/go.mod @@ -125,3 +125,5 @@ require ( ) go 1.20 + +replace github.com/buildpacks/imgutil => github.com/jericop/imgutil v1.0.0 \ No newline at end of file From 18f6ba2a497b4f0f516eeb7508eb0b8064ab2169 Mon Sep 17 00:00:00 2001 From: Jerico Pena Date: Thu, 2 Nov 2023 09:57:26 -0400 Subject: [PATCH 3/3] Bump imgutil dependency for default platform change Signed-off-by: Jerico Pena --- go.mod | 4 +--- go.sum | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8046101adf..95ac60f314 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/Masterminds/semver v1.5.0 github.com/Microsoft/go-winio v0.6.1 github.com/apex/log v1.9.0 - github.com/buildpacks/imgutil v0.0.0-20230626185301-726f02e4225c + github.com/buildpacks/imgutil v0.0.0-20231102131059-84d632186b59 github.com/buildpacks/lifecycle v0.17.2 github.com/docker/cli v24.0.7+incompatible github.com/docker/docker v24.0.7+incompatible @@ -125,5 +125,3 @@ require ( ) go 1.20 - -replace github.com/buildpacks/imgutil => github.com/jericop/imgutil v1.0.0 \ No newline at end of file diff --git a/go.sum b/go.sum index 677cd5be10..9e80695228 100644 --- a/go.sum +++ b/go.sum @@ -97,6 +97,8 @@ github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20230522190001- github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= github.com/buildpacks/imgutil v0.0.0-20230626185301-726f02e4225c h1:HlRuSz+JGAzudNtNCfHIzXe0AEuHX6Vx8uZgmjvX02o= github.com/buildpacks/imgutil v0.0.0-20230626185301-726f02e4225c/go.mod h1:mBG5M3GJW5nknCEOOqtmMHyPYnSpw/5GEiciuYU/COw= +github.com/buildpacks/imgutil v0.0.0-20231102131059-84d632186b59 h1:5g+dMdOO6Ufx/bDa5gUH/Aw9FN6wt7T3HzKSkHVvue4= +github.com/buildpacks/imgutil v0.0.0-20231102131059-84d632186b59/go.mod h1:PsazEB9yz+NG/cgm0Z1oQ0Xq6rD/U7eNMt5Su41afYY= github.com/buildpacks/lifecycle v0.17.2 h1:CfJYWHIC5v996idgjDamYHBTk+G+c1Qt7Yk80MlbWpw= github.com/buildpacks/lifecycle v0.17.2/go.mod h1:h8MrqltqMM+HQnn2F2JOQaKWmeybZ54qvlNV3pAiAqw= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=