From 45d30e1263e3954f97278ea64776ce2879847a5e Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Mon, 16 Oct 2023 12:32:44 +0300
Subject: [PATCH] update docker-compose.yml & .env

---
 .env               | 17 +++++++++++------
 docker-compose.yml | 13 -------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.env b/.env
index 0af4929..ac6da65 100644
--- a/.env
+++ b/.env
@@ -1,10 +1,12 @@
 COMPOSE_PROJECT_NAME=
 NETWORK_NAME=
 
-WEB_APP_BASE_PATH=/login
-WEB_APP_TITLE=
-WEB_APP_DESCRIPTION=
+# WEB
+BASE_PATH=/login
+TITLE=
+DESCRIPTION=
 
+# API
 LDAP_BIND_DN=
 LDAP_BIND_CREDENTIALS=
 LDAP_DOMAIN=
@@ -12,6 +14,9 @@ LDAP_URL=
 LDAP_BASE=
 LDAP_ATTRIBUTE=
 
-API_SECRET=
-API_TOKEN_TTL=
-API_CACHE_TTL=
\ No newline at end of file
+SECRET=
+TOKEN_TTL=
+CACHE_TTL=
+
+REDIS_HOST=redis
+REDIS_PORT=
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 1eab30c..32671e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,10 +5,6 @@ services:
     build:
       context: .
       dockerfile: ./apps/web/Dockerfile
-      args:
-        - BASE_PATH=${WEB_APP_BASE_PATH}
-        - APP_TITLE=${WEB_APP_TITLE}
-        - APP_DESCRIPTION=${WEB_APP_DESCRIPTION}
     restart: always
     networks:
       - auth_network
@@ -17,15 +13,6 @@ services:
       context: .
       dockerfile: ./apps/api/Dockerfile
     environment:
-      - LDAP_BIND_DN=${LDAP_BIND_DN}
-      - LDAP_BIND_CREDENTIALS=${LDAP_BIND_CREDENTIALS}
-      - LDAP_DOMAIN=${LDAP_DOMAIN}
-      - LDAP_URL=${LDAP_URL}
-      - LDAP_BASE=${LDAP_BASE}
-      - LDAP_ATTRIBUTE=${LDAP_ATTRIBUTE}
-      - SECRET=${API_SECRET}
-      - TOKEN_TTL=${API_TOKEN_TTL}
-      - CACHE_TTL=${API_CACHE_TTL}
       - REDIS_HOST=redis
     restart: always
     networks: