mirror of
https://github.com/containers/podman.git
synced 2025-11-13 17:47:13 +08:00
Bump Buildah to v1.24.0
Bumps Buildah to v1.24.0 and adopts the new values for pull: true, false, never, and always. The pull-never and pull-always options for the build command are still usable, but they have been removed from the man page documentation with this change. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
7
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
7
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@@ -181,11 +181,6 @@ type ContainersConfig struct {
|
||||
// performance implications.
|
||||
PrepareVolumeOnCreate bool `toml:"prepare_volume_on_create,omitempty"`
|
||||
|
||||
// RootlessNetworking depicts the "kind" of networking for rootless
|
||||
// containers. Valid options are `slirp4netns` and `cni`. Default is
|
||||
// `slirp4netns` on Linux, and `cni` on non-Linux OSes.
|
||||
RootlessNetworking string `toml:"rootless_networking,omitempty"`
|
||||
|
||||
// SeccompProfile is the seccomp.json profile path which is used as the
|
||||
// default for the runtime.
|
||||
SeccompProfile string `toml:"seccomp_profile,omitempty"`
|
||||
@@ -1193,7 +1188,7 @@ func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error)
|
||||
return "", errors.Errorf("could not find %q in one of %v. %s", name, c.Engine.HelperBinariesDir, configHint)
|
||||
}
|
||||
|
||||
// ImageCopyTmpDir default directory to store tempory image files during copy
|
||||
// ImageCopyTmpDir default directory to store temporary image files during copy
|
||||
func (c *Config) ImageCopyTmpDir() (string, error) {
|
||||
if path, found := os.LookupEnv("TMPDIR"); found {
|
||||
return path, nil
|
||||
|
||||
4
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
4
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
@@ -197,10 +197,6 @@ default_sysctls = [
|
||||
#
|
||||
#prepare_volume_on_create = false
|
||||
|
||||
# Indicates the networking to be used for rootless containers
|
||||
#
|
||||
#rootless_networking = "slirp4netns"
|
||||
|
||||
# Path to the seccomp.json profile which is used as the default seccomp profile
|
||||
# for the runtime.
|
||||
#
|
||||
|
||||
39
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
39
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@@ -177,23 +177,22 @@ func DefaultConfig() (*Config, error) {
|
||||
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
"TERM=xterm",
|
||||
},
|
||||
EnvHost: false,
|
||||
HTTPProxy: true,
|
||||
Init: false,
|
||||
InitPath: "",
|
||||
IPCNS: "private",
|
||||
LogDriver: defaultLogDriver(),
|
||||
LogSizeMax: DefaultLogSizeMax,
|
||||
NetNS: "private",
|
||||
NoHosts: false,
|
||||
PidsLimit: DefaultPidsLimit,
|
||||
PidNS: "private",
|
||||
RootlessNetworking: getDefaultRootlessNetwork(),
|
||||
ShmSize: DefaultShmSize,
|
||||
TZ: "",
|
||||
Umask: "0022",
|
||||
UTSNS: "private",
|
||||
UserNSSize: DefaultUserNSSize,
|
||||
EnvHost: false,
|
||||
HTTPProxy: true,
|
||||
Init: false,
|
||||
InitPath: "",
|
||||
IPCNS: "private",
|
||||
LogDriver: defaultLogDriver(),
|
||||
LogSizeMax: DefaultLogSizeMax,
|
||||
NetNS: "private",
|
||||
NoHosts: false,
|
||||
PidsLimit: DefaultPidsLimit,
|
||||
PidNS: "private",
|
||||
ShmSize: DefaultShmSize,
|
||||
TZ: "",
|
||||
Umask: "0022",
|
||||
UTSNS: "private",
|
||||
UserNSSize: DefaultUserNSSize,
|
||||
},
|
||||
Network: NetworkConfig{
|
||||
DefaultNetwork: "podman",
|
||||
@@ -566,9 +565,3 @@ func (c *Config) LogDriver() string {
|
||||
func (c *Config) MachineEnabled() bool {
|
||||
return c.Engine.MachineEnabled
|
||||
}
|
||||
|
||||
// RootlessNetworking returns the "kind" of networking
|
||||
// rootless containers should use
|
||||
func (c *Config) RootlessNetworking() string {
|
||||
return c.Containers.RootlessNetworking
|
||||
}
|
||||
|
||||
6
vendor/github.com/containers/common/pkg/config/default_linux.go
generated
vendored
6
vendor/github.com/containers/common/pkg/config/default_linux.go
generated
vendored
@@ -24,12 +24,6 @@ func getDefaultMachineUser() string {
|
||||
return "core"
|
||||
}
|
||||
|
||||
// getDefaultRootlessNetwork returns the default rootless network configuration.
|
||||
// It is "slirp4netns" for Linux.
|
||||
func getDefaultRootlessNetwork() string {
|
||||
return "slirp4netns"
|
||||
}
|
||||
|
||||
// getDefaultProcessLimits returns the nproc for the current process in ulimits format
|
||||
// Note that nfile sometimes cannot be set to unlimited, and the limit is hardcoded
|
||||
// to (oldMaxSize) 1048576 (2^20), see: http://stackoverflow.com/a/1213069/1811501
|
||||
|
||||
6
vendor/github.com/containers/common/pkg/config/default_unsupported.go
generated
vendored
6
vendor/github.com/containers/common/pkg/config/default_unsupported.go
generated
vendored
@@ -13,12 +13,6 @@ func getDefaultMachineUser() string {
|
||||
return "core"
|
||||
}
|
||||
|
||||
// getDefaultRootlessNetwork returns the default rootless network configuration.
|
||||
// It is "cni" for non-Linux OSes (to better support `podman-machine` usecases).
|
||||
func getDefaultRootlessNetwork() string {
|
||||
return "cni"
|
||||
}
|
||||
|
||||
// isCgroup2UnifiedMode returns whether we are running in cgroup2 mode.
|
||||
func isCgroup2UnifiedMode() (isUnified bool, isUnifiedErr error) {
|
||||
return false, nil
|
||||
|
||||
6
vendor/github.com/containers/common/pkg/config/default_windows.go
generated
vendored
6
vendor/github.com/containers/common/pkg/config/default_windows.go
generated
vendored
@@ -11,12 +11,6 @@ func getDefaultMachineUser() string {
|
||||
return "user"
|
||||
}
|
||||
|
||||
// getDefaultRootlessNetwork returns the default rootless network configuration.
|
||||
// It is "cni" for non-Linux OSes (to better support `podman-machine` usecases).
|
||||
func getDefaultRootlessNetwork() string {
|
||||
return "cni"
|
||||
}
|
||||
|
||||
// isCgroup2UnifiedMode returns whether we are running in cgroup2 mode.
|
||||
func isCgroup2UnifiedMode() (isUnified bool, isUnifiedErr error) {
|
||||
return false, nil
|
||||
|
||||
Reference in New Issue
Block a user