From 1f86e4a96601db10e08db2ec6911e12a03a4feb3 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 19 Sep 2025 08:41:05 -0400
Subject: [PATCH 1/5] Services step fix.

---
 .gitea/workflows/renovate-pr-deploy.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/renovate-pr-deploy.yml b/.gitea/workflows/renovate-pr-deploy.yml
index 117faf5..508ad9e 100644
--- a/.gitea/workflows/renovate-pr-deploy.yml
+++ b/.gitea/workflows/renovate-pr-deploy.yml
@@ -40,13 +40,13 @@ jobs:
         id: services
         run: |
           # Ensure we have main branch available
-          git fetch origin main --depth=1
+          git fetch origin main
 
-          # Find the common ancestor (merge-base) between PR branch and main
-          base=$(git merge-base origin/main ${{ github.sha }})
+          # Find the common ancestor (merge-base) between PR HEAD and main
+          base=$(git merge-base HEAD origin/main)
 
           # Get all image names added/changed in docker-compose.yml since base
-          images=$(git diff $base ${{ github.sha }} -- docker-compose.yml \
+          images=$(git diff $base HEAD -- docker-compose.yml \
             | grep -E '^\+.*image:' \
             | sed -E 's/.*image:[[:space:]]*//g' \
             | awk -F: '{print $1}' \
-- 
2.52.0


From 767269ecb5328b0b5ec1d88f128c0cbe466b0a24 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 19 Sep 2025 08:46:00 -0400
Subject: [PATCH 2/5] Correcting tag.

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 735a340..56a9dbf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -176,7 +176,7 @@ services:
       - /run/dbus:/run/dbus:ro
   ollama:
     container_name: ollama
-    image: ollama/ollama:0.12.0
+    image: ollama/ollama:v0.12.0
     ports:
       - 11434:11434
     restart: unless-stopped
-- 
2.52.0


From f8a425714c94e52e1d1b4c1e3179901c538f59c8 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 19 Sep 2025 08:49:41 -0400
Subject: [PATCH 3/5] Correcting tag.

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 56a9dbf..735a340 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -176,7 +176,7 @@ services:
       - /run/dbus:/run/dbus:ro
   ollama:
     container_name: ollama
-    image: ollama/ollama:v0.12.0
+    image: ollama/ollama:0.12.0
     ports:
       - 11434:11434
     restart: unless-stopped
-- 
2.52.0


From bc5d39f884fc900253316ddc200a46f5d20340d1 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 19 Sep 2025 08:57:25 -0400
Subject: [PATCH 4/5] Correcting tag.

---
 .gitea/workflows/pr-docker-deploy.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml
index 73ed70b..26bc677 100644
--- a/.gitea/workflows/pr-docker-deploy.yml
+++ b/.gitea/workflows/pr-docker-deploy.yml
@@ -186,9 +186,6 @@ jobs:
           ssh_key: ${{ secrets.RIKKU_SSH_PRIVATE_KEY }}
           args: --remove-orphans -d --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }}
           env_file: '.env'
-          registry_host: 'ghcr.io'
-          registry_user: TrezOne
-          registry_pass: ${{ secrets.GHCR_LOGIN_TOKEN }}
           summary: true
 
       - name: Gotify Notification
-- 
2.52.0


From c03214cd9a37bd53cdeab403e04a2d641ff98ca4 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 19 Sep 2025 09:07:03 -0400
Subject: [PATCH 5/5] Re-adding login info for ghcr.io and adding login for
 Docker Hub.

---
 .gitea/workflows/pr-docker-deploy.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitea/workflows/pr-docker-deploy.yml b/.gitea/workflows/pr-docker-deploy.yml
index 26bc677..1dcf99b 100644
--- a/.gitea/workflows/pr-docker-deploy.yml
+++ b/.gitea/workflows/pr-docker-deploy.yml
@@ -150,6 +150,12 @@ jobs:
         run: |
           docker login -u gitea-sonarqube-bot -p ${RIKKU_REGISTRY_PASSWORD} git.trez.wtf
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
       - name: Cache Vault install
         id: cache-vault
         uses: actions/cache@v4
@@ -186,6 +192,9 @@ jobs:
           ssh_key: ${{ secrets.RIKKU_SSH_PRIVATE_KEY }}
           args: --remove-orphans -d --dry-run ${{ needs.generate-service-list.outputs.svc_deploy_list }}
           env_file: '.env'
+          registry_host: 'ghcr.io'
+          registry_user: TrezOne
+          registry_pass: ${{ secrets.GHCR_LOGIN_TOKEN }}
           summary: true
 
       - name: Gotify Notification
-- 
2.52.0