From 4397009ae39ef2205134eb42909ccf8c4e1898a8 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 4 Jun 2021 12:55:23 +0200 Subject: [PATCH 1/3] [0.38] Leave default seccomp path empty The default path should be empty in order for podman to distinguish between a path the was explicitly or to use the default (in memory) profile. Fixes: containers/podman#10556 Signed-off-by: Paul Holzinger Backported-by: Valentin Rothberg --- pkg/config/default.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/config/default.go b/pkg/config/default.go index 04aaac94d..78312be23 100644 --- a/pkg/config/default.go +++ b/pkg/config/default.go @@ -197,7 +197,6 @@ func DefaultConfig() (*Config, error) { NoHosts: false, PidsLimit: DefaultPidsLimit, PidNS: "private", - SeccompProfile: SeccompDefaultPath, ShmSize: DefaultShmSize, TZ: "", Umask: "0022", From 523738564705f0f8687e7d0600f358057bd420ad Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 8 Jun 2021 14:37:25 +0200 Subject: [PATCH 2/3] v0.38.6 * [0.38] Leave default seccomp path empty Signed-off-by: Valentin Rothberg --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index e15bd6aea..211cf3a5a 100644 --- a/version/version.go +++ b/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.38.6-dev" +const Version = "0.38.6" From 956a47eaf68e840dbe655a91f5e77fb3d5a8c781 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 8 Jun 2021 14:37:49 +0200 Subject: [PATCH 3/3] bump to v0.38.7-dev Signed-off-by: Valentin Rothberg --- pkg/config/default.go | 34 +++++++++++++++++----------------- version/version.go | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkg/config/default.go b/pkg/config/default.go index 78312be23..133f9f073 100644 --- a/pkg/config/default.go +++ b/pkg/config/default.go @@ -186,23 +186,23 @@ 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: netns, - NoHosts: false, - PidsLimit: DefaultPidsLimit, - PidNS: "private", - ShmSize: DefaultShmSize, - TZ: "", - Umask: "0022", - UTSNS: "private", - UserNS: "host", - UserNSSize: DefaultUserNSSize, + EnvHost: false, + HTTPProxy: true, + Init: false, + InitPath: "", + IPCNS: "private", + LogDriver: DefaultLogDriver, + LogSizeMax: DefaultLogSizeMax, + NetNS: netns, + NoHosts: false, + PidsLimit: DefaultPidsLimit, + PidNS: "private", + ShmSize: DefaultShmSize, + TZ: "", + Umask: "0022", + UTSNS: "private", + UserNS: "host", + UserNSSize: DefaultUserNSSize, }, Network: NetworkConfig{ DefaultNetwork: "podman", diff --git a/version/version.go b/version/version.go index 211cf3a5a..1252645b4 100644 --- a/version/version.go +++ b/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.38.6" +const Version = "0.38.7-dev"