From e45b230c743723c1e164806b284c02dbcd638806 Mon Sep 17 00:00:00 2001 From: Olivier Mauras Date: Mon, 4 Jun 2018 22:05:36 +0000 Subject: [PATCH] Docker: Add AppArmor support --- srcpkgs/docker/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index 8bb756f4f6..ff44d98165 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,13 +1,13 @@ # Template file for 'docker' pkgname=docker version=18.05.0 -revision=1 +revision=2 _subversion='-ce' _version="$version$_subversion" wrksrc="$pkgname$_subversion-$_version" build_wrksrc="components/engine" hostmakedepends="git go pkg-config curl cmake" -makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel" +makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel libapparmor-devel" short_desc="Pack, ship and run any application as a lightweight container" maintainer="Andrea Brancaleoni " license="Apache-2.0" @@ -26,15 +26,15 @@ system_groups="docker" _docker_components="runc containerd tini proxy dockercli" do_build() { - AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' DOCKER_GITCOMMIT=v$_version \ + AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp apparmor' DOCKER_GITCOMMIT=v$_version \ hack/make.sh dynbinary } pre_build() { vmkdir usr/bin - sed -i "s|/usr/local|$DESTDIR/usr|g; s|apparmor ||g" hack/dockerfile/install/install.sh + sed -i "s|/usr/local|$DESTDIR/usr|g" hack/dockerfile/install/install.sh for COMPONENT in $_docker_components; do - AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp' DOCKER_GITCOMMIT=v$_version \ + AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp apparmor' DOCKER_GITCOMMIT=v$_version \ hack/dockerfile/install/install.sh $COMPONENT done }