fix(Dockerfile): checkout correct branch

.gitea/workflows/build.yaml

@@ -1,5 +1,9 @@
 name: Build
 
+env:
+  # Introduce suffix for new upstream repository
+  RPMBUILDER_SUFFIX: rs
+
 on:
   pull_request:
     types:
@@ -27,7 +31,7 @@ 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:
@@ -45,5 +49,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/release.yaml

@@ -1,5 +1,9 @@
 name: Release
 
+env:
+  # Introduce suffix for new upstream repository
+  RPMBUILDER_SUFFIX: rs
+
 on:
   push:
     tags:
@@ -29,7 +33,7 @@ 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:
@@ -55,7 +59,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:
@@ -74,11 +78,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 +101,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}

Dockerfile

@@ -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
 # ==============================================================================