Skip to content

Commit c0995c2

Browse files
mtrmacmtrmac
committed
DO NOT MERGE: vendor UNMERGED podman-container-tools/buildah#6691
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
1 parent 9e4e4a6 commit c0995c2

56 files changed

Lines changed: 17857 additions & 1128 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/podman/common/build.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515

1616
buildahDefine "github.com/containers/buildah/define"
1717
buildahCLI "github.com/containers/buildah/pkg/cli"
18+
"github.com/containers/buildah/pkg/download"
1819
"github.com/containers/buildah/pkg/parse"
1920
buildahUtil "github.com/containers/buildah/pkg/util"
2021
encconfig "github.com/containers/ocicrypt/config"
@@ -192,7 +193,7 @@ func ParseBuildOpts(cmd *cobra.Command, args []string, buildOpts *BuildFlagsWrap
192193
)
193194
if len(args) > 0 {
194195
// The context directory could be a URL. Try to handle that.
195-
tempDir, subDir, err := buildahDefine.TempDirForURL("", "buildah", args[0])
196+
tempDir, subDir, err := download.TempDirForURL("", "buildah", args[0], nil)
196197
if err != nil {
197198
return nil, fmt.Errorf("prepping temporary context directory: %w", err)
198199
}

‎go.mod‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ require (
175175
github.com/yusufpapurcu/wmi v1.2.4 // indirect
176176
go.etcd.io/bbolt v1.4.3 // indirect
177177
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
178-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
179-
go.opentelemetry.io/otel v1.39.0 // indirect
180-
go.opentelemetry.io/otel/metric v1.39.0 // indirect
181-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
178+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
179+
go.opentelemetry.io/otel v1.40.0 // indirect
180+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
181+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
182182
go.yaml.in/yaml/v2 v2.4.3 // indirect
183183
go.yaml.in/yaml/v3 v3.0.4 // indirect
184184
golang.org/x/mod v0.32.0 // indirect
@@ -190,3 +190,5 @@ require (
190190
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
191191
tags.cncf.io/container-device-interface/specs-go v1.1.0 // indirect
192192
)
193+
194+
replace github.com/containers/buildah => github.com/mtrmac/buildah v0.0.0-20260225211424-ee4bc93e8ec1

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ github.com/containernetworking/cni v1.3.0 h1:v6EpN8RznAZj9765HhXQrtXgX+ECGebEYEm
5555
github.com/containernetworking/cni v1.3.0/go.mod h1:Bs8glZjjFfGPHMw6hQu82RUgEPNGEaBb9KS5KtNMnJ4=
5656
github.com/containernetworking/plugins v1.9.0 h1:Mg3SXBdRGkdXyFC4lcwr6u2ZB2SDeL6LC3U+QrEANuQ=
5757
github.com/containernetworking/plugins v1.9.0/go.mod h1:JG3BxoJifxxHBhG3hFyxyhid7JgRVBu/wtooGEvWf1c=
58-
github.com/containers/buildah v1.42.1-0.20260216192603-e473f9d26ec6 h1:j8qnAjmrLf6x47qChpQZla1JzdMZ2BEmhTFlE0e9EUU=
59-
github.com/containers/buildah v1.42.1-0.20260216192603-e473f9d26ec6/go.mod h1:rnvz1cLM9/wTR4BYODd62GHIwTrWzQsn5J1+qEbjgJ8=
6058
github.com/containers/common v0.64.2 h1:1xepE7QwQggUXxmyQ1Dbh6Cn0yd7ktk14sN3McSWf5I=
6159
github.com/containers/common v0.64.2/go.mod h1:o29GfYy4tefUuShm8mOn2AiL5Mpzdio+viHI7n24KJ4=
6260
github.com/containers/gvisor-tap-vsock v0.8.8 h1:5FznbOYMIuaCv8B6zQ7M6wjqP63Lasy0A6GpViEnjTg=
@@ -283,6 +281,8 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
283281
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
284282
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
285283
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
284+
github.com/mtrmac/buildah v0.0.0-20260225211424-ee4bc93e8ec1 h1:BSvQ/2aJl2FzORitIfKryIxknQHTtiKb/K0CqjXcEwM=
285+
github.com/mtrmac/buildah v0.0.0-20260225211424-ee4bc93e8ec1/go.mod h1:0ptgl7GOAMa4uRSspfXVTAEZn1sUC0wLIgbGod11ukE=
286286
github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
287287
github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
288288
github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=
@@ -421,18 +421,18 @@ go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
421421
go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
422422
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
423423
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
424-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
425-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
426-
go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
427-
go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
428-
go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
429-
go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
424+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 h1:ssfIgGNANqpVFCndZvcuyKbl0g+UAVcbBcqGkG28H0Y=
425+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0/go.mod h1:GQ/474YrbE4Jx8gZ4q5I4hrhUzM6UPzyrqJYV2AqPoQ=
426+
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
427+
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
428+
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
429+
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
430430
go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
431431
go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
432432
go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
433433
go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
434-
go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
435-
go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
434+
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
435+
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
436436
go.podman.io/common v0.67.1-0.20260304132626-c0ec6c1ad7ea h1:iDxH5QwfIOjhuhLKsCDmakIzK+nbJ7iWv4+nvOBVzYs=
437437
go.podman.io/common v0.67.1-0.20260304132626-c0ec6c1ad7ea/go.mod h1:ej/rUzFJ27a3nxsDtZdQnp1+2EzuAA8dgv2Cl9BcBjg=
438438
go.podman.io/image/v5 v5.39.2-0.20260304132626-c0ec6c1ad7ea h1:r1F0pu+uRPx3G5Z7Bzf6pBxJgypQTOaMDkMQelZdBDM=

‎pkg/api/handlers/compat/images_build.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020

2121
"github.com/containers/buildah"
2222
buildahDefine "github.com/containers/buildah/define"
23+
"github.com/containers/buildah/pkg/download"
2324
"github.com/containers/buildah/pkg/parse"
2425
"github.com/containers/podman/v6/internal/localapi"
2526
"github.com/containers/podman/v6/libpod"
@@ -238,7 +239,7 @@ func processBuildContext(query url.Values, r *http.Request, buildContext *BuildC
238239
remote := query.Get("remote")
239240

240241
if utils.IsLibpodRequest(r) && remote != "" {
241-
tempDir, subDir, err := buildahDefine.TempDirForURL(anchorDir, "buildah", remote)
242+
tempDir, subDir, err := download.TempDirForURL(anchorDir, "buildah", remote, nil)
242243
if err != nil {
243244
return nil, utils.GetInternalServerError(genSpaceErr(err))
244245
}
@@ -938,7 +939,7 @@ func handleLocalBuildContexts(query url.Values, anchorDir string) (*BuildContext
938939
switch {
939940
case strings.HasPrefix(value, "url:"):
940941
value = strings.TrimPrefix(value, "url:")
941-
tempDir, subdir, err := buildahDefine.TempDirForURL(anchorDir, "buildah", value)
942+
tempDir, subdir, err := download.TempDirForURL(anchorDir, "buildah", value, nil)
942943
if err != nil {
943944
return nil, utils.GetInternalServerError(genSpaceErr(err))
944945
}
@@ -1124,7 +1125,7 @@ func handleBuildContexts(r *http.Request, query url.Values, anchorDir string, mu
11241125
logrus.Debugf("name: %q, context: %q", name, value)
11251126

11261127
if urlValue, ok := strings.CutPrefix(value, "url:"); ok {
1127-
tempDir, subdir, err := buildahDefine.TempDirForURL(anchorDir, "buildah", urlValue)
1128+
tempDir, subdir, err := download.TempDirForURL(anchorDir, "buildah", urlValue, nil)
11281129
if err != nil {
11291130
return nil, fmt.Errorf("downloading URL %q: %w", name, err)
11301131
}

‎vendor/github.com/containers/buildah/add.go‎

Lines changed: 24 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/buildah/commit.go‎

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/buildah/common.go‎

Lines changed: 0 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/buildah/convertcw.go‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)