Merge pull request #1149 from kinvolk/tormath1/fix-457

docker/torcx: disable SELinux by default on `dockerd` wrapper script
This commit is contained in:
Mathieu Tortuyaux 2021-07-30 15:00:12 +02:00 committed by GitHub
commit 22c2e57360
2 changed files with 4 additions and 4 deletions

View File

@ -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}

View File

@ -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}