From b63c294288c50b360bcce0b57cd4cfac5d083f02 Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Wed, 2 Sep 2020 17:55:18 +0200
Subject: [PATCH] Move filebeat installation to the build stage

---
 wazuh/Dockerfile                   | 3 +++
 wazuh/config/01-config_filebeat.sh | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 0e770055..5bc84e45 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -76,5 +76,8 @@ RUN chmod +x /etc/service/wazuh-api/run && \
 ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/7.x/wazuh-template.json /etc/filebeat
 RUN chmod go-w /etc/filebeat/wazuh-template.json
 
+ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
+RUN curl -s https://packages.wazuh.com/3.x/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module
+
 # Run all services
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/wazuh/config/01-config_filebeat.sh b/wazuh/config/01-config_filebeat.sh
index 8802f1f6..952301e6 100644
--- a/wazuh/config/01-config_filebeat.sh
+++ b/wazuh/config/01-config_filebeat.sh
@@ -3,16 +3,8 @@
 
 set -e
 
-WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.1.tar.gz
-
 # Modify the output to Elasticsearch if th ELASTICSEARCH_URL is set
 if [ "$ELASTICSEARCH_URL" != "" ]; then
   >&2 echo "Customize Elasticsearch ouput IP."
   sed -i 's|http://elasticsearch:9200|'$ELASTICSEARCH_URL'|g' /etc/filebeat/filebeat.yml
 fi
-
-# Install Wazuh Filebeat Module
-
-curl -s "https://packages.wazuh.com/3.x/filebeat/${WAZUH_FILEBEAT_MODULE}" | tar -xvz -C /usr/share/filebeat/module
-mkdir -p /usr/share/filebeat/module/wazuh
-chmod 755 -R /usr/share/filebeat/module/wazuh