kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix SELinux issue with missing Contexts in lxc execdriver

Browse source 
There is a bug in the SELinux patch for the lxc execdriver, that
causes lxc containers to blow up whether or not SELinux is enabled.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
This commit is contained in:
Dan Walsh 2014-04-02 13:56:30 -04:00
parent d76ac4d429
commit ca4224762b
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
daemonconfig/config.go
View file

@ -1,10 +1,9 @@
package daemonconfig package daemonconfig
import ( import (
"net"
"github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/runtime/networkdriver" "github.com/dotcloud/docker/runtime/networkdriver"
"net"
) )
const ( const (

6
runtime/execdriver/lxc/lxc_template.go
View file

@ -32,8 +32,8 @@ lxc.pts = 1024
lxc.console = none lxc.console = none
{{if getProcessLabel .Context}} {{if getProcessLabel .Context}}
lxc.se_context = {{ getProcessLabel .Context}} lxc.se_context = {{ getProcessLabel .Context}}
{{$MOUNTLABEL := getMountLabel .Context}}
{{end}} {{end}}
{{$MOUNTLABEL := getMountLabel .Context}}
# no controlling tty at all # no controlling tty at all
lxc.tty = 1 lxc.tty = 1
@ -90,8 +90,8 @@ lxc.mount.entry = sysfs {{escapeFstabSpaces $ROOTFS}}/sys sysfs nosuid,nodev,noe
lxc.mount.entry = {{.Console}} {{escapeFstabSpaces $ROOTFS}}/dev/console none bind,rw 0 0 lxc.mount.entry = {{.Console}} {{escapeFstabSpaces $ROOTFS}}/dev/console none bind,rw 0 0
{{end}} {{end}}
lxc.mount.entry = devpts {{escapeFstabSpaces $ROOTFS}}/dev/pts devpts {{formatMountLabel "newinstance,ptmxmode=0666,nosuid,noexec" "$MOUNTLABEL"}} 0 0 lxc.mount.entry = devpts {{escapeFstabSpaces $ROOTFS}}/dev/pts devpts {{formatMountLabel "newinstance,ptmxmode=0666,nosuid,noexec" $MOUNTLABEL}} 0 0
lxc.mount.entry = shm {{escapeFstabSpaces $ROOTFS}}/dev/shm tmpfs {{formatMountLabel "size=65536k,nosuid,nodev,noexec" "$MOUNTLABEL"}} 0 0 lxc.mount.entry = shm {{escapeFstabSpaces $ROOTFS}}/dev/shm tmpfs {{formatMountLabel "size=65536k,nosuid,nodev,noexec" $MOUNTLABEL}} 0 0
{{range $value := .Mounts}} {{range $value := .Mounts}}
{{if $value.Writable}} {{if $value.Writable}}