From 9f5e916e601a470d02fa57c03d8226e552001408 Mon Sep 17 00:00:00 2001 From: knuthtimo-lab Date: Mon, 2 Mar 2026 18:03:27 +0100 Subject: [PATCH] Fehler beheben --- innungsapp/apps/admin/Dockerfile | 11 +++++++++++ innungsapp/apps/admin/docker-entrypoint.sh | 13 +++++++++++++ innungsapp/docker-compose.yml | 8 +++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/innungsapp/apps/admin/Dockerfile b/innungsapp/apps/admin/Dockerfile index abdbb86..4b49e36 100644 --- a/innungsapp/apps/admin/Dockerfile +++ b/innungsapp/apps/admin/Dockerfile @@ -37,9 +37,20 @@ COPY . . # Generate Prisma client for Alpine Linux RUN pnpm --filter @innungsapp/shared prisma:generate +# Accept build arguments for environment variables +ARG BETTER_AUTH_SECRET +ARG BETTER_AUTH_URL +ARG BETTER_AUTH_BASE_URL +ARG NEXT_PUBLIC_APP_URL + # Build the admin app ENV NEXT_TELEMETRY_DISABLED=1 ENV DOCKER_BUILD=1 +# Set environment variables from build args for Next.js build +ENV BETTER_AUTH_SECRET=$BETTER_AUTH_SECRET +ENV BETTER_AUTH_URL=$BETTER_AUTH_URL +ENV BETTER_AUTH_BASE_URL=$BETTER_AUTH_BASE_URL +ENV NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL RUN pnpm --filter @innungsapp/admin build # ============================================= diff --git a/innungsapp/apps/admin/docker-entrypoint.sh b/innungsapp/apps/admin/docker-entrypoint.sh index 26c7bab..64dad8e 100644 --- a/innungsapp/apps/admin/docker-entrypoint.sh +++ b/innungsapp/apps/admin/docker-entrypoint.sh @@ -5,6 +5,19 @@ set -e export DATABASE_URL="${DATABASE_URL:-file:/app/data/prod.db}" MIGRATIONS_DIR="./packages/shared/prisma/migrations" +# Debug: Check environment variables +echo "========================================" +echo "Environment Variables Check:" +echo "========================================" +echo "DATABASE_URL: $DATABASE_URL" +echo "BETTER_AUTH_URL: ${BETTER_AUTH_URL:-[not set]}" +echo "BETTER_AUTH_BASE_URL: ${BETTER_AUTH_BASE_URL:-[not set]}" +echo "BETTER_AUTH_SECRET: ${BETTER_AUTH_SECRET:0:10}...[hidden]" +echo "NEXT_PUBLIC_APP_URL: ${NEXT_PUBLIC_APP_URL:-[not set]}" +echo "NODE_ENV: ${NODE_ENV:-[not set]}" +echo "========================================" +echo "" + # Prefer migration-based deploys. Fall back to db push when no migrations exist yet. set -- "$MIGRATIONS_DIR"/*/migration.sql if [ -f "$1" ]; then diff --git a/innungsapp/docker-compose.yml b/innungsapp/docker-compose.yml index 0f6e348..8a116b1 100644 --- a/innungsapp/docker-compose.yml +++ b/innungsapp/docker-compose.yml @@ -3,10 +3,15 @@ services: build: context: . dockerfile: apps/admin/Dockerfile + args: + BETTER_AUTH_SECRET: "${BETTER_AUTH_SECRET}" + BETTER_AUTH_URL: "${BETTER_AUTH_URL:-https://innungsapp.com}" + BETTER_AUTH_BASE_URL: "${BETTER_AUTH_URL:-https://innungsapp.com}" + NEXT_PUBLIC_APP_URL: "${NEXT_PUBLIC_APP_URL:-https://innungsapp.com}" container_name: innungsapp-admin restart: unless-stopped ports: - - "3000:3000" + - "3010:3000" environment: # Database — SQLite file inside the named volume DATABASE_URL: "file:/app/data/prod.db" @@ -14,6 +19,7 @@ services: # Auth — CHANGE THESE in production! BETTER_AUTH_SECRET: "${BETTER_AUTH_SECRET}" BETTER_AUTH_URL: "${BETTER_AUTH_URL:-https://yourdomain.com}" + BETTER_AUTH_BASE_URL: "${BETTER_AUTH_URL:-https://yourdomain.com}" # Email (SMTP) EMAIL_FROM: "${EMAIL_FROM:-noreply@innungsapp.de}"