Commit Graph

8 Commits

Author SHA1 Message Date
4562635fa9 disable install of docker-engine for 1.10, try to get ready for 1.11
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c4bc9657b9e52f12b37aa36da15c1a2eb86519a3
Component: engine
2016-01-18 13:38:29 -08:00
641ecc1ebd Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install
apparmor check version on deb install
Upstream-commit: 9312a738d84e880bf4635ba4b7729b3c2e017fbc
Component: engine
2015-10-26 22:44:11 +01:00
ee5b4b81d9 add generate aa profile to deb install
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8369f00d30cc1d7823723dec6147f0419e67ad46
Component: engine
2015-10-19 16:15:25 -07:00
56a008d359 deb: add fish completions
This adds the Fish completions to the .deb package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6b1a643ac8bf599d04510b26d6d5befefc30ccde
Component: engine
2015-10-17 23:28:11 -07:00
e46c794117 revert apparmor changes back to how it was in 1.7.1, but keep tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ed248207d74ac59fb190be31dee96c6a8cef68da
Component: engine
2015-08-06 12:49:25 -07:00
74cf202b4f Move AppArmor policy to contrib & deb packaging
The automatic installation of AppArmor policies prevents the
management of custom, site-specific apparmor policies for the
default container profile. Furthermore, this change will allow
a future policy for the engine itself to be written without demanding
the engine be able to arbitrarily create and manage AppArmor policies.

- Add deb package suggests for apparmor.
- Ubuntu postinst use aa-status & fix policy path
- Add the policies to the debian packages.
- Add apparmor tests for writing proc files
Additional restrictions against modifying files in proc
are enforced by AppArmor. Ensure that AppArmor is preventing
access to these files, not simply Docker's configuration of proc.
- Remove /proc/k?mem from AA policy
The path to mem and kmem are in /dev, not /proc
and cannot be restricted successfully through AppArmor.
The device cgroup will need to be sufficient here.
- Load contrib/apparmor during integration tests
Note that this is somewhat dirty because we
cannot restore the host to its original configuration.
However, it should be noted that prior to this patch
series, the Docker daemon itself was loading apparmor
policy from within the tests, so this is no dirtier or
uglier than the status-quo.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 80d99236c1ef9d389dbaca73c1a949da16b56b42
Component: engine
2015-07-21 11:05:53 -04:00
72be67236b add nanorc to packaged builds
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: f66d225427d135069e1fd1e9649bc5654a0f675c
Component: engine
2015-05-07 16:10:07 -07:00
a1ac14178e Fix build-deb
This fixes the part of #12996 that I forgot. 👼

This also fixes a minor path issue (there's no `libexec` in Debian), and fixes a minor bug with the `debVersion` parsing.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 867eed8f3586c81b32dc9f85208692e9e1c9909a
Component: engine
2015-05-06 18:10:15 -06:00