From 5020d86d9f9747cd9d2e10f4c2986b2ff5587b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 19 Mar 2019 11:41:32 -0400
Subject: [PATCH] build: fix pipeline for ubuntu 18.10
Since the host running the Jenkins pipeline uses Ubuntu 18.10, the
apparmor profile is breaking the dh_installman binary. Use the
docker-default profile for apparmor to fix dh_installman.
Change-Id: Ia23f593e7c2d36b3d43df89cef0b1672a06511e3
---
scripts/make-packaging-target.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index a128c667..c05f3be5 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -182,20 +182,20 @@ def run_generate_all(parsed_args):
"distribution": "ubuntu_18.10",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged",
+ "options": "--privileged --security-opt apparmor=docker-default",
},
{
"distribution": "ubuntu_18.10_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged",
+ "options": "--privileged --security-opt apparmor=docker-default",
},
{
"distribution": "ubuntu_18.10_oci",
"docker_image": "ubuntu_18.10",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
- "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged",
+ "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)",
},
{
@@ -203,7 +203,7 @@ def run_generate_all(parsed_args):
"docker_image": "ubuntu_18.10_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
- "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged",
+ "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)",
},
# Fedora
--
GitLab