From cf6415cf6afdfa6e8711f0ebefa5d8fb3a399fcd Mon Sep 17 00:00:00 2001 From: Owen Halliday Date: Fri, 31 Jan 2025 14:05:10 -0500 Subject: [PATCH 1/6] add env_file to docker compose --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index bab29f9..82d7e55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ services: opensearch-node1: # This is also the hostname of the container within the Docker network (i.e. https://opensearch-node1/) image: opensearchproject/opensearch:latest container_name: opensearch-node1 + env_file: ".env" environment: - cluster.name=opensearch-cluster # Name the cluster - node.name=opensearch-node1 # Name the node that will run in this container @@ -28,6 +29,7 @@ services: opensearch-node2: image: opensearchproject/opensearch:latest # This should be the same image used for opensearch-node1 to avoid issues container_name: opensearch-node2 + env_file: ".env" environment: - cluster.name=opensearch-cluster - node.name=opensearch-node2 From d3d3e2a451047bda37faf19b31d9168e7691f8d2 Mon Sep 17 00:00:00 2001 From: Owen Halliday Date: Fri, 31 Jan 2025 14:06:05 -0500 Subject: [PATCH 2/6] change admin password variable's value --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 82d7e55..5d209cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 # Nodes eligibile to serve as cluster manager - bootstrap.memory_lock=true # Disable JVM heap memory swapping - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # Set min and max JVM heap sizes to at least 50% of system RAM - - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} # Sets the demo admin user password when using demo configuration (for OpenSearch 2.12 and later) + - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_PASSWORD} # Sets the demo admin user password when using demo configuration (for OpenSearch 2.12 and later) ulimits: memlock: soft: -1 # Set memlock to unlimited (no soft or hard limit) @@ -37,7 +37,7 @@ services: - 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} + - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_PASSWORD} ulimits: memlock: soft: -1 From 179730727d4a0d43d4283d661fc3c0bc6bec5693 Mon Sep 17 00:00:00 2001 From: Owen Halliday Date: Fri, 31 Jan 2025 14:09:33 -0500 Subject: [PATCH 3/6] update readme to reflect environment variable changes --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 02ed5f5..1a54f1e 100644 --- a/README.md +++ b/README.md @@ -18,15 +18,10 @@ This repo contains: source .venv/bin/activate pip install -r requirements.txt ``` - -* Set your password as an environment variable for the `docker-compose` file. + ### Environment Variables The `` must have at least one upper, lower, number, and special characters and be at least 8 characters. - ``` - export OPENSEARCH_INITIAL_ADMIN_PASSWORD= - ``` - NOTE: including a `$` in the password as a special character leads to issues when running `docker compose` later on (the following text gets interpreted as a shell variable), so avoid using `$` in your password. From b14b7627ef0ac3e4cb9cc64e203cab6cd5aa7b88 Mon Sep 17 00:00:00 2001 From: Owen Halliday Date: Fri, 31 Jan 2025 14:05:10 -0500 Subject: [PATCH 4/6] add env_file to docker compose --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index bab29f9..82d7e55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ services: opensearch-node1: # This is also the hostname of the container within the Docker network (i.e. https://opensearch-node1/) image: opensearchproject/opensearch:latest container_name: opensearch-node1 + env_file: ".env" environment: - cluster.name=opensearch-cluster # Name the cluster - node.name=opensearch-node1 # Name the node that will run in this container @@ -28,6 +29,7 @@ services: opensearch-node2: image: opensearchproject/opensearch:latest # This should be the same image used for opensearch-node1 to avoid issues container_name: opensearch-node2 + env_file: ".env" environment: - cluster.name=opensearch-cluster - node.name=opensearch-node2 From 7433a00d882c5d76bf0008d2693a6d01cd69f92f Mon Sep 17 00:00:00 2001 From: Owen Halliday Date: Fri, 31 Jan 2025 14:06:05 -0500 Subject: [PATCH 5/6] change admin password variable's value --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 82d7e55..5d209cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 # Nodes eligibile to serve as cluster manager - bootstrap.memory_lock=true # Disable JVM heap memory swapping - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # Set min and max JVM heap sizes to at least 50% of system RAM - - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD} # Sets the demo admin user password when using demo configuration (for OpenSearch 2.12 and later) + - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_PASSWORD} # Sets the demo admin user password when using demo configuration (for OpenSearch 2.12 and later) ulimits: memlock: soft: -1 # Set memlock to unlimited (no soft or hard limit) @@ -37,7 +37,7 @@ services: - 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} + - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_PASSWORD} ulimits: memlock: soft: -1 From ce6c3d15591ff3458dee43ad465aa7e3d12fcd43 Mon Sep 17 00:00:00 2001 From: Owen Halliday Date: Fri, 31 Jan 2025 14:09:33 -0500 Subject: [PATCH 6/6] update readme to reflect environment variable changes --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index dda4e7b..63b93af 100644 --- a/README.md +++ b/README.md @@ -18,15 +18,10 @@ This repo contains: source .venv/bin/activate pip install -r requirements.txt ``` - -* Set your password as an environment variable for the `docker-compose` file. + ### Environment Variables The `` must have at least one upper, lower, number, and special characters and be at least 8 characters. - ``` - export OPENSEARCH_INITIAL_ADMIN_PASSWORD= - ``` - NOTE: including a `$` in the password as a special character leads to issues when running `docker compose` later on (the following text gets interpreted as a shell variable), so avoid using `$` in your password.