From 369ff671d5a3a6b1a4e7905fc16bac9466362e39 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Fri, 12 Aug 2022 07:42:46 -0600 Subject: [PATCH] Cleanup --- .../build.sh | 23 ------------------- .../vulcanize-ipld-eth-beacon-db/build.sh | 19 --------------- container-build/vulcanize-lighthouse/build.sh | 20 ---------------- .../vulcanize-test-contract/build.sh | 15 ------------ container-image-list.txt | 1 + pip-stuff.sh | 1 + setup-repositories.py | 4 ++-- 7 files changed, 4 insertions(+), 79 deletions(-) diff --git a/container-build/vulcanize-eth-statediff-fill-service/build.sh b/container-build/vulcanize-eth-statediff-fill-service/build.sh index fb146b43..24e2983f 100755 --- a/container-build/vulcanize-eth-statediff-fill-service/build.sh +++ b/container-build/vulcanize-eth-statediff-fill-service/build.sh @@ -1,25 +1,2 @@ # Build vulcanize/eth-statediff-fill-service docker build -t vulcanize/eth-statediff-fill-service:local ${vulcanize_repo_base_dir}/eth-statediff-fill-service - -#version: "3.2" -#services: -# eth-statediff-fill-service: -# restart: unless-stopped -# depends_on: -# ipld-eth-db: -# condition: service_healthy -# build: -# context: ${vulcanize_eth_statediff_fill_service} -# dockerfile: ./Dockerfile -# environment: -# ETH_SERVER_HTTPPATH: 0.0.0.0:8085 -# VDB_COMMAND: "serve" -# DATABASE_NAME: "vulcanize_testing" -# DATABASE_HOSTNAME: "ipld-eth-db" -# DATABASE_PORT: 5432 -# DATABASE_USER: "vdbm" -# DATABASE_PASSWORD: "password" -# ETH_HTTP_PATH: $eth_http_path -# WATCHED_ADDRESS_GAP_FILLER_INTERVAL: $watched_address_gap_filler_interval -# ports: -# - "127.0.0.1:8085:8085" diff --git a/container-build/vulcanize-ipld-eth-beacon-db/build.sh b/container-build/vulcanize-ipld-eth-beacon-db/build.sh index 06001279..b9656fa6 100755 --- a/container-build/vulcanize-ipld-eth-beacon-db/build.sh +++ b/container-build/vulcanize-ipld-eth-beacon-db/build.sh @@ -1,21 +1,2 @@ # Build vulcanize/ipld-eth-beacon-db docker build -t vulcanize/ipld-eth-beacon-db:local ${vulcanize_repo_base_dir}/ipld-eth-beacon-db - -#version: "3.2" -#services: -# ipld-eth-beacon-db: -# restart: always -# build: -# context: ${vulcanize_ipld_eth_beacon_db}/ -# environment: -# POSTGRES_USER: vdbm -# POSTGRES_DB: vulcanize_testing -# POSTGRES_PASSWORD: password -# volumes: -# - vdb_db_eth-beacon_db:/var/lib/postgresql/data -# ports: -# - "127.0.0.1:8076:5432" -# command: ["postgres", "-c", "log_statement=all"] -# -#volumes: -# vdb_db_eth-beacon_db: diff --git a/container-build/vulcanize-lighthouse/build.sh b/container-build/vulcanize-lighthouse/build.sh index 6ce0de68..c6359367 100755 --- a/container-build/vulcanize-lighthouse/build.sh +++ b/container-build/vulcanize-lighthouse/build.sh @@ -5,23 +5,3 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) docker build -t vulcanize/lighthouse:local ${SCRIPT_DIR} - -#version: "3.2" -#services: -# lighthouse: -# restart: always -# build: -# context: ../../ -# dockerfile: ./docker/latest/lighthouse.Dockerfile -# environment: -# - NETWORK=mainnet -# volumes: -# - lighthouse_db:/root/.lighthouse -# ports: -# - 127.0.0.1:5052:5052 -# - 9000:9000/udp -# - 9000:9000/tcp -# command: ["tail", "-f", "/dev/null"] -# -#volumes: -# lighthouse_db: diff --git a/container-build/vulcanize-test-contract/build.sh b/container-build/vulcanize-test-contract/build.sh index 6a65e075..9b1be250 100755 --- a/container-build/vulcanize-test-contract/build.sh +++ b/container-build/vulcanize-test-contract/build.sh @@ -1,17 +1,2 @@ # Build vulcanize/test-contract docker build -t vulcanize/test-contract:local ${vulcanize_repo_base_dir}/ipld-eth-db-validator/test/contract - -#version: "3.2" -#services: -# contract: -# depends_on: -# go-ethereum: -# condition: service_healthy -# build: -# context: ${vulcanize_test_contract} -# args: -# ETH_ADDR: "http://go-ethereum:8545" -# environment: -# ETH_ADDR: "http://go-ethereum:8545" -# ports: -# - "127.0.0.1:3000:3000" \ No newline at end of file diff --git a/container-image-list.txt b/container-image-list.txt index 4822748f..205e6d98 100644 --- a/container-image-list.txt +++ b/container-image-list.txt @@ -1,6 +1,7 @@ vulcanize/test-contract vulcanize/eth-statediff-fill-service vulcanize/go-ethereum +vulcanize/go-ethereum-foundry vulcanize/lighthouse vulcanize/ipld-eth-db vulcanize/eth-statediff-fill-service diff --git a/pip-stuff.sh b/pip-stuff.sh index e9b301cc..b801f7c2 100644 --- a/pip-stuff.sh +++ b/pip-stuff.sh @@ -2,3 +2,4 @@ pip install testcontainers python -m pip install --upgrade pip pip install python-decouple pip install gitpython +pip install tqdm diff --git a/setup-repositories.py b/setup-repositories.py index b94f88b4..fdab73c4 100644 --- a/setup-repositories.py +++ b/setup-repositories.py @@ -1,5 +1,5 @@ # env vars: -# DEV_ROOT defaults to ~/vulcanize +# VULCANIZE_REPO_BASE_DIR defaults to ~/vulcanize import os import sys @@ -28,7 +28,7 @@ def is_git_repo(path): parser = argparse.ArgumentParser( description="git clone the set of repositories required to build the complete system from source", - epilog="Config provided either in .env or settings.ini or env vars: DEV_ROOT (defaults to ~/vulcanize)" + epilog="Config provided either in .env or settings.ini or env vars: VULCANIZE_REPO_BASE_DIR (defaults to ~/vulcanize)" ) parser.add_argument("--verbose", action="store_true", help="increase output verbosity") parser.add_argument("--quiet", action="store_true", help="don\'t print informational output")