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

Merge pull request #1632 from mjg59/master

Browse Source 
Enable SELinux for Docker
This commit is contained in:
mjg59 2015-11-11 17:12:13 -08:00
commit 1ce40e4ca1
3 changed files with 6 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.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.3-r1.ebuild vendored
View File

6
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -24,7 +24,7 @@ inherit bash-completion-r1 linux-info multilib systemd udev user cros-workon
LICENSE="Apache-2.0" LICENSE="Apache-2.0"
SLOT="0" SLOT="0"
IUSE="aufs +btrfs contrib +device-mapper doc experimental lxc +overlay vim-syntax zsh-completion" IUSE="aufs +btrfs contrib +device-mapper doc experimental lxc +overlay +selinux vim-syntax zsh-completion"
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies # https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
CDEPEND=" CDEPEND="
@ -188,6 +188,10 @@ src_compile() {
fi fi
done done
if use selinux; then
DOCKER_BUILDTAGS+=" selinux"
fi
# https://github.com/docker/docker/pull/13338 # https://github.com/docker/docker/pull/13338
if use experimental; then if use experimental; then
export DOCKER_EXPERIMENTAL=1 export DOCKER_EXPERIMENTAL=1

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 --host=fd:// $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ ExecStart=/usr/lib/coreos/dockerd daemon --selinux-enabled --host=fd:// $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target