Commit Graph

6491 Commits

Author SHA1 Message Date
openshift-merge-bot[bot] 0e4301a18e
Merge pull request #6398 from nalind/v1.41.5
[release-1.41] tag v1.41.5
2025-09-29 18:50:25 +00:00
Nalin Dahyabhai 7d95c695cd Tag v1.41.5
Tag the 1.41.5 release.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-09-29 10:24:44 -04:00
openshift-merge-bot[bot] ee5b5742b0
Merge pull request #6389 from nalind/mount-target-parent-perms-1.41
[release-1.41] Run: create parent directories of mount targets with mode 0755
2025-09-17 19:24:14 +00:00
Nalin Dahyabhai b7b5a915cc tests/run.bats: "run masks" test: accept "unreadable" masked directories
When checking that certain directories are masked, treat the
readable-but-empty case as acceptable, as before, and now also accept
the actually-unreadable case, which can happen with crun 1.24.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-09-16 11:28:40 -04:00
Nalin Dahyabhai 913046ac29 Run: create parent directories of mount targets with mode 0755
Relax the permissions on directories we create to hold mount targets,
from 0700 to 0755.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-09-16 11:27:45 -04:00
openshift-merge-bot[bot] 1e62000f2c
Merge pull request #6366 from TomSweeneyRedHat/dev/tsweeney/1.41.2
Bump c/image to v5.36.2, c/common v0.64.2, ulinkunitz/xz v0.5.12, Docker 28.3.3, Buildah to v1.41.4
2025-09-04 13:33:07 +00:00
tomsweeneyredhat 4094f92e3f [release-1.41] Bump to Buildah v1.41.4
Bump to Buildah v1.41.4 in preparation for
Podman v5.6.1

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-09-03 14:09:22 -04:00
tomsweeneyredhat 4acf2a5495 [release-1.41] c/common to v0.64.2, ulikunitz/xv v0.5.12, docker/docker
v28.3.3

Bump c/common to v0.64.2 docker/docker to v28.3.3, and
ulikunitz/xv to v0.5.12.

