From 6b05e997ae8aed417969060970d1b9b4ad1474b8 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Fri, 27 Aug 2021 14:50:44 +0200 Subject: [PATCH 1/4] bump components --- README.md | 8 ++++---- start_ocean.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ea2d703..cd9e55d 100644 --- a/README.md +++ b/README.md @@ -65,11 +65,11 @@ The default versions are always a combination of component versions which are co | Component name | Required by | Version | IP Address | Ports exposed | | -------------- | ------------------ | --------------------------------- | --------------- | ------------- | | ganache | ocean-contracts | latest | 172.15.0.3 | 8545 -> 8545 | -| ocean-contracts | | v0.6.4 | 172.15.0.14 | | -| Aquarius | | v2.2.12 | 172.15.0.5 | 5000 -> 5000 | +| ocean-contracts | | v0.6.5 | 172.15.0.14 | | +| Aquarius | | v3.0.1 | 172.15.0.5 | 5000 -> 5000 | | Elasticsearch | Aquarius | 6.8.3 | 172.15.0.6 | | -| Provider | | v0.4.12 | 172.15.0.4 | 8030 -> 8030 | -| Provider2 | | v0.4.12 | 172.15.0.7 | 8030 -> 8030 | +| Provider | | v0.4.14 | 172.15.0.4 | 8030 -> 8030 | +| Provider2 | | v0.4.14 | 172.15.0.7 | 8030 -> 8030 | | RBAC Server | | main | 172.15.0.8 | 3000 -> 3000 | | GraphNode | | oceanprotocol/graph-node:latest | 172.15.0.15 | 9000 -> 8000 ,9001 -> 8001 , 9020 -> 8020, 9030 -> 8030, 9040 -> 8040 | | Graphipfs | | ipfs/go-ipfs:v0.4.23 | 172.15.0.16 | 5001 -> 5001 | diff --git a/start_ocean.sh b/start_ocean.sh index 85e0a2f..61f061f 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -28,9 +28,9 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v2.2.12} -export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.4.12} -export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.6.4} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3.0.1} +export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.4.14} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.6.5} export RBAC_VERSION=${RBAC_VERSION:-next} export PROJECT_NAME="ocean" export FORCEPULL="false" From afecb06fd98f3a49df851215a925af1d20d0aec5 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Fri, 27 Aug 2021 15:07:34 +0200 Subject: [PATCH 2/4] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1847533..3b8141f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @alexcos20 @kremalicious @mihaisc @ssallam +* @alexcos20 @kremalicious @mihaisc @calina-c From ced2ce2ebc7ace0da751bd510f911eb3dbc4971d Mon Sep 17 00:00:00 2001 From: Calina Cenan Date: Tue, 31 Aug 2021 14:40:37 +0300 Subject: [PATCH 3/4] Adjust some aqua envs. --- compose-files/aquarius.yml | 2 +- start_ocean.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index d3589c5..2ca879c 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -11,7 +11,6 @@ services: - elasticsearch - ocean-contracts environment: - DB_MODULE: ${DB_MODULE} DB_HOSTNAME: ${DB_HOSTNAME} DB_PORT: ${DB_PORT} DB_USERNAME: ${DB_USERNAME} @@ -30,5 +29,6 @@ services: EVENTS_RPC: "http://172.15.0.3:8545" EVENTS_ALLOW: "0" RUN_EVENTS_MONITOR: "1" + RBAC_SERVER_URL: "http://localhost:3000" volumes: - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ diff --git a/start_ocean.sh b/start_ocean.sh index 85e0a2f..1315bc4 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -62,7 +62,6 @@ echo "export ADDRESS_FILE=${ADDRESS_FILE}" export CONTRACTS_NETWORK_NAME="development" # Default Aquarius parameters: use Elasticsearch -export DB_MODULE="elasticsearch" export DB_HOSTNAME="172.15.0.6" export DB_PORT="9200" export DB_USERNAME="elastic" From 7e175e91f7cf4489180624429031fc0cc12b6a06 Mon Sep 17 00:00:00 2001 From: Calina Cenan Date: Wed, 1 Sep 2021 07:36:14 +0000 Subject: [PATCH 4/4] Remove RBAC SERVER URL since it behaves unexpectedly. --- compose-files/aquarius.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index 81f9635..e91ac79 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -29,6 +29,5 @@ services: EVENTS_RPC: "http://172.15.0.3:8545" EVENTS_ALLOW: "0" RUN_EVENTS_MONITOR: "1" - RBAC_SERVER_URL: "http://172.15.0.8:3000" volumes: - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/