From b00dcb66c8d98fbadab293c4094c126e2cd70c60 Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Tue, 16 Jul 2024 18:54:23 +0530
Subject: [PATCH] Pass environment variables in compose file

---
 .../compose/docker-compose-laconic-faucet.yml      | 14 +++++++-------
 .../{start-server.sh => start-faucet.sh}           | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename stack-orchestrator/config/laconic-faucet/{start-server.sh => start-faucet.sh} (69%)

diff --git a/stack-orchestrator/compose/docker-compose-laconic-faucet.yml b/stack-orchestrator/compose/docker-compose-laconic-faucet.yml
index f171917..fc40f8e 100644
--- a/stack-orchestrator/compose/docker-compose-laconic-faucet.yml
+++ b/stack-orchestrator/compose/docker-compose-laconic-faucet.yml
@@ -3,11 +3,11 @@ services:
     restart: unless-stopped
     image: cerc/laconic-faucet:local
     environment:
-      ${CERC_SCRIPT_DEBUG}
-      ${CERC_FAUCET_KEY}
-    volumes:
-      - ../config/laconic-faucet/start-server.sh:/start-server.sh
-    ports:
-      - "3000"
+      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
+      CERC_FAUCET_KEY: ${CERC_FAUCET_KEY}
     entrypoint: "bash"
-    command: "/start-server.sh"
+    command: "./start-faucet.sh"
+    volumes:
+      - ../config/laconic-faucet/start-faucet.sh:/app/start-faucet.sh
+    ports:
+      - "3000:3000"
diff --git a/stack-orchestrator/config/laconic-faucet/start-server.sh b/stack-orchestrator/config/laconic-faucet/start-faucet.sh
similarity index 69%
rename from stack-orchestrator/config/laconic-faucet/start-server.sh
rename to stack-orchestrator/config/laconic-faucet/start-faucet.sh
index 68f4fbd..4348125 100644
--- a/stack-orchestrator/config/laconic-faucet/start-server.sh
+++ b/stack-orchestrator/config/laconic-faucet/start-faucet.sh
@@ -1,17 +1,16 @@
 #!/bin/bash
 
 set -e
+set -u
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
-set -u
 
-yarn install
-
-toml_file = "/app/environments/local.toml"
+toml_file="./environments/local.toml"
 
 # Set faucet key from env
-faucet_key = ${CERC_FAUCET_KEY}
+faucet_key=${CERC_FAUCET_KEY}
+echo "The faucet key is $faucet_key"
 
 # Update the faucetKey in local.toml
 sed -i "s/faucetKey = \"\"/faucetKey = \"$faucet_key\"/" "$toml_file"
@@ -19,3 +18,4 @@ echo "Updated faucetKey in local.toml"
 
 # Start node-js server
 yarn start-faucet
+echo "Started faucet"