From 29cf202ca70f69a7f9d052377554b6b2662b7c7b Mon Sep 17 00:00:00 2001 From: Flook Peter Date: Thu, 25 Jul 2024 17:15:04 +0800 Subject: [PATCH 1/2] Add in opensearch --- README.md | 9 ++++++++- docker-compose-persist.yaml | 3 +++ docker-compose.yaml | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a8cc8e..d9f94aa 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,13 @@ mysql mysql:3306 localhost:3306 host.docker.internal:3306 ./run.sh remove postgres ``` +### Run version + +```shell +_VERSION=0.1 ./run.sh +POSTGRES_VERSION=14.0 ./run.sh postgres +``` + ### Run from anywhere In your `.bashrc, .zshrc, ...`, add: @@ -124,10 +131,10 @@ POSTGRES_USER=my-user POSTGRES_PASSWORD=my-password ./run.sh postgres | Database | mssql | ✅ | | Database | mysql | ✅ | | Database | neo4j | ✅ | +| Database | opensearch | ✅ | | Database | postgres | ✅ | | Database | spanner | ✅ | | Database | sqlite | ✅ | -| Database | opensearch | ❌ | | Data Catalog | marquez | ✅ | | Data Catalog | unitycatalog | ✅ | | Data Catalog | amundsen | ❌ | diff --git a/docker-compose-persist.yaml b/docker-compose-persist.yaml index 23ebca0..72bf1b2 100644 --- a/docker-compose-persist.yaml +++ b/docker-compose-persist.yaml @@ -69,6 +69,9 @@ services: neo4j: volumes: - "./data/neo4j/persist:/data" + opensearch: + volumes: + - "./data/opensearch/persist:/usr/share/opensearch/data" postgres-server: volumes: - "./data/postgres/persist:/data/postgres" diff --git a/docker-compose.yaml b/docker-compose.yaml index 2db9105..227013a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -655,6 +655,20 @@ services: ports: - "7474:7474" - "7687:7687" + opensearch: + container_name: opensearch + environment: + - "discovery.type=single-node" + - "OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_PASSWORD:-!BigData#1}" + healthcheck: + interval: 10s + retries: 5 + test: [ CMD, curl, --fail, "https://localhost:9200", "-ku", "admin:${OPENSEARCH_PASSWORD:-!BigData#1}" ] + timeout: 5s + image: "opensearchproject/opensearch:${OPENSEARCH_VERSION:-2.15.0}" + ports: + - "9600:9600" + - "9200:9200" pinot: command: "StartServer -zkAddress zookeeper:2181" container_name: pinot-server From 7fd0210e98d46e199f77863131ee84085f35327b Mon Sep 17 00:00:00 2001 From: pflooky Date: Thu, 25 Jul 2024 09:15:49 +0000 Subject: [PATCH 2/2] Format docker compose YAML files --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 227013a..e6f0a97 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -658,12 +658,12 @@ services: opensearch: container_name: opensearch environment: - - "discovery.type=single-node" + - discovery.type=single-node - "OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_PASSWORD:-!BigData#1}" healthcheck: interval: 10s retries: 5 - test: [ CMD, curl, --fail, "https://localhost:9200", "-ku", "admin:${OPENSEARCH_PASSWORD:-!BigData#1}" ] + test: [CMD, curl, --fail, "https://localhost:9200", -ku, "admin:${OPENSEARCH_PASSWORD:-!BigData#1}"] timeout: 5s image: "opensearchproject/opensearch:${OPENSEARCH_VERSION:-2.15.0}" ports: