diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 3c9fe04c..8461df61 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -133,6 +133,7 @@ jobs: NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_BASE_URL || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_BASE_URL || secrets.TESTING_NEXT_PUBLIC_BASE_URL || secrets.NEXT_PUBLIC_BASE_URL) }} NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_WEBSITE_ID || secrets.TESTING_NEXT_PUBLIC_UMAMI_WEBSITE_ID || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID) }} NEXT_PUBLIC_UMAMI_SCRIPT_URL: ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_SCRIPT_URL || secrets.TESTING_NEXT_PUBLIC_UMAMI_SCRIPT_URL || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL) }} + DIRECTUS_URL: ${{ needs.prepare.outputs.target == 'production' && 'https://cms.klz-cables.com' || (needs.prepare.outputs.target == 'staging' && 'https://cms-staging.klz-cables.com' || 'https://cms-testing.klz-cables.com') }} run: | echo "🏗️ Building → $TARGET / $IMAGE_TAG" docker buildx build \ @@ -141,6 +142,7 @@ jobs: --build-arg NEXT_PUBLIC_BASE_URL="$NEXT_PUBLIC_BASE_URL" \ --build-arg NEXT_PUBLIC_UMAMI_WEBSITE_ID="$NEXT_PUBLIC_UMAMI_WEBSITE_ID" \ --build-arg NEXT_PUBLIC_UMAMI_SCRIPT_URL="$NEXT_PUBLIC_UMAMI_SCRIPT_URL" \ + --build-arg DIRECTUS_URL="$DIRECTUS_URL" \ -t registry.infra.mintel.me/mintel/klz-cables.com:$IMAGE_TAG \ --push . diff --git a/Dockerfile b/Dockerfile index 1f7a40e1..f9e97c45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,10 +27,12 @@ ENV NEXT_TELEMETRY_DISABLED=1 ARG NEXT_PUBLIC_BASE_URL ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID ARG NEXT_PUBLIC_UMAMI_SCRIPT_URL +ARG DIRECTUS_URL ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID ENV NEXT_PUBLIC_UMAMI_SCRIPT_URL=$NEXT_PUBLIC_UMAMI_SCRIPT_URL +ENV DIRECTUS_URL=$DIRECTUS_URL # Validate environment variables during build RUN npx tsx scripts/validate-env.ts diff --git a/next.config.mjs b/next.config.mjs index 8c749144..9ed1b8da 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -327,6 +327,8 @@ const nextConfig = { ? new URL(process.env.SENTRY_DSN).origin : 'https://errors.infra.mintel.me'; + const directusUrl = process.env.DIRECTUS_URL || 'https://cms.klz-cables.com'; + return [ { source: '/stats/:path*', @@ -338,7 +340,7 @@ const nextConfig = { }, { source: '/cms/:path*', - destination: `${process.env.DIRECTUS_URL}/:path*`, + destination: `${directusUrl}/:path*`, }, ]; },