From 699038df2bf69e7931bc23abbe0f8d56586346b0 Mon Sep 17 00:00:00 2001
From: Johannes Kiesel <johannes.kiesel@uni-weimar.de>
Date: Mon, 13 Jan 2025 15:44:49 +0100
Subject: [PATCH] improve RAD CI pipeline

---
 .github/workflows/rad25-base.yml              | 25 ++++++++-----------
 .../debating-systems/base/Dockerfile          |  4 +++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/rad25-base.yml b/.github/workflows/rad25-base.yml
index 1512834..ddcd062 100644
--- a/.github/workflows/rad25-base.yml
+++ b/.github/workflows/rad25-base.yml
@@ -3,11 +3,12 @@ name: Publish RAD25 base image to GitHub Packages
 on:
   push:
     tags:
-      - v*
+      - rad25-base-v*
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
+  IMAGE_NAME: ${{ touche-webis-de/touche25-retrieval-augmented-debating-base }}
+  SRC_PATH: ${{ ./clef25/retrieval-augmented-debating/debating-systems/base/ }}
 
 jobs:
   build-and-publish:
@@ -21,7 +22,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Log in to the Container registry
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -29,22 +30,18 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/touche-webis-de/touche25-retrieval-augmented-debating-base
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-          labels: |
-            org.opencontainers.image.description=Base image for the Retrieval-Augmented Debating 2025 task
-            org.opencontainers.image.url=https://github.com/touche-webis-de/touche-code/tree/main/clef25/retrieval-augmented-debating/debating-systems/base
-            org.opencontainers.image.source=https://github.com/touche-webis-de/touche-code/tree/main/clef25/retrieval-augmented-debating/debating-systems/base
+            type=match,pattern=v(\d.\d.\d),group=1
+            type=match,pattern=v(\d.\d),group=1
+            type=match,pattern=v(\d),group=1
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        uses: docker/build-push-action@v6
         with:
-          context: ./clef25/retrieval-augmented-debating/debating-systems/base/
+          context: ${{ env.SRC_PATH }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/clef25/retrieval-augmented-debating/debating-systems/base/Dockerfile b/clef25/retrieval-augmented-debating/debating-systems/base/Dockerfile
index 201753e..723c7c7 100644
--- a/clef25/retrieval-augmented-debating/debating-systems/base/Dockerfile
+++ b/clef25/retrieval-augmented-debating/debating-systems/base/Dockerfile
@@ -1,5 +1,9 @@
 ARG BASE_IMAGE=ubuntu:24.04
 
+LABEL org.opencontainers.image.description="Base image for the Retrieval-Augmented Debating 2025 task"
+LABEL org.opencontainers.image.url="https://github.com/touche-webis-de/touche-code/tree/main/clef25/retrieval-augmented-debating/debating-systems/base"
+LABEL org.opencontainers.image.source="https://github.com/touche-webis-de/touche-code/tree/main/clef25/retrieval-augmented-debating/debating-systems/base"
+
 FROM ${BASE_IMAGE}
 ARG NVM_VERSION=0.40.1
 ARG NODE_VERSION=23.6.0