Compare commits

...

1 Commits

Author SHA1 Message Date
Jose M
c94b82b42d Bump version 2019-08-16 10:02:55 +02:00
7 changed files with 21 additions and 15 deletions

View File

@@ -1,6 +1,12 @@
# Change Log # Change Log
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## Wazuh Docker v3.9.5_7.3.0-oss
### Added
- Update to Wazuh version 3.9.5_7.3.0-oss
## Wazuh Docker v3.9.3_7.2.0-oss ## Wazuh Docker v3.9.3_7.2.0-oss
### Added ### 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. * `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. * `master` branch contains the latest code, be aware of possible bugs on this branch.
* `Wazuh.Version_ElasticStack.Version` (for example 3.9.3_7.2.0) 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.5_7.3.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 ## Credits and Thank you

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="3.9.3_7.2.0" WAZUH-DOCKER_VERSION="3.9.5_7.3.0"
REVISION="3930" REVISION="3950"

View File

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

View File

@@ -1,5 +1,5 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
ARG ELASTIC_VERSION=7.2.0 ARG ELASTIC_VERSION=7.3.0
FROM docker.elastic.co/elasticsearch/elasticsearch-oss:${ELASTIC_VERSION} FROM docker.elastic.co/elasticsearch/elasticsearch-oss:${ELASTIC_VERSION}
ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip" ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip"
@@ -14,7 +14,7 @@ ENV API_USER="foo" \
ENV ENABLE_CONFIGURE_S3="false" ENV ENABLE_CONFIGURE_S3="false"
ARG TEMPLATE_VERSION=v3.9.3 ARG TEMPLATE_VERSION=v3.9.5
# Elasticearch cluster configuration environment variables # Elasticearch cluster configuration environment variables
# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration

View File

@@ -1,7 +1,7 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/kibana/kibana-oss:7.2.0 FROM docker.elastic.co/kibana/kibana-oss:7.3.0
ARG ELASTIC_VERSION=7.2.0 ARG ELASTIC_VERSION=7.3.0
ARG WAZUH_VERSION=3.9.3 ARG WAZUH_VERSION=3.9.5
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
USER root USER root

View File

@@ -1,14 +1,14 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM phusion/baseimage:latest FROM phusion/baseimage:latest
ARG FILEBEAT_VERSION=7.2.0 ARG FILEBEAT_VERSION=7.3.0
ARG WAZUH_VERSION=3.9.3-1 ARG WAZUH_VERSION=3.9.5-1
ENV API_USER="foo" \ ENV API_USER="foo" \
API_PASS="bar" API_PASS="bar"
ARG TEMPLATE_VERSION="v3.9.3" ARG TEMPLATE_VERSION="v3.9.5"
# Set repositories. # Set repositories.
RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \ RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \