From a02a41987948c13ee6c988b17ed7e234bc10b4a0 Mon Sep 17 00:00:00 2001
From: Marc Mintel <marc@mintel.me>
Date: Tue, 5 May 2026 16:06:54 +0200
Subject: [PATCH] Fix: Remove payload env variables from Dockerfile and
 deploy.yml to resolve build failure

---
 .gitea/workflows/deploy.yml | 16 +++-------------
 Dockerfile                  |  9 +++------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index f600998..517555d 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -196,8 +196,7 @@ jobs:
             S3_BUCKET=${{ secrets.S3_BUCKET || vars.S3_BUCKET || 'mintel' }}
             S3_REGION=${{ secrets.S3_REGION || vars.S3_REGION || 'fsn1' }}
             S3_PREFIX=${{ secrets.S3_PREFIX || vars.S3_PREFIX || 'mintel.me' }}
-            DATABASE_URI=${{ secrets.DATABASE_URI || (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_DB_PASSWORD && format('postgres://directus:{0}@postgres-db:5432/directus', secrets.TESTING_DIRECTUS_DB_PASSWORD)) || 'postgres://payload:payload@127.0.0.1:5432/payload' }}
-            PAYLOAD_SECRET=${{ secrets.PAYLOAD_SECRET || 'secret' }}
+
             BUILD_ID=${{ github.sha }}
           tags: registry.infra.mintel.me/mintel/mintel.me:${{ needs.prepare.outputs.image_tag }}
           # Temporarily disable registry cache export to save runner disk/bandwidth
@@ -242,12 +241,7 @@ jobs:
       DIRECTUS_URL: ${{ needs.prepare.outputs.directus_url }}
       DIRECTUS_HOST: cms.${{ needs.prepare.outputs.traefik_host }}
 
-      # Database configuration
-      postgres_DB_NAME: ${{ secrets.DIRECTUS_DB_NAME || vars.DIRECTUS_DB_NAME || 'directus' }}
-      postgres_DB_USER: ${{ secrets.DIRECTUS_DB_USER || vars.DIRECTUS_DB_USER || 'directus' }}
-      postgres_DB_PASSWORD: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_DB_PASSWORD) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_DB_PASSWORD) || secrets.DIRECTUS_DB_PASSWORD || vars.DIRECTUS_DB_PASSWORD || 'directus' }}
-      DATABASE_URI: postgres://${{ secrets.DIRECTUS_DB_USER || vars.DIRECTUS_DB_USER || 'directus' }}:${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_DB_PASSWORD) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_DB_PASSWORD) || secrets.DIRECTUS_DB_PASSWORD || vars.DIRECTUS_DB_PASSWORD || 'directus' }}@postgres-db:5432/${{ secrets.DIRECTUS_DB_NAME || vars.DIRECTUS_DB_NAME || 'directus' }}
-      PAYLOAD_SECRET: ${{ secrets.PAYLOAD_SECRET || vars.PAYLOAD_SECRET || 'secret' }}
+
 
       # Mail
       MAIL_HOST: ${{ secrets.SMTP_HOST || vars.SMTP_HOST }}
@@ -311,11 +305,7 @@ jobs:
           SENTRY_DSN=$SENTRY_DSN
           PROJECT_COLOR=$PROJECT_COLOR
           LOG_LEVEL=$LOG_LEVEL
-          postgres_DB_NAME=$postgres_DB_NAME
-          postgres_DB_USER=$postgres_DB_USER
-          postgres_DB_PASSWORD=$postgres_DB_PASSWORD
-          DATABASE_URI=$DATABASE_URI
-          PAYLOAD_SECRET=$PAYLOAD_SECRET
+
           MAIL_HOST=$MAIL_HOST
           MAIL_PORT=$MAIL_PORT
           MAIL_USERNAME=$MAIL_USERNAME
diff --git a/Dockerfile b/Dockerfile
index a54e899..fc4070b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,8 +13,7 @@ ARG S3_SECRET_KEY
 ARG S3_BUCKET
 ARG S3_REGION
 ARG S3_PREFIX
-ARG DATABASE_URI
-ARG PAYLOAD_SECRET
+
 ARG BUILD_ID
 
 # Environment variables for Next.js build
@@ -27,8 +26,7 @@ ENV S3_SECRET_KEY=$S3_SECRET_KEY
 ENV S3_BUCKET=$S3_BUCKET
 ENV S3_REGION=$S3_REGION
 ENV S3_PREFIX=$S3_PREFIX
-ENV DATABASE_URI=$DATABASE_URI
-ENV PAYLOAD_SECRET=$PAYLOAD_SECRET
+
 ENV SKIP_RUNTIME_ENV_VALIDATION=true
 ENV NEXT_BUILD_WORKERS=1
 ENV NEXT_DISABLE_SOURCEMAPS=true
@@ -81,8 +79,7 @@ COPY --from=builder --chown=1001:65533 /app/apps/web/public ./public
 COPY --from=builder --chown=1001:65533 /app/apps/web/.next/standalone ./
 COPY --from=builder --chown=1001:65533 /app/apps/web/.next/static ./apps/web/.next/static
 
-# Explicitly copy Payload dynamically generated importMap.js excluded by Standalone tracing
-COPY --from=builder --chown=1001:65533 /app/apps/web/app/(payload)/admin/importMap.js ./apps/web/app/(payload)/admin/importMap.js
+
 
 # Fix permissions for the non-root user (Standard uid/gid from base image)
 USER nextjs