mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 07:21:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1639 from vcaputo/docker-disable-selinux-on-btrfs

Browse Source 
app-emulation/docker: disable SELinux when using btrfs
This commit is contained in:
Vito Caputo 2015-11-17 14:55:18 -08:00
commit 925ed0adf9
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.3-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.3-r2.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service vendored
View File

@ -9,7 +9,7 @@ EnvironmentFile=-/run/flannel_docker_opts.env
MountFlags=slave MountFlags=slave
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576
ExecStart=/usr/lib/coreos/dockerd daemon --selinux-enabled --host=fd:// $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

17
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd vendored
View File

@ -55,6 +55,17 @@ select_docker_driver() {
esac esac
} }
maybe_disable_selinux() {
case "${DOCKER_DRIVER}" in
btrfs)
USE_SELINUX=""
;;
*)
# Leave enabled for everything else.
;;
esac
}
ARG_ROOT="/var/lib/docker" ARG_ROOT="/var/lib/docker"
ARG_DRIVER="" ARG_DRIVER=""
parse_docker_args "$@" parse_docker_args "$@"
@ -64,4 +75,8 @@ if [[ -z "${ARG_DRIVER}" && -z "${DOCKER_DRIVER}" ]]; then
select_docker_driver select_docker_driver
fi fi
exec docker "$@" # Enable selinux except when known to be unsupported (btrfs).
USE_SELINUX="--selinux-enabled"
maybe_disable_selinux
exec docker "$@" "${USE_SELINUX}"