From 62759dcdb3a37a09e074ed6277e9d7ad4dec138d Mon Sep 17 00:00:00 2001
From: Ryan Freeman <hello@ryanfreeman.dev>
Date: Wed, 28 Aug 2024 16:13:01 +0100
Subject: [PATCH] Update workflow

---
 .gitea/workflows/publish.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml
index 9d97226..e45d61c 100644
--- a/.gitea/workflows/publish.yml
+++ b/.gitea/workflows/publish.yml
@@ -19,7 +19,7 @@ jobs:
         env:
           SECRET_PASSPHRASE: ${{ secrets.SECRET_PASSPHRASE }}
 
-      - name: Login to Docker Hub
+      - name: Login to registry
         uses: docker/login-action@v3
         with:
           registry: git.ryansnet.xyz
@@ -30,15 +30,15 @@ jobs:
         uses: https://github.com/docker/setup-buildx-action@v3
         with:
           config-inline: |
-            [registry."git.ryansnet.xyz"]
+            [registry."${{secrets.REGISTRY_URL}}"]
 
-      - name: Build and push Docker image
-        uses: https://github.com/docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{secrets.DOCKER_HUB_USERNAME}}/${{vars.REPO_NAME}}:latest
+      - name: Build and tag image
+        run: |
+          docker build -t ${{secrets.REGISTRY_URL}}/${{secrets.REGISTRY_USERNAME}}/${{secrets.REPO_NAME}}:latest .
+          docker tag ${{secrets.REGISTRY_URL}}/${{secrets.REGISTRY_USERNAME}}/${{secrets.REPO_NAME}}:latest ${{secrets.REGISTRY_URL}}/${{secrets.REGISTRY_USERNAME}}/${{secrets.REPO_NAME}}:latest
+
+      - name: Push image
+        run: docker push ${{secrets.REGISTRY_URL}}/${{secrets.REGISTRY_USERNAME}}/${{secrets.REPO_NAME}}:latest
 
       - name: Stop and remove old Docker container
         continue-on-error: true
@@ -48,9 +48,9 @@ jobs:
 
       - name: Pull new image and start Docker container
         run: |
-          sudo docker pull ${{secrets.DOCKER_HUB_USERNAME}}/${{vars.REPO_NAME}}:latest
+          sudo docker pull ${{secrets.REGISTRY_URL}}/${{secrets.REGISTRY_USERNAME}}/${{vars.REPO_NAME}}:latest
           sudo docker run -d --restart unless-stopped \
           --env-file ./.env \
           --name portfolio \
           -p ${{vars.DEPLOY_IP}}:3000:3000 \
-          ${{secrets.DOCKER_HUB_USERNAME}}/${{vars.REPO_NAME}}:latest
\ No newline at end of file
+          ${{secrets.REGISTRY_URL}}/${{secrets.REGISTRY_USERNAME}}/${{vars.REPO_NAME}}:latest
\ No newline at end of file