From 4846b69d644fb520547e295d8c92fc8930756fde Mon Sep 17 00:00:00 2001
From: Kriss Milne <kriss@krissmilne.tech>
Date: Sat, 10 Jan 2026 03:03:50 +0000
Subject: [PATCH 1/4] Update build to only build server

---
 .github/workflows/tdarr_build_push.yml | 58 ++++++++++++++------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/tdarr_build_push.yml b/.github/workflows/tdarr_build_push.yml
index 0612427..8541678 100644
--- a/.github/workflows/tdarr_build_push.yml
+++ b/.github/workflows/tdarr_build_push.yml
@@ -6,38 +6,38 @@ on:
   workflow_dispatch:
 
 jobs:
-  build_and_push_tdarr_base:
-    name: Build and Push tdarr_base
-    runs-on: ubuntu-latest
-    outputs:
-      date: ${{ steps.date.outputs.date }}
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v5
+  # build_and_push_tdarr_base:
+  #   name: Build and Push tdarr_base
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     date: ${{ steps.date.outputs.date }}
+  #   steps:
+  #     - name: Checkout source
+  #       uses: actions/checkout@v5
 
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+  #     - name: Log in to Docker Hub
+  #       uses: docker/login-action@v3
+  #       with:
+  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
+  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Extract date for tag
-        id: date
-        run: echo "date=$(date +'%Y%m%d')" >> "$GITHUB_OUTPUT"
+  #     - name: Extract date for tag
+  #       id: date
+  #       run: echo "date=$(date +'%Y%m%d')" >> "$GITHUB_OUTPUT"
 
-      - name: Build and push tdarr_base Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: docker/tdarr_base
-          push: true
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/tdarr_base:noble_${{ steps.date.outputs.date }}
-            ${{ secrets.DOCKERHUB_USERNAME }}/tdarr_base:latest
+  #     - name: Build and push tdarr_base Docker image
+  #       uses: docker/build-push-action@v6
+  #       with:
+  #         context: docker/tdarr_base
+  #         push: true
+  #         tags: |
+  #           ${{ secrets.DOCKERHUB_USERNAME }}/tdarr_base:noble_${{ steps.date.outputs.date }}
+  #           ${{ secrets.DOCKERHUB_USERNAME }}/tdarr_base:latest
 
   build_and_push_tdarr_server:
     name: Build and Push tdarr_server
     runs-on: ubuntu-latest
-    needs: build_and_push_tdarr_base
+    # needs: build_and_push_tdarr_base
     steps:
       - name: Checkout source
         uses: actions/checkout@v5
@@ -48,6 +48,10 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Extract date for tag
+        id: date
+        run: echo "date=$(date +'%Y%m%d')" >> "$GITHUB_OUTPUT"
+
       - name: Build and push tdarr_base Docker image
         uses: docker/build-push-action@v6
         with:
@@ -57,7 +61,7 @@ jobs:
           build-args: |
             VERSION=2.58.02
             MODULE=Tdarr_Server
