Merge pull request #1215 from wazuh/1214-rollback-ism-changes

Rollback ISM changes
wazuh · Feb 20, 2024 · 1b32518 · 1b32518
2 parents ec90762 + 33a5534
commit 1b32518
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 25 deletions.
diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile
@@ -35,8 +35,6 @@ ENV USER="wazuh-indexer" \
     NAME="wazuh-indexer" \
     INSTALL_DIR="/usr/share/wazuh-indexer"
 
-RUN apt-get update -y && apt-get install curl -y
-
 RUN getent group $GROUP || groupadd -r -g 1000 $GROUP
 
 RUN useradd --system \
@@ -54,9 +52,7 @@ COPY config/entrypoint.sh /
 
 COPY config/securityadmin.sh /
 
-COPY config/ism-check.sh /
-
-RUN chmod 700 /entrypoint.sh && chmod 700 /securityadmin.sh && chmod 700 /ism-check.sh
+RUN chmod 700 /entrypoint.sh && chmod 700 /securityadmin.sh
 
 RUN chown 1000:1000 /*.sh
 

diff --git a/build-docker-images/wazuh-indexer/config/entrypoint.sh b/build-docker-images/wazuh-indexer/config/entrypoint.sh
@@ -90,6 +90,4 @@ fi
 #  touch "/var/lib/wazuh-indexer/.flag"
 #fi
 
-nohup /ism-check.sh &
-
 run_as_other_user_if_needed /usr/share/wazuh-indexer/bin/opensearch <<<"$KEYSTORE_PASSWORD"
diff --git a/build-docker-images/wazuh-indexer/config/ism-check.sh b/build-docker-images/wazuh-indexer/config/ism-check.sh
diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml
@@ -89,7 +89,6 @@ services:
     environment:
       - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
       - "bootstrap.memory_lock=true"
-      - 'INDEXER_PASSWORD=SecretPassword'
     ulimits:
       memlock:
         soft: -1

diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
@@ -52,8 +52,7 @@ services:
     ports:
       - "9200:9200"
     environment:
-      - "OPENSEARCH_JAVA_OPTS=-Xms1024m -Xmx1024m"
-      - 'INDEXER_PASSWORD=SecretPassword'
+      - "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
     ulimits:
       memlock:
         soft: -1