From 4c8dd65f1bfc608caf7bfecb66e7abc3a5f8e50e Mon Sep 17 00:00:00 2001 From: Jose M Date: Wed, 14 Aug 2019 11:54:52 +0200 Subject: [PATCH] Bump version --- README.md | 2 +- VERSION | 4 ++-- kibana/Dockerfile | 4 +++- wazuh/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6e9d24ae..bf6ea9e5 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ In addition, a docker-compose file is provided to launch the containers mentione * `stable` branch on correspond to the latest Wazuh-Docker stable version. * `master` branch contains the latest code, be aware of possible bugs on this branch. -* `Wazuh.Version_ElasticStack.Version` (for example 3.9.3_7.1.1-opendistro) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. +* `Wazuh.Version_ElasticStack.Version` (for example 3.9.4_7.1.1-opendistro) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. ## Credits and Thank you diff --git a/VERSION b/VERSION index 0ae1b25e..6429e234 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.9.3_7.1.1" -REVISION="3930" \ No newline at end of file +WAZUH-DOCKER_VERSION="3.9.4_7.1.1" +REVISION="3940" \ No newline at end of file diff --git a/kibana/Dockerfile b/kibana/Dockerfile index e8ef6e70..cfa2cfcb 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM amazon/opendistro-for-elasticsearch-kibana:1.1.0 ARG ELASTIC_VERSION=7.1.1 -ARG WAZUH_VERSION=3.9.3 +ARG WAZUH_VERSION=3.9.4 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" USER root @@ -60,4 +60,6 @@ RUN ./welcome_wazuh.sh RUN /usr/local/bin/kibana-docker --optimize +ENV ELASTICSEARCH_URL "--cacert /usr/share/elasticsearch/config/root-ca.pem -u admin:admin -k https://elasticsearch:9200" + ENTRYPOINT ./entrypoint.sh diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index b417aa48..6f78a99c 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -3,12 +3,12 @@ FROM phusion/baseimage:latest ARG FILEBEAT_VERSION=7.1.1 -ARG WAZUH_VERSION=3.9.3-1 +ARG WAZUH_VERSION=3.9.4-1 ENV API_USER="foo" \ API_PASS="bar" -ARG TEMPLATE_VERSION="v3.9.3" +ARG TEMPLATE_VERSION="v3.9.4" # Set repositories. RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \