Merge pull request 'chore(deps): update docker/setup-qemu-action action to v4.2.0' (#107) from renovate/docker-setup-qemu-action-4.x into master

.gitea/workflows/build.yaml

@@ -1,5 +1,9 @@
 name: Build
 
+env:
+  # Introduce suffix for new upstream repository
+  RPMBUILDER_SUFFIX: rs
+
 on:
   pull_request:
     types:
@@ -15,9 +19,11 @@ jobs:
   build-arm64:
     runs-on: ubuntu-latest-arm64
     steps:
-      - uses: actions/checkout@v6.0.1
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-      - uses: docker/setup-qemu-action@v3.7.0
+      - uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
-      - uses: docker/setup-buildx-action@v3.12.0
+        with:
+          image: harbor.cryptic.systems/docker/tonistiigi/binfmt:latest
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
 
       - name: Build image
         run: |
@@ -27,15 +33,17 @@ jobs:
             --platform linux/arm64 \
             --file Dockerfile \
             --provenance false \
-            --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-arm64 \
+            --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-arm64 \
             .
 
   build-amd64:
     runs-on: ubuntu-latest-amd64
     steps:
-      - uses: actions/checkout@v6.0.1
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-      - uses: docker/setup-qemu-action@v3.7.0
+      - uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
-      - uses: docker/setup-buildx-action@v3.12.0
+        with:
+          image: harbor.cryptic.systems/docker/tonistiigi/binfmt:latest
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
 
       - name: Build image
         run: |
@@ -45,5 +53,5 @@ jobs:
             --platform linux/amd64 \
             --file Dockerfile \
             --provenance false \
-            --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-amd64 \
+            --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-amd64 \
             .

.gitea/workflows/markdown-linters.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on:
     - ubuntu-latest
     steps:
-    - uses: actions/checkout@v6.0.1
+    - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-    - uses: DavidAnson/markdownlint-cli2-action@v21.0.0
+    - uses: DavidAnson/markdownlint-cli2-action@ded1f9488f68a970bc66ea5619e13e9b52e601cd # v23.2.0
       with:
         globs: '**/*.md'

.gitea/workflows/release.yaml

@@ -1,5 +1,9 @@
 name: Release
 
+env:
+  # Introduce suffix for new upstream repository
+  RPMBUILDER_SUFFIX: rs
+
 on:
   push:
     tags:
@@ -9,11 +13,13 @@ jobs:
   push-arm64:
     runs-on: ubuntu-latest-arm64
     steps:
-      - uses: actions/checkout@v6.0.1
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-      - uses: docker/setup-qemu-action@v3.7.0
+      - uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
-      - uses: docker/setup-buildx-action@v3.12.0
+        with:
+          image: harbor.cryptic.systems/docker/tonistiigi/binfmt:latest
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
 
-      - uses: docker/login-action@v3.6.0
+      - uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4.3.0
         with:
           registry: git.cryptic.systems
           username: ${{ github.repository_owner }}
@@ -29,17 +35,19 @@ jobs:
             --platform linux/arm64 \
             --provenance false \
             --push \
-            --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-arm64 \
+            --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-arm64 \
             .
 
   push-amd64:
     runs-on: ubuntu-latest-amd64
     steps:
-      - uses: actions/checkout@v6.0.1
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-      - uses: docker/setup-qemu-action@v3.7.0
+      - uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
-      - uses: docker/setup-buildx-action@v3.12.0
+        with:
+          image: harbor.cryptic.systems/docker/tonistiigi/binfmt:latest
+      - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
 
-      - uses: docker/login-action@v3.6.0
+      - uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4.3.0
         with:
           registry: git.cryptic.systems
           username: ${{ github.repository_owner }}
@@ -55,7 +63,7 @@ jobs:
             --platform linux/amd64 \
             --provenance false \
             --push \
-            --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-amd64 \
+            --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-amd64 \
             .
 
   push-manifest:
@@ -64,7 +72,7 @@ jobs:
     - push-arm64
     - push-amd64
     steps:
-      - uses: docker/login-action@v3.6.0
+      - uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4.3.0
         with:
           registry: git.cryptic.systems
           username: ${{ github.repository_owner }}
@@ -74,11 +82,11 @@ jobs:
         run: |
           TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
 
-          docker manifest create git.cryptic.systems/volker.raschek/rpm-builder:${TAG} \
+          docker manifest create git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX} \
-            --amend git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-amd64 \
+            --amend git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-amd64 \
-            --amend git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-arm64
+            --amend git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-arm64
 
