From 35886b5b808eb5d41c86a1756ad57fd0438ad4e7 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Sat, 10 Dec 2022 09:52:36 +0200 Subject: [PATCH 1/6] Update elasticsearch.yml --- compose-files/elasticsearch.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compose-files/elasticsearch.yml b/compose-files/elasticsearch.yml index c8c4e19..6cc2d32 100644 --- a/compose-files/elasticsearch.yml +++ b/compose-files/elasticsearch.yml @@ -9,3 +9,6 @@ services: ES_JAVA_OPTS: "-Xms512m -Xmx512m" MAX_MAP_COUNT: "64000" discovery.type: "single-node" + ELASTIC_PASSWORD: "changeme" + xpack.security.enabled: "false" + xpack.security.http.ssl.enabled: "false" From 75f419808e261351e5ea2371cf9dc9547d34d4ff Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Sat, 10 Dec 2022 09:53:34 +0200 Subject: [PATCH 2/6] Update aquarius.yml --- compose-files/aquarius.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index 463b389..cea9117 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -30,5 +30,6 @@ services: EVENTS_RPC: "http://172.15.0.3:8545" EVENTS_ALLOW: "0" RUN_EVENTS_MONITOR: "1" + AQUARIUS_URL: http://172.15.0.5:5000 volumes: - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ From 7fc2042bcef3ab998460c947fd88d1e24bcd7d3b Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Sat, 10 Dec 2022 09:54:00 +0200 Subject: [PATCH 3/6] Update elasticsearch.yml --- compose-files/elasticsearch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compose-files/elasticsearch.yml b/compose-files/elasticsearch.yml index 6cc2d32..dadaf8d 100644 --- a/compose-files/elasticsearch.yml +++ b/compose-files/elasticsearch.yml @@ -2,6 +2,8 @@ version: '3' services: elasticsearch: image: elasticsearch:${ELASTICSEARCH_VERSION:-latest} + ports: + - 9200:9200 networks: backend: ipv4_address: 172.15.0.6 From 865f18491ff7b59f0e5594be871483f97da3da9b Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Sat, 10 Dec 2022 09:54:47 +0200 Subject: [PATCH 4/6] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index d774213..ee66d67 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -88,7 +88,7 @@ export CONTRACTS_NETWORK_NAME="development" # Default Aquarius parameters: use Elasticsearch export DB_MODULE="elasticsearch" -export DB_HOSTNAME="172.15.0.6" +export DB_HOSTNAME="http://172.15.0.6" export DB_PORT="9200" export DB_USERNAME="elastic" export DB_PASSWORD="changeme" From 914c610b5c6b92c18911907e82916cf9f67fc172 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Sat, 10 Dec 2022 09:55:57 +0200 Subject: [PATCH 5/6] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index ee66d67..d5e22ee 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=${ELASTICSEARCH_VERSION:-7.14.2} +export ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-8.5.3} 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 e6e884290cbf1cd13d4eefbafc0e04636158de3f Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Sat, 10 Dec 2022 10:02:31 +0200 Subject: [PATCH 6/6] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index d5e22ee..71a32b4 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=${ELASTICSEARCH_VERSION:-8.5.3} +export ELASTICSEARCH_VERSION=${ELASTICSEARCH_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}