Commit 1743a6d1 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

ops: cleaner docker-compose startup logs (#532)

parent 1024d415
...@@ -2,12 +2,17 @@ ...@@ -2,12 +2,17 @@
RETRIES=${RETRIES:-40} RETRIES=${RETRIES:-40}
# get the addrs from the URL provided # get the addrs from the URL provided
ADDRESSES=$(curl --retry-connrefused --retry $RETRIES --retry-delay 5 $URL) ADDRESSES=$(curl --silent --retry-connrefused --retry $RETRIES --retry-delay 5 $URL)
# set the env # set the env
export ADDRESS_MANAGER_ADDRESS=$(echo $ADDRESSES | jq -r '.AddressManager') export ADDRESS_MANAGER_ADDRESS=$(echo $ADDRESSES | jq -r '.AddressManager')
# waits for l2geth to be up # waits for l2geth to be up
curl --retry-connrefused --retry $RETRIES --retry-delay 1 $L2_NODE_WEB3_URL curl --silent \
--retry-connrefused \
--retry $RETRIES \
--retry-delay 1 \
--output /dev/null \
$L2_NODE_WEB3_URL
# go # go
exec node ./exec/run-batch-submitter.js exec node ./exec/run-batch-submitter.js
...@@ -4,7 +4,14 @@ RETRIES=${RETRIES:-20} ...@@ -4,7 +4,14 @@ RETRIES=${RETRIES:-20}
JSON='{"jsonrpc":"2.0","id":0,"method":"net_version","params":[]}' JSON='{"jsonrpc":"2.0","id":0,"method":"net_version","params":[]}'
# wait for the base layer to be up # wait for the base layer to be up
curl -H "Content-Type: application/json" --retry-connrefused --retry $RETRIES --retry-delay 1 -d $JSON $L1_NODE_WEB3_URL curl \
--silent \
-H "Content-Type: application/json" \
--retry-connrefused \
--retry $RETRIES \
--retry-delay 1 \
-d $JSON \
$L1_NODE_WEB3_URL
yarn run deploy yarn run deploy
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
RETRIES=${RETRIES:-60} RETRIES=${RETRIES:-60}
# get the addrs from the URL provided # get the addrs from the URL provided
ADDRESSES=$(curl --retry-connrefused --retry $RETRIES --retry-delay 5 $URL) ADDRESSES=$(curl --silent --retry-connrefused --retry $RETRIES --retry-delay 5 $URL)
# set the env # set the env
export DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=$(echo $ADDRESSES | jq -r '.AddressManager') export DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=$(echo $ADDRESSES | jq -r '.AddressManager')
......
#!/bin/bash #!/bin/bash
RETRIES=${RETRIES:-40} RETRIES=${RETRIES:-40}
# get the addrs from the URL provided # get the addrs from the URL provided
ADDRESSES=$(curl --retry-connrefused --retry $RETRIES --retry-delay 5 $URL) ADDRESSES=$(curl --silent --retry-connrefused --retry $RETRIES --retry-delay 5 $URL)
function envSet() { function envSet() {
VAR=$1 VAR=$1
...@@ -20,6 +20,12 @@ if [ $ETH1_L1_ETH_GATEWAY_ADDRESS == null ]; then ...@@ -20,6 +20,12 @@ if [ $ETH1_L1_ETH_GATEWAY_ADDRESS == null ]; then
fi fi
# wait for the dtl to be up, else geth will crash if it cannot connect # wait for the dtl to be up, else geth will crash if it cannot connect
curl --retry-connrefused --retry $RETRIES --retry-delay 2 $ROLLUP_CLIENT_HTTP curl \
--silent \
--output /dev/null \
--retry-connrefused \
--retry $RETRIES \
--retry-delay 1 \
$ROLLUP_CLIENT_HTTP
exec geth --verbosity=6 exec geth --verbosity=6
...@@ -2,12 +2,18 @@ ...@@ -2,12 +2,18 @@
RETRIES=${RETRIES:-60} RETRIES=${RETRIES:-60}
# get the addrs from the URL provided # get the addrs from the URL provided
ADDRESSES=$(curl --retry-connrefused --retry $RETRIES --retry-delay 5 $URL) ADDRESSES=$(curl --silent --retry-connrefused --retry $RETRIES --retry-delay 5 $URL)
# set the env # set the env
export ADDRESS_MANAGER_ADDRESS=$(echo $ADDRESSES | jq -r '.AddressManager') export ADDRESS_MANAGER_ADDRESS=$(echo $ADDRESSES | jq -r '.AddressManager')
# waits for l2geth to be up # waits for l2geth to be up
curl --retry-connrefused --retry $RETRIES --retry-delay 1 $L2_NODE_WEB3_URL curl \
--silent \
--output /dev/null \
--retry-connrefused \
--retry $RETRIES \
--retry-delay 1 \
$L2_NODE_WEB3_URL
# go # go
exec node ./exec/run-message-relayer.js exec node ./exec/run-message-relayer.js
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment