diff --git a/.env b/.env deleted file mode 100644 index 44a1d3e..0000000 --- a/.env +++ /dev/null @@ -1,27 +0,0 @@ -COMPOSE_PROJECT_NAME= -TRAEFIK_APP_NAME= -TRAEFIK_ENTRYPOINTS=web-secure -# TRAEFIK_ENTRYPOINTS=web-secure-ext -WEB_HOST= - -# WEB -APP_BASE_PATH=/login -APP_TITLE= -APP_DESCRIPTION=Лизинговая компания Эволюция - -# API -LDAP_BIND_DN= -LDAP_BIND_CREDENTIALS= -LDAP_DOMAIN= -LDAP_URL= -LDAP_BASE= -LDAP_ATTRIBUTE= - -API_SECRET= -API_TOKEN_TTL= -API_CACHE_TTL= -COOKIE_TOKEN_NAME=token -COOKIE_TOKEN_MAX_AGE= - -TELEGRAM_BOT_URL= -TELEGRAM_URL_SEND_AUTH_MESSAGE= \ No newline at end of file diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index b651ba0..c307040 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -31,7 +31,10 @@ RUN pnpm install # Build the project COPY --from=builder /app/out/full/ . COPY turbo.json turbo.json -COPY .env .env +ARG APP_BASE_PATH +ARG APP_DESCRIPTION +ARG TELEGRAM_BOT_URL +ARG URL_API_CHECK_AUTH RUN pnpm dotenv -e .env turbo run build --filter=web... FROM node:alpine AS runner diff --git a/docker-compose.yml b/docker-compose.yml index fd2e25c..ea97436 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,18 @@ version: '3' services: auth_web: build: + args: + - APP_BASE_PATH=${APP_BASE_PATH} + - APP_DESCRIPTION=${APP_DESCRIPTION} + - TELEGRAM_BOT_URL=${TELEGRAM_BOT_URL} + - URL_API_CHECK_AUTH=${URL_API_CHECK_AUTH} context: . dockerfile: ./apps/web/Dockerfile + environment: + - APP_BASE_PATH=${APP_BASE_PATH} + - APP_DESCRIPTION=${APP_DESCRIPTION} + - TELEGRAM_BOT_URL=${TELEGRAM_BOT_URL} + - URL_API_CHECK_AUTH=${URL_API_CHECK_AUTH} restart: always networks: - auth_network