Skip to content

Commit

Permalink
Merge pull request #130 from wazuh/update-3.8.2_6.6.2
Browse files Browse the repository at this point in the history
Upgrade Elastic stack version to 6.6.2
manuasir authored Mar 29, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 2b0f295 + b99d54e commit b47f723
Showing 8 changed files with 20 additions and 14 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
# Change Log
All notable changes to this project will be documented in this file.

## Wazuh Docker v3.8.2_6.6.1
## Wazuh Docker v3.8.2_6.6.2

### Changed

- Update Elastic Stack version to 6.6.1. ([#129](https://github.com/wazuh/wazuh-docker/pull/129))
- Update Elastic Stack version to 6.6.2. ([#130](https://github.com/wazuh/wazuh-docker/pull/130))

## Wazuh Docker v3.8.2_6.6.2

### Changed

- Update Elastic Stack version to 6.6.2. ([#129](https://github.com/wazuh/wazuh-docker/pull/129))

## Wazuh Docker v3.8.2_6.5.4

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -61,7 +61,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.8.2_6.6.1) 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.8.2_6.6.2) 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

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="3.8.2_6.6.1"
WAZUH-DOCKER_VERSION="3.8.2_6.6.2"
REVISION="3802"
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ version: '2'

services:
wazuh:
image: wazuh/wazuh:3.8.2_6.6.1
image: wazuh/wazuh:3.8.2_6.6.2
hostname: wazuh-manager
restart: always
ports:
@@ -14,7 +14,7 @@ services:
depends_on:
- logstash
logstash:
image: wazuh/wazuh-logstash:3.8.2_6.6.1
image: wazuh/wazuh-logstash:3.8.2_6.6.2
hostname: logstash
restart: always
links:
@@ -26,7 +26,7 @@ services:
environment:
- LS_HEAP_SIZE=2048m
elasticsearch:
image: wazuh/wazuh-elasticsearch:3.8.2_6.6.1
image: wazuh/wazuh-elasticsearch:3.8.2_6.6.2
hostname: elasticsearch
restart: always
ports:
@@ -43,7 +43,7 @@ services:
hard: -1
mem_limit: 2g
kibana:
image: wazuh/wazuh-kibana:3.8.2_6.6.1
image: wazuh/wazuh-kibana:3.8.2_6.6.2
hostname: kibana
restart: always
depends_on:
@@ -52,7 +52,7 @@ services:
- elasticsearch:elasticsearch
- wazuh:wazuh
nginx:
image: wazuh/wazuh-nginx:3.8.2_6.6.1
image: wazuh/wazuh-nginx:3.8.2_6.6.2
hostname: nginx
restart: always
environment:
2 changes: 1 addition & 1 deletion elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.1
FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.2

ENV ALERTS_SHARDS="1" \
ALERTS_REPLICAS="0"
4 changes: 2 additions & 2 deletions kibana/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/kibana/kibana:6.6.1
ARG WAZUH_APP_VERSION=3.8.2_6.6.1
FROM docker.elastic.co/kibana/kibana:6.6.2
ARG WAZUH_APP_VERSION=3.8.2_6.6.2
USER root

ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
2 changes: 1 addition & 1 deletion logstash/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/logstash/logstash:6.6.1
FROM docker.elastic.co/logstash/logstash:6.6.2

COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh

2 changes: 1 addition & 1 deletion wazuh/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM phusion/baseimage:latest
ARG FILEBEAT_VERSION=6.6.1
ARG FILEBEAT_VERSION=6.6.2
ARG WAZUH_VERSION=3.8.2-1

ENV API_USER="foo" \

0 comments on commit b47f723

Please sign in to comment.