From a36a9ed8f6d04f768ab677b50b4727267e2746fe Mon Sep 17 00:00:00 2001
From: Patrick Sy <patrick.sy@telekom.de>
Date: Thu, 2 Oct 2025 16:28:50 +0200
Subject: [PATCH 1/2] ci: Changed sha tag name, using docker tag in deployment

---
 .forgejo/workflows/build.yaml  |  2 +-
 .forgejo/workflows/deploy.yaml | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index a1cf071..728b67d 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -27,7 +27,7 @@ jobs:
         with:
           images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}
           tags: |
-            type=sha
+            type=sha,prefix=
             type=ref,event=tag
       -
         name: Login to registry
diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 804a6d5..b099c7e 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -15,9 +15,29 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Repository meta
+        id: repository
+        run: |
+          registry=${{ github.server_url }}
+          registry=${registry##http*://}
+          echo "registry=${registry}" >> "$GITHUB_OUTPUT"
+          echo "registry=${registry}"
+          repository="$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')"
+          echo "repository=${repository}" >> "$GITHUB_OUTPUT"
+          echo "repository=${repository}"
+
+      - name: Docker meta
+        uses: docker/metadata-action@v5
+        id: docker
+        with:
+          images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}
+          tags: |
+            type=sha,prefix=
+
       - name: Replace Image Version
-        runs: |
-          sed -i "s/###IMAGETAG###/${{ github.sha }}/g" ./EdgeConnectConfig.yaml
+        run: |
+          echo sed -i "s/###IMAGETAG###/${{ steps.docker.outputs.tags }}/g" ./EdgeConnectConfig.yaml
+          sed -i "s/###IMAGETAG###/${{ steps.docker.outputs.tags }}/g" ./EdgeConnectConfig.yaml
           cat ./EdgeConnectConfig.yaml
 
       - name: Deploy action

From 06d7f5f9806f0c48ef2e62cd64278b079a6f67e9 Mon Sep 17 00:00:00 2001
From: Patrick Sy <patrick.sy@telekom.de>
Date: Thu, 2 Oct 2025 16:31:48 +0200
Subject: [PATCH 2/2] ci: hardcoded image coordinates

---
 .forgejo/workflows/deploy.yaml | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index b099c7e..aa178e6 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -15,29 +15,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Repository meta
-        id: repository
-        run: |
-          registry=${{ github.server_url }}
-          registry=${registry##http*://}
-          echo "registry=${registry}" >> "$GITHUB_OUTPUT"
-          echo "registry=${registry}"
-          repository="$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')"
-          echo "repository=${repository}" >> "$GITHUB_OUTPUT"
-          echo "repository=${repository}"
-
-      - name: Docker meta
-        uses: docker/metadata-action@v5
-        id: docker
-        with:
-          images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}
-          tags: |
-            type=sha,prefix=
-
       - name: Replace Image Version
         run: |
-          echo sed -i "s/###IMAGETAG###/${{ steps.docker.outputs.tags }}/g" ./EdgeConnectConfig.yaml
-          sed -i "s/###IMAGETAG###/${{ steps.docker.outputs.tags }}/g" ./EdgeConnectConfig.yaml
+          echo sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${{ github.sha }}@g" ./EdgeConnectConfig.yaml
+          sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${{ github.sha }}@g" ./EdgeConnectConfig.yaml
           cat ./EdgeConnectConfig.yaml
 
       - name: Deploy action