Bump to Buildah v1.41.0

Bump Buildah to v1.41.0 in preparation for
Podman v5.6

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
tomsweeneyredhat
2025-07-21 12:05:56 -04:00
parent 4833d31dfa
commit 048729a560
32 changed files with 1207 additions and 401 deletions

View File

@@ -5,11 +5,13 @@ import (
"io"
"net"
"github.com/containers/buildah/copier"
"github.com/containers/buildah/define"
"github.com/containers/buildah/internal"
"github.com/containers/buildah/pkg/sshagent"
"github.com/containers/common/libnetwork/etchosts"
"github.com/containers/image/v5/types"
"github.com/containers/storage/pkg/idtools"
"github.com/containers/storage/pkg/lockfile"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
@@ -20,6 +22,15 @@ const (
runUsingRuntimeCommand = define.Package + "-oci-runtime"
)
// compatLayerExclusions is the set of items to omit from layers if
// options.CompatLayerOmissions is set to true. For whatever reason, the
// classic builder didn't bake these into images, but BuildKit does.
var compatLayerExclusions = []copier.ConditionalRemovePath{
{Path: "dev", Owner: &idtools.IDPair{UID: 0, GID: 0}},
{Path: "proc", Owner: &idtools.IDPair{UID: 0, GID: 0}},
{Path: "sys", Owner: &idtools.IDPair{UID: 0, GID: 0}},
}
// TerminalPolicy takes the value DefaultTerminal, WithoutTerminal, or WithTerminal.
type TerminalPolicy int
@@ -180,12 +191,8 @@ type RunOptions struct {
// RunMountArtifacts are the artifacts created when using a run mount.
type runMountArtifacts struct {
// RunMountTargets are the run mount targets inside the container which should be removed
RunMountTargets []string
// RunOverlayDirs are overlay directories which will need to be cleaned up using overlay.RemoveTemp()
RunOverlayDirs []string
// TmpFiles are artifacts that need to be removed outside the container
TmpFiles []string
// Any images which were mounted, which should be unmounted
MountedImages []string
// Agents are the ssh agents started, which should have their Shutdown() methods called