From 501d937d7e8fa6e8d93962485edcc026925f2301 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 30 Jul 2021 10:31:45 +0200 Subject: [PATCH 1/2] app-arch/torcx: update wrapper to disable selinux it's the default behavior now. Since this script is deprecated, we do a minimum change on it. Signed-off-by: Mathieu Tortuyaux --- .../coreos-overlay/app-arch/torcx/files/dockerd-wrapper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/dockerd-wrapper.sh b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/dockerd-wrapper.sh index 2a94d06561..19c440bdda 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/dockerd-wrapper.sh +++ b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/dockerd-wrapper.sh @@ -34,8 +34,8 @@ parse_docker_args "$@" USE_SELINUX="" # Do not override selinux if it is already explicitly configured. if [[ -z "${ARG_SELINUX}" ]]; then - # If unspecified, default on - USE_SELINUX="--selinux-enabled" + # If unspecified, default off + USE_SELINUX="--selinux-enabled=false" fi exec dockerd "$@" ${USE_SELINUX} From be50e579c8cff7be20e3eb8a9f4e2d5b0399e716 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 30 Jul 2021 10:32:33 +0200 Subject: [PATCH 2/2] app-emulation/docker: update wrapper to disable selinux this is now the default behavior - since this script is deprecated we do a minimum update on it Signed-off-by: Mathieu Tortuyaux --- .../coreos-overlay/app-emulation/docker/files/dockerd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd index 2a94d06561..19c440bdda 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd @@ -34,8 +34,8 @@ parse_docker_args "$@" USE_SELINUX="" # Do not override selinux if it is already explicitly configured. if [[ -z "${ARG_SELINUX}" ]]; then - # If unspecified, default on - USE_SELINUX="--selinux-enabled" + # If unspecified, default off + USE_SELINUX="--selinux-enabled=false" fi exec dockerd "$@" ${USE_SELINUX}