From a233b433bae5a23844107afc7ad22a12821a1721 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Mon, 8 Feb 2021 12:05:09 -0500
Subject: [PATCH] maint: Remove the qemu-static hack.
This hack is no longer necessary. The Jenkins nodes are running Docker 19.
Change-Id: I8e41e1295a49ebe48b2fca9fa6c91158f49f16c9
---
.gitignore | 1 -
Makefile | 1 -
docker/Dockerfile_debian_10_arm64 | 4 ----
docker/Dockerfile_debian_10_armhf | 4 ----
scripts/make-packaging-target.py | 26 +++++++-------------------
5 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5e135de7..f6639658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ Makefile.packaging.distro_targets
repositories
manual-download
.docker-image-*
-qemu-static
# QtCreator
/build-*
diff --git a/Makefile b/Makefile
index fed2e066..34fbdef1 100644
--- a/Makefile
+++ b/Makefile
@@ -121,4 +121,3 @@ clean:
rm -rf packages
rm -f Makefile.packaging.distro_targets
rm -f .docker-image-*
- rm -fr qemu-static
diff --git a/docker/Dockerfile_debian_10_arm64 b/docker/Dockerfile_debian_10_arm64
index 77c9e711..0a1024ef 100644
--- a/docker/Dockerfile_debian_10_arm64
+++ b/docker/Dockerfile_debian_10_arm64
@@ -1,9 +1,5 @@
FROM arm64v8/debian:buster
-# FIXME: dirty qemu-static hack required because our Jenkins node runs Docker 17
-# Remove next line as soon as we get Docker 18 +
-COPY qemu-static/qemu-aarch64-static /usr/bin/qemu-aarch64-static
-
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get clean
diff --git a/docker/Dockerfile_debian_10_armhf b/docker/Dockerfile_debian_10_armhf
index e1d12e5e..a6e8f8c6 100644
--- a/docker/Dockerfile_debian_10_armhf
+++ b/docker/Dockerfile_debian_10_armhf
@@ -1,9 +1,5 @@
FROM arm32v7/debian:buster
-# FIXME: dirty qemu-static hack required because our Jenkins node runs Docker 17
-# Remove next line as soon as we get Docker 18 +
-COPY qemu-static/qemu-arm-static /usr/bin/qemu-arm-static
-
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get clean
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 29ccf395..1bd31819 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -38,7 +38,7 @@ target_template = """\
PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME:=jami-packaging-%(distribution)s$(RING_PACKAGING_IMAGE_SUFFIX)
PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE:=.docker-image-$(PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME)
DOCKER_EXTRA_ARGS =
-QEMU_STATIC_%(distribution)s = %(qemu_static)s
+
PACKAGE_%(distribution)s_DOCKER_RUN_COMMAND = docker run \\
--rm \\
@@ -54,12 +54,7 @@ PACKAGE_%(distribution)s_DOCKER_RUN_COMMAND = docker run \\
-t $(DOCKER_EXTRA_ARGS) %(options)s \\
$(PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME)
-# FIXME: dirty qemu-static hack required because our Jenkis node runs Docker 17
-# Remove all the qemu-static / QEMU-STATIC stuff as soon as we get Docker 18 +
-QEMU_STATIC_%(distribution)s:
- if [ ! -z $(QEMU_STATIC_%(distribution)s) ]; then mkdir -p qemu-static && cp -af /usr/bin/$(QEMU_STATIC_%(distribution)s) qemu-static/; fi
-
-$(PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE): QEMU_STATIC_%(distribution)s docker/Dockerfile_%(docker_image)s
+$(PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE): docker/Dockerfile_%(docker_image)s
docker build \\
-t $(PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME) \\
-f docker/Dockerfile_%(docker_image)s %(password_rhel8)s \\
@@ -84,7 +79,7 @@ package-%(distribution)s-interactive: $(RELEASE_TARBALL_FILENAME) packages/%(dis
"""
-def generate_target(distribution, debian_packaging_override, output_file, options='', docker_image='', version='', qemu_static='', password_rhel8 = ''):
+def generate_target(distribution, debian_packaging_override, output_file, options='', docker_image='', version='', password_rhel8 = ''):
if (docker_image == ''):
docker_image = distribution
if (docker_image == 'rhel_8'):
@@ -98,7 +93,6 @@ def generate_target(distribution, debian_packaging_override, output_file, option
"output_file": output_file,
"options": options,
"version": version,
- "qemu_static": qemu_static,
"password_rhel8": password_rhel8,
}
@@ -109,8 +103,7 @@ def run_generate(parsed_args):
parsed_args.output_file,
parsed_args.options,
parsed_args.docker_image,
- parsed_args.version,
- parsed_args.qemu_static))
+ parsed_args.version))
def run_generate_all(parsed_args):
@@ -133,14 +126,12 @@ def run_generate_all(parsed_args):
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default",
- "qemu_static": 'qemu-arm-static',
},
{
"distribution": "debian_10_arm64",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- "qemu_static": 'qemu-aarch64-static',
+ "options": "--privileged --security-opt apparmor=docker-default"
},
{
"distribution": "debian_10_oci",
@@ -164,8 +155,7 @@ def run_generate_all(parsed_args):
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
- "version": "$(DEBIAN_OCI_VERSION)",
- "qemu_static": 'qemu-arm-static',
+ "version": "$(DEBIAN_OCI_VERSION)"
},
{
"distribution": "debian_10_arm64_oci",
@@ -173,8 +163,7 @@ def run_generate_all(parsed_args):
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
- "version": "$(DEBIAN_OCI_VERSION)",
- "qemu_static": 'qemu-aarch64-static',
+ "version": "$(DEBIAN_OCI_VERSION)"
},
# Raspbian
{
@@ -315,7 +304,6 @@ def parse_args():
ap.add_argument('--options', default='')
ap.add_argument('--docker_image', default='')
ap.add_argument('--version', default='')
- ap.add_argument('--qemu_static', default='')
parsed_args = ap.parse_args()
--
GitLab