kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #15277 from calavera/check_apparmor_docker_contrib 

Include apparmor/docker only when it exists.
This commit is contained in:
Jessie Frazelle 2015-08-03 17:36:23 -07:00
parent d7c2fe0f20 408cffac94
commit dff25c9e46
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/make/ubuntu
View File

@ -73,8 +73,10 @@ bundle_ubuntu() {
done
# Include contributed apparmor policy
mkdir -p "$DIR/etc/apparmor.d/"
cp contrib/apparmor/* "$DIR/etc/apparmor.d/"
if [ -d contrib/apparmor ]; then
mkdir -p "$DIR/etc/apparmor.d/"
cp contrib/apparmor/* "$DIR/etc/apparmor.d/"
fi
# Copy the binary
# This will fail if the binary bundle hasn't been built