diff --git a/docker/release/dockercomposefiles/docker-compose-1.x.yml b/docker/release/dockercomposefiles/docker-compose-1.x.yml old mode 100755 new mode 100644 index 0190af85fe..a64c5ba5a8 --- a/docker/release/dockercomposefiles/docker-compose-1.x.yml +++ b/docker/release/dockercomposefiles/docker-compose-1.x.yml @@ -10,7 +10,7 @@ services: - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_master_nodes=opensearch-node1,opensearch-node2 - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping - - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM + - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM ulimits: memlock: soft: -1 @@ -54,7 +54,7 @@ services: expose: - '5601' environment: - OPENSEARCH_HOSTS: https://opensearch-node1:9200 + OPENSEARCH_HOSTS: '["https://opensearch-node1:9200","https://opensearch-node2:9200"]' networks: - opensearch-net diff --git a/docker/release/dockercomposefiles/docker-compose-2.x.yml b/docker/release/dockercomposefiles/docker-compose-2.x.yml index da8b7e9575..fa5aae33c5 100644 --- a/docker/release/dockercomposefiles/docker-compose-2.x.yml +++ b/docker/release/dockercomposefiles/docker-compose-2.x.yml @@ -10,7 +10,7 @@ services: - discovery.seed_hosts=opensearch-node1,opensearch-node2 - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping - - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM + - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} # Sets the demo admin user password when using demo configuration, required for OpenSearch 2.12 and higher ulimits: memlock: @@ -56,7 +56,7 @@ services: expose: - '5601' environment: - OPENSEARCH_HOSTS: https://opensearch-node1:9200 + OPENSEARCH_HOSTS: '["https://opensearch-node1:9200","https://opensearch-node2:9200"]' networks: - opensearch-net diff --git a/docker/release/dockercomposefiles/docker-compose-default.x.yml b/docker/release/dockercomposefiles/docker-compose-default.x.yml new file mode 100644 index 0000000000..9a2f35006f --- /dev/null +++ b/docker/release/dockercomposefiles/docker-compose-default.x.yml @@ -0,0 +1,68 @@ +--- +version: '3' +services: + opensearch-node1: + image: opensearchproject/opensearch:latest + container_name: opensearch-node1 + environment: + - cluster.name=opensearch-cluster + - node.name=opensearch-node1 + - discovery.seed_hosts=opensearch-node1,opensearch-node2 + - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 + - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping + - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM + - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} # Sets the demo admin user password when using demo configuration, required for OpenSearch 2.12 and higher + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 65536 # maximum number of open files for the OpenSearch user, set to at least 65536 on modern systems + hard: 65536 + volumes: + - opensearch-data1:/usr/share/opensearch/data + ports: + - 9200:9200 + - 9600:9600 # required for Performance Analyzer + networks: + - opensearch-net + opensearch-node2: + image: opensearchproject/opensearch:latest + container_name: opensearch-node2 + environment: + - cluster.name=opensearch-cluster + - node.name=opensearch-node2 + - discovery.seed_hosts=opensearch-node1,opensearch-node2 + - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 + - bootstrap.memory_lock=true + - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m + - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 65536 + hard: 65536 + volumes: + - opensearch-data2:/usr/share/opensearch/data + networks: + - opensearch-net + opensearch-dashboards: + image: opensearchproject/opensearch-dashboards:latest + container_name: opensearch-dashboards + ports: + - 5601:5601 + expose: + - '5601' + environment: + OPENSEARCH_HOSTS: '["https://opensearch-node1:9200","https://opensearch-node2:9200"]' + networks: + - opensearch-net + +volumes: + opensearch-data1: + opensearch-data2: + +networks: + opensearch-net: diff --git a/release-notes/opensearch-release-notes-2.12.0.md b/release-notes/opensearch-release-notes-2.12.0.md index e1544c0ead..f7db8ccc87 100644 --- a/release-notes/opensearch-release-notes-2.12.0.md +++ b/release-notes/opensearch-release-notes-2.12.0.md @@ -8,7 +8,6 @@ OpenSearch 2.12.0 includes a number of features designed to increase performance

DEPRECATION NOTICE