From 575527891952da087f28c3a71ab99bfacc2b0143 Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Wed, 20 Jun 2018 09:45:41 -0300 Subject: [PATCH] docker: add apparmor build_option and enable it for arches that have (#253) libapparmor available. --- srcpkgs/docker/template | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index ff44d981650..ac48185ec1e 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,13 +1,13 @@ # Template file for 'docker' pkgname=docker version=18.05.0 -revision=2 +revision=3 _subversion='-ce' _version="$version$_subversion" wrksrc="$pkgname$_subversion-$_version" -build_wrksrc="components/engine" +build_wrksrc=components/engine hostmakedepends="git go pkg-config curl cmake" -makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel libapparmor-devel" +makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel $(vopt_if apparmor libapparmor-devel)" short_desc="Pack, ship and run any application as a lightweight container" maintainer="Andrea Brancaleoni " license="Apache-2.0" @@ -25,8 +25,15 @@ system_groups="docker" _docker_components="runc containerd tini proxy dockercli" +build_options="apparmor" +desc_option_apparmor="apparmor linux kernel security module support" +case "$XBPS_TARGET_MACHINE" in + *-musl) ;; + *) build_options_default="apparmor" +esac + do_build() { - AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp apparmor' DOCKER_GITCOMMIT=v$_version \ + AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp $(vopt_if apparmor apparmor)' DOCKER_GITCOMMIT=v$_version \ hack/make.sh dynbinary }