Skip to content

Commit

Permalink
Disable curl's progress meter (looks messy in logs)
Browse files Browse the repository at this point in the history
Originally I used `--no-progress-meter` but I think `curl -fsSL` is a
better goto.
  • Loading branch information
joeytwiddle committed Aug 10, 2022
1 parent d4e9da3 commit e00f9ac
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ethd
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ upgrade_compose() {
if [ "$__compose_version_major" -eq 1 -a "$__compose_version_minor" -lt 28 ]; then
echo "Found docker-compose version $__compose_version_major.$__compose_version_minor, upgrading to 1.29.2"
${__auto_sudo} apt-get install -y curl
${__auto_sudo} curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose
${__auto_sudo} curl -fsSL "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose
${__auto_sudo} chmod +x /usr/bin/docker-compose
fi
__compose_version=$(docker-compose --version | sed -n -e "s/.*version \([0-9.-]*\).*/\1/p")
Expand All @@ -88,7 +88,7 @@ upgrade_compose() {
if [ "$__compose_version_major" -eq 1 -a "$__compose_version_minor" -lt 28 ]; then
echo "Updating docker-compose failed. It is still version $__compose_version_major.$__compose_version_minor."
echo "Please manually update docker-compose to version 1.29.2. These commands should do it:"
echo "sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose"
echo "sudo curl -fsSL "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose"
echo "sudo chmod +x /usr/bin/docker-compose"
fi
fi
Expand Down
6 changes: 3 additions & 3 deletions prysm/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@ if [[ "$1" =~ ^(beacon-chain)$ ]]; then
GENESIS=/var/lib/prysm/genesis.ssz
if [ ! -f "$GENESIS" ]; then
echo "Fetching genesis file for Goerli testnet"
curl -L -o "$GENESIS" https://github.com/eth-clients/eth2-networks/raw/master/shared/prater/genesis.ssz
curl -fsSL -o "$GENESIS" https://github.com/eth-clients/eth2-networks/raw/master/shared/prater/genesis.ssz
fi
exec "$@" "--genesis-state=$GENESIS" ${__rapid_sync} ${__override_ttd} ${__mev_boost}
elif [[ "$@" =~ --ropsten ]]; then
GENESIS=/var/lib/prysm/genesis.ssz
if [ ! -f "$GENESIS" ]; then
echo "Fetching genesis file for Ropsten testnet"
curl -L -o "$GENESIS" https://github.com/eth-clients/merge-testnets/raw/main/ropsten-beacon-chain/genesis.ssz
curl -fsSL -o "$GENESIS" https://github.com/eth-clients/merge-testnets/raw/main/ropsten-beacon-chain/genesis.ssz
fi
exec "$@" "--genesis-state=$GENESIS" ${__rapid_sync} ${__override_ttd} ${__mev_boost}
elif [[ "$@" =~ --sepolia ]]; then
GENESIS=/var/lib/prysm/genesis.ssz
if [ ! -f "$GENESIS" ]; then
echo "Fetching genesis file for Sepolia testnet"
curl -L -o "$GENESIS" https://github.com/eth-clients/merge-testnets/raw/main/sepolia/genesis.ssz
curl -fsSL -o "$GENESIS" https://github.com/eth-clients/merge-testnets/raw/main/sepolia/genesis.ssz
fi
exec "$@" "--genesis-state=$GENESIS" ${__rapid_sync} ${__override_ttd} ${__mev_boost}
else
Expand Down

0 comments on commit e00f9ac

Please sign in to comment.