-            DATE=${{ needs.build_and_push_tdarr_base.outputs.date }}
+            DATE=${{ steps.date.outputs.date }}
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/tdarr:noble_${{ needs.build_and_push_tdarr_base.outputs.date }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/tdarr:noble_${{ steps.date.outputs.date }}
             ${{ secrets.DOCKERHUB_USERNAME }}/tdarr:latest
\ No newline at end of file

From 57b6f7ff49c9bb1d200c4d48dcc311229c9356ac Mon Sep 17 00:00:00 2001
From: Kriss Milne <kriss@krissmilne.tech>
Date: Sat, 10 Jan 2026 03:04:02 +0000
Subject: [PATCH 2/4] Add DATE to second context

---
 docker/tdarr/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/tdarr/Dockerfile b/docker/tdarr/Dockerfile
index 2ff5d62..7162364 100644
--- a/docker/tdarr/Dockerfile
+++ b/docker/tdarr/Dockerfile
@@ -4,6 +4,7 @@ FROM krissmilne/tdarr_base:noble_${DATE}
 
 ARG VERSION
 ARG MODULE
+ARG DATE
 
 ENV WEB_UI_PORT="8265" SERVER_PORT="8266" NODE_PORT="8267" PUID="1000" PGID="1000" UMASK="002" TZ="Etc/UTC" HOME="/home/Tdarr"
 

From 0cbc7cc38bfce0fe664f25391c7f9cb759234278 Mon Sep 17 00:00:00 2001
From: Kriss Milne <kriss@krissmilne.tech>
Date: Sat, 10 Jan 2026 03:10:50 +0000
Subject: [PATCH 3/4] Set DATE to fixed date for tdarr version due to stupid
 test case

---
 docker/tdarr/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker/tdarr/Dockerfile b/docker/tdarr/Dockerfile
index 7162364..39dd0e8 100644
--- a/docker/tdarr/Dockerfile
+++ b/docker/tdarr/Dockerfile
@@ -4,9 +4,8 @@ FROM krissmilne/tdarr_base:noble_${DATE}
 
 ARG VERSION
 ARG MODULE
-ARG DATE
 
-ENV WEB_UI_PORT="8265" SERVER_PORT="8266" NODE_PORT="8267" PUID="1000" PGID="1000" UMASK="002" TZ="Etc/UTC" HOME="/home/Tdarr"
+ENV WEB_UI_PORT="8265" SERVER_PORT="8266" NODE_PORT="8267" PUID="1000" PGID="1000" UMASK="002" TZ="Etc/UTC" HOME="/home/Tdarr" DATE="2025_11_21T08_22_03z"
 
 ENV VERSION="${VERSION}"
 ENV MODULE="${MODULE}"

From a55296620164d5711ac9bfe0b172e5d340922c30 Mon Sep 17 00:00:00 2001
From: Kriss Milne <kriss@krissmilne.tech>
Date: Sat, 10 Jan 2026 03:18:55 +0000
Subject: [PATCH 4/4] revert build config to master

---
 .github/workflows/tdarr_build_push.yml | 58 ++++++++++++--------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/tdarr_build_push.yml b/.github/workflows/tdarr_build_push.yml
index 8541678..0612427 100644
--- a/.github/workflows/tdarr_build_push.yml
+++ b/.github/workflows/tdarr_build_push.yml
@@ -6,38 +6,38 @@ on:
   workflow_dispatch:
 
 jobs:
-  # build_and_push_tdarr_base:
-  #   name: Build and Push tdarr_base
-  #   runs-on: ubuntu-latest
-  #   outputs:
-  #     date: ${{ steps.date.outputs.date }}
-  #   steps:
-  #     - name: Checkout source
-  #       uses: actions/checkout@v5
+  build_and_push_tdarr_base:
+    name: Build and Push tdarr_base
+    runs-on: ubuntu-latest
+    outputs:
+      date: ${{ steps.date.outputs.date }}
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v5
 
-  #     - name: Log in to Docker Hub
-  #       uses: docker/login-action@v3
-  #       with:
-  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
-  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-  #     - name: Extract date for tag
-  #       id: date
-  #       run: echo "date=$(date +'%Y%m%d')" >> "$GITHUB_OUTPUT"
+      - name: Extract date for tag
+        id: date
+        run: echo "date=$(date +'%Y%m%d')" >> "$GITHUB_OUTPUT"
 
-  #     - name: Build and push tdarr_base Docker image
-  #       uses: docker/build-push-action@v6
-  #       with:
-  #         context: docker/tdarr_base
-  #         push: true
-  #         tags: |
-  #           ${{ secrets.DOCKERHUB_USERNAME }}/tdarr_base:noble_${{ steps.date.outputs.date }}
-  #           ${{ secrets.DOCKERHUB_USERNAME }}/tdarr_base:latest
+      - name: Build and push tdarr_base Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: docker/tdarr_base
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/tdarr_base:noble_${{ steps.date.outputs.date }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/tdarr_base:latest
 
   build_and_push_tdarr_server:
     name: Build and Push tdarr_server
     runs-on: ubuntu-latest
-    # needs: build_and_push_tdarr_base
+    needs: build_and_push_tdarr_base
     steps:
       - name: Checkout source
         uses: actions/checkout@v5
@@ -48,10 +48,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Extract date for tag
-        id: date
-        run: echo "date=$(date +'%Y%m%d')" >> "$GITHUB_OUTPUT"
-
       - name: Build and push tdarr_base Docker image
         uses: docker/build-push-action@v6
         with:
@@ -61,7 +57,7 @@ jobs:
           build-args: |
             VERSION=2.58.02
             MODULE=Tdarr_Server
-            DATE=${{ steps.date.outputs.date }}
+            DATE=${{ needs.build_and_push_tdarr_base.outputs.date }}
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/tdarr:noble_${{ steps.date.outputs.date }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/tdarr:noble_${{ needs.build_and_push_tdarr_base.outputs.date }}
             ${{ secrets.DOCKERHUB_USERNAME }}/tdarr:latest
\ No newline at end of file