From b2eaa5f04ab0812cf9dd94b5473fae5760c2e413 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Wed, 28 Aug 2019 11:16:16 +0200 Subject: [PATCH] moved the structural configuration out of the brizo environment so we can use the same values for configuring pleuston as well --- brizo.env | 8 -------- compose-files/brizo.yml | 6 +++++- compose-files/pleuston.yml | 2 ++ start_ocean.sh | 10 ++++++++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/brizo.env b/brizo.env index f9c5189..ceebbe6 100755 --- a/brizo.env +++ b/brizo.env @@ -1,13 +1,5 @@ # Use this file to set the env vars required for Brizo. -# Set a valid parity address and password to have seamless interaction with the `keeper` -PARITY_ADDRESS=0x00bd138abd70e2f00903268f3db08f2d25677c9e -PARITY_PASSWORD=node0 - -SECRET_STORE_URL=http://secret-store:12001 -KEEPER_URL=http://keeper-node:8545 -PARITY_URL=http://keeper-node:8545 - AZURE_ACCOUNT_NAME= AZURE_ACCOUNT_KEY= AZURE_RESOURCE_GROUP= diff --git a/compose-files/brizo.yml b/compose-files/brizo.yml index 814de95..7eec401 100644 --- a/compose-files/brizo.yml +++ b/compose-files/brizo.yml @@ -9,11 +9,15 @@ services: ipv4_address: 172.15.0.17 depends_on: - keeper-node + - secret-store-signing-node env_file: - ${BRIZO_ENV_FILE} environment: KEEPER_URL: ${KEEPER_RPC_URL} - PARITY_URL: ${KEEPER_RPC_URL} + PARITY_URL: ${SIGNING_NODE_URL} LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} + SECRET_STORE_URL: ${SECRET_STORE_URL} + PARITY_ADDRESS: ${PUBLISHER_ADDRESS} + PARITY_PASSWORD: ${PUBLISHER_PASSWORD} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro diff --git a/compose-files/pleuston.yml b/compose-files/pleuston.yml index 5a10b1d..b18fca2 100644 --- a/compose-files/pleuston.yml +++ b/compose-files/pleuston.yml @@ -13,5 +13,7 @@ services: - brizo environment: LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} + REACT_APP_AQUARIUS_URI: ${AQUARIUS_URI} + REACT_APP_BRIZO_ADDRESS: ${PUBLISHER_ADDRESS} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/pleuston/node_modules/@oceanprotocol/keeper-contracts/artifacts/:ro diff --git a/start_ocean.sh b/start_ocean.sh index e0280c2..a81137f 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -63,6 +63,16 @@ export DB_CLIENT_KEY="" export DB_CLIENT_CERT="" CHECK_ELASTIC_VM_COUNT=true +# Set a valid parity address and password to have seamless interaction with the `keeper` +# it has to exist on the secret store signing node and as well on the keeper node +export PUBLISHER_ADDRESS=0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0 +export PUBLISHER_PASSWORD=secret + +export SECRET_STORE_URL=http://secret-store:12001 +export SIGNING_NODE_URL=http://secret-store-signing-node:8545 + +export AQUARIUS_URI=http://localhost:5000 + # Default Faucet options export FAUCET_TIMESPAN=${FAUCET_TIMESPAN:-24}