From db18ae857133a6461034060e9d3fb537bd5554b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:55:24 +0200 Subject: [PATCH] Bump github.com/buildpacks/pack from 0.33.3-0.20240508211754-0a39de09a078 to 0.34.2 (#6) * Bump github.com/buildpacks/pack Bumps [github.com/buildpacks/pack](https://github.com/buildpacks/pack) from 0.33.3-0.20240508211754-0a39de09a078 to 0.34.2. - [Release notes](https://github.com/buildpacks/pack/releases) - [Changelog](https://github.com/buildpacks/pack/blob/main/RELEASE.md) - [Commits](https://github.com/buildpacks/pack/commits/v0.34.2) --- updated-dependencies: - dependency-name: github.com/buildpacks/pack dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * fix compilation error Co-authored-by: Johannes Dillmann --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavel Busko Co-authored-by: Johannes Dillmann --- go.mod | 10 ++++------ go.sum | 16 ++++++++-------- pkg/staging/buildpacks.go | 8 +++++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 5622c85..88c8027 100644 --- a/go.mod +++ b/go.mod @@ -2,14 +2,12 @@ module code.cloudfoundry.org/cnbapplifecycle go 1.22 -toolchain go1.22.2 - require ( github.com/BurntSushi/toml v1.3.2 github.com/apex/log v1.9.0 github.com/buildpacks/lifecycle v0.19.6 - github.com/buildpacks/pack v0.33.3-0.20240508211754-0a39de09a078 - github.com/docker/docker v26.1.1+incompatible + github.com/buildpacks/pack v0.34.2 + github.com/docker/docker v26.1.3+incompatible github.com/onsi/ginkgo/v2 v2.17.2 github.com/onsi/gomega v1.33.1 github.com/spf13/cobra v1.8.0 @@ -48,7 +46,7 @@ require ( github.com/aws/smithy-go v1.20.1 // indirect github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231213181459-b0fcec718dc6 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/buildpacks/imgutil v0.0.0-20240507132533-9f7b96c3d09d // indirect + github.com/buildpacks/imgutil v0.0.0-20240605145725-186f89b2d168 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect @@ -60,7 +58,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dimchansky/utfbom v1.1.1 // indirect github.com/distribution/reference v0.6.0 // indirect - github.com/docker/cli v26.1.1+incompatible // indirect + github.com/docker/cli v26.1.3+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.8.0 // indirect github.com/docker/go-connections v0.5.0 // indirect diff --git a/go.sum b/go.sum index 355a0e4..bfc7ae5 100644 --- a/go.sum +++ b/go.sum @@ -86,12 +86,12 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/buildpacks/imgutil v0.0.0-20240507132533-9f7b96c3d09d h1:GVRuY/C8j4pjOddeeZelbKKLMMX+dYR3TlxE4L1hECU= -github.com/buildpacks/imgutil v0.0.0-20240507132533-9f7b96c3d09d/go.mod h1:n2R6VRuWsAX3cyHCp/u0Z4WJcixny0gYg075J39owrk= +github.com/buildpacks/imgutil v0.0.0-20240605145725-186f89b2d168 h1:yVYVi1V7x1bXklOx9lpbTfteyzQKGZC/wkl+IlaVRlU= +github.com/buildpacks/imgutil v0.0.0-20240605145725-186f89b2d168/go.mod h1:n2R6VRuWsAX3cyHCp/u0Z4WJcixny0gYg075J39owrk= github.com/buildpacks/lifecycle v0.19.6 h1:/bmfMs35aSkxyzYDF+iHl9VnYmUBBbHBmnvo8XNEINk= github.com/buildpacks/lifecycle v0.19.6/go.mod h1:sWrBJzf/7dWrcHrWiV/P2+3jS8G8Ki5tczq8jO3XVRQ= -github.com/buildpacks/pack v0.33.3-0.20240508211754-0a39de09a078 h1:PGEBo3DVEEsFtimT6uTZDgnBAXZIpSejUcSqAw1BuTA= -github.com/buildpacks/pack v0.33.3-0.20240508211754-0a39de09a078/go.mod h1:V84RLsUBm+0GKazl31GCVpCOm4LFu+oVNbtUPRhXeFc= +github.com/buildpacks/pack v0.34.2 h1:6+BvuYeS07QUJZAkb/L9v2TI7mtLA2zzbfewfB4bRT8= +github.com/buildpacks/pack v0.34.2/go.mod h1:g1o7cohzXn2X+uYdWKdFgity1l2QvUDSGIMVhzBbA1M= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= @@ -124,12 +124,12 @@ github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v26.1.1+incompatible h1:bE1/uE2tCa08fMv+7ikLR/RDPoCqytwrLtkIkSzxLvw= -github.com/docker/cli v26.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v26.1.3+incompatible h1:bUpXT/N0kDE3VUHI2r5VMsYQgi38kYuoC0oL9yt3lqc= +github.com/docker/cli v26.1.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v26.1.1+incompatible h1:oI+4kkAgIwwb54b9OC7Xc3hSgu1RlJA/Lln/DF72djQ= -github.com/docker/docker v26.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v26.1.3+incompatible h1:lLCzRbrVZrljpVNobJu1J2FHk8V0s4BawoZippkc+xo= +github.com/docker/docker v26.1.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= diff --git a/pkg/staging/buildpacks.go b/pkg/staging/buildpacks.go index 3115c0a..a9127a2 100644 --- a/pkg/staging/buildpacks.go +++ b/pkg/staging/buildpacks.go @@ -24,9 +24,11 @@ func DownloadBuildpacks(buildpacks []string, buildpacksDir string, imageFetcher fetchedBps := []buildpack.BuildModule{} order := dist.Order{{Group: []dist.ModuleRef{}}} downloadOptions := buildpack.DownloadOptions{ - Daemon: false, - ImageOS: "linux", - Platform: runtime.GOARCH, + Daemon: false, + Target: &dist.Target{ + OS: "linux", + Arch: runtime.GOARCH, + }, } bpDownloader := buildpack.NewDownloader(logger, imageFetcher, downloader, nil)