Merge branch 'develop' of github.com:oceanprotocol/docker-images into feature/refactor

README.md

@@ -138,6 +138,8 @@ Variable | Description
 `KEEPER_NETWORK_NAME` | set to one of `"ganache"` (default), `"kovan"`, or `"ocean_poa_net_local"`
 `ARTIFACTS_FOLDER` | this is where the deployed smart contracts abi files will be available. This can be pointed at any path you like.
 
+In addition to these variables, when running Brizo you need to provide the Azure credentials to allow Brizo connect to Azure. These variables can be configured in the file `brizo.env`.
+
 ## Contributing
 
 We use GitHub as a means for maintaining and tracking issues and source code development.

brizo.env

@@ -0,0 +1,23 @@
+# Use this file to set the env vars required for Brizo.
+
+KEEPER_URL=http://parity-node:8545
+LOCAL_CONTRACTS=true
+KEEPER_NETWORK_NAME=ocean_poa_net_local
+
+SECRET_STORE_URL=http://secret-store:12001
+PARITY_URL=http://parity-node:8545
+# Set a valid parity address and password to have seamless interaction with the `keeper`
+PARITY_ADDRESS=
+PARITY_PASSWORD=
+
+AQUARIUS_URL=http://aquarius:5000
+BRIZO_URL=http://brizo:8030
+
+AZURE_ACCOUNT_NAME=
+AZURE_ACCOUNT_KEY=
+AZURE_RESOURCE_GROUP=
+AZURE_LOCATION=westus
+AZURE_CLIENT_ID=
+AZURE_CLIENT_SECRET=
+AZURE_TENANT_ID=
+AZURE_SUBSCRIPTION_ID=

docker-compose-local-parity-node.yml

@@ -113,11 +113,8 @@ services:
     depends_on:
     - keeper-contracts
     - parity-node
-    environment:
-      KEEPER_URL: http://parity-node:8545
-      LOCAL_CONTRACTS: "true"
-      KEEPER_NETWORK_NAME: ${KEEPER_NETWORK_NAME}
-      AQUARIUS_URL: http://aquarius:5000
+    env_file:
+      - ${BRIZO_ENV_FILE}
     volumes:
     - ${ARTIFACTS_FOLDER}:/usr/local/keeper-contracts/:ro
 

docker-compose-no-pleuston.yml

@@ -50,9 +50,8 @@ services:
     - backend
     depends_on:
     - keeper-contracts
-    environment:
-      KEEPER_URL: http://keeper-contracts:8545
-      LOCAL_CONTRACTS: "true"
+    env_file:
+      - ${BRIZO_ENV_FILE}
     volumes:
     - ${ARTIFACTS_FOLDER}:/usr/local/keeper-contracts/:ro
 

docker-compose.yml

@@ -50,9 +50,8 @@ services:
     - backend
     depends_on:
     - keeper-contracts
-    environment:
-      KEEPER_URL: http://keeper-contracts:8545
-      LOCAL_CONTRACTS: "true"
+    env_file:
+      - ${BRIZO_ENV_FILE}
     volumes:
     - ${ARTIFACTS_FOLDER}:/usr/local/keeper-contracts/:ro
 

start_ocean.sh

@@ -3,13 +3,14 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 COMPOSE_DIR="${DIR}/compose-files"
 # Must be set to true for the first run, change it to "false" to avoid migrating the smart contracts on each run.
-export DEPLOY_CONTRACTS="true"
+export DEPLOY_CONTRACTS="false"
 # Ganache specific option, these two options have no effect when not running ganache-cli
 export GANACHE_DATABASE_PATH="${DIR}"
 export REUSE_DATABASE="false"
 # Specify which ethereum client to run or connect to: kovan, ganache, or ocean_poa_net_local
 export KEEPER_NETWORK_NAME="ganache"
 export ARTIFACTS_FOLDER=$HOME/.ocean/keeper-contracts/artifacts
+export BRIZO_ENV_FILE=$DIR/brizo.env
 
 # colors
 COLOR_R="\033[0;31m"    # red
@@ -30,8 +31,8 @@ function show_banner {
 
 show_banner
 
-# default to stable versions
-export OCEAN_VERSION=stable
+# default to latest versions
+export OCEAN_VERSION=latest
 
 COMPOSE_FILES=""
 COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml"