Skip to content
Snippets Groups Projects
Unverified Commit 5020d86d authored by Sébastien Blin's avatar Sébastien Blin
Browse files

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
parent d5cb9994
No related branches found
No related tags found
No related merge requests found
...@@ -182,20 +182,20 @@ def run_generate_all(parsed_args): ...@@ -182,20 +182,20 @@ def run_generate_all(parsed_args):
"distribution": "ubuntu_18.10", "distribution": "ubuntu_18.10",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged", "options": "--privileged --security-opt apparmor=docker-default",
}, },
{ {
"distribution": "ubuntu_18.10_i386", "distribution": "ubuntu_18.10_i386",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged", "options": "--privileged --security-opt apparmor=docker-default",
}, },
{ {
"distribution": "ubuntu_18.10_oci", "distribution": "ubuntu_18.10_oci",
"docker_image": "ubuntu_18.10", "docker_image": "ubuntu_18.10",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)", "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)", "version": "$(DEBIAN_OCI_VERSION)",
}, },
{ {
...@@ -203,7 +203,7 @@ def run_generate_all(parsed_args): ...@@ -203,7 +203,7 @@ def run_generate_all(parsed_args):
"docker_image": "ubuntu_18.10_i386", "docker_image": "ubuntu_18.10_i386",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)", "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)", "version": "$(DEBIAN_OCI_VERSION)",
}, },
# Fedora # Fedora
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment