From 47de7a9e426ac28242f7ca2242c420b90236485e Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Thu, 5 Jan 2023 17:34:16 +0100
Subject: [PATCH] GHA: handle changed interface of Icinga/docker-icinga2

---
 .github/workflows/docker.yml | 17 ++++++++++++++---
 RELEASE.md                   | 25 -------------------------
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6385f787b..1e59e7329 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -11,7 +11,19 @@ on:
       - published
 
 jobs:
+  docker-release:
+    if: github.event_name == 'release'
+    concurrency: docker-release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Docker image
+        uses: Icinga/docker-icinga2@master
+        with:
+          dockerhub-token: '${{ secrets.DOCKER_HUB_PERSONAL_TOKEN }}'
+
   docker:
+    if: github.event_name != 'release'
     runs-on: ubuntu-latest
 
     steps:
@@ -24,6 +36,5 @@ jobs:
 
       - name: Docker image
         uses: Icinga/docker-icinga2@master
-        env:
-          INPUT_TOKEN: '${{ github.token }}'
-          DOCKER_HUB_PASSWORD: '${{ secrets.DOCKER_HUB_PERSONAL_TOKEN }}'
+        with:
+          dockerhub-token: '${{ secrets.DOCKER_HUB_PERSONAL_TOKEN }}'
diff --git a/RELEASE.md b/RELEASE.md
index 8efb6d787..b52905998 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -361,31 +361,6 @@ The release body should contain a short changelog, with links
 into the roadmap, changelog and blogpost.
 
 
-## Docker  <a id="docker"></a>
-
-> Only for final versions (not for RCs).
-
-Once the release has been published on GitHub, wait for its
-[GitHub actions](https://github.com/Icinga/icinga2/actions) to complete.
-
-```bash
-VERSION=2.12.1
-
-TAGS=(2.12)
-#TAGS=(2.12 2 latest)
-
-docker pull icinga/icinga2:$VERSION
-
-for t in "${TAGS[@]}"; do
-  docker tag icinga/icinga2:$VERSION icinga/icinga2:$t
-done
-
-for t in "${TAGS[@]}"; do
-  docker push icinga/icinga2:$t
-done
-```
-
-
 ## Post Release  <a id="post-release"></a>
 
 ### Online Documentation  <a id="online-documentation"></a>