Bump version

This commit is contained in:
Manuel J. Bernal 2019-12-16 19:34:57 +01:00
parent 505767ef31
commit 89eda06a27
7 changed files with 24 additions and 20 deletions

View File

@ -1,6 +1,12 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v3.10.2_7.5.0
### Added
- Update to Wazuh version 3.10.2_7.5.0
## Wazuh Docker v3.10.2_7.3.2
### Added

View File

@ -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.10.2_7.3.2) 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.10.2_7.5.0) 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

View File

@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="3.10.2_7.3.2"
REVISION="31020"
WAZUH-DOCKER_VERSION="3.10.2_7.5.0"
REVISION="31030"

View File

@ -3,7 +3,7 @@ version: '2'
services:
wazuh:
image: wazuh/wazuh:3.10.2_7.3.2
image: wazuh/wazuh:3.10.2_7.5.0
hostname: wazuh-manager
restart: always
ports:
@ -13,7 +13,7 @@ services:
- "55000:55000"
elasticsearch:
image: wazuh/wazuh-elasticsearch:3.10.2_7.3.2
image: wazuh/wazuh-elasticsearch:3.10.2_7.5.0
hostname: elasticsearch
restart: always
ports:
@ -30,7 +30,7 @@ services:
mem_limit: 2g
kibana:
image: wazuh/wazuh-kibana:3.10.2_7.3.2
image: wazuh/wazuh-kibana:3.10.2_7.5.0
hostname: kibana
restart: always
depends_on:
@ -39,7 +39,7 @@ services:
- elasticsearch:elasticsearch
- wazuh:wazuh
nginx:
image: wazuh/wazuh-nginx:3.10.2_7.3.2
image: wazuh/wazuh-nginx:3.10.2_7.5.0
hostname: nginx
restart: always
environment:

View File

@ -1,5 +1,5 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
ARG ELASTIC_VERSION=7.3.2
ARG ELASTIC_VERSION=7.5.0
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"

View File

@ -1,21 +1,19 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/kibana/kibana:7.3.2
ARG ELASTIC_VERSION=7.3.2
FROM docker.elastic.co/kibana/kibana:7.5.0
USER kibana
ARG ELASTIC_VERSION=7.5.0
ARG WAZUH_VERSION=3.10.2
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
#ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /usr/share/kibana/
RUN /usr/share/kibana/bin/kibana-plugin install https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip
# RUN rm -rf /tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
USER root
ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
RUN /usr/share/kibana/bin/kibana-plugin install --allow-root file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
RUN rm -rf /tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
COPY config/entrypoint.sh ./entrypoint.sh
RUN chmod 755 ./entrypoint.sh
USER kibana
ENV PATTERN="" \
CHECKS_PATTERN="" \
CHECKS_TEMPLATE="" \
@ -72,7 +70,7 @@ COPY --chown=kibana:kibana ./config/welcome_wazuh.sh ./
RUN chmod +x ./welcome_wazuh.sh
RUN ./welcome_wazuh.sh
USER kibana
RUN /usr/local/bin/kibana-docker --optimize
ENTRYPOINT ./entrypoint.sh

View File

@ -1,7 +1,7 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM phusion/baseimage:latest
ARG FILEBEAT_VERSION=7.3.2
ARG FILEBEAT_VERSION=7.5.0
ARG WAZUH_VERSION=3.10.2-1