From 7e29582ba3b7b3fb4e687dc8c3b3144c086740e5 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Fri, 21 May 2021 15:11:40 -0400
Subject: [PATCH] packaging: Remove unused targets.
This further reduces the targets set to what the CI currently uses.
The native ARM (armhf, aarch64) builds are dropped as we are not
equipped in terms of native hardware to build them and QEMU user
emulation is too slow. The remaining i386 builds are removed as they
are not used by the CI and have or are being phased out by their
upstreams.
* scripts/make-packaging-target.py
(DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS): New variable.
[debian_10]: Use it.
[debian_10_i386, debian_10_armhf, debian_10_arm64]
[ubuntu_18.04_i386, ubuntu_18.04_qt_i386]: Delete targets.
[rhel_8]: Comment out target for now.
[debian_testing]: Use the above variable.
[ubuntu_20.04, ubuntu_20.10, ubuntu_21.04]: Likewise.
* docker/Dockerfile_debian_10_arm64: Delete file.
* docker/Dockerfile_debian_10_armhf: Likewise.
* docker/Dockerfile_debian_10_i386: Likewise.
* docker/Dockerfile_ubuntu_18.04_i386: Likewise.
* docker/Dockerfile_ubuntu_18.04_qt_i386: Likewise.
Change-Id: Iabb840e7f9a2111afe822e2c05797a651d55e21d
---
docker/Dockerfile_debian_10_arm64 | 33 ----------------
docker/Dockerfile_debian_10_armhf | 33 ----------------
docker/Dockerfile_debian_10_i386 | 33 ----------------
docker/Dockerfile_ubuntu_18.04_i386 | 39 -------------------
docker/Dockerfile_ubuntu_18.04_qt_i386 | 27 -------------
scripts/make-packaging-target.py | 53 ++++++++------------------
6 files changed, 16 insertions(+), 202 deletions(-)
delete mode 100644 docker/Dockerfile_debian_10_arm64
delete mode 100644 docker/Dockerfile_debian_10_armhf
delete mode 100644 docker/Dockerfile_debian_10_i386
delete mode 100644 docker/Dockerfile_ubuntu_18.04_i386
delete mode 100644 docker/Dockerfile_ubuntu_18.04_qt_i386
diff --git a/docker/Dockerfile_debian_10_arm64 b/docker/Dockerfile_debian_10_arm64
deleted file mode 100644
index 0dd24e06..00000000
--- a/docker/Dockerfile_debian_10_arm64
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM arm64v8/debian:buster
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retries=10 \
- ca-certificates \
- devscripts \
- dirmngr \
- gnupg \
- wget
-
-RUN wget -O - https://dl.jami.net/public-key.gpg | \
- tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
-RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/debian_10_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
-
-# add deb-src entries (needed for next step)
-RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
-RUN apt-get clean && apt-get update
-
-COPY packaging/rules/debian/* /tmp/builddeps/debian/
-RUN cd /tmp/builddeps && \
- apt-get update; \
- mk-build-deps \
- --remove --install \
- --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
- "debian/control"; \
- cd / && rm -rf /tmp/builddeps
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_10_armhf b/docker/Dockerfile_debian_10_armhf
deleted file mode 100644
index f8229e9b..00000000
--- a/docker/Dockerfile_debian_10_armhf
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM arm32v7/debian:buster
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retries=10 \
- ca-certificates \
- devscripts \
- dirmngr \
- gnupg \
- wget
-
-RUN wget -O - https://dl.jami.net/public-key.gpg | \
- tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
-RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/debian_10_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
-
-# add deb-src entries (needed for next step)
-RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
-RUN apt-get clean && apt-get update
-
-COPY packaging/rules/debian/* /tmp/builddeps/debian/
-RUN cd /tmp/builddeps && \
- apt-get update; \
- mk-build-deps \
- --remove --install \
- --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
- "debian/control"; \
- cd / && rm -rf /tmp/builddeps
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_10_i386 b/docker/Dockerfile_debian_10_i386
deleted file mode 100644
index 4d08a5a5..00000000
--- a/docker/Dockerfile_debian_10_i386
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM i386/debian:buster
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retries=10 \
- ca-certificates \
- devscripts \
- dirmngr \
- gnupg \
- wget
-
-RUN wget -O - https://dl.jami.net/public-key.gpg | \
- tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
-RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/debian_10_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
-
-# add deb-src entries (needed for next step)
-RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
-RUN apt-get clean && apt-get update
-
-COPY packaging/rules/debian/* /tmp/builddeps/debian/
-RUN cd /tmp/builddeps && \
- apt-get update; \
- mk-build-deps \
- --remove --install \
- --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
- "debian/control"; \
- cd / && rm -rf /tmp/builddeps
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_18.04_i386 b/docker/Dockerfile_ubuntu_18.04_i386
deleted file mode 100644
index e6aaa730..00000000
--- a/docker/Dockerfile_ubuntu_18.04_i386
+++ /dev/null
@@ -1,39 +0,0 @@
-FROM i386/ubuntu:18.04
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retries=10 \
- ca-certificates \
- devscripts \
- dirmngr \
- equivs \
- gcc-8 \
- g++-8 \
- gnupg \
- wget
-
-RUN wget -O - https://dl.jami.net/public-key.gpg | \
- tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
-RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/ubuntu_18.04_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
-
-# add deb-src entries (needed for next step)
-RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
-RUN apt-get clean && apt-get update
-
-COPY packaging/rules/debian/* /tmp/builddeps/debian/
-RUN cd /tmp/builddeps && \
- apt-get update; \
- mk-build-deps \
- --remove --install \
- --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
- "debian/control"; \
- cd / && rm -rf /tmp/builddeps
-
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_18.04_qt_i386 b/docker/Dockerfile_ubuntu_18.04_qt_i386
deleted file mode 100644
index 4b31ab2e..00000000
--- a/docker/Dockerfile_ubuntu_18.04_qt_i386
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM i386/ubuntu:18.04
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retries=10 \
- devscripts \
- equivs \
- wget
-
-# add/enable src repos (needed for next step)
-RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
-
-RUN apt-get clean && apt-get update
-COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
-RUN cd /tmp/builddeps && \
- apt-get update; \
- mk-build-deps \
- --remove --install \
- --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
- "debian/control"; \
- cd / && rm -rf /tmp/builddeps
-
-ADD scripts/build-package-debian-qt.sh /opt/build-package-debian-qt.sh
-
-CMD /opt/build-package-debian-qt.sh
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 1afb9892..b8209020 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -89,6 +89,10 @@ RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS = (
'--security-opt seccomp=./docker/profile-seccomp-fedora_28.json '
'--privileged')
+DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS = (
+ '-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) '
+ '--privileged '
+ '--security-opt apparmor=docker-default ')
DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS_QT = (
'-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) '
@@ -130,22 +134,7 @@ def run_generate_all(parsed_args):
{
"distribution": "debian_10",
"output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "debian_10_i386",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "debian_10_armhf",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "debian_10_arm64",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default"
+ "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS,
},
{
"distribution": "debian_10_qt",
@@ -156,7 +145,7 @@ def run_generate_all(parsed_args):
{
"distribution": "debian_testing",
"output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
+ "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS,
},
{
"distribution": "debian_testing_qt",
@@ -176,27 +165,16 @@ def run_generate_all(parsed_args):
"output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX)",
},
- {
- "distribution": "ubuntu_18.04_i386",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX)",
- },
{
"distribution": "ubuntu_18.04_qt",
"output_file": "$(DEBIAN_QT_DSC_FILENAME)",
"options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS_QT,
"version": "$(DEBIAN_QT_VERSION)",
},
- {
- "distribution": "ubuntu_18.04_qt_i386",
- "output_file": "$(DEBIAN_QT_DSC_FILENAME)",
- "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS_QT,
- "version": "$(DEBIAN_QT_VERSION)",
- },
{
"distribution": "ubuntu_20.04",
"output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
+ "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS,
},
{
"distribution": "ubuntu_20.04_qt",
@@ -207,7 +185,7 @@ def run_generate_all(parsed_args):
{
"distribution": "ubuntu_20.10",
"output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
+ "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS,
},
{
"distribution": "ubuntu_20.10_qt",
@@ -218,7 +196,7 @@ def run_generate_all(parsed_args):
{
"distribution": "ubuntu_21.04",
"output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
+ "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS,
},
{
"distribution": "ubuntu_21.04_qt",
@@ -242,12 +220,13 @@ def run_generate_all(parsed_args):
"output_file": ".packages-built",
"options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS
},
- {
- "distribution": "rhel_8",
- "output_file": ".packages-built",
- "options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS,
- "docker_build_args": "--build-arg PASS=${PASS}"
- },
+ # Disabled 2021/05/21 because it's broken.
+ # {
+ # "distribution": "rhel_8",
+ # "output_file": ".packages-built",
+ # "options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS,
+ # "docker_build_args": "--build-arg PASS=$${PASS}"
+ # },
# OpenSUSE
{
"distribution": "opensuse-leap_15.2",
--
GitLab