mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Linux upstream kernel Overlay file systems support SELinux
Remove checks that prevent overlay and SELinux from working together. Fixes are arriving in the 4.9 kernel. Signed-off-by: Dan Walsh <dwalsh@redhat.com>
This commit is contained in:
parent
e4a88b3a23
commit
b71cd179fa
2 changed files with 2 additions and 8 deletions
|
@ -603,13 +603,7 @@ func configureMaxThreads(config *Config) error {
|
|||
// configureKernelSecuritySupport configures and validates security support for the kernel
|
||||
func configureKernelSecuritySupport(config *Config, driverName string) error {
|
||||
if config.EnableSelinuxSupport {
|
||||
if selinuxEnabled() {
|
||||
// As Docker on overlayFS and SELinux are incompatible at present, error on overlayfs being enabled
|
||||
if driverName == "overlay" {
|
||||
return fmt.Errorf("SELinux is not supported with the %s graph driver", driverName)
|
||||
}
|
||||
logrus.Debug("SELinux enabled successfully")
|
||||
} else {
|
||||
if !selinuxEnabled() {
|
||||
logrus.Warn("Docker could not enable SELinux on the host system")
|
||||
}
|
||||
} else {
|
||||
|
|
|
@ -235,7 +235,7 @@ output otherwise.
|
|||
Force the Docker runtime to use a specific storage driver.
|
||||
|
||||
**--selinux-enabled**=*true*|*false*
|
||||
Enable selinux support. Default is false. SELinux does not presently support either of the overlay storage drivers.
|
||||
Enable selinux support. Default is false.
|
||||
|
||||
**--storage-opt**=[]
|
||||
Set storage driver options. See STORAGE DRIVER OPTIONS.
|
||||
|
|
Loading…
Reference in a new issue