Skip to content

Commit 0f2d006

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #25939 from TomSweeneyRedHat/dev/tsweeney/buildah_v1.40
Bump to Buildah v1.40.0
2 parents 0a65e7c + 10d768b commit 0f2d006

Some content is hidden

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

58 files changed

+686
-307
lines changed

‎cmd/podman/common/build.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,10 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *Buil
580580
UnsetLabels: flags.UnsetLabels,
581581
}
582582

583+
if c.Flag("inherit-labels").Changed {
584+
opts.InheritLabels = types.NewOptionalBool(flags.InheritLabels)
585+
}
586+
583587
if flags.IgnoreFile != "" {
584588
excludes, err := parseDockerignore(flags.IgnoreFile)
585589
if err != nil {

‎docs/source/markdown/options/inherit-labels.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
####> This option file is used in:
2+
####> podman build, farm build
3+
####> If file is edited, make sure the changes
4+
####> are applicable to all of those.
5+
#### **--inherit-labels**
6+
7+
Inherit the labels from the base image or base stages. (default true).

‎docs/source/markdown/podman-build.1.md.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ It does not affect _/etc/resolv.conf_ in the final image.
221221

222222
@@option iidfile
223223

224+
@@option inherit-labels
225+
224226
@@option ipc.image
225227

226228
@@option isolation

‎docs/source/markdown/podman-farm-build.1.md.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ This option specifies the name of the farm to be used in the build process.
123123

124124
@@option iidfile
125125

126+
@@option inherit-labels
127+
126128
@@option ipc.image
127129

128130
@@option isolation

‎go.mod‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/checkpoint-restore/checkpointctl v1.3.0
1313
github.com/checkpoint-restore/go-criu/v7 v7.2.0
1414
github.com/containernetworking/plugins v1.6.2
15-
github.com/containers/buildah v1.39.1-0.20250401180830-32d78c69be17
15+
github.com/containers/buildah v1.40.0
1616
github.com/containers/common v0.63.0
1717
github.com/containers/conmon v2.0.20+incompatible
1818
github.com/containers/gvisor-tap-vsock v0.8.5
@@ -27,7 +27,7 @@ require (
2727
github.com/cyphar/filepath-securejoin v0.4.1
2828
github.com/digitalocean/go-qemu v0.0.0-20250212194115-ee9b0668d242
2929
github.com/docker/distribution v2.8.3+incompatible
30-
github.com/docker/docker v28.1.1+incompatible
30+
github.com/docker/docker v28.1.0+incompatible
3131
github.com/docker/go-connections v0.5.0
3232
github.com/docker/go-plugins-helpers v0.0.0-20240701071450-45e2431495c8
3333
github.com/docker/go-units v0.5.0
@@ -151,11 +151,10 @@ require (
151151
github.com/miekg/pkcs11 v1.1.1 // indirect
152152
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
153153
github.com/mitchellh/mapstructure v1.5.0 // indirect
154-
github.com/moby/buildkit v0.20.2 // indirect
154+
github.com/moby/buildkit v0.21.0 // indirect
155155
github.com/moby/docker-image-spec v1.3.1 // indirect
156156
github.com/moby/go-archive v0.1.0 // indirect
157157
github.com/moby/patternmatcher v0.6.0 // indirect
158-
github.com/moby/sys/atomicwriter v0.1.0 // indirect
159158
github.com/moby/sys/mountinfo v0.7.2 // indirect
160159
github.com/moby/sys/sequential v0.6.0 // indirect
161160
github.com/moby/sys/userns v0.1.0 // indirect
@@ -203,11 +202,10 @@ require (
203202
go.opentelemetry.io/otel/metric v1.34.0 // indirect
204203
go.opentelemetry.io/otel/trace v1.34.0 // indirect
205204
go.uber.org/automaxprocs v1.6.0 // indirect
206-
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
207205
golang.org/x/mod v0.24.0 // indirect
208206
golang.org/x/oauth2 v0.29.0 // indirect
209207
golang.org/x/time v0.11.0 // indirect
210-
golang.org/x/tools v0.31.0 // indirect
208+
golang.org/x/tools v0.32.0 // indirect
211209
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
212210
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
213211
google.golang.org/grpc v1.71.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ github.com/containernetworking/cni v1.3.0 h1:v6EpN8RznAZj9765HhXQrtXgX+ECGebEYEm
6666
github.com/containernetworking/cni v1.3.0/go.mod h1:Bs8glZjjFfGPHMw6hQu82RUgEPNGEaBb9KS5KtNMnJ4=
6767
github.com/containernetworking/plugins v1.6.2 h1:pqP8Mq923TLyef5g97XfJ/xpDeVek4yF8A4mzy9Tc4U=
6868
github.com/containernetworking/plugins v1.6.2/go.mod h1:SP5UG3jDO9LtmfbBJdP+nl3A1atOtbj2MBOYsnaxy64=
69-
github.com/containers/buildah v1.39.1-0.20250401180830-32d78c69be17 h1:mfnd0BqHdV8p6+pol7SelIEgG7NbJQYW4IPywGakmCY=
70-
github.com/containers/buildah v1.39.1-0.20250401180830-32d78c69be17/go.mod h1:AvIRsFvWfSuMNGoMm8hXFaOGvzhsnujWz1C38rk+mk4=
69+
github.com/containers/buildah v1.40.0 h1:qCHTKnL/UEutxT6ZS8Zvhy7QUpe719jEIeGMSlcN3j4=
70+
github.com/containers/buildah v1.40.0/go.mod h1:U6qj0nseq6t97T2kkNpjgo0WBVRYIXASIOlS5eWvlhM=
7171
github.com/containers/common v0.63.0 h1:ox6vgUYX5TSvt4W+bE36sYBVz/aXMAfRGVAgvknSjBg=
7272
github.com/containers/common v0.63.0/go.mod h1:+3GCotSqNdIqM3sPs152VvW7m5+Mg8Kk+PExT3G9hZw=
7373
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
@@ -121,8 +121,8 @@ github.com/docker/cli v28.0.4+incompatible h1:pBJSJeNd9QeIWPjRcV91RVJihd/TXB77q1
121121
github.com/docker/cli v28.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
122122
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
123123
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
124-
github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=
125-
github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
124+
github.com/docker/docker v28.1.0+incompatible h1:4iqpcWQCt3Txcz7iWIb1U3SZ/n9ffo4U+ryY5/3eOp0=
125+
github.com/docker/docker v28.1.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
126126
github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
127127
github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
128128
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -318,8 +318,8 @@ github.com/mistifyio/go-zfs/v3 v3.0.1 h1:YaoXgBePoMA12+S1u/ddkv+QqxcfiZK4prI6HPn
318318
github.com/mistifyio/go-zfs/v3 v3.0.1/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
319319
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
320320
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
321-
github.com/moby/buildkit v0.20.2 h1:qIeR47eQ1tzI1rwz0on3Xx2enRw/1CKjFhoONVcTlMA=
322-
github.com/moby/buildkit v0.20.2/go.mod h1:DhaF82FjwOElTftl0JUAJpH/SUIUx4UvcFncLeOtlDI=
321+
github.com/moby/buildkit v0.21.0 h1:+z4vVqgt0spLrOSxi4DLedRbIh2gbNVlZ5q4rsnNp60=
322+
github.com/moby/buildkit v0.21.0/go.mod h1:mBq0D44uCyz2PdX8T/qym5LBbkBO3GGv0wqgX9ABYYw=
323323
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
324324
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
325325
github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
@@ -551,8 +551,8 @@ golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ss
551551
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
552552
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
553553
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
554-
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc=
555-
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
554+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
555+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
556556
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
557557
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
558558
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -668,8 +668,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
668668
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
669669
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
670670
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
671-
golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
672-
golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
671+
golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
672+
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
673673
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
674674
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
675675
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
130130
IDMappingOptions string `schema:"idmappingoptions"`
131131
IdentityLabel bool `schema:"identitylabel"`
132132
Ignore bool `schema:"ignore"`
133+
InheritLabels bool `schema:"inheritlabels"`
133134
Isolation string `schema:"isolation"`
134135
Jobs int `schema:"jobs"`
135136
LabelOpts string `schema:"labelopts"`
@@ -744,6 +745,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
744745
IDMappingOptions: &idMappingOptions,
745746
IgnoreUnrecognizedInstructions: query.Ignore,
746747
IgnoreFile: ignoreFile,
748+
InheritLabels: types.NewOptionalBool(query.InheritLabels),
747749
Isolation: isolation,
748750
Jobs: &jobs,
749751
Labels: labels,

‎pkg/api/server/register_images.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,13 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
567567
// Contents of base images to be modified on ADD or COPY only
568568
// (As of Podman version v5.2)
569569
// - in: query
570+
// name: inheritlabels
571+
// type: boolean
572+
// default: true
573+
// description: |
574+
// Inherit the labels from the base image or base stages
575+
// (As of Podman version v5.5)
576+
// - in: query
570577
// name: nocache
571578
// type: boolean
572579
// default: false
@@ -1540,6 +1547,13 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
15401547
// Contents of base images to be modified on ADD or COPY only
15411548
// (As of Podman version v5.2)
15421549
// - in: query
1550+
// name: inheritlabels
1551+
// type: boolean
1552+
// default: true
1553+
// description: |
1554+
// Inherit the labels from the base image or base stages
1555+
// (As of Podman version v5.5)
1556+
// - in: query
15431557
// name: nocache
15441558
// type: boolean
15451559
// default: false

‎pkg/bindings/images/build.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,12 @@ func Build(ctx context.Context, containerFiles []string, options types.BuildOpti
237237
if options.IgnoreUnrecognizedInstructions {
238238
params.Set("ignore", "1")
239239
}
240+
if options.InheritLabels == imageTypes.OptionalBoolFalse {
241+
params.Set("inheritlabels", "0")
242+
} else {
243+
params.Set("inheritlabels", "1")
244+
}
245+
240246
params.Set("isolation", strconv.Itoa(int(options.Isolation)))
241247
if options.CommonBuildOpts.HTTPProxy {
242248
params.Set("httpproxy", "1")

‎vendor/github.com/containers/buildah/.cirrus.yml‎

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)