diff --git a/app/build-containers.py b/app/build-containers.py index fac5e149..74f8295f 100644 --- a/app/build-containers.py +++ b/app/build-containers.py @@ -16,7 +16,7 @@ # Builds or pulls containers for the system components # env vars: -# VULCANIZE_REPO_BASE_DIR defaults to ~/vulcanize +# CERC_REPO_BASE_DIR defaults to ~/cerc # TODO: display the available list of containers; allow re-build of either all or specific containers @@ -28,7 +28,7 @@ import subprocess parser = argparse.ArgumentParser( description="build the set of containers required for a complete stack", - epilog="Config provided either in .env or settings.ini or env vars: VULCANIZE_REPO_BASE_DIR (defaults to ~/vulcanize)" + epilog="Config provided either in .env or settings.ini or env vars: CERC_REPO_BASE_DIR (defaults to ~/cerc)" ) parser.add_argument("--verbose", action="store_true", help="increase output verbosity") parser.add_argument("--quiet", action="store_true", help="don\'t print informational output") @@ -40,7 +40,7 @@ args = parser.parse_args() verbose = args.verbose quiet = args.quiet -dev_root_path = os.path.expanduser(config("VULCANIZE_REPO_BASE_DIR", default="~/vulcanize")) +dev_root_path = os.path.expanduser(config("CERC_REPO_BASE_DIR", default="~/cerc")) if not args.quiet: print(f'Dev Root is: {dev_root_path}') @@ -64,8 +64,8 @@ def process_container(container): print(f"Error, script: {build_script_filename} doesn't exist") sys.exit(1) if not args.dry_run: - # We need to export VULCANIZE_REPO_BASE_DIR - build_result = subprocess.run(build_script_filename, shell=True, env={'VULCANIZE_REPO_BASE_DIR':dev_root_path}) + # We need to export CERC_REPO_BASE_DIR + build_result = subprocess.run(build_script_filename, shell=True, env={'CERC_REPO_BASE_DIR':dev_root_path}) # TODO: check result in build_result.returncode print(f"Result is: {build_result}") diff --git a/app/setup-repositories.py b/app/setup-repositories.py index 9623b4e9..b9ee06a4 100644 --- a/app/setup-repositories.py +++ b/app/setup-repositories.py @@ -14,7 +14,7 @@ # along with this program. If not, see . # env vars: -# VULCANIZE_REPO_BASE_DIR defaults to ~/vulcanize +# CERC_REPO_BASE_DIR defaults to ~/cerc import os import sys @@ -42,7 +42,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: VULCANIZE_REPO_BASE_DIR (defaults to ~/vulcanize)" + epilog="Config provided either in .env or settings.ini or env vars: CERC_REPO_BASE_DIR (defaults to ~/cerc)" ) parser.add_argument("--verbose", action="store_true", help="increase output verbosity") parser.add_argument("--quiet", action="store_true", help="don\'t print informational output") @@ -55,7 +55,7 @@ args = parser.parse_args() verbose = args.verbose quiet = args.quiet -dev_root_path = os.path.expanduser(config("DEV_ROOT", default="~/vulcanize")) +dev_root_path = os.path.expanduser(config("DEV_ROOT", default="~/cerc")) if not args.quiet: print(f'Dev Root is: {dev_root_path}') diff --git a/compose/docker-compose-contract.yml b/compose/docker-compose-contract.yml index 9a65cd01..b8815f90 100644 --- a/compose/docker-compose-contract.yml +++ b/compose/docker-compose-contract.yml @@ -4,7 +4,7 @@ services: depends_on: go-ethereum: condition: service_healthy - image: vulcanize/test-contract:local + image: cerc/test-contract:local environment: ETH_ADDR: "http://go-ethereum:8545" ports: diff --git a/compose/docker-compose-db-sharding.yml b/compose/docker-compose-db-sharding.yml index 169584a9..b6117661 100644 --- a/compose/docker-compose-db-sharding.yml +++ b/compose/docker-compose-db-sharding.yml @@ -6,10 +6,10 @@ services: depends_on: ipld-eth-db: condition: service_healthy - image: vulcanize/ipld-eth-db:local + image: cerc/ipld-eth-db:local environment: DATABASE_USER: "vdbm" - DATABASE_NAME: "vulcanize_testing" + DATABASE_NAME: "cerc_testing" DATABASE_PASSWORD: "password" DATABASE_HOSTNAME: "ipld-eth-db" DATABASE_PORT: 5432 @@ -20,7 +20,7 @@ services: command: ["postgres", "-c", "log_statement=all"] environment: POSTGRES_USER: "vdbm" - POSTGRES_DB: "vulcanize_testing" + POSTGRES_DB: "cerc_testing" POSTGRES_PASSWORD: "password" healthcheck: test: ["CMD", "nc", "-v", "localhost", "5432"] diff --git a/compose/docker-compose-db.yml b/compose/docker-compose-db.yml index d164297b..a984f7f0 100644 --- a/compose/docker-compose-db.yml +++ b/compose/docker-compose-db.yml @@ -1,14 +1,14 @@ # TODO: figure out if this is needed -- it doesn't seem to make sense in the context of the -# current version of vulcanize/ipld-eth-db/Dockerfile, which is only the migrations code, not the DB itself +# current version of cerc/ipld-eth-db/Dockerfile, which is only the migrations code, not the DB itself # The sibling component docker-compose-db-sharding.yml looks more plausible version: "3.2" services: ipld-eth-db: restart: always - image: vulcanize/ipld-eth-db:local + image: cerc/ipld-eth-db:local environment: POSTGRES_USER: "vdbm" - POSTGRES_DB: "vulcanize_testing" + POSTGRES_DB: "cerc_testing" POSTGRES_PASSWORD: "password" healthcheck: test: ["CMD", "nc", "-v", "localhost", "5432"] diff --git a/compose/docker-compose-eth-statediff-fill-service.yml b/compose/docker-compose-eth-statediff-fill-service.yml index d59de1e5..16135250 100644 --- a/compose/docker-compose-eth-statediff-fill-service.yml +++ b/compose/docker-compose-eth-statediff-fill-service.yml @@ -5,11 +5,11 @@ services: depends_on: ipld-eth-db: condition: service_healthy - image: vulcanize/eth-statediff-fill-service:local + image: cerc/eth-statediff-fill-service:local environment: ETH_SERVER_HTTPPATH: 0.0.0.0:8085 VDB_COMMAND: "serve" - DATABASE_NAME: "vulcanize_testing" + DATABASE_NAME: "cerc_testing" DATABASE_HOSTNAME: "ipld-eth-db" DATABASE_PORT: 5432 DATABASE_USER: "vdbm" diff --git a/compose/docker-compose-go-ethereum-foundry.yml b/compose/docker-compose-go-ethereum-foundry.yml index 1145a2d3..c4a496b5 100644 --- a/compose/docker-compose-go-ethereum-foundry.yml +++ b/compose/docker-compose-go-ethereum-foundry.yml @@ -6,7 +6,7 @@ services: depends_on: ipld-eth-db: condition: service_healthy - image: vulcanize/go-ethereum-foundry:local + image: cerc/go-ethereum-foundry:local healthcheck: test: ["CMD", "nc", "-v", "localhost", "8545"] interval: 30s @@ -14,7 +14,7 @@ services: retries: 10 environment: DB_USER: vdbm - DB_NAME: vulcanize_testing + DB_NAME: cerc_testing DB_HOST: ipld-eth-db DB_PORT: 5432 DB_PASSWORD: password diff --git a/compose/docker-compose-ipld-eth-beacon-db.yml b/compose/docker-compose-ipld-eth-beacon-db.yml index 58e936a0..957b0b28 100644 --- a/compose/docker-compose-ipld-eth-beacon-db.yml +++ b/compose/docker-compose-ipld-eth-beacon-db.yml @@ -2,10 +2,10 @@ version: "3.2" services: ipld-eth-beacon-db: restart: always - image: vulcanize/ipld-eth-beacon-db:local + image: cerc/ipld-eth-beacon-db:local environment: POSTGRES_USER: vdbm - POSTGRES_DB: vulcanize_testing + POSTGRES_DB: cerc_testing POSTGRES_PASSWORD: password volumes: - vdb_db_eth-beacon_db:/var/lib/postgresql/data diff --git a/compose/docker-compose-ipld-eth-beacon-indexer.yml b/compose/docker-compose-ipld-eth-beacon-indexer.yml index 52d133dd..69b4c17e 100644 --- a/compose/docker-compose-ipld-eth-beacon-indexer.yml +++ b/compose/docker-compose-ipld-eth-beacon-indexer.yml @@ -5,7 +5,7 @@ services: depends_on: - ipld-eth-beacon-db - lighthouse - image: vulcanize/ipld-eth-beacon-indexer:local + image: cerc/ipld-eth-beacon-indexer:local volumes: - type: bind source: ${eth_beacon_config_file} diff --git a/compose/docker-compose-ipld-eth-server.yml b/compose/docker-compose-ipld-eth-server.yml index 88e6e46f..785d2d31 100644 --- a/compose/docker-compose-ipld-eth-server.yml +++ b/compose/docker-compose-ipld-eth-server.yml @@ -5,7 +5,7 @@ services: depends_on: ipld-eth-db: condition: service_healthy - image: vulcanize/ipld-eth-server:local + image: cerc/ipld-eth-server:local environment: IPLD_SERVER_GRAPHQL: "true" IPLD_POSTGRAPHILEPATH: http://graphql:5000 @@ -14,7 +14,7 @@ services: ETH_SERVER_GRAPHQLPATH: 0.0.0.0:8082 VDB_COMMAND: "serve" ETH_CHAIN_CONFIG: "/tmp/chain.json" - DATABASE_NAME: vulcanize_testing + DATABASE_NAME: cerc_testing DATABASE_HOSTNAME: ipld-eth-db DATABASE_PORT: 5432 DATABASE_USER: "vdbm" @@ -36,11 +36,11 @@ services: depends_on: ipld-eth-db: condition: service_healthy - image: vulcanize/postgraphile:v1.0.1 + image: cerc/postgraphile:v1.0.1 environment: PG_HOST: ipld-eth-db PG_PORT: 5432 - PG_DATABASE: vulcanize_testing + PG_DATABASE: cerc_testing PG_USER: vdbm PG_PASSWORD: password SCHEMA: public,eth diff --git a/compose/docker-compose-lighthouse.yml b/compose/docker-compose-lighthouse.yml index 887b398e..73d90797 100644 --- a/compose/docker-compose-lighthouse.yml +++ b/compose/docker-compose-lighthouse.yml @@ -2,7 +2,7 @@ version: "3.2" services: lighthouse: restart: always - image: vulcanize/lighthouse:local + image: cerc/lighthouse:local environment: - NETWORK=mainnet volumes: diff --git a/compose/docker-compose-prometheus-grafana.yml b/compose/docker-compose-prometheus-grafana.yml index 82042108..494748bc 100644 --- a/compose/docker-compose-prometheus-grafana.yml +++ b/compose/docker-compose-prometheus-grafana.yml @@ -7,7 +7,7 @@ services: user: "987" image: prom/prometheus volumes: - - ${vulcanize_ops}/metrics/etc:/etc/prometheus + - ${cerc_ops}/metrics/etc:/etc/prometheus - ./prometheus-data:/prometheus ports: - "127.0.0.1:9090:9090" diff --git a/container-build/vulcanize-eth-statediff-fill-service/build.sh b/container-build/vulcanize-eth-statediff-fill-service/build.sh index 33dd19b2..a88129c4 100755 --- a/container-build/vulcanize-eth-statediff-fill-service/build.sh +++ b/container-build/vulcanize-eth-statediff-fill-service/build.sh @@ -1,2 +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 +# Build cerc/eth-statediff-fill-service +docker build -t cerc/eth-statediff-fill-service:local ${CERC_REPO_BASE_DIR}/eth-statediff-fill-service diff --git a/container-build/vulcanize-go-ethereum-foundry/Dockerfile b/container-build/vulcanize-go-ethereum-foundry/Dockerfile index 24cc838b..bbbc64fc 100644 --- a/container-build/vulcanize-go-ethereum-foundry/Dockerfile +++ b/container-build/vulcanize-go-ethereum-foundry/Dockerfile @@ -11,7 +11,7 @@ COPY start-private-network.sh . COPY deploy-local-network.sh . COPY $GENESIS_FILE_PATH ./genesis.json # TODO: figure out if this works for aarm64 -COPY --from=vulcanize/go-ethereum:local /usr/local/bin/geth /bin/geth +COPY --from=cerc/go-ethereum:local /usr/local/bin/geth /bin/geth RUN chmod +x /bin/geth EXPOSE 8545 diff --git a/container-build/vulcanize-go-ethereum-foundry/build.sh b/container-build/vulcanize-go-ethereum-foundry/build.sh index 9124a94b..d4fd2deb 100755 --- a/container-build/vulcanize-go-ethereum-foundry/build.sh +++ b/container-build/vulcanize-go-ethereum-foundry/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# Build vulcanize/go-ethereum-foundry +# Build cerc/go-ethereum-foundry # See: https://stackoverflow.com/a/246128/1701505 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -docker build -t vulcanize/go-ethereum-foundry:local --build-arg GENESIS_FILE_PATH=genesis-automine.json ${SCRIPT_DIR} +docker build -t cerc/go-ethereum-foundry:local --build-arg GENESIS_FILE_PATH=genesis-automine.json ${SCRIPT_DIR} diff --git a/container-build/vulcanize-go-ethereum-foundry/deploy-local-network.sh b/container-build/vulcanize-go-ethereum-foundry/deploy-local-network.sh index 3ccb6994..e286bf30 100755 --- a/container-build/vulcanize-go-ethereum-foundry/deploy-local-network.sh +++ b/container-build/vulcanize-go-ethereum-foundry/deploy-local-network.sh @@ -31,7 +31,7 @@ eval "$( DB_USER=vdbm DB_PASSWORD=password -DB_NAME=vulcanize_public +DB_NAME=cerc_public DB_HOST=127.0.0.1 DB_PORT=5432 DB_TYPE=postgres diff --git a/container-build/vulcanize-go-ethereum/build.sh b/container-build/vulcanize-go-ethereum/build.sh index fd79af14..da59ec34 100755 --- a/container-build/vulcanize-go-ethereum/build.sh +++ b/container-build/vulcanize-go-ethereum/build.sh @@ -1,2 +1,2 @@ -# Build vulcanize/go-ethereum -docker build -t vulcanize/go-ethereum:local ${VULCANIZE_REPO_BASE_DIR}/go-ethereum +# Build cerc/go-ethereum +docker build -t cerc/go-ethereum:local ${CERC_REPO_BASE_DIR}/go-ethereum diff --git a/container-build/vulcanize-ipld-eth-beacon-db/build.sh b/container-build/vulcanize-ipld-eth-beacon-db/build.sh index 888c3662..b0bc8973 100755 --- a/container-build/vulcanize-ipld-eth-beacon-db/build.sh +++ b/container-build/vulcanize-ipld-eth-beacon-db/build.sh @@ -1,2 +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 +# Build cerc/ipld-eth-beacon-db +docker build -t cerc/ipld-eth-beacon-db:local ${CERC_REPO_BASE_DIR}/ipld-eth-beacon-db diff --git a/container-build/vulcanize-ipld-eth-beacon-indexer/build.sh b/container-build/vulcanize-ipld-eth-beacon-indexer/build.sh index c9586f94..59395bfc 100755 --- a/container-build/vulcanize-ipld-eth-beacon-indexer/build.sh +++ b/container-build/vulcanize-ipld-eth-beacon-indexer/build.sh @@ -1,2 +1,2 @@ -# Build vulcanize/ipld-eth-beacon-indexer -docker build -t vulcanize/ipld-eth-beacon-indexer:local ${VULCANIZE_REPO_BASE_DIR}/ipld-eth-beacon-indexer +# Build cerc/ipld-eth-beacon-indexer +docker build -t cerc/ipld-eth-beacon-indexer:local ${CERC_REPO_BASE_DIR}/ipld-eth-beacon-indexer diff --git a/container-build/vulcanize-ipld-eth-db/build.sh b/container-build/vulcanize-ipld-eth-db/build.sh index 3647243d..e6b164dc 100755 --- a/container-build/vulcanize-ipld-eth-db/build.sh +++ b/container-build/vulcanize-ipld-eth-db/build.sh @@ -1,2 +1,2 @@ -# Build vulcanize/ipld-eth-db -docker build -t vulcanize/ipld-eth-db:local ${VULCANIZE_REPO_BASE_DIR}/ipld-eth-db +# Build cerc/ipld-eth-db +docker build -t cerc/ipld-eth-db:local ${CERC_REPO_BASE_DIR}/ipld-eth-db diff --git a/container-build/vulcanize-ipld-eth-server/build.sh b/container-build/vulcanize-ipld-eth-server/build.sh index 722294bc..41f2b8a2 100755 --- a/container-build/vulcanize-ipld-eth-server/build.sh +++ b/container-build/vulcanize-ipld-eth-server/build.sh @@ -1,2 +1,2 @@ -# Build vulcanize/ipld-eth-server -docker build -t vulcanize/ipld-eth-server:local ${VULCANIZE_REPO_BASE_DIR}/ipld-eth-server +# Build cerc/ipld-eth-server +docker build -t cerc/ipld-eth-server:local ${CERC_REPO_BASE_DIR}/ipld-eth-server diff --git a/container-build/vulcanize-lighthouse/build.sh b/container-build/vulcanize-lighthouse/build.sh index c6359367..7babdbd1 100755 --- a/container-build/vulcanize-lighthouse/build.sh +++ b/container-build/vulcanize-lighthouse/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# Build vulcanize/lighthouse +# Build cerc/lighthouse # See: https://stackoverflow.com/a/246128/1701505 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -docker build -t vulcanize/lighthouse:local ${SCRIPT_DIR} +docker build -t cerc/lighthouse:local ${SCRIPT_DIR} diff --git a/container-build/vulcanize-test-contract/build.sh b/container-build/vulcanize-test-contract/build.sh index d1fde373..1f721658 100755 --- a/container-build/vulcanize-test-contract/build.sh +++ b/container-build/vulcanize-test-contract/build.sh @@ -1,2 +1,2 @@ -# Build vulcanize/test-contract -docker build -t vulcanize/test-contract:local --build-arg ETH_ADDR=http://go-ethereum:8545 ${VULCANIZE_REPO_BASE_DIR}/ipld-eth-db-validator/test/contract +# Build cerc/test-contract +docker build -t cerc/test-contract:local --build-arg ETH_ADDR=http://go-ethereum:8545 ${CERC_REPO_BASE_DIR}/ipld-eth-db-validator/test/contract diff --git a/container-image-list.txt b/container-image-list.txt index 20e75a5f..23456a9a 100644 --- a/container-image-list.txt +++ b/container-image-list.txt @@ -1,9 +1,9 @@ -vulcanize/test-contract -vulcanize/eth-statediff-fill-service -vulcanize/go-ethereum -vulcanize/go-ethereum-foundry -vulcanize/lighthouse -vulcanize/ipld-eth-db -vulcanize/ipld-eth-beacon-db -vulcanize/ipld-eth-beacon-indexer -vulcanize/ipld-eth-server +cerc/test-contract +cerc/eth-statediff-fill-service +cerc/go-ethereum +cerc/go-ethereum-foundry +cerc/lighthouse +cerc/ipld-eth-db +cerc/ipld-eth-beacon-db +cerc/ipld-eth-beacon-indexer +cerc/ipld-eth-server diff --git a/repository-list.txt b/repository-list.txt index f37ba485..7f5bad0b 100644 --- a/repository-list.txt +++ b/repository-list.txt @@ -1,8 +1,8 @@ -vulcanize/ops -vulcanize/ipld-eth-db -vulcanize/go-ethereum -vulcanize/ipld-eth-server -vulcanize/eth-statediff-fill-service -vulcanize/ipld-eth-db-validator -vulcanize/ipld-eth-beacon-indexer -vulcanize/ipld-eth-beacon-db +cerc/ops +cerc/ipld-eth-db +cerc/go-ethereum +cerc/ipld-eth-server +cerc/eth-statediff-fill-service +cerc/ipld-eth-db-validator +cerc/ipld-eth-beacon-indexer +cerc/ipld-eth-beacon-db