This is in preparation for Podman v5.6.1 and to also clear
CVE-2025-58058 and to be ultra cautious about CVE-2025-54388

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-09-03 14:06:24 -04:00
openshift-merge-bot[bot] a56e497019
Merge pull request #6344 from TomSweeneyRedHat/dev/tsweeney/v1.41.3
[release-1.41] Bump Buildah to v1.41.3
2025-08-14 18:20:00 +00:00
tomsweeneyredhat b60c59c79a [release-1.41] Bump Buildah to v1.41.3
Bump to Buildah v1.41.3 in preparation for Podman v5.6
and to fix a last minute issue.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-08-14 13:23:44 -04:00
openshift-merge-bot[bot] 382240e8ea
Merge pull request #6342 from nalind/mount-image-fails-with-imagestores-1.41
[release-1.41] Commit: don't depend on MountImage(), because .imagestore
2025-08-14 15:59:45 +00:00
Nalin Dahyabhai 1f7f1d285d Commit: don't depend on MountImage(), because .imagestore
Fall back to creating a new builder with it if MountImage() fails on the
base image, because when the store is configured with its "imagestore"
option, that can happen.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-08-14 11:08:20 -04:00
openshift-merge-bot[bot] 0b0272eccf
Merge pull request #6338 from TomSweeneyRedHat/dev/tsweeney/v1.41.2
[release-1.41] Bump to v1.41.2
2025-08-13 18:32:55 +00:00
tomsweeneyredhat 5442721d42 [release-1.41] Bump to v1.41.2
Bump to Buildah v1.41.2 in order to get some last minute
fixes for a breaking change into Podman v5.6.0.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-08-13 13:48:47 -04:00
openshift-merge-bot[bot] ea57af9a77
Merge pull request #6337 from openshift-cherrypick-robot/cherry-pick-6332-to-release-1.41
[release-1.41] Rework how we decide what to filter out of layer diffs
2025-08-13 17:32:55 +00:00
Nalin Dahyabhai 72e680a9eb Rework how we decide what to filter out of layer diffs
After narrowing down the list of parent directories which we might need
to exclude to those which are present in the base image, filter them out
of the layer diff as it is generated.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-08-13 15:45:17 +00:00
Nalin Dahyabhai 870c53c695 Note that we have to build `true` first for the sake of its tests
Add a note that we need a test binary built for the sake of a few
conformance tests, for people who run the conformance tests directly
instead of using the top-level makefile target.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-08-13 15:45:17 +00:00
Nalin Dahyabhai 4fe68bc9b3 copier.Stat(): return owner UID and GID if available
Return owner information for items that we've stat'ed.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-08-13 15:45:17 +00:00
Nalin Dahyabhai f42946075a copier.Get(): ensure that directory entries end in "/"
Make sure that entries with Typeflag == TypeDir always end with a "/",
adding it as a suffix.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-08-13 15:45:17 +00:00
Nalin Dahyabhai 9933e79661 copier.Get(): strip user and group names from entries
When generating archives, clear user and group names to keep up with
recent changes to the storage library.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-08-13 15:45:17 +00:00
Nalin Dahyabhai 4ae77145e8 imagebuildah.Executor/StageExecutor: check numeric --from= values
When we look up a stage that's referred to in a COPY --from argument,
treat the string as a stage number not only if it parses as one, as we
checked before, but now also require that the number correspond to one
of the stages that would be completed before the one into which the
content will be copied.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-08-13 15:45:17 +00:00
openshift-merge-bot[bot] db117b2d26
Merge pull request #6317 from TomSweeneyRedHat/dev/tsweeney/podmanrc2bump
[release-1.41] Bump c/* projects and Buildah to v1.41.1
2025-08-07 10:13:59 +00:00
tomsweeneyredhat 2de767f3a5 [release-1.41] Bump Buildah to v1.41.1
Bump Buildah to v1.41.1 in preparation for Podman v5.6 RC2

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-08-06 16:26:49 -04:00
tomsweeneyredhat 0d0c7340e9 [release-1.41] Bump c/* projects and Buildah to v1.41.1
This bumps the following projects:

c/storage  v1.59.1
c/image    v5.36.1
c/common   v0.64.1

and then Buidlah to v1.41.1

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-08-06 15:55:50 -04:00
flouthoc 540cec341b [release-1.41] generatePathChecksum: ignore ModTime, AccessTime
and ChangeTime

When generating a checksum for files mounted into container via
`--mount=type=bind` ignore their `ModTime`, `AccessTime` and
`ChangeTime` so we can maintain cache burst consistency with `COPY`
command.

Closes: https://github.com/containers/buildah/issues/6291

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-08-06 15:55:50 -04:00
openshift-merge-bot[bot] 7643ec23e1
Merge pull request #6321 from openshift-cherrypick-robot/cherry-pick-6315-to-release-1.41
[release-1.41] History should note unset-label, timestamp, and rewrite-timestamp
2025-08-06 14:54:59 +00:00
Nalin Dahyabhai f06ea2c5de History should note unset-label, timestamp, and rewrite-timestamp
Make the history created-by field note when a label was unset, or if the
one of the CLI flags that modifies the timestamps in the layer were
used, so that the cache evaluation logic can factor that into account.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-08-06 08:50:39 +00:00
Nalin Dahyabhai d2e9062ea7 pkg/cli.GenBuildOptions(): don't hardwire optional bools
Treat the five optional bool flags as optional bool values, allowing for
them to not be set if they weren't explicitly given on the command line.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-08-06 08:50:39 +00:00
openshift-merge-bot[bot] a13fa89ae8
Merge pull request #6319 from openshift-cherrypick-robot/cherry-pick-6302-to-release-1.41
[release-1.41] Only suppress "noted" items when not squashing
2025-08-06 08:44:33 +00:00
Nalin Dahyabhai af12f7539b Only suppress "noted" items when not squashing
When suppressing what we think are pulled-up directories at commit-time,
only do that when we're _not_ squashing the image, in which case we
really do need to output it into the one layer that our output image
will have.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-08-05 21:27:14 +00:00
openshift-merge-bot[bot] 2ab59811a4
Merge pull request #6306 from openshift-cherrypick-robot/cherry-pick-6296-to-release-1.41
[release-1.41] Exclude pulled up parent directories at commit-time
2025-08-05 14:51:35 +00:00
openshift-merge-bot[bot] 1854b44a2d
Merge pull request #6305 from openshift-cherrypick-robot/cherry-pick-6300-to-release-1.41
[release-1.41] Restore the default meaning of `--pull` (should be `always`).
2025-07-31 15:01:38 +00:00
Nalin Dahyabhai dee9f3d191 Test that pulled up parent directories are excluded at commit
Add a test that causes parent directories of mount targets to be "pulled
up" if we're running on top of overlay in a situation where its native
diff method is available, and ensure that we can still avoid adding
those directories to the committed layer when we're the only reason they
were pulled up.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-07-31 14:56:42 +00:00
Nalin Dahyabhai 34b0bc031c Exclude pulled up parent directories at commit-time
When Ensure() tells us about the parent directories of a mountpoint
target that it created for us, add them to the list of items that we'll
exclude from the commit unless something else causes them to be
modified.

The "native" overlay diff method just walks the diff directory, so we
can get directories in the committed layer that look exactly like the
ones in the previous layer, depending on the storage driver.  And while
it's barely noticeable, we can still control for it.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-07-31 14:56:42 +00:00
Nalin Dahyabhai 4f2feb8f47 copier.Ensure(): also return parent directories
Have Ensure() also return the parent directories of items that it
created, along with information about them that can be used to filter
them out of the layer at commit-time.

This modifies the signature of Ensure(), but it was added in 1.41.0, and
shouldn't (yet) have any external users.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-07-31 14:56:42 +00:00
Nalin Dahyabhai 19041cde31 copier.MkdirOptions: add ModTimeNew
Add an optional ModTimeNew field to MkdirOptions, for setting the
timestamp on newly-created directories.  Note that the timestamps on
parent directories of the topmost newly-created directories are not
something we affect, so they'll be updated as usual.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-07-31 14:56:42 +00:00
Romain Geissler ea7dfee85a Restore the default meaning of `--pull` (should be `always`).
Now the bud --help output correctly reads that the default behavior when
--pull is not provided at all is "missing", and that the default value
for --pull if explicitly provided but without value is "always".

Fixes #6266.

Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>
2025-07-30 15:48:10 +00:00
tomsweeneyredhat 9f185b7777 Bump to Buildah v1.41.0
Bump Buildah to v1.41.0 in preparation for
Podman v5.6.0

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-07-16 21:19:45 -04:00
tomsweeneyredhat 2b7cb35d05 Bump to c/storage v1.59.0, c/image v5.36.0,
... c/common v0.64.0

Bump to c/storage v1.59.0, c/image to v5.36.0, and
c/common to v0.64.0 in preparation for Buildah v1.41.0 and
Podman v5.6.0

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-07-16 21:19:16 -04:00
openshift-merge-bot[bot] b3eab30b05
Merge pull request #6290 from containers/renovate/github.com-containers-image-v5-5.x
fix(deps): update module github.com/containers/image/v5 to v5.36.0
2025-07-16 14:05:02 +00:00
renovate[bot] 9c525fd526
fix(deps): update module github.com/containers/image/v5 to v5.36.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-15 23:26:18 +00:00
openshift-merge-bot[bot] db61e10b3f
Merge pull request #6287 from containers/renovate/github.com-containers-storage-1.x
fix(deps): update module github.com/containers/storage to v1.59.0
2025-07-14 21:07:21 +00:00
renovate[bot] b8c6fcf211
fix(deps): update module github.com/containers/storage to v1.59.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-14 18:59:21 +00:00
openshift-merge-bot[bot] 8403fd604b
Merge pull request #6269 from flouthoc/cache-canidates
Mark stale issues and pull requests / stale (push) Has been cancelled Details
/ closed_issue_discussion_lock (push) Has been cancelled Details
/ call_cron_failures (push) Has been cancelled Details
stage_executor: check platform of cache candidates
2025-07-11 17:45:22 +00:00
flouthoc 3502889676
stage_executor: check platform of cache candidates
When building images for `manifest` list using `--platform` same image
is used for multiple platform if base is `scratch` , following PR adds a
check to always verify `platform` of `cache` with `target`.

Closes: https://github.com/containers/podman/issues/18723

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-07-11 09:44:07 -07:00
openshift-merge-bot[bot] 252cc24fd5
Merge pull request #6240 from 2004joshua/link
feat: ADD/COPY --link support for buildah
2025-07-11 15:27:00 +00:00
openshift-merge-bot[bot] 869997e379
Merge pull request #6278 from containers/renovate/golang.org-x-crypto-0.x
fix(deps): update module golang.org/x/crypto to v0.40.0
2025-07-11 15:07:26 +00:00
openshift-merge-bot[bot] aa807d5863
Merge pull request #6252 from pstoeckle/main
chore(typos): fix typos
2025-07-11 09:20:15 +00:00
renovate[bot] 96588db2e6
fix(deps): update module golang.org/x/crypto to v0.40.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-10 18:07:11 +00:00
openshift-merge-bot[bot] 1c0e79c974
Merge pull request #6277 from containers/renovate/golang.org-x-term-0.x
fix(deps): update module golang.org/x/term to v0.33.0
2025-07-10 18:05:47 +00:00