From d81ab1e304e8646908558a65d0e48963b20dcc87 Mon Sep 17 00:00:00 2001
From: "Manuel J. Bernal" <manu.asi2@gmail.com>
Date: Wed, 12 Jun 2019 17:04:42 +0200
Subject: [PATCH] Bump version

---
 elasticsearch/Dockerfile |  8 +++++---
 kibana/Dockerfile        |  7 +++++--
 wazuh/Dockerfile         | 12 +++++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 93238c65..05ad928a 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,5 +1,7 @@
 # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.1.0
+ARG ELASTIC_VERSION=7.1.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
+ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip"
 
 ENV ELASTICSEARCH_URL="http://elasticsearch:9200"
 
@@ -13,7 +15,7 @@ ENV XPACK_ML="true"
 
 ENV ENABLE_CONFIGURE_S3="false"
 
-ENV TEMPLATE_VERSION=v3.9.1
+ARG TEMPLATE_VERSION=v3.9.2
 
 # Elasticearch cluster configuration environment variables
 # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
@@ -41,7 +43,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./
 
 RUN chmod +x ./load_settings.sh
 
-RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-7.1.0.zip
+RUN ${bin/elasticsearch-plugin install --batch S3_PLUGIN_URL}
 
 COPY config/configure_s3.sh ./config/configure_s3.sh
 RUN chmod 755 ./config/configure_s3.sh
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index a5e42fd5..e521eb43 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,6 +1,9 @@
 # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:7.1.0
-ARG WAZUH_APP_VERSION=3.9.1_7.1.0
+FROM docker.elastic.co/kibana/kibana:7.1.1
+ARG ELASTIC_VERSION=7.1.1
+ARG WAZUH_VERSION=3.9.2
+ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
+
 USER root
 
 ADD  https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 9f822892..4f3849a0 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,12 +1,14 @@
 # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=7.1.0
-ARG WAZUH_VERSION=3.9.1-1
+
+ARG FILEBEAT_VERSION=7.1.1
+
+ARG WAZUH_VERSION=3.9.2-1
 
 ENV API_USER="foo" \
    API_PASS="bar"
 
-ENV TEMPLATE_VERSION="v3.9.1"
+ARG TEMPLATE_VERSION="v3.9.2"
 
 # Set repositories.
 RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \
@@ -18,8 +20,8 @@ RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /
 
 RUN add-apt-repository universe && apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
    apt-get --no-install-recommends --no-install-suggests -y install openssl postfix bsd-mailx python-boto python-pip  \
-   apt-transport-https vim expect nodejs python-cryptography mailutils libsasl2-modules wazuh-manager \
-   wazuh-api && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -f \
+   apt-transport-https vim expect nodejs python-cryptography mailutils libsasl2-modules wazuh-manager=${WAZUH_VERSION} \
+   wazuh-api=${WAZUH_VERSION} && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -f \
    /var/ossec/logs/alerts/*/*/*.log && rm -f /var/ossec/logs/alerts/*/*/*.json && rm -f \
    /var/ossec/logs/archives/*/*/*.log && rm -f /var/ossec/logs/archives/*/*/*.json && rm -f \
    /var/ossec/logs/firewall/*/*/*.log && rm -f /var/ossec/logs/firewall/*/*/*.json