From 5b3c4b7db17dadfd5813fe1b140015004d7ee5f4 Mon Sep 17 00:00:00 2001 From: frikky Date: Tue, 8 Jun 2021 17:15:26 +0200 Subject: [PATCH] Rolled back database config to beta-1 --- .env | 7 ++++--- docker-compose.yml | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 131dcc43..7e9ffd78 100644 --- a/.env +++ b/.env @@ -51,9 +51,10 @@ SHUFFLE_ELASTIC=true # DATABASE CONFIGURATIONS DATASTORE_EMULATOR_HOST=shuffle-database:8000 -SHUFFLE_OPENSEARCH_URL=https://shuffle-opensearch:9200 -SHUFFLE_OPENSEARCH_USERNAME=admin -SHUFFLE_OPENSEARCH_PASSWORD=admin +#SHUFFLE_OPENSEARCH_URL=https://shuffle-opensearch:9200 +SHUFFLE_OPENSEARCH_URL=http://shuffle-opensearch:9200 +SHUFFLE_OPENSEARCH_USERNAME= #admin +SHUFFLE_OPENSEARCH_PASSWORD= #admin SHUFFLE_OPENSEARCH_CERTIFICATE_FILE= SHUFFLE_OPENSEARCH_APIKEY= SHUFFLE_OPENSEARCH_CLOUDID= diff --git a/docker-compose.yml b/docker-compose.yml index 71bb1286..c0100d39 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,14 +66,18 @@ services: - CLEANUP=${SHUFFLE_CONTAINER_AUTO_CLEANUP} restart: unless-stopped opensearch: - image: opensearchproject/opensearch:1.0.0-rc1 + image: opensearchproject/opensearch:1.0.0-beta1 hostname: shuffle-opensearch container_name: shuffle-opensearch environment: - bootstrap.memory_lock=true - "OPENSEARCH_JAVA_OPTS=-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM - - discovery.seed_hosts=shuffle-opensearch + - opendistro_security.disabled=true - cluster.routing.allocation.disk.threshold_enabled=false + - cluster.name=shuffle-cluster + - node.name=shuffle-opensearch + - discovery.seed_hosts=shuffle-opensearch + - cluster.initial_master_nodes=shuffle-opensearch ulimits: memlock: soft: -1