clear up opensearch building files

magda-io · May 16, 2024 · 1c1f92b · 1c1f92b
1 parent 6ad5a38
commit 1c1f92b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 95 deletions.
diff --git a/magda-opensearch-dashboards/docker-compose.yml b/magda-opensearch-dashboards/docker-compose.yml
@@ -12,7 +12,10 @@ services:
     # extra_hosts:
     #   - "host.docker.internal:host-gateway"
     volumes:
-      - ./setup-test.sh:/tmp/setup.sh
       - ./opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml
-    entrypoint:
-      - /tmp/setup.sh
+    command:
+      - /bin/bash
+      - -c
+      - |
+        ./bin/opensearch-dashboards-plugin remove securityDashboards
+        ./opensearch-dashboards-docker-entrypoint.sh opensearch-dashboards
diff --git a/magda-opensearch-dashboards/setup-test.sh b/magda-opensearch-dashboards/setup-test.sh
diff --git a/magda-opensearch/Dockerfile b/magda-opensearch/Dockerfile
@@ -1,7 +1,4 @@
 FROM opensearchproject/opensearch:2.14.0
-RUN /usr/share/opensearch/bin/opensearch-plugin remove opensearch-security
-
-#COPY --chown=opensearch:opensearch component/opensearch.yml /usr/share/opensearch/config/
+RUN /usr/share/opensearch/bin/opensearch-plugin remove opensearch-security --purge
 COPY --chown=opensearch:opensearch component/wn_s.pl /usr/share/opensearch/config/analysis/
 COPY --chown=opensearch:opensearch component/regionSynonyms.txt /usr/share/opensearch/config/analysis/
-#RUN apk add --no-cache --update curl procps
diff --git a/magda-opensearch/docker-compose.yml b/magda-opensearch/docker-compose.yml
@@ -4,24 +4,19 @@ services:
     image: opensearchproject/opensearch:2.14.0
     ports:
       - 9200:9200
-      - 9600:9600
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
+      - 9300:9300
     volumes:
-      - ./setup-test.sh:/tmp/setup.sh
       - ./regionSynonyms.test.txt:/usr/share/opensearch/config/analysis/regionSynonyms.txt
       - ./wn_s_test.pl:/usr/share/opensearch/config/analysis/wn_s.pl
     environment:
       - cluster.name=oes-data-0
-      - NODE_DATA=true
-      - NODE_MASTER=true
-      - NODE_INGEST=true
-      - HTTP_ENABLE=true
-      - DISCOVERY_SERVICE=localhost
-      - NETWORK_HOST=0.0.0.0
-      - bootstrap.memory_lock=true
+      - node.roles=cluster_manager,data,ingest
+      - discovery.seed_hosts=localhost
+      - network.host=0.0.0.0
       - discovery.type=single-node
-    entrypoint:
-      - /tmp/setup.sh
+    command:
+      - /bin/bash
+      - -c
+      - |
+        ./bin/opensearch-plugin remove opensearch-security --purge
+        ./opensearch-docker-entrypoint.sh opensearch
diff --git a/magda-opensearch/opensearch.yml b/magda-opensearch/opensearch.yml
diff --git a/magda-opensearch/package.json b/magda-opensearch/package.json
@@ -15,7 +15,7 @@
   "config": {
     "docker": {
       "name": "magda-opensearch",
-      "include": "Dockerfile opensearch.yml setup.sh wn_s.pl regionSynonyms.txt"
+      "include": "Dockerfile wn_s.pl regionSynonyms.txt"
     },
     "regionSources": {
       "COUNTRY": {

diff --git a/magda-opensearch/setup-test.sh b/magda-opensearch/setup-test.sh
diff --git a/magda-opensearch/setup.sh b/magda-opensearch/setup.sh