use xz compression

.gitlab-ci.yml

@@ -2,7 +2,11 @@
 include:
   - remote: 'https://git.scc.kit.edu/KIT-CERT/publish/-/raw/main/gitlab-ci/ssh-config.yml'
   - remote: 'https://git.scc.kit.edu/KIT-CERT/publish/-/raw/main/gitlab-ci/build_image.yml'
-  - remote: 'https://git.scc.kit.edu/KIT-CERT/publish/-/raw/main/gitlab-ci/python-pkg.yml'
+  - remote: 'https://git.scc.kit.edu/KIT-CERT/publish/-/raw/main/gitlab-ci/gbp-pkg.yml'
+
+stages:
+  - build_image
+  - build_pkg
 
 variables:
   BUILD_CONTEXT: ci_container
@@ -11,40 +15,54 @@ variables:
   TARGET_REPOSITORY: "bullseye"
 
 
-stages:
-  - build_image
-  - build_pkg
-  - debian-package
-
 .image-buster:
   variables:
     IMAGE_NAME: pkg_build-exim-encrypt-dlfunc/buster
     BUILD_FILE: Dockerfile.buster
     TARGET_REPOSITORY: "buster"
 
-.image-bullseye:
-  IMAGE_NAME: pkg_build-exim-encrypt-dlfunc/bullseye
-
 .image-jammy:
   variables:
     IMAGE_NAME: pkg_build-exim-encrypt-dlfunc/jammy
+    TARGET_REPOSITORY: "jammy"
     BUILD_FILE: Dockerfile.jammy
 
+.image-focal:
+  variables:
+    IMAGE_NAME: pkg_build-exim-encrypt-dlfunc/focal
+    TARGET_REPOSITORY: "focal"
+    BUILD_FILE: Dockerfile.focal
+
 build_pkg_image_buster:
   extends:
     - .image-buster
     - build_pkg_image
 
-pkg_buster:
-  extends:
-    - .image-buster
-    - python_pkg
-
 build_pkg_image_jammy:
   extends:
     - .image-jammy
     - build_pkg_image
 
+build_pkg_image_focal:
+  extends:
+    - .image-focal
+    - build_pkg_image
+
+pkg_buster:
+  extends:
+    - .image-buster
+    - gbp_pkg
+
+pkg_focal:
+  extends:
+    - .image-focal
+    - gbp_pkg
+
+pkg_jammy:
+  extends:
+    - .image-jammy
+    - gbp_pkg
+
 #.code-coverage:
 #    stage: build
 #    script:

ci_container/Dockerfile.focal

@@ -0,0 +1,41 @@
+FROM docker.io/library/ubuntu:focal
+
+LABEL org.opencontainers.image.created=${BUILDTIMESTAMP} \
+      org.opencontainers.image.authors="Heiko Reese <reese@kit.edu>" \
+      org.opencontainers.image.title="exim build container" \
+      org.opencontainers.image.description="A buld environment for exim-encrypt-dlfunc" \
+      org.opencontainers.image.source="https://git.scc.kit.edu/mail/exim-encrypt-dlfunc/" \
+      org.opencontainers.image.licenses="Apache-2.0"
+
+
+RUN apt-get update; \
+    DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get install --no-install-recommends -y \
+        build-essential \
+        exim4-daemon-heavy \
+        exim4-dev \
+        gcovr \
+        git \
+        libsodium-dev \
+        openssl \
+        pkg-config \
+        python3-pip \
+        libxml2-utils \
+        debhelper \
+        debsigs \
+        devscripts \
+        dh-make \
+        git-buildpackage \
+        gpgv1 \
+        meson \
+        less \
+        mc \
+		rsync \
+        openssh-client \
+        vim; \
+    DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
+
+RUN pip3 install --upgrade meson ninja; \
+    rm -rf ~/.cache/pip/*;
+
+WORKDIR /mnt/

ci_container/Dockerfile.jammy

@@ -29,6 +29,7 @@ RUN apt-get update; \
         meson \
         less \
         mc \
+		rsync \
         openssh-client \
         vim; \
     DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get clean; \

debian/rules

@@ -17,6 +17,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@
 
+# need this for ubuntu, they use zstd, but reprepro does not support that
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
 
 # dh_make generated override targets
 # This is example for Cmake (See https://bugs.debian.org/641051 )