Fedora 43 added

- ARMv6 base image replaced by tianon
- Clean up job added for outdated images

Author: Paulchen-Panther

.github/workflows/package.yml

@@ -27,7 +27,8 @@ jobs:
           { distribution: fedora, codename: 39,       description: Fedora 39,                      target_platform: "['amd64', 'arm64']" },
           { distribution: fedora, codename: 40,       description: Fedora 40,                      target_platform: "['amd64', 'arm64']" },
           { distribution: fedora, codename: 41,       description: Fedora 41,                      target_platform: "['amd64', 'arm64']" },
-          { distribution: fedora, codename: 42,       description: Fedora 42,                      target_platform: "['amd64', 'arm64']" }
+          { distribution: fedora, codename: 42,       description: Fedora 42,                      target_platform: "['amd64', 'arm64']" },
+          { distribution: fedora, codename: 43,       description: Fedora 43,                      target_platform: "['amd64', 'arm64']" }
         ]
         qt_version: [ 5, 6 ]
         # Qt6 on Debian Bullseye (only armv6) is excluded in reusable workflow qt5_6.yml because target_platform is passed as string to reusable workflow
@@ -39,3 +40,34 @@ jobs:
       codename: ${{ matrix.os.codename }}
       qt_version: ${{ matrix.qt_version }}
       target_platform: ${{ matrix.os.target_platform }}
+
+  cleanup:
+    name: 🧹 Cleanup untagged images
+    needs: ubuntu_debian_fedora
+    if: ${{ needs.ubuntu_debian_fedora.result == 'success' }}
+    env:
+      SECRET_DOCKER_CI: ${{ secrets.DOCKER_CI }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🐳 Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: 🔑 Login to GitHub Container Registry
+        if: ${{ env.SECRET_DOCKER_CI != null }}
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.DOCKER_CI }}
+
+      - name: 🧹 Cleanup
+        if: ${{ env.SECRET_DOCKER_CI != null }}
+        uses: dataaxiom/ghcr-cleanup-action@v1
+        with:
+          token: ${{ secrets.DOCKER_CI }}
+          packages: "*"
+          expand-packages: true
+          delete-untagged: true
+          delete-partial-images: true
+          delete-orphaned-images: true
+          validate: true

.github/workflows/qt5_6.yml

@@ -96,11 +96,10 @@ jobs:
           outputs: type=image,name=ghcr.io/${{ env.REPOSITORY }}/${{ inputs.distribution }},push-by-digest=true,name-canonical=true,push=true
           build-args: |
             DIST=${{ inputs.distribution }}
-            SUITE=${{ inputs.codename == 'trixie' && matrix.target_platform == 'armv6' && 'bookworm' || inputs.codename }}
+            SUITE=${{ inputs.codename }}
             QT_VERSION=${{ inputs.qt_version }}
             REPOSITORY="${{ github.server_url }}/${{ env.REPOSITORY }}"
             CMAKE_VERSION=${{ env.CMAKE_VERSION }}
-            UPGRADE_TO_TRIXIE=${{ inputs.codename == 'trixie' && matrix.target_platform == 'armv6' && 'true' || 'false' }}
 
       - name: ⬇ Export digest
         run: |

debian-armv6

@@ -1,13 +1,11 @@
-ARG SUITE="buster"
-ARG UPGRADE_TO_TRIXIE="false"
-ARG QT_VERSION="5"
+ARG SUITE="bullseye"
+ARG QT_VERSION="6"
 ARG REPOSITORY="https://github.com/hyperion-project"
 ARG CMAKE_VERSION="3.28.3"
 
-FROM balenalib/rpi-raspbian:${SUITE}
+FROM tianon/raspbian:${SUITE}-slim
 
 ARG SUITE
-ARG UPGRADE_TO_TRIXIE
 ARG QT_VERSION
 ARG REPOSITORY
 ARG CMAKE_VERSION
@@ -20,15 +18,14 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/arm/v6}
 # update
 RUN apt-get update
 
-# upgrade from Bookworm to Trixie
-RUN if [ "$UPGRADE_TO_TRIXIE" = "true" ]; then \
-    apt-get dist-upgrade; \
-    sed -i -e 's/bookworm/trixie/g' /etc/apt/sources.list; \
-    apt update && apt-get -y full-upgrade && apt -y clean && apt -y autoremove; \
-fi
+# adding raspberrypi repository
+RUN apt-get -y install --no-install-recommends ca-certificates curl gnupg; \
+    curl -fsSL http://archive.raspberrypi.org/debian/raspberrypi.gpg.key | gpg --dearmor -o /usr/share/keyrings/raspberrypi-archive-keyring.gpg; \
+    echo "deb [signed-by=/usr/share/keyrings/raspberrypi-archive-keyring.gpg] http://archive.raspberrypi.org/debian/ ${SUITE} main" > /etc/apt/sources.list.d/raspi.list; \
+    apt-get update
 
 # install qt5 or qt6 (qt6 is not available on debian buster/bullseye)
-RUN if [ "$SUITE" = "bookworm" ] && [ "$QT_VERSION" = "6" ]; then \
+RUN if [ "$SUITE" = "bookworm" ] || [ "$SUITE" = "trixie" ] && [ "$QT_VERSION" = "6" ]; then \
     apt-get -y install qt6-base-dev libqt6sql6-sqlite qt6-serialport-dev qt6-websockets-dev libxkbcommon-dev libvulkan-dev libgl1-mesa-dev; \
 else \
     apt-get -y install qtbase5-dev libqt5serialport5-dev libqt5websockets5-dev libqt5sql5-sqlite libqt5svg5-dev; \
@@ -41,7 +38,6 @@ RUN apt-get -y install \
     debhelper \
     libdistro-info-perl \
     git \
-    curl \
     python3-dev \
     build-essential \
     ninja-build \
@@ -58,9 +54,12 @@ RUN apt-get -y install \
     libmbedtls-dev \
     libftdi1-dev \
     libssl-dev \
-    libraspberrypi-dev \
     libglib2.0-dev \
     libdrm-dev
+
+RUN if [ "$SUITE" != "trixie" ]; then \
+    apt-get -y install --no-install-recommends libraspberrypi-dev; \
+fi
 
 # Mark /source as safe directory for git (used in CI mounts)
 RUN git config --system --add safe.directory /source

fedora

@@ -1,6 +1,6 @@
 ARG DIST="fedora"
 ARG SUITE="39"
-ARG QT_VERSION="5"
+ARG QT_VERSION="6"
 ARG REPOSITORY="https://github.com/hyperion-project"
 ARG CMAKE_VERSION="3.28.3"
 

ubuntu_debian

@@ -1,6 +1,6 @@
 ARG DIST="debian"
-ARG SUITE="buster"
-ARG QT_VERSION="5"
+ARG SUITE="bullseye"
+ARG QT_VERSION="6"
 ARG REPOSITORY="https://github.com/hyperion-project"
 ARG CMAKE_VERSION="3.28.3"
 ARG DEBIAN_FRONTEND=noninteractive