From b789f67ec7df8fe5e84d1ca4bc0ab3ad7e1f0206 Mon Sep 17 00:00:00 2001
From: Grzegorz Matoga <grzegorz.matoga@ocado.com>
Date: Thu, 24 Jul 2025 18:24:18 +0200
Subject: [PATCH] refactor: streamline git clone and docker build steps in
 workflow

---
 .gitea/workflows/build-and-push.yaml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml
index 6c702ae..f35aa30 100644
--- a/.gitea/workflows/build-and-push.yaml
+++ b/.gitea/workflows/build-and-push.yaml
@@ -11,19 +11,21 @@ jobs:
     steps:
       - name: Clone repository
         run: |
-          # Configure git to use the token
-          git config --global credential.helper store
-          echo "https://${{ gitea.actor }}:${{ secrets.GITEATOKEN }}@${{ gitea.server_url }}" > ~/.git-credentials
-          
-          # Clone without credentials in URL
-          git clone ${{ gitea.server_url }}/${{ gitea.repository }}.git .
+          git clone https://${{ gitea.actor }}:${{ secrets.GITEATOKEN }}@${{ gitea.server_url }}/${{ gitea.repository }}.git .
           git checkout ${{ gitea.sha }}
-          
-          # Clean up credentials
-          rm ~/.git-credentials
       
       - name: Build and push
         run: |
-          echo "${{ secrets.GITEATOKEN }}" | docker login ${{ gitea.server_url }} -u ${{ gitea.actor }} --password-stdin
-          docker build -t ${{ gitea.server_url }}/${{ gitea.repository_owner }}/hello-gitea:latest .
-          docker push ${{ gitea.server_url }}/${{ gitea.repository_owner }}/hello-gitea:latest
+          # Login to registry
+          echo "${{ secrets.GITEATOKEN }}" | docker login "${{ gitea.server_url }}" -u "${{ gitea.actor }}" --password-stdin
+          
+          # Build with correct image format (no https://)
+          # Format: registry-host/owner/image:tag
+          IMAGE_NAME="git.eurekin.pl/${{ gitea.repository_owner }}/hello-gitea"
+          
+          # Ensure lowercase
+          IMAGE_NAME=$(echo "$IMAGE_NAME" | tr '[:upper:]' '[:lower:]')
+          
+          echo "Building image: $IMAGE_NAME:latest"
+          docker build -t "${IMAGE_NAME}:latest" .
+          docker push "${IMAGE_NAME}:latest"
\ No newline at end of file