rebase to develop (#290)

Co-authored-by: macwis <[email protected]>
fabriqnetwork · Jan 23, 2024 · 173daf2 · 173daf2
1 parent c3e5ad6
commit 173daf2
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/docker/docker-compose-latest-build.yml b/docker/docker-compose-latest-build.yml
@@ -15,6 +15,7 @@ services:
     image: 792926601177.dkr.ecr.us-east-2.amazonaws.com/specular-platform:specular-latest
     tty: true
     healthcheck:
+      test: bash -c "[ -f /tmp/.l1_started.sh.lock ]"
       test: bash -c "[ -f /tmp/.l1_started.sh.lock ]"
       retries: 10
       interval: 5s
@@ -43,7 +44,7 @@ services:
       l1-geth:
         condition: service_healthy
     healthcheck:
-      test: bash -c "[ -f /tmp/.start_sp_geth.sh.lock ]"
+      test: bash -c "[ -f /tmp/.sp_geth_started.sh.lock ]"
       retries: 10
       interval: 5s
       start_period: 40s
@@ -67,6 +68,7 @@ services:
       sp-geth:
         condition: service_healthy
     healthcheck:
+      test: bash -c "[ -f /tmp/.sp_magi_started.sh.lock ]"
       test: bash -c "[ -f /tmp/.sp_magi_started.sh.lock ]"
       retries: 10
       interval: 5s

diff --git a/docker/specular.Dockerfile b/docker/specular.Dockerfile
@@ -37,8 +37,8 @@ RUN npm install -g pnpm
 RUN pnpm install
 
 
-# COPY --from=build /specular/config/local_docker /specular/workspace
-# COPY --from=build /specular/sbin /specular/sbin
+COPY --from=build /specular/config/local_docker /specular/workspace
+COPY --from=build /specular/sbin /specular/sbin
 
 # DEBUG/LOCAL BUILD
 COPY ../config/local_docker /specular/workspace

diff --git a/sbin/start_l1.sh b/sbin/start_l1.sh
@@ -7,6 +7,14 @@ SBIN="$(
 . $SBIN/utils/utils.sh
 ROOT_DIR=$SBIN/..
 
+WAITFILE="/tmp/.${0##*/}.lock"
+
+if [[ ! -z ${WAIT_DIR+x} ]]; then
+  WAITFILE=$WAIT_DIR/.${0##*/}.lock
+fi
+
+echo $WAITFILE
+
 # Check that the all required dotenv files exists.
 reqdotenv "paths" ".paths.env"
 reqdotenv "genesis" ".genesis.env"

diff --git a/sbin/start_sp_geth.sh b/sbin/start_sp_geth.sh
@@ -9,6 +9,12 @@ SBIN="$(
 . $SBIN/utils/utils.sh
 ROOT_DIR=$SBIN/..
 
+WAITFILE="/tmp/.${0##*/}.lock"
+
+if [[ ! -z ${WAIT_DIR+x} ]]; then
+  WAITFILE=$WAIT_DIR/.${0##*/}.lock
+fi
+
 # Check that the all required dotenv files exists.
 reqdotenv "paths" ".paths.env"
 reqdotenv "sp_geth" ".sp_geth.env"

diff --git a/sbin/start_sp_magi.sh b/sbin/start_sp_magi.sh
@@ -9,6 +9,12 @@ SBIN="$(
 . $SBIN/utils/utils.sh
 ROOT_DIR=$SBIN/..
 
+WAITFILE="/tmp/.${0##*/}.lock"
+
+if [[ ! -z ${WAIT_DIR+x} ]]; then
+  WAITFILE=$WAIT_DIR/.${0##*/}.lock
+fi
+
 # Check that the all required dotenv files exists.
 reqdotenv "paths" ".paths.env"
 reqdotenv "sp_magi" ".sp_magi.env"