From 82d7d6268d4ae9c6ef296defce75e769af30b7d0 Mon Sep 17 00:00:00 2001 From: ssallam Date: Fri, 17 Jan 2020 12:59:14 +0100 Subject: [PATCH 1/5] Update default versions to work with keeper-contracts v0.13.2 --- start_ocean.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 2590869..086d073 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -25,10 +25,10 @@ DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v1.0.3} -export BRIZO_VERSION=${BRIZO_VERSION:-v0.7.2} -export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.3.4} -export KEEPER_VERSION=${KEEPER_VERSION:-v0.12.7} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v1.0.5} +export BRIZO_VERSION=${BRIZO_VERSION:-v0.8.1} +export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.4.1} +export KEEPER_VERSION=${KEEPER_VERSION:-v0.13.2} export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.2} export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0} export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.0.0} From 7d47c17acef807b9448a0060d0aa0e3590a832b6 Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 22 Jan 2020 17:04:23 +0100 Subject: [PATCH 2/5] Update events-handler to v0.4.4 --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 086d073..2cc261f 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -27,7 +27,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v1.0.5} export BRIZO_VERSION=${BRIZO_VERSION:-v0.8.1} -export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.4.1} +export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.4.4} export KEEPER_VERSION=${KEEPER_VERSION:-v0.13.2} export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.2} export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0} From 944e5863b1696cf3853964ca3b7f3d893d43f95f Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 22 Jan 2020 17:46:03 +0100 Subject: [PATCH 3/5] Update versions in README file to match the defaults. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e0a3d8f..fbb3040 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ The default versions are always a combination of component versions which are co | Aquarius | Brizo | Events Handler | Keeper | Commons | Faucet | Agent | | -------- | -------- | -------------- | --------- | -------- | -------- | ------ | -| `v1.0.3` | `v0.7.2` | `v0.3.4` | `v0.12.7` | `v2.0.0` | `v0.3.2` | latest | +| `v1.0.5` | `v0.8.1` | `v0.4.4` | `v0.13.2` | `v2.0.0` | `v0.3.2` | latest | You can use the `--latest` option to pull the most recent Docker images for all components, which are always tagged as `latest` in Docker. The `latest` Docker image tag derives from the default main branch of the component's Git repo. @@ -86,11 +86,11 @@ You can override the Docker image tag used for a particular component by setting For example: ```bash -export BRIZO_VERSION=v0.4.4 +export BRIZO_VERSION=v0.8.1 ./start_ocean.sh ``` -will use the default Docker image tags for Aquarius, Keeper Contracts and Commons, but `v0.2.1` for Brizo. +will use the default Docker image tags for Aquarius, Keeper Contracts and Commons, but `v0.8.1` for Brizo. > If you use the `--latest` option, then the `latest` Docker images will be used _regardless of whether you set any environment variables beforehand._ From 1f294589ad81a69265da51c46156af6293fb73a6 Mon Sep 17 00:00:00 2001 From: ssallam Date: Thu, 23 Jan 2020 09:20:15 +0100 Subject: [PATCH 4/5] Revert brizo uri to use "localhost" --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 2cc261f..ec683a9 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -103,7 +103,7 @@ if [ ${IP} = "localhost" ]; then export COMMONS_CLIENT_URL=http://localhost:3000 export COMMONS_KEEPER_RPC_HOST=http://localhost:8545 export COMMONS_SECRET_STORE_URL=http://localhost:12001 - export BRIZO_URL=http://brizo:8030 + export BRIZO_URL=http://localhost:8030 else export SECRET_STORE_URL=http://${IP}:12001 export SIGNING_NODE_URL=http://${IP}:8545 From 3d9630e11824d844e94cf22122667a5355cd50b1 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 23 Jan 2020 13:33:16 +0100 Subject: [PATCH 5/5] bump to Commons v2.1.0 --- README.md | 2 +- start_ocean.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fbb3040..1cdeb2e 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ The default versions are always a combination of component versions which are co | Aquarius | Brizo | Events Handler | Keeper | Commons | Faucet | Agent | | -------- | -------- | -------------- | --------- | -------- | -------- | ------ | -| `v1.0.5` | `v0.8.1` | `v0.4.4` | `v0.13.2` | `v2.0.0` | `v0.3.2` | latest | +| `v1.0.5` | `v0.8.1` | `v0.4.4` | `v0.13.2` | `v2.1.0` | `v0.3.2` | latest | You can use the `--latest` option to pull the most recent Docker images for all components, which are always tagged as `latest` in Docker. The `latest` Docker image tag derives from the default main branch of the component's Git repo. diff --git a/start_ocean.sh b/start_ocean.sh index ec683a9..3401dd1 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,8 +30,8 @@ export BRIZO_VERSION=${BRIZO_VERSION:-v0.8.1} export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.4.4} export KEEPER_VERSION=${KEEPER_VERSION:-v0.13.2} export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.2} -export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.0.0} -export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.0.0} +export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.1.0} +export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.1.0} export AGENT_VERSION=${AGENT_VERSION:-latest} export PARITY_IMAGE="parity/parity:v2.5.7-stable" @@ -98,7 +98,7 @@ if [ ${IP} = "localhost" ]; then export SECRET_STORE_URL=http://secret-store:12001 export SIGNING_NODE_URL=http://secret-store-signing-node:8545 export AQUARIUS_URI=http://aquarius:5000 - export FAUCET_URL=http://faucet:3001 + export FAUCET_URL=http://localhost:3001 export COMMONS_SERVER_URL=http://localhost:4000 export COMMONS_CLIENT_URL=http://localhost:3000 export COMMONS_KEEPER_RPC_HOST=http://localhost:8545