3 Commits

Author	SHA1	Message	Date
Aleksa Sarai	2613b94bd4	daemon: switch to 'ensure' workflow for AppArmor profiles ... In certain cases (unattended upgrades), system services can disable loaded AppArmor profiles. However, since /etc being read-only is a supported setup we cannot just write a copy of the profile to /etc/apparmor.d. Instead, dynamically load the docker-default AppArmor profile if a container is started with that profile set. This code will short-cut if the profile is already loaded. Fixes: 2f7596aaef3a ("apparmor: do not save profile to /etc/apparmor.d") Signed-off-by: Aleksa Sarai <asarai@suse.de> Upstream-commit: 567ef8e7858ca4f282f598ba1f5a951cbad39e83 Component: engine	2016-12-07 08:47:28 +11:00
Aleksa Sarai	e0976913a0	apparmor: switch IsLoaded to return bool ... Signed-off-by: Aleksa Sarai <asarai@suse.de> Upstream-commit: e440a57a793feb15c0f06d27178ee8241a2a9081 Component: engine	2016-12-06 00:10:08 +11:00
Tonis Tiigi	8ba16d91c8	Replace execdrivers with containerd implementation ... Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> Signed-off-by: Anusha Ragunathan <anusha@docker.com> Upstream-commit: 9c4570a958df42d1ad19364b1a8da55b891d850a Component: engine	2016-03-18 13:38:32 -07:00