diff --git a/docker/shared_testnet/README.md b/docker/shared_testnet/README.md index fb0369395..d8bcf93d2 100644 --- a/docker/shared_testnet/README.md +++ b/docker/shared_testnet/README.md @@ -27,7 +27,7 @@ ansible-galaxy install -g -f -r ansible/requirements.yml ansible-playbook ansible/nimbus.yml -i ansible/inventory/test -t beacon-node -u YOUR_USER -K -l nimbus-slaves[5:8] # faster way to pull the Docker image and recreate the containers -ansible nimbus-slaves[5:8] -i ansible/inventory/test -u YOUR_USER -o -m shell -a "echo; cd /docker/beacon-node-testnet2-1; docker-compose --compatibility up --no-start beacon_node; echo '---'" | sed 's/\\n/\n/g' +ansible nimbus-slaves[5:8] -i ansible/inventory/test -u YOUR_USER -o -m shell -a "echo; cd /docker/beacon-node-testnet2-1; docker-compose --compatibility pull; docker-compose --compatibility up --no-start; echo '---'" | sed 's/\\n/\n/g' # build beacon_node in an external volume ansible nimbus-slaves[5:8] -i ansible/inventory/test -u YOUR_USER -o -m shell -a "echo; cd /docker/beacon-node-testnet2-1; docker-compose --compatibility run --rm beacon_node --build; echo '---'" | sed 's/\\n/\n/g' @@ -52,6 +52,6 @@ From the nim-beacon-chain repo: From the "infra-nimbus" repo: ```bash -ansible nimbus-slaves[5:8] -i ansible/inventory/test -u YOUR_USER -o -m shell -a "echo; cd /docker/beacon-node-testnet2-1; docker-compose --compatibility up -d beacon_node; echo '---'" | sed 's/\\n/\n/g' +ansible nimbus-slaves[5:8] -i ansible/inventory/test -u YOUR_USER -o -m shell -a "echo; cd /docker/beacon-node-testnet2-1; docker-compose --compatibility up -d; echo '---'" | sed 's/\\n/\n/g' ``` diff --git a/docker/shared_testnet/entry_point.sh b/docker/shared_testnet/entry_point.sh index 9b263f93a..60c83696c 100755 --- a/docker/shared_testnet/entry_point.sh +++ b/docker/shared_testnet/entry_point.sh @@ -63,6 +63,11 @@ while true; do esac done +# some old getopt (from util-linux 2.31.1) leaves a '--' option in $@ +if [[ "$1" == "--" ]]; then + shift +fi + EXTRA_ARGS="$@" ######### @@ -87,6 +92,7 @@ fi if [[ "$RUN" == "1" ]]; then cd /root/.cache/nimbus/nim-beacon-chain + echo $(make SCRIPT_PARAMS="--skipGoerliKey --writeLogFile=false --runOnly --printCmdOnly" ${NETWORK} | tail -n 1) ${EXTRA_ARGS} # make sure Docker's SIGINT reaches the beacon_node binary eval $(make SCRIPT_PARAMS="--skipGoerliKey --writeLogFile=false --runOnly --printCmdOnly" ${NETWORK} | tail -n 1) ${EXTRA_ARGS} fi