fix variable decl

.gitlab-ci.yml

@@ -1,115 +1,149 @@
+---
+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'
+
+variables:
+  BUILD_CONTEXT: ci_container
+  BUILD_FILE: Dockerfile
+  IMAGE_NAME: pkg_build-exim-encrypt-dlfunc/bullseye
+  TARGET_REPOSITORY: "bullseye"
+
+
 stages:
-    - build
+  - build_image
-    - debian-package
+  - build_pkg
+  - debian-package
 
 .image-buster:
-    image: '${CONTAINER_REGISTRY_NAME}/exim-encrypt-dlfunc-build-buster'
+  variables:
+    IMAGE_NAME: pkg_build-exim-encrypt-dlfunc/buster
+    BUILD_FILE: Dockerfile.buster
+    TARGET_REPOSITORY: "buster"
 
 .image-bullseye:
-    image: '${CONTAINER_REGISTRY_NAME}/exim-encrypt-dlfunc-build-bullseye'
+  IMAGE_NAME: pkg_build-exim-encrypt-dlfunc/bullseye
 
-.image-focal:
+.image-jammy:
-    image: '${CONTAINER_REGISTRY_NAME}/exim-encrypt-dlfunc-build-focal'
+  variables:
+    IMAGE_NAME: pkg_build-exim-encrypt-dlfunc/jammy
+    BUILD_FILE: Dockerfile.jammy
 
-.code-coverage:
+build_pkg_image_buster:
-    stage: build
+  extends:
-    script:
+    - .image-buster
-        - "export PATH=/usr/local/sbin:/usr/local/bin:${PATH}"
+    - build_pkg_image
-        - meson build -Db_coverage=true
-        - cd build
-        - ninja
-        - ninja test
-        - ninja coverage-xml
-        - grep -Eo 'line-rate="[^"]+"' meson-logs/coverage.xml | head -n 1 |
-            grep -Eo '[0-9.]+' | awk '{ printf "coverage\x3a %.2f%% of statements\n", $1 * 100 }'
-        - ninja coverage-html
-        - mv meson-logs/coveragereport ../coverage
-    artifacts:
-        paths:
-            - coverage/
-        reports:
-            cobertura: build/meson-logs/coverage.xml
 
-.build:
+pkg_buster:
-    stage: build
+  extends:
-    script:
+    - .image-buster
-        - which meson
+    - python_pkg
-        - meson build
-        - cd build
-        - ninja
-        - ninja test
-    artifacts:
-        paths:
-            - build/src/libexim-encrypt-dlfunc.so
-            - build/src/libexim-encrypt-dlfunc-genkeys
-            - build/src/libexim-encrypt-dlfunc-decrypt-secretbox
-            - build/src/libexim-encrypt-dlfunc-decrypt-sealedbox
 
