From 94be60ba4e7ee55b30230c215a325fbdeb85ea4a Mon Sep 17 00:00:00 2001
From: Marc Mintel <marc@mintel.me>
Date: Tue, 3 Feb 2026 11:51:45 +0100
Subject: [PATCH] fix: correct Docker registry strategy, add custom Directus
 Dockerfile, and revert app tagging

---
 .gitea/workflows/pipeline.yml                     | 13 ++++++++++++-
 apps/sample-website/docker-compose.yml            |  4 ++--
 packages/infra/docker/Dockerfile.directus         | 12 ++++++++++++
 packages/infra/docker/docker-compose.template.yml |  4 ++--
 4 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 packages/infra/docker/Dockerfile.directus

diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml
index e824b6b..9d9046d 100644
--- a/.gitea/workflows/pipeline.yml
+++ b/.gitea/workflows/pipeline.yml
@@ -108,7 +108,7 @@ jobs:
             -f packages/infra/docker/Dockerfile.nextjs \
             --push .
 
-      - name: 🏗️ Build & Push Gatekeeper
+      - name: 🏗️ Build & Push Gatekeeper (Product)
         env:
           TAG: ${{ github.ref_name }}
         run: |
@@ -118,3 +118,14 @@ jobs:
             -t registry.infra.mintel.me/mintel/gatekeeper:latest \
             -f packages/infra/docker/Dockerfile.gatekeeper \
             --push .
+
+      - name: 🏗️ Build & Push Directus (Base)
+        env:
+          TAG: ${{ github.ref_name }}
+        run: |
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            -t registry.infra.mintel.me/mintel/directus:$TAG \
+            -t registry.infra.mintel.me/mintel/directus:latest \
+            -f packages/infra/docker/Dockerfile.directus \
+            --push .
diff --git a/apps/sample-website/docker-compose.yml b/apps/sample-website/docker-compose.yml
index 0273031..3026a4d 100644
--- a/apps/sample-website/docker-compose.yml
+++ b/apps/sample-website/docker-compose.yml
@@ -9,7 +9,7 @@ services:
         NEXT_PUBLIC_UMAMI_SCRIPT_URL: ${NEXT_PUBLIC_UMAMI_SCRIPT_URL}
         NEXT_PUBLIC_TARGET: ${TARGET:-development}
         DIRECTUS_URL: ${DIRECTUS_URL:-http://directus:8055}
-    image: registry.infra.mintel.me/mintel/sample-website:latest
+    image: sample-website:latest
     container_name: sample-website-app
     restart: always
     networks:
@@ -24,7 +24,7 @@ services:
       - "traefik.http.services.sample-website.loadbalancer.server.port=3000"
 
   directus:
-    image: directus/directus:11
+    image: registry.infra.mintel.me/mintel/directus:latest
     container_name: sample-website-directus
     restart: always
     networks:
diff --git a/packages/infra/docker/Dockerfile.directus b/packages/infra/docker/Dockerfile.directus
new file mode 100644
index 0000000..beccbdd
--- /dev/null
+++ b/packages/infra/docker/Dockerfile.directus
@@ -0,0 +1,12 @@
+FROM directus/directus:11
+
+# Add any custom extensions or configurations here if needed
+# COPY ./extensions /directus/extensions
+
+# Default environment for optimized production use
+ENV LOGGER_LEVEL="info"
+ENV WEBSOCKETS_ENABLED="true"
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 \
+    CMD curl -f http://localhost:8055/health || exit 1
diff --git a/packages/infra/docker/docker-compose.template.yml b/packages/infra/docker/docker-compose.template.yml
index ff7aad7..e8e0820 100644
--- a/packages/infra/docker/docker-compose.template.yml
+++ b/packages/infra/docker/docker-compose.template.yml
@@ -1,6 +1,6 @@
 services:
   app:
-    image: registry.infra.mintel.me/mintel/${APP_NAME:-app}:${IMAGE_TAG:-latest}
+    image: ${APP_NAME:-app}:latest
     restart: always
     networks:
       - infra
@@ -55,7 +55,7 @@ services:
       - "traefik.http.services.${PROJECT_NAME}-gatekeeper.loadbalancer.server.port=3000"
 
   directus:
-    image: directus/directus:11
+    image: registry.infra.mintel.me/mintel/directus:latest
     restart: always
     networks:
       - infra