From bff8ae7be47e1e6b1c9fa33f5d1eba9bbf1704e6 Mon Sep 17 00:00:00 2001
From: Jens <1742418+1cu@users.noreply.github.com>
Date: Fri, 5 Jun 2026 10:46:45 +0200
Subject: [PATCH] fix: align Docker tags with release channels (#1081)

## Description

- Link to the related issue(s): Issue #1077
- Align Docker image tags with the existing GitHub release channels so
`main` publishes preview images and `release` publishes stable latest
images.

## Changes Summary

- Publish per-arch Docker images as `preview-amd64` / `preview-arm64`
from `main`.
- Publish per-arch Docker images as `latest-amd64` / `latest-arm64` from
`release`.
- Stitch the matching multi-arch channel manifest as `:preview` or
`:latest`.
- Document `:latest` as the stable Docker image tag and mention
`:preview` in the README.

### Type of Change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (adds new functionality without breaking existing
usage)
- [ ] Breaking change (changes that might break existing user setups,
scripts, or configurations)

## Validation

- [x] `pdm run format`
- [x] `pdm run lint`
- [x] `pdm run test` (`1176 passed, 4 skipped`)

## Checklist

- [x] I have reviewed my changes to ensure they meet the project's
standards.
- [x] I have tested my changes and ensured that all tests pass (`pdm run
test`).
- [x] I have formatted the code (`pdm run format`).
- [x] I have verified that linting passes (`pdm run lint`).
- [x] I have updated documentation where necessary.

By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice.


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **New Features**
  * Docker preview channel is now available for testing

* **Documentation**
* Updated Docker installation instructions with image references and
guidance on using the preview channel

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .github/workflows/build.yml | 46 ++++++++++++++++++++++++++-----------
 README.md                   |  4 +++-
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8be3303..ba8ea7d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,12 +43,12 @@ on:  # https://docs.github.com/en/actions/reference/workflows-and-actions/events
     # https://docs.github.com/en/actions/reference/workflows-and-actions/events-that-trigger-workflows#workflow_dispatch
 
 
-# Serialize runs per branch so concurrent main merges cannot race on the shared
-# ghcr.io :latest tag. Main queues publishing runs; non-main runs cancel older
-# attempts when new commits land.
+# Serialize runs per branch so concurrent main/release merges cannot race on
+# their shared ghcr.io channel tags. Publishing branches queue runs; other
+# branches cancel older attempts when new commits land.
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/release' }}
 
 
 env:
@@ -322,16 +322,25 @@ jobs:
 
 
     - name: Publish Docker image
-      if: github.repository_owner == 'Second-Hand-Friends' && github.ref_name == 'main' && matrix.PUBLISH_RELEASE && startsWith(matrix.os, 'ubuntu') && !env.ACT
+      if: github.repository_owner == 'Second-Hand-Friends' && (github.ref_name == 'main' || github.ref_name == 'release') && matrix.PUBLISH_RELEASE && startsWith(matrix.os, 'ubuntu') && !env.ACT
       run: |
         set -eux
 
         echo "${{ github.token }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
 
+        case "$GITHUB_REF_NAME" in
+          main)
+            docker_channel=preview
+            ;;
+          release)
+            docker_channel=latest
+            ;;
+        esac
+
         arch=$(docker image inspect "$IMAGE_NAME" --format '{{.Architecture}}')
 
-        docker image tag "$IMAGE_NAME" "$REGISTRY_IMAGE:latest-$arch"
-        docker push "$REGISTRY_IMAGE:latest-$arch"
+        docker image tag "$IMAGE_NAME" "$REGISTRY_IMAGE:$docker_channel-$arch"
+        docker push "$REGISTRY_IMAGE:$docker_channel-$arch"
 
 
     - name: Collect coverage reports
@@ -347,12 +356,12 @@ jobs:
   ###########################################################
   publish-docker-manifest:
   ###########################################################
-    # Combine the per-arch tags from the matrix into one multi-arch :latest
-    # manifest. Without this, the last matrix push wins and :latest is single-arch.
+    # Combine the per-arch tags from the matrix into one multi-arch channel
+    # manifest. Without this, the last matrix push wins and the channel is single-arch.
     needs: [build]
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    if: github.repository_owner == 'Second-Hand-Friends' && github.ref_name == 'main' && !github.event.act
+    if: github.repository_owner == 'Second-Hand-Friends' && (github.ref_name == 'main' || github.ref_name == 'release') && !github.event.act
 
     permissions:
       # Required to publish the stitched multi-arch manifest to ghcr.io.
@@ -368,13 +377,22 @@ jobs:
 
         echo "${{ github.token }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
 
+        case "$GITHUB_REF_NAME" in
+          main)
+            docker_channel=preview
+            ;;
+          release)
+            docker_channel=latest
+            ;;
+        esac
+
         docker buildx imagetools create \
-          --tag "$REGISTRY_IMAGE:latest" \
-          "$REGISTRY_IMAGE:latest-amd64" \
-          "$REGISTRY_IMAGE:latest-arm64"
+          --tag "$REGISTRY_IMAGE:$docker_channel" \
+          "$REGISTRY_IMAGE:$docker_channel-amd64" \
+          "$REGISTRY_IMAGE:$docker_channel-arm64"
 
         # Print the resulting manifest list for the run log.
-        docker buildx imagetools inspect "$REGISTRY_IMAGE:latest"
+        docker buildx imagetools inspect "$REGISTRY_IMAGE:$docker_channel"
 
 
   ###########################################################
diff --git a/README.md b/README.md
index c86fa4e..ccfdac9 100644
--- a/README.md
+++ b/README.md
@@ -103,10 +103,12 @@ Die Nutzung erfolgt auf eigenes Risiko. Jede rechtswidrige Verwendung ist unters
      --shm-size=256m \
      -e DISPLAY=$X11_DISPLAY \
      -v $DATA_DIR:/mnt/data \
-     ghcr.io/second-hand-friends/kleinanzeigen-bot \
+     ghcr.io/second-hand-friends/kleinanzeigen-bot:latest \
      --help
    ```
 
+   Use `ghcr.io/second-hand-friends/kleinanzeigen-bot:preview` for the preview channel.
+
 ### Installation from source
 
 1. The following components need to be installed: