diff --git a/go.mod b/go.mod index acd3b4ff..13f452fb 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/BurntSushi/toml v1.6.0 github.com/apex/log v1.9.0 github.com/buildpacks/lifecycle v0.21.8 - github.com/buildpacks/pack v0.40.3 + github.com/buildpacks/pack v0.40.4 github.com/cespare/xxhash/v2 v2.3.0 github.com/google/go-containerregistry v0.21.5 github.com/jarcoal/httpmock v1.4.1 @@ -116,7 +116,7 @@ require ( github.com/dimchansky/utfbom v1.1.1 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/dlclark/regexp2 v1.11.5 // indirect - github.com/docker/cli v29.4.0+incompatible // indirect + github.com/docker/cli v29.4.1+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker v28.5.2+incompatible // indirect github.com/docker/docker-credential-helpers v0.9.5 // indirect diff --git a/go.sum b/go.sum index 409fa844..d3733529 100644 --- a/go.sum +++ b/go.sum @@ -165,8 +165,8 @@ github.com/buildpacks/imgutil v0.0.0-20260216175732-65b01efeb22e h1:is9Ms8aIyO6T github.com/buildpacks/imgutil v0.0.0-20260216175732-65b01efeb22e/go.mod h1:EBy9ZOatKkTBAWOgN2Y0aNV4P40dOdGyzzB9q2a5HBE= github.com/buildpacks/lifecycle v0.21.8 h1:dH9QUJdIRpZHBCcQ3CxQeeIdjSDWsdFHYb1aYbYBeJo= github.com/buildpacks/lifecycle v0.21.8/go.mod h1:p4UUOU4p/XaUm5u2X0eZO6Lt9b8LKqg4df62PJRUNLU= -github.com/buildpacks/pack v0.40.3 h1:JCBsul/yYfHEYv8whNkKUztOUthP8PAS5TW/x2WR8vQ= -github.com/buildpacks/pack v0.40.3/go.mod h1:Cw9SRAL7Tzo0tGGyXlokO4ciqu1FRs9jcvZqtXcUCeo= +github.com/buildpacks/pack v0.40.4 h1:Q8MNBBd8PyzHN/V6TMzddTD8iXV6l2c3e7An1sEeaDo= +github.com/buildpacks/pack v0.40.4/go.mod h1:+uuMmMJrY+OJacgf7vhUCFvtUYp1lweEep/j09gGPxo= github.com/butuzov/ireturn v0.4.0 h1:+s76bF/PfeKEdbG8b54aCocxXmi0wvYdOVsWxVO7n8E= github.com/butuzov/ireturn v0.4.0/go.mod h1:ghI0FrCmap8pDWZwfPisFD1vEc56VKH4NpQUxDHta70= github.com/butuzov/mirror v1.3.0 h1:HdWCXzmwlQHdVhwvsfBb2Au0r3HyINry3bDWLYXiKoc= @@ -244,8 +244,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ= github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/docker/cli v29.4.0+incompatible h1:+IjXULMetlvWJiuSI0Nbor36lcJ5BTcVpUmB21KBoVM= -github.com/docker/cli v29.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v29.4.1+incompatible h1:02RT8QqqwtGRn+6SYypv8IUEbD/ltY6sfKCJIoUcGzk= +github.com/docker/cli v29.4.1+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 v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM= diff --git a/vendor/github.com/buildpacks/pack/pkg/image/fetcher.go b/vendor/github.com/buildpacks/pack/pkg/image/fetcher.go index f325a30c..ca7c9452 100644 --- a/vendor/github.com/buildpacks/pack/pkg/image/fetcher.go +++ b/vendor/github.com/buildpacks/pack/pkg/image/fetcher.go @@ -258,12 +258,18 @@ func (f *Fetcher) FetchForPlatform(ctx context.Context, name string, options Fet platformStr := options.Target.ValuesAsPlatform() + // Log the pull attempt upfront so it appears in output regardless of whether + // digest resolution succeeds (mirrors the log emitted by Fetch for non-FetchForPlatform paths). + if options.Daemon { + f.logger.Debugf("Pulling image %s with platform %s", style.Symbol(name), style.Symbol(platformStr)) + } + // When PullPolicy is PullNever, skip platform-specific digest resolution as it requires // network access to fetch the manifest list. Instead, use the image as-is from the daemon. // Note: This may cause issues with containerd storage. Users should pre-pull the platform-specific // digest if they encounter errors. if options.Daemon && options.PullPolicy == PullNever { - f.logger.Debugf("Using lifecycle %s with platform %s (skipping digest resolution due to --pull-policy never)", name, platformStr) + f.logger.Debugf("Using image %s with platform %s (skipping digest resolution due to --pull-policy never)", name, platformStr) return f.Fetch(ctx, name, options) } @@ -285,7 +291,7 @@ func (f *Fetcher) FetchForPlatform(ctx context.Context, name string, options Fet } // Log the resolution for visibility - f.logger.Debugf("Using lifecycle %s; pulling digest %s for platform %s", name, resolvedName, platformStr) + f.logger.Debugf("Using image %s; pulling digest %s for platform %s", name, resolvedName, platformStr) return f.Fetch(ctx, resolvedName, options) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 9395fefe..0da52504 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -335,7 +335,7 @@ github.com/buildpacks/lifecycle/phase github.com/buildpacks/lifecycle/platform github.com/buildpacks/lifecycle/platform/files github.com/buildpacks/lifecycle/platform/launch -# github.com/buildpacks/pack v0.40.3 +# github.com/buildpacks/pack v0.40.4 ## explicit; go 1.25.9 github.com/buildpacks/pack/internal/layer github.com/buildpacks/pack/internal/name @@ -478,7 +478,7 @@ github.com/distribution/reference ## explicit; go 1.13 github.com/dlclark/regexp2 github.com/dlclark/regexp2/syntax -# github.com/docker/cli v29.4.0+incompatible +# github.com/docker/cli v29.4.1+incompatible ## explicit github.com/docker/cli/cli/config github.com/docker/cli/cli/config/configfile