-          docker manifest push git.cryptic.systems/volker.raschek/rpm-builder:${TAG}
+          docker manifest push git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}
 
   sync-to-hub-docker-io:
     needs:
@@ -97,5 +105,5 @@ jobs:
           --dest-username ${{ secrets.DOCKER_IO_USERNAME }} \
           --src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \
           --src-username volker.raschek \
-            docker://git.cryptic.systems/volker.raschek/rpm-builder:${TAG} \
+            docker://git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX} \
-            docker://docker.io/volkerraschek/rpm-builder:${TAG}
+            docker://docker.io/volkerraschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}

.gitea/workflows/update-docker-hub-description.yaml

@@ -13,8 +13,8 @@ jobs:
     runs-on:
     - ubuntu-latest
     steps:
-    - uses: actions/checkout@v6.0.1
+    - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-    - uses: peter-evans/dockerhub-description@v5.0.0
+    - uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5.0.0
       with:
         username: ${{ secrets.DOCKER_IO_USERNAME }}
         password: ${{ secrets.DOCKER_IO_PASSWORD }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:1.92.0-slim-bullseye AS build
+FROM docker.io/library/rust:1.96.1-slim-bullseye AS build
 
 ARG RPMBUILDER_VERSION=master
 
@@ -9,11 +9,15 @@ RUN set -e && \
 
 # compile musl and rpm-builder
 RUN set -e && \
-    git clone -b rpm-builder-${RPMBUILDER_VERSION} https://github.com/rpm-rs/rpm-builder.git /rpm-builder && \
+    if [ "${RPMBUILDER_VERSION}" != "master" ]; then \
+      git clone -b rpm-builder-${RPMBUILDER_VERSION} https://github.com/rpm-rs/rpm-builder.git /rpm-builder; \
+    else \
+      git clone -b master https://github.com/rpm-rs/rpm-builder.git /rpm-builder; \
+    fi && \
     cd /rpm-builder && \
     cargo build --profile release
 
-FROM docker.io/library/debian:buster-slim
+FROM docker.io/library/debian:bullseye-slim
 
 COPY --from=build /rpm-builder/target/release/rpm-builder /usr/bin/rpm-builder
 

Makefile

@@ -15,7 +15,8 @@ RPMBUILDER_IMAGE_REGISTRY_USER?=volker.raschek
 RPMBUILDER_IMAGE_NAMESPACE?=${RPMBUILDER_IMAGE_REGISTRY_USER}
 RPMBUILDER_IMAGE_NAME:=rpm-builder
 RPMBUILDER_IMAGE_VERSION?=latest
-RPMBUILDER_IMAGE_FULLY_QUALIFIED=${RPMBUILDER_IMAGE_REGISTRY_NAME}/${RPMBUILDER_IMAGE_NAMESPACE}/${RPMBUILDER_IMAGE_NAME}:${RPMBUILDER_IMAGE_VERSION}
+RPMBUILDER_IMAGE_SUFFIX?=rs
+RPMBUILDER_IMAGE_FULLY_QUALIFIED=${RPMBUILDER_IMAGE_REGISTRY_NAME}/${RPMBUILDER_IMAGE_NAMESPACE}/${RPMBUILDER_IMAGE_NAME}:${RPMBUILDER_IMAGE_VERSION}-${RPMBUILDER_IMAGE_SUFFIX}
 
 # BUILD CONTAINER IMAGE
 # ==============================================================================