Merge pull request #15277 from calavera/check_apparmor_docker_contrib

Include apparmor/docker only when it exists. Upstream-commit: dff25c9e46562c60fefe1133dac8d846126fd61f Component: engine
2015-08-03 17:36:23 -07:00
parent d72b66b9b4 78c95b1e80
commit 86c6dbe4c7
1 changed files with 4 additions and 2 deletions
@@ -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