From 3718bea7000d64d74aa7f1afa8f09c6ec3c995bd Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Mon, 28 Nov 2022 13:04:05 +0300
Subject: [PATCH] Docker: fix pass .env variables to web app

---
 .env                | 1 +
 apps/web/Dockerfile | 8 ++++++++
 docker-compose.yml  | 8 ++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

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