From fe0b456b86b622973227f7fdca34a317b6f6a87b Mon Sep 17 00:00:00 2001
From: Prathamesh Musale <prathamesh.musale0@gmail.com>
Date: Wed, 21 Feb 2024 15:11:44 +0530
Subject: [PATCH] Add separate compose file for app in demo stack

---
 .../docker-compose-mobymask-app-v3-demo.yml   | 32 +++++++++++++++++++
 .../docker-compose-mobymask-app-v3.yml        | 17 ++++++++--
 .../data/stacks/mobymask-v3-demo/stack.yml    |  2 +-
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 stack_orchestrator/data/compose/docker-compose-mobymask-app-v3-demo.yml

diff --git a/stack_orchestrator/data/compose/docker-compose-mobymask-app-v3-demo.yml b/stack_orchestrator/data/compose/docker-compose-mobymask-app-v3-demo.yml
new file mode 100644
index 00000000..3925cb5b
--- /dev/null
+++ b/stack_orchestrator/data/compose/docker-compose-mobymask-app-v3-demo.yml
@@ -0,0 +1,32 @@
+version: '3.2'
+
+services:
+  # Builds and serves the MobyMask v3 react-app
+  mobymask-v3-app:
+    restart: unless-stopped
+    image: cerc/mobymask-ui:local
+    environment:
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
+      CERC_SNAP_URL: ${CERC_SNAP_URL}
+    working_dir: /app
+    command: ["bash", "/scripts/mobymask-app-start.sh"]
+    volumes:
+      - ../config/watcher-mobymask-v3-demo/mobymask-app-start.sh:/scripts/mobymask-app-start.sh
+      - ../config/watcher-mobymask-v3-demo/local/keys:/server/keys
+      - mobymask_deployment:/server
+      - nitro_deployment:/nitro
+    ports:
+      - "127.0.0.1:3004:80"
+    healthcheck:
+      test: ["CMD", "nc", "-vz", "localhost", "80"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 10s
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+volumes:
+  mobymask_deployment:
+  nitro_deployment:
diff --git a/stack_orchestrator/data/compose/docker-compose-mobymask-app-v3.yml b/stack_orchestrator/data/compose/docker-compose-mobymask-app-v3.yml
index 3925cb5b..244fb29b 100644
--- a/stack_orchestrator/data/compose/docker-compose-mobymask-app-v3.yml
+++ b/stack_orchestrator/data/compose/docker-compose-mobymask-app-v3.yml
@@ -5,15 +5,27 @@ services:
   mobymask-v3-app:
     restart: unless-stopped
     image: cerc/mobymask-ui:local
+    env_file:
+      - ../config/watcher-mobymask-v3/mobymask-params.env
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_CHAIN_ID: ${CERC_CHAIN_ID}
+      CERC_DEPLOYED_CONTRACT: ${CERC_DEPLOYED_CONTRACT}
+      CERC_RELAY_NODES: ${CERC_RELAY_NODES}
+      CERC_DENY_MULTIADDRS: ${CERC_DENY_MULTIADDRS}
+      CERC_PUBSUB: ${CERC_PUBSUB}
+      CERC_GOSSIPSUB_DIRECT_PEERS: ${CERC_GOSSIPSUB_DIRECT_PEERS}
+      CERC_NA_ADDRESS: ${CERC_NA_ADDRESS}
+      CERC_VPA_ADDRESS: ${CERC_VPA_ADDRESS}
+      CERC_CA_ADDRESS: ${CERC_CA_ADDRESS}
       CERC_APP_WATCHER_URL: ${CERC_APP_WATCHER_URL}
+      CERC_PAYMENT_NITRO_ADDRESS: ${CERC_PAYMENT_NITRO_ADDRESS:-0xBBB676f9cFF8D242e9eaC39D063848807d3D1D94}
       CERC_SNAP_URL: ${CERC_SNAP_URL}
     working_dir: /app
     command: ["bash", "/scripts/mobymask-app-start.sh"]
     volumes:
-      - ../config/watcher-mobymask-v3-demo/mobymask-app-start.sh:/scripts/mobymask-app-start.sh
-      - ../config/watcher-mobymask-v3-demo/local/keys:/server/keys
+      - ../config/watcher-mobymask-v3/mobymask-app-start.sh:/scripts/mobymask-app-start.sh
+      - peers_ids:/peers
       - mobymask_deployment:/server
       - nitro_deployment:/nitro
     ports:
@@ -28,5 +40,6 @@ services:
       - "host.docker.internal:host-gateway"
 
 volumes:
+  peers_ids:
   mobymask_deployment:
   nitro_deployment:
diff --git a/stack_orchestrator/data/stacks/mobymask-v3-demo/stack.yml b/stack_orchestrator/data/stacks/mobymask-v3-demo/stack.yml
index 57cda474..68788478 100644
--- a/stack_orchestrator/data/stacks/mobymask-v3-demo/stack.yml
+++ b/stack_orchestrator/data/stacks/mobymask-v3-demo/stack.yml
@@ -44,4 +44,4 @@ pods:
   - nitro-contracts
   - watcher-mobymask-v3-demo
   - mobymask-snap
-  - mobymask-app-v3
+  - mobymask-app-v3-demo