From 46c39ad2861a4367bd42bf3930bd92251617a369 Mon Sep 17 00:00:00 2001 From: nolash Date: Fri, 3 Sep 2021 09:22:52 +0200 Subject: [PATCH] Prune more docker compose vars --- apps/contract-migration/config.sh | 1 - docker-compose.yml | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/contract-migration/config.sh b/apps/contract-migration/config.sh index 7e80c7e2..3831ce7e 100644 --- a/apps/contract-migration/config.sh +++ b/apps/contract-migration/config.sh @@ -29,7 +29,6 @@ export DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$ export CIC_TRUST_ADDRESS=${CIC_TRUST_ADDRESS:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER} export CIC_DEFAULT_TOKEN_SYMBOL=$TOKEN_SYMBOL export TOKEN_SINK_ADDRESS=${TOKEN_SINK_ADDRESS:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER} -export RPC_PROVIDER=$RPC_HTTP_PROVIDER # Legacy variable defaults diff --git a/docker-compose.yml b/docker-compose.yml index f0c4ab5c..47880a32 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,12 +72,8 @@ services: EXTRA_PIP_ARGS: $EXTRA_PIP_ARGS # image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/contract-migration:latest environment: - CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS - RPC_HTTP_PROVIDER: ${RPC_HTTP_PROVIDER:-http://eth:8545} - # And these two are for wait-for-it (could parse this) + RPC_PROVIDER: ${RPC_PROVIDER:-http://eth:8545} DEV_USE_DOCKER_WAIT_SCRIPT: 1 - DEV_ETH_PROVIDER_HOST: eth - DEV_ETH_PROVIDER_PORT: 8545 CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996} CIC_CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996} DEV_DATA_DIR: ${DEV_DATA_DIR:-/tmp/cic/config}