From 1f0ffff7961068e433b987d53b3016e1b8dfd03d Mon Sep 17 00:00:00 2001
From: Rachid F <rf@artesi.xyz>
Date: Mon, 18 Mar 2024 18:09:41 +0300
Subject: [PATCH] :ambulance: Added NEXT_PUBLIC_FRONTEND_DOMAIN to webapp
 dockerfile

---
 apps/client-ts/Dockerfile |  3 +++
 docker-compose.source.yml |  3 ++-
 docker-compose.yml        | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/apps/client-ts/Dockerfile b/apps/client-ts/Dockerfile
index 0b9c99b3a..372ec94b7 100644
--- a/apps/client-ts/Dockerfile
+++ b/apps/client-ts/Dockerfile
@@ -36,13 +36,16 @@ ARG NEXT_PUBLIC_STYTCH_PROJECT_ENV
 ARG NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN
 ARG NEXT_PUBLIC_DISTRIBUTION 
 ARG NEXT_PUBLIC_BACKEND_DOMAIN
+ARG NEXT_PUBLIC_FRONTEND_DOMAIN
 
 ENV NEXT_PUBLIC_STYTCH_PROJECT_ID="$NEXT_PUBLIC_STYTCH_PROJECT_ID"
 ENV NEXT_PUBLIC_STYTCH_SECRET="$NEXT_PUBLIC_STYTCH_SECRET"
 ENV NEXT_PUBLIC_STYTCH_PROJECT_ENV="$NEXT_PUBLIC_STYTCH_PROJECT_ENV"
 ENV NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN="$NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN"
+
 ENV NEXT_PUBLIC_DISTRIBUTION="$NEXT_PUBLIC_DISTRIBUTION"
 ENV NEXT_PUBLIC_BACKEND_DOMAIN="${NEXT_PUBLIC_BACKEND_DOMAIN}"
+ENV NEXT_PUBLIC_FRONTEND_DOMAIN="${NEXT_PUBLIC_FRONTEND_DOMAIN}"
 
 RUN corepack enable
 
diff --git a/docker-compose.source.yml b/docker-compose.source.yml
index 25c1d1b80..f2e3d9840 100644
--- a/docker-compose.source.yml
+++ b/docker-compose.source.yml
@@ -79,7 +79,8 @@ services:
         NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN: ${NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN}
         NEXT_PUBLIC_DISTRIBUTION: ${DISTRIBUTION}
         NEXT_PUBLIC_BACKEND_DOMAIN: ${NEXT_PUBLIC_BACKEND_DOMAIN}
-        NEXT_PUBLIC_WEBAPP_DOMAIN: "http://localhost:3000"
+        NEXT_PUBLIC_FRONTEND_DOMAIN: ${NEXT_PUBLIC_FRONTEND_DOMAIN}
+        NEXT_PUBLIC_WEBAPP_DOMAIN: ${NEXT_PUBLIC_WEBAPP_DOMAIN}
     restart: unless-stopped
     ports:
       - 80:3000
diff --git a/docker-compose.yml b/docker-compose.yml
index e8a140af2..f0dcf440f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -99,6 +99,26 @@ services:
     restart:
       unless-stopped
 
+  webapp-next:
+    image: panoradotdev/frontend-webapp:latest
+    environment:
+      NEXT_PUBLIC_STYTCH_PROJECT_ID: ${NEXT_PUBLIC_STYTCH_PROJECT_ID}
+      NEXT_PUBLIC_STYTCH_SECRET: ${NEXT_PUBLIC_STYTCH_SECRET}
+      NEXT_PUBLIC_STYTCH_PROJECT_ENV: ${NEXT_PUBLIC_STYTCH_PROJECT_ENV}
+      NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN: ${NEXT_PUBLIC_STYTCH_PUBLIC_TOKEN}
+      NEXT_PUBLIC_DISTRIBUTION: ${DISTRIBUTION}
+      NEXT_PUBLIC_BACKEND_DOMAIN: ${NEXT_PUBLIC_BACKEND_DOMAIN}
+      NEXT_PUBLIC_FRONTEND_DOMAIN: ${NEXT_PUBLIC_FRONTEND_DOMAIN}
+      NEXT_PUBLIC_WEBAPP_DOMAIN: ${NEXT_PUBLIC_WEBAPP_DOMAIN}
+    restart: unless-stopped
+    ports:
+      - 80:3000
+    depends_on:
+      - api
+    networks:
+      - backend
+      - frontend
+
   # Initialize s3 buckets
   panora-store-init:
     image: minio/minio