new file mode 100644

@@ -0,0 +1,29 @@

+//+build !windows

+

+package daemon

+

+import (

+	"github.com/docker/docker/container"

+)

+

+func (daemon *Daemon) saveApparmorConfig(container *container.Container) error {

+	container.AppArmorProfile = "" //we don't care about the previous value.

+

+	if !daemon.apparmorEnabled {

+		return nil // if apparmor is disabled there is nothing to do here.

+	}

+

+	if err := parseSecurityOpt(container, container.HostConfig); err != nil {

+		return err

+	}

+

+	if !container.HostConfig.Privileged {

+		if container.AppArmorProfile == "" {

+			container.AppArmorProfile = defaultApparmorProfile

+		}

+

+	} else {

+		container.AppArmorProfile = "unconfined"

+	}

+	return nil

+}

new file mode 100644

@@ -0,0 +1,11 @@

+//+build windows

+

+package daemon

+

+import (

+	"github.com/docker/docker/container"

+)

+

+func (daemon *Daemon) saveApparmorConfig(container *container.Container) error {

+	return nil

+}

@@ -92,6 +92,7 @@ type Daemon struct {

 	discoveryWatcher          discoveryReloader

 	root                      string

 	seccompEnabled            bool

+	apparmorEnabled           bool

 	shutdown                  bool

 	uidMaps                   []idtools.IDMap

 	gidMaps                   []idtools.IDMap

@@ -683,6 +684,7 @@ func NewDaemon(config *Config, registryService registry.Service, containerdRemot

 	d.uidMaps = uidMaps

 	d.gidMaps = gidMaps

 	d.seccompEnabled = sysInfo.Seccomp

+	d.apparmorEnabled = sysInfo.AppArmor

 	d.nameIndex = registrar.NewRegistrar()

 	d.linkIndex = newLinkIndex()

@@ -164,6 +164,10 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint

 		checkpointDir = container.CheckpointDir()

 	}

+	if daemon.saveApparmorConfig(container); err != nil {

+		return err

+	}

+

 	if err := daemon.containerd.Create(container.ID, checkpoint, checkpointDir, *spec, container.InitializeStdio, createOptions...); err != nil {

 		errDesc := grpc.ErrorDesc(err)

 		contains := func(s1, s2 string) bool {