From 5bc8693bbc4c20f928bc1d72c9dac813667f6ef5 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Tue, 15 Feb 2022 11:13:48 -0300
Subject: [PATCH] clean Dockerfile and docker-compose start script

---
 docker-compose.yml                               |  2 --
 production-cluster.yml                           |  1 -
 .../wazuh_dashboard/wazuh/config/wazuh.yml       |  8 --------
 wazuh-indexer/Dockerfile                         | 16 ++++++----------
 4 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 production_cluster/wazuh_dashboard/wazuh/config/wazuh.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index f055f19d..28b42f3d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,8 +57,6 @@ services:
       - ELASTICSEARCH_PASSWORD=admin
       - SERVER_SSL_ENABLED=false
       - WAZUH_API_URL=https://wazuh.manager
-    #volumes:
-    #  - ./production_cluster/wazuh_dashboard/dashboard.yml:/etc/wazuh-dashboard/dashboard.yml
 
 volumes:
   ossec_api_configuration:
diff --git a/production-cluster.yml b/production-cluster.yml
index cca353e7..3b1ef143 100644
--- a/production-cluster.yml
+++ b/production-cluster.yml
@@ -152,7 +152,6 @@ services:
       - ./production_cluster/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/etc/wazuh-dashboard/certs/wazuh-dashboard-key.pem
       - ./production_cluster/wazuh_indexer_ssl_certs/root-ca.pem:/etc/wazuh-dashboard/certs/root-ca.pem
       - ./production_cluster/wazuh_dashboard/dashboard.yml:/etc/wazuh-dashboard/dashboard.yml
-      #- ./production_cluster/wazuh_dashboard/wazuh:/usr/share/wazuh-dashboard/data/wazuh
     depends_on:
       - wazuh1.indexer
     links:
diff --git a/production_cluster/wazuh_dashboard/wazuh/config/wazuh.yml b/production_cluster/wazuh_dashboard/wazuh/config/wazuh.yml
deleted file mode 100644
index f37a7aca..00000000
--- a/production_cluster/wazuh_dashboard/wazuh/config/wazuh.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-hosts:
-  - default:
-     url: https://wazuh.master
-     port: 55000
-     username: acme-user
-     password: MyS3cr37P450r.*-
-     run_as: false
-
diff --git a/wazuh-indexer/Dockerfile b/wazuh-indexer/Dockerfile
index 04972402..cdb843b9 100644
--- a/wazuh-indexer/Dockerfile
+++ b/wazuh-indexer/Dockerfile
@@ -12,23 +12,19 @@ RUN sha256sum -c ${tini_bin}.sha256sum && \
     rm ${tini_bin}.sha256sum && \
     mv ${tini_bin} /tini && \
     chmod +x /tini
-#RUN mkdir /usr/share/wazuh-indexer
-#WORKDIR /usr/share/opensearch
-#RUN tar zxf /opt/opensearch.tar.gz --strip-components=1
-#RUN sed -i -e 's/OPENSEARCH_DISTRIBUTION_TYPE=tar/OPENSEARCH_DISTRIBUTION_TYPE=docker/' /usr/share/opensearch/bin/opensearch-env
-#RUN mkdir -p config config/jvm.options.d data logs
-#RUN chmod 0775 config config/jvm.options.d data logs
-#COPY config/opensearch.yml config/log4j2.properties config/
-#RUN chmod 0660 config/opensearch.yml config/log4j2.properties
+
 COPY config/unattended_installer.tar.gz /
+
 COPY config/config.sh .
+
 RUN tar -xzvf /unattended_installer.tar.gz
+
 RUN bash config.sh
 
 ################################################################################
-# Build stage 1 (the actual OpenSearch image):
+# Build stage 1 (the actual Wazuh indexer image):
 #
-# Copy opensearch from stage 0
+# Copy wazuh-indexer from stage 0
 # Add entrypoint
 ################################################################################
 FROM ubuntu:focal