diff --git a/.env.example b/.env.example index a86dbe8..253ed0e 100644 --- a/.env.example +++ b/.env.example @@ -33,6 +33,7 @@ TOOL_SUBDOMAIN_PATTERN={tool}-{project}-{user}.tools.localhost VITE_API_URL=http://localhost:8000 VITE_OIDC_ISSUER=https://auth.example.com/application/o/headquarter/ VITE_OIDC_CLIENT_ID=your-client-id +VITE_OIDC_REDIRECT_URI=https://headquarter.commumedia.org/callback # Secrets (generate strong random values for production) SECRET_ENCRYPTION_KEY=change-me-in-production diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index c9e6353..0d64671 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -1,5 +1,10 @@ FROM node:22-alpine AS builder +ARG VITE_API_URL +ARG VITE_OIDC_ISSUER +ARG VITE_OIDC_CLIENT_ID +ARG VITE_OIDC_REDIRECT_URI + WORKDIR /app COPY package.json ./ RUN npm install -g pnpm@11.1.1 \ diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 20808b4..43a9165 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -42,10 +42,16 @@ services: build: context: ./apps/web dockerfile: Dockerfile + args: + - VITE_API_URL=${VITE_API_URL:-http://localhost:8000} + - VITE_OIDC_ISSUER=${VITE_OIDC_ISSUER} + - VITE_OIDC_CLIENT_ID=${VITE_OIDC_CLIENT_ID} + - VITE_OIDC_REDIRECT_URI=${VITE_OIDC_REDIRECT_URI:-https://${ROOT_DOMAIN:-localhost}/callback} environment: - VITE_API_URL=${VITE_API_URL:-http://localhost:8000} - VITE_OIDC_ISSUER=${VITE_OIDC_ISSUER} - VITE_OIDC_CLIENT_ID=${VITE_OIDC_CLIENT_ID} + - VITE_OIDC_REDIRECT_URI=${VITE_OIDC_REDIRECT_URI:-https://${ROOT_DOMAIN:-localhost}/callback} depends_on: - api networks: diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml index ec3d3fe..738ac2a 100644 --- a/docker-compose.traefik.yml +++ b/docker-compose.traefik.yml @@ -42,6 +42,11 @@ services: build: context: ./apps/web dockerfile: Dockerfile + args: + - VITE_API_URL=${VITE_API_URL:-http://localhost:8000} + - VITE_OIDC_ISSUER=${VITE_OIDC_ISSUER} + - VITE_OIDC_CLIENT_ID=${VITE_OIDC_CLIENT_ID} + - VITE_OIDC_REDIRECT_URI=${VITE_OIDC_REDIRECT_URI:-https://${ROOT_DOMAIN:-localhost}/callback} environment: - VITE_API_URL=${VITE_API_URL:-http://localhost:8000} - VITE_OIDC_ISSUER=${VITE_OIDC_ISSUER}