From 7ba5cd4e75b3813d5931ad0dc5f88c04ab247937 Mon Sep 17 00:00:00 2001
From: Patrick Niebeling <patrick.niebeling@adacor.com>
Date: Wed, 20 Nov 2024 13:13:26 +0100
Subject: [PATCH] Extend Workflow

Signed-off-by: Patrick Niebeling <patrick.niebeling@adacor.com>
---
 .gitea/workflows/deploy copy.bak | 31 +++++++++++++++++++++
 .gitea/workflows/deploy.yaml     | 46 +++++++++++++++-----------------
 2 files changed, 52 insertions(+), 25 deletions(-)
 create mode 100644 .gitea/workflows/deploy copy.bak

diff --git a/.gitea/workflows/deploy copy.bak b/.gitea/workflows/deploy copy.bak
new file mode 100644
index 0000000..51230a4
--- /dev/null
+++ b/.gitea/workflows/deploy copy.bak	
@@ -0,0 +1,31 @@
+name: Deploy Container Image to Registry
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Build Image
+        run: |
+          echo "[***] Build hook running"
+          cd ${{ gitea.workspace }}/StableV2/
+          VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1)
+
+          docker build \
+          --build-arg VERSION=${VERSION} \
+          --build-arg COMMIT=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^\([[:xdigit:]]\{40\}\)[[:blank:]]refs\/tags\/${VERSION}^{}$/\1/p" |  xargs git rev-parse --short) \
+          --build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) \
+          --build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
+          -t ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }} -t ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}:$VERSION .
+      - name: Push Image
+        run: |
+          echo '${{ vars.DOCKER_AUTH_CONFIG }}' > ~/.docker/config.json
+          cat ~/.docker/config.json
+          VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1)
+          docker push ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}
+          docker push ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}:${VERSION}
\ No newline at end of file
diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 51230a4..134115d 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -1,31 +1,27 @@
 name: Deploy Container Image to Registry
-on:
-  push:
-    branches:
-      - main
+on: ['push']
 
 jobs:
-  build-image:
+  docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - name: Build Image
-        run: |
-          echo "[***] Build hook running"
-          cd ${{ gitea.workspace }}/StableV2/
-          VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
-          docker build \
-          --build-arg VERSION=${VERSION} \
-          --build-arg COMMIT=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^\([[:xdigit:]]\{40\}\)[[:blank:]]refs\/tags\/${VERSION}^{}$/\1/p" |  xargs git rev-parse --short) \
-          --build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) \
-          --build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
-          -t ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }} -t ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}:$VERSION .
-      - name: Push Image
-        run: |
-          echo '${{ vars.DOCKER_AUTH_CONFIG }}' > ~/.docker/config.json
-          cat ~/.docker/config.json
-          VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1)
-          docker push ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}
-          docker push ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}:${VERSION}
\ No newline at end of file
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.REG_GITEA_USERNAME }}
+          password: ${{ secrets.REG_GITEA_PASSWORD }}
+      # - name: Build and push
+      #   uses: docker/build-push-action@v6
+      #   with:
+      #     platforms: linux/amd64,linux/arm64
+      #     push: true
+      #     tags: |
+      #       user/app:latest
+      #       user/app:1.0.0
\ No newline at end of file