opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-02 19:28:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump Buildah to v1.35.0

Browse Source 
As the title says.  This is the last step in the vendor dance for
Podman v5.0.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
tomsweeneyredhat
2024-03-07 07:49:49 -05:00
parent 15e508a639
commit b234bb55e4
41 changed files with 386 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/github.com/containers/common/pkg/config/default.go generated vendored
View File

@@ -531,13 +531,13 @@ func (c EngineConfig) EventsLogMaxSize() uint64 {
func (c *Config) SecurityOptions() []string {
securityOpts := []string{}
if c.Containers.SeccompProfile != "" && c.Containers.SeccompProfile != SeccompDefaultPath {
securityOpts = append(securityOpts, fmt.Sprintf("seccomp=%s", c.Containers.SeccompProfile))
securityOpts = append(securityOpts, "seccomp="+c.Containers.SeccompProfile)
}
if apparmor.IsEnabled() && c.Containers.ApparmorProfile != "" {
securityOpts = append(securityOpts, fmt.Sprintf("apparmor=%s", c.Containers.ApparmorProfile))
securityOpts = append(securityOpts, "apparmor="+c.Containers.ApparmorProfile)
}
if selinux.GetEnabled() && !c.Containers.EnableLabeling {
securityOpts = append(securityOpts, fmt.Sprintf("label=%s", selinux.DisableSecOpt()[0]))
securityOpts = append(securityOpts, "label="+selinux.DisableSecOpt()[0])
}
return securityOpts
}