From ee5b4b81d97de23a028ac2b8fa2604c389f5064e Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Tue, 13 Oct 2015 17:52:18 -0700 Subject: [PATCH] add generate aa profile to deb install Signed-off-by: Jessica Frazelle Upstream-commit: 8369f00d30cc1d7823723dec6147f0419e67ad46 Component: engine --- components/engine/hack/make/.build-deb/docker-engine.install | 1 + components/engine/hack/make/.build-deb/rules | 4 ++++ components/engine/hack/make/build-deb | 2 ++ 3 files changed, 7 insertions(+) diff --git a/components/engine/hack/make/.build-deb/docker-engine.install b/components/engine/hack/make/.build-deb/docker-engine.install index a8857a96dc..0ee579350a 100644 --- a/components/engine/hack/make/.build-deb/docker-engine.install +++ b/components/engine/hack/make/.build-deb/docker-engine.install @@ -9,3 +9,4 @@ contrib/init/systemd/docker.socket lib/systemd/system/ contrib/mk* usr/share/docker-engine/contrib/ contrib/nuke-graph-directory.sh usr/share/docker-engine/contrib/ contrib/syntax/nano/Dockerfile.nanorc usr/share/nano/ +contrib/apparmor/docker-engine etc/apparmor.d/ diff --git a/components/engine/hack/make/.build-deb/rules b/components/engine/hack/make/.build-deb/rules index b4c8e2b4c7..be45676c1d 100755 --- a/components/engine/hack/make/.build-deb/rules +++ b/components/engine/hack/make/.build-deb/rules @@ -32,5 +32,9 @@ override_dh_installudev: # match our existing priority dh_installudev --priority=z80 +override_dh_install: + dh_install + dh_apparmor --profile-name=docker-engine -pdocker-engine + %: dh $@ --with=bash-completion $(shell command -v dh_systemd_enable > /dev/null 2>&1 && echo --with=systemd) diff --git a/components/engine/hack/make/build-deb b/components/engine/hack/make/build-deb index deab30c238..418d9a1947 100644 --- a/components/engine/hack/make/build-deb +++ b/components/engine/hack/make/build-deb @@ -57,6 +57,8 @@ set -e echo 'ENV DOCKER_EXPERIMENTAL 1' >> "$DEST/$version/Dockerfile.build" fi cat >> "$DEST/$version/Dockerfile.build" <<-EOF + RUN go build -o aagen contrib/apparmor/*.go \ + && ./aagen contrib/apparmor/docker-engine RUN ln -sfv hack/make/.build-deb debian RUN { echo '$debSource (${debVersion}-0~${suite}) $suite; urgency=low'; echo; echo ' * Version: $VERSION'; echo; echo " -- $debMaintainer $debDate"; } > debian/changelog && cat >&2 debian/changelog RUN dpkg-buildpackage -uc -us