From 0d4e77c96c1c92a2ece5b583cb8e0c86cb97d5fa Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 29 Nov 2022 12:53:56 +0200 Subject: [PATCH 1/6] make es version customizable --- compose-files/elasticsearch.yml | 2 +- start_ocean.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compose-files/elasticsearch.yml b/compose-files/elasticsearch.yml index 029ef91..e101c78 100644 --- a/compose-files/elasticsearch.yml +++ b/compose-files/elasticsearch.yml @@ -1,7 +1,7 @@ version: '3' services: elasticsearch: - image: elasticsearch:7.14.2 + image: elasticsearch:${ELASTICSEACH_VERSION:-latest} networks: backend: ipv4_address: 172.15.0.6 diff --git a/start_ocean.sh b/start_ocean.sh index bb90847..399a9b7 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -29,6 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v4.2.0} +export ELASTICSEACH_VERSION=${ELASTICSEACH_VERSION:-8.5.1} export PROVIDER_VERSION=${PROVIDER_VERSION:-v1.3.10} export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.0} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.8} From 5aacc4d72424f056729aa8a854e94a65798eec94 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 29 Nov 2022 12:54:07 +0200 Subject: [PATCH 2/6] move to latest es --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 26ff7c2..fe01cca 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ The default versions are always a combination of component versions which are co | ganache | ocean-contracts | latest | 172.15.0.3 | 8545 -> 8545 | | ocean-contracts | | v1.1.8 | 172.15.0.14 | | | Aquarius | | v4.2.0 | 172.15.0.5 | 5000 -> 5000 | -| Elasticsearch | Aquarius | 6.8.3 | 172.15.0.6 | | +| Elasticsearch | Aquarius | 8.1.5 | 172.15.0.6 | | | Provider | | v1.3.10 | 172.15.0.4 | 8030 -> 8030 | | Provider2 | | v1.3.10 | 172.15.0.7 | 8030 -> 8030 | | RBAC Server | | main | 172.15.0.8 | 3000 -> 3000 | From eb3cbbec6d6f9b4b86c49763cbee07c6d59d1a66 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 29 Nov 2022 13:35:08 +0200 Subject: [PATCH 3/6] do not bump es version --- README.md | 2 +- start_ocean.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fe01cca..f457070 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ The default versions are always a combination of component versions which are co | ganache | ocean-contracts | latest | 172.15.0.3 | 8545 -> 8545 | | ocean-contracts | | v1.1.8 | 172.15.0.14 | | | Aquarius | | v4.2.0 | 172.15.0.5 | 5000 -> 5000 | -| Elasticsearch | Aquarius | 8.1.5 | 172.15.0.6 | | +| Elasticsearch | Aquarius | 7.14.2 | 172.15.0.6 | | | Provider | | v1.3.10 | 172.15.0.4 | 8030 -> 8030 | | Provider2 | | v1.3.10 | 172.15.0.7 | 8030 -> 8030 | | RBAC Server | | main | 172.15.0.8 | 3000 -> 3000 | diff --git a/start_ocean.sh b/start_ocean.sh index 399a9b7..ad223ef 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v4.2.0} -export ELASTICSEACH_VERSION=${ELASTICSEACH_VERSION:-8.5.1} +export ELASTICSEACH_VERSION=${ELASTICSEACH_VERSION:-7.14.2} export PROVIDER_VERSION=${PROVIDER_VERSION:-v1.3.10} export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.0} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.8} From ab0136b00d8021003132817e5db1444cbc74ec4c Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 29 Nov 2022 13:36:36 +0200 Subject: [PATCH 4/6] fix typos --- compose-files/elasticsearch.yml | 2 +- start_ocean.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose-files/elasticsearch.yml b/compose-files/elasticsearch.yml index e101c78..c8c4e19 100644 --- a/compose-files/elasticsearch.yml +++ b/compose-files/elasticsearch.yml @@ -1,7 +1,7 @@ version: '3' services: elasticsearch: - image: elasticsearch:${ELASTICSEACH_VERSION:-latest} + image: elasticsearch:${ELASTICSEARCH_VERSION:-latest} networks: backend: ipv4_address: 172.15.0.6 diff --git a/start_ocean.sh b/start_ocean.sh index ad223ef..b46f29a 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v4.2.0} -export ELASTICSEACH_VERSION=${ELASTICSEACH_VERSION:-7.14.2} +export ELASTICSEARCH_VERSION=${ELASTICSEACH_VERSION:-7.14.2} export PROVIDER_VERSION=${PROVIDER_VERSION:-v1.3.10} export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.0} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.8} From 0f4cb5e3a4f1abaec63921cd6866c5074ddf0ffe Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 29 Nov 2022 13:36:48 +0200 Subject: [PATCH 5/6] update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f457070..15b0f3e 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,7 @@ You can override the Docker image tag used for a particular component by setting - `PROVIDER_VERSION` - `CONTRACTS_VERSION` - `RBAC_VERSION` +- `ELASTICSEARCH_VERSION` For example: From fe5f2b786275ce4018518578fcc523d003b8c5b1 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 29 Nov 2022 13:47:09 +0200 Subject: [PATCH 6/6] fix typo --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index b46f29a..d774213 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v4.2.0} -export ELASTICSEARCH_VERSION=${ELASTICSEACH_VERSION:-7.14.2} +export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-7.14.2} export PROVIDER_VERSION=${PROVIDER_VERSION:-v1.3.10} export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v3.0.0} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v1.1.8}