fix: celery healthcheck

pantos-io · Feb 12, 2025 · 3e61cdf · 3e61cdf
1 parent 3901841
commit 3e61cdf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -9,12 +9,13 @@ services:
     networks:
       pantos-service-node:
       pantos-ethereum:
-    entrypoint: sh -c 'set -a; . /etc/pantos/eth-data/ETHEREUM.env && . /etc/pantos/bnb-data/BNB_CHAIN.env; set +a; exec /usr/bin/pantos-service-node-server'
+    entrypoint: /usr/bin/pantos-service-node-server
     environment:
       PANTOS_ENV_FILE: /etc/pantos/service-node-config.env
       APP_URL: http://localhost:808${INSTANCE-1}
       BNB_CHAIN_PRIVATE_KEY: /etc/pantos/bnb-data/keystore
       ETHEREUM_PRIVATE_KEY: /etc/pantos/eth-data/keystore
+      SOURCE_ENV_FILES: /etc/pantos/eth-data/ETHEREUM.env,/etc/pantos/bnb-data/BNB_CHAIN.env
     volumes:
       - type: volume
         source: bnb-data
@@ -42,13 +43,13 @@ services:
     networks:
       pantos-service-node:
       pantos-ethereum:
-    entrypoint: sh -c 'set -a; . /etc/pantos/eth-data/ETHEREUM.env && . /etc/pantos/bnb-data/BNB_CHAIN.env; set +a; exec /usr/bin/pantos-service-node-celery'
     environment:
       PANTOS_ENV_FILE: /etc/pantos/service-node-config.env
       APP_URL: http://localhost:808${INSTANCE-1}
       BNB_CHAIN_PRIVATE_KEY: /etc/pantos/bnb-data/keystore
       ETHEREUM_PRIVATE_KEY: /etc/pantos/eth-data/keystore
       PANTOS_STATUS_MONITOR: 1
+      SOURCE_ENV_FILES: /etc/pantos/eth-data/ETHEREUM.env,/etc/pantos/bnb-data/BNB_CHAIN.env
     ports:
       - 555${INSTANCE-0}:5555
     volumes:

diff --git a/linux/scripts/pantos-service-node-celery b/linux/scripts/pantos-service-node-celery
@@ -22,6 +22,15 @@ source_if_not_set() {
 
 source_if_not_set /etc/default/"$APP_NAME"
 
+# Check if SOURCE_ENV_FILES is defined and source each file
+if [ -n "$SOURCE_ENV_FILES" ]; then
+    echo "Sourcing environment files: $SOURCE_ENV_FILES"
+    IFS=',' read -ra FILES <<< "$SOURCE_ENV_FILES"
+    for file in "${FILES[@]}"; do
+        . "$file"
+    done
+fi
+
 cd "$APP_DIR"
 
 while [ $# -gt 0 ]; do

diff --git a/linux/scripts/pantos-service-node-server b/linux/scripts/pantos-service-node-server
@@ -24,6 +24,15 @@ source_if_not_set() {
 
 source_if_not_set /etc/default/"$APP_NAME"
 
+# Check if SOURCE_ENV_FILES is defined and source each file
+if [ -n "$SOURCE_ENV_FILES" ]; then
+    echo "Sourcing environment files: $SOURCE_ENV_FILES"
+    IFS=',' read -ra FILES <<< "$SOURCE_ENV_FILES"
+    for file in "${FILES[@]}"; do
+        . "$file"
+    done
+fi
+
 cd "$APP_DIR"
 
 while [ $# -gt 0 ]; do