Browse Source

remove docker-unconfined profile we were not using it and it breaks apparmor on wheezy

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
(cherry picked from commit e542238f2a4ba9d77bf8ebc77e319dd6b321925f)
Jessica Frazelle 10 years ago
parent
commit
a97b89b585

+ 0 - 15
daemon/execdriver/native/apparmor.go

@@ -59,21 +59,6 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
   deny /sys/firmware/efi/efivars/** rwklx,
   deny /sys/firmware/efi/efivars/** rwklx,
   deny /sys/kernel/security/** rwklx,
   deny /sys/kernel/security/** rwklx,
 }
 }
-
-profile docker-unconfined flags=(attach_disconnected,mediate_deleted,complain) {
-  #include <abstractions/base>
-
-  network,
-  capability,
-  file,
-  umount,
-  mount,
-  pivot_root,
-  change_profile -> *,
-
-  ptrace,
-  signal,
-}
 `
 `
 
 
 func generateProfile(out io.Writer) error {
 func generateProfile(out io.Writer) error {

+ 2 - 2
daemon/execdriver/native/driver.go

@@ -54,11 +54,11 @@ func NewDriver(root, initPath string, options []string) (*driver, error) {
 
 
 	if apparmor.IsEnabled() {
 	if apparmor.IsEnabled() {
 		if err := installAppArmorProfile(); err != nil {
 		if err := installAppArmorProfile(); err != nil {
-			apparmor_profiles := []string{"docker-default", "docker-unconfined"}
+			apparmorProfiles := []string{"docker-default"}
 
 
 			// Allow daemon to run if loading failed, but are active
 			// Allow daemon to run if loading failed, but are active
 			// (possibly through another run, manually, or via system startup)
 			// (possibly through another run, manually, or via system startup)
-			for _, policy := range apparmor_profiles {
+			for _, policy := range apparmorProfiles {
 				if err := hasAppArmorProfileLoaded(policy); err != nil {
 				if err := hasAppArmorProfileLoaded(policy); err != nil {
 					return nil, fmt.Errorf("AppArmor enabled on system but the %s profile could not be loaded.", policy)
 					return nil, fmt.Errorf("AppArmor enabled on system but the %s profile could not be loaded.", policy)
 				}
 				}

+ 0 - 4
docs/security/apparmor.md

@@ -20,10 +20,6 @@ The `docker-default` profile the default for running
 containers. It is moderately protective while
 containers. It is moderately protective while
 providing wide application compatability.
 providing wide application compatability.
 
 
-The `docker-unconfined` profile is intended for
-privileged applications and is the default when runing
-a container with the *--privileged* flag.
-
 The system's standard `unconfined` profile inherits all
 The system's standard `unconfined` profile inherits all
 system-wide policies, applying path-based policies
 system-wide policies, applying path-based policies
 intended for the host system inside of containers.
 intended for the host system inside of containers.