diff --git a/.env b/.env index eee2926..08abf62 100644 --- a/.env +++ b/.env @@ -10,6 +10,7 @@ LDAP_DOMAIN= LDAP_URL= LDAP_BASE= LDAP_ATTRIBUTE= + API_SECRET= API_TOKEN_TTL= API_CACHE_TTL= diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index 43c45b0..c642e80 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -29,6 +29,14 @@ RUN yarn install COPY --from=builder /app/out/full/ . COPY turbo.json turbo.json +# Pass variables from .env +ARG BASE_PATH +ARG APP_TITLE +ARG APP_DESCRIPTION +ENV BASE_PATH=${BASE_PATH} +ENV APP_TITLE=${APP_TITLE} +ENV APP_DESCRIPTION=${APP_DESCRIPTION} + RUN yarn turbo run build --filter=web... FROM node:16-alpine AS runner diff --git a/docker-compose.yml b/docker-compose.yml index 1506270..1bac68a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,10 +6,10 @@ services: build: context: . dockerfile: ./apps/web/Dockerfile - environment: - - BASE_PATH=${WEB_BASE_PATH} - - APP_TITLE=${WEB_APP_TITLE} - - APP_DESCRIPTION=${WEB_APP_DESCRIPTION} + args: + - APP_TITLE=${WEB_APP_TITLE} + - APP_DESCRIPTION=${WEB_APP_DESCRIPTION} + - BASE_PATH=${WEB_BASE_PATH} restart: always ports: - 3000:3000