-.debian-package:
+build_pkg_image_jammy:
-    stage: debian-package
+  extends:
-    script:
+    - .image-jammy
-        - mkdir ~/.gnupg; chown root:root ~/.gnupg; chmod 700 ~/.gnupg
+    - build_pkg_image
-        - eval $(gpg-agent --batch --sh --disable-scdaemon)
-        - echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf
-        - echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf
-        - gpg-connect-agent /bye
-        - echo $DEBIAN_SIGNING_KEY_ASC | base64 -d | gpg --batch --import --always-trust --yes
-        - echo "1DC7C2770DC111723D505DD61614D5CDEE1555A7:6:" | gpg --import-ownertrust
-        - dpkg-buildpackage --sign-key=1DC7C2770DC111723D505DD61614D5CDEE1555A7
-        - mv -t . ../*.deb ../*.dsc ../*.tar.gz ../*.changes ../*.buildinfo
-    artifacts:
-        paths:
-            - ./*.deb
-            - ./*.dsc
-            - ./*.tar.gz
-            - ./*.changes
-            - ./*.buildinfo
 
-code-coverage:
+#.code-coverage:
-    extends:
+#    stage: build
-        - .image-bullseye
+#    script:
-        - .code-coverage
+#        - "export PATH=/usr/local/sbin:/usr/local/bin:${PATH}"
-    needs: [ ]
+#        - meson build -Db_coverage=true
-
+#        - cd build
-build:bullseye:
+#        - ninja
-    extends:
+#        - ninja test
-        - .image-bullseye
+#        - ninja coverage-xml
-        - .build
+#        - grep -Eo 'line-rate="[^"]+"' meson-logs/coverage.xml | head -n 1 |
-        - .code-coverage
+#            grep -Eo '[0-9.]+' | awk '{ printf "coverage\x3a %.2f%% of statements\n", $1 * 100 }'
-    needs: [ ]
+#        - ninja coverage-html
-
+#        - mv meson-logs/coveragereport ../coverage
-build:focal:
+#    artifacts:
-    extends:
+#        paths:
-        - .image-focal
+#            - coverage/
-        - .build
+#        reports:
-    needs: [ ]
+#            cobertura: build/meson-logs/coverage.xml
-
+#
-build:buster:
+#.build:
-    extends:
+#    stage: build
-        - .build
+#    script:
-        - .image-buster
+#        - which meson
-    needs: [ ]
+#        - meson build
-
+#        - cd build
-debian-package:bullseye:
+#        - ninja
-    extends:
+#        - ninja test
-        - .image-bullseye
+#    artifacts:
-        - .debian-package
+#        paths:
-    dependencies:
+#            - build/src/libexim-encrypt-dlfunc.so
-        - build:bullseye
+#            - build/src/libexim-encrypt-dlfunc-genkeys
-    needs: [ "build:bullseye" ]
+#            - build/src/libexim-encrypt-dlfunc-decrypt-secretbox
-
+#            - build/src/libexim-encrypt-dlfunc-decrypt-sealedbox
-debian-package:focal:
+#
-    extends:
+#.debian-package:
-        - .image-focal
+#    stage: debian-package
-        - .debian-package
+#    script:
-    dependencies:
+#        - mkdir ~/.gnupg; chown root:root ~/.gnupg; chmod 700 ~/.gnupg
-        - build:focal
+#        - eval $(gpg-agent --batch --sh --disable-scdaemon)
-    needs: [ "build:focal" ]
+#        - echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf
-
+#        - echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf
-debian-package:buster:
+#        - gpg-connect-agent /bye
-    extends:
+#        - echo $DEBIAN_SIGNING_KEY_ASC | base64 -d | gpg --batch --import --always-trust --yes
-        - .image-buster
+#        - echo "1DC7C2770DC111723D505DD61614D5CDEE1555A7:6:" | gpg --import-ownertrust
-        - .debian-package
+#        - dpkg-buildpackage --sign-key=1DC7C2770DC111723D505DD61614D5CDEE1555A7
-    dependencies:
+#        - mv -t . ../*.deb ../*.dsc ../*.tar.gz ../*.changes ../*.buildinfo
-        - build:buster
+#    artifacts:
-    needs: [ "build:buster" ]
+#        paths:
+#            - ./*.deb
+#            - ./*.dsc
+#            - ./*.tar.gz
+#            - ./*.changes
+#            - ./*.buildinfo
+#
+#code-coverage:
+#    extends:
+#        - .image-bullseye
+#        - .code-coverage
+#    needs: [ ]
+#
+#build:bullseye:
+#    extends:
+#        - .image-bullseye
+#        - .build
+#        - .code-coverage
+#    needs: [ ]
+#
+#build:focal:
+#    extends:
+#        - .image-focal
+#        - .build
+#    needs: [ ]
+#
+#build:buster:
+#    extends:
+#        - .build
+#        - .image-buster
+#    needs: [ ]
+#
+#debian-package:bullseye:
+#    extends:
+#        - .image-bullseye
+#        - .debian-package
+#    dependencies:
+#        - build:bullseye
+#    needs: [ "build:bullseye" ]
+#
+#debian-package:focal:
+#    extends:
+#        - .image-focal
+#        - .debian-package
+#    dependencies:
+#        - build:focal
+#    needs: [ "build:focal" ]
+#
+#debian-package:buster:
+#    extends:
+#        - .image-buster
+#        - .debian-package
+#    dependencies:
+#        - build:buster
+#    needs: [ "build:buster" ]

ci_container/Dockerfile

@@ -18,18 +18,17 @@ RUN apt-get update; \
         openssl \
         pkg-config \
         python3-pip \
-        libxml2-utils; \
+        libxml2-utils \
-    DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get install --no-install-recommends -y \
         debhelper \
         debsigs \
         devscripts \
         dh-make \
         git-buildpackage \
         gpgv1 \
-        meson; \
+        meson \
-    DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get install --no-install-recommends -y \
         less \
         mc \
+        rsync \
         openssh-client \
         vim; \
     DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get clean; \

ci_container/Dockerfile.buster

@@ -0,0 +1,40 @@
+FROM debian:latest
+
+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

@@ -0,0 +1,40 @@
+FROM docker.io/library/ubuntu:jammy
+
+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 \
+        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/