Skip to content

Commit

Permalink
Merge pull request #327 from wazuh/release-wazuh_3.12.2_7.6.2
Browse files Browse the repository at this point in the history
Release wazuh 3.12.2_7.6.2
  • Loading branch information
xr09 authored Apr 13, 2020
2 parents c0a503b + 99ddc15 commit 75e7f3d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Change Log
All notable changes to this project will be documented in this file.

## Wazuh Docker v3.12.2_7.6.2

### Added

- Update to Wazuh version 3.12.2_7.6.2

## Wazuh Docker v3.12.1_7.6.2

### Added
Expand Down
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="3.12.1_7.6.2"
REVISION="31210"
WAZUH-DOCKER_VERSION="3.12.2_7.6.2"
REVISION="31220"
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '2'

services:
wazuh:
image: wazuh/wazuh:3.12.1_7.6.2
image: wazuh/wazuh:3.12.2_7.6.2
hostname: wazuh-manager
restart: always
ports:
Expand All @@ -13,7 +13,7 @@ services:
- "55000:55000"

elasticsearch:
image: wazuh/wazuh-elasticsearch:3.12.1_7.6.2
image: wazuh/wazuh-elasticsearch:3.12.2_7.6.2
hostname: elasticsearch
restart: always
ports:
Expand All @@ -30,7 +30,7 @@ services:
mem_limit: 2g

kibana:
image: wazuh/wazuh-kibana:3.12.1_7.6.2
image: wazuh/wazuh-kibana:3.12.2_7.6.2
hostname: kibana
restart: always
depends_on:
Expand All @@ -40,7 +40,7 @@ services:
- wazuh:wazuh

nginx:
image: wazuh/wazuh-nginx:3.12.1_7.6.2
image: wazuh/wazuh-nginx:3.12.2_7.6.2
hostname: nginx
restart: always
environment:
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ENV XPACK_ML="true"

ENV ENABLE_CONFIGURE_S3="false"

ARG TEMPLATE_VERSION=v3.12.1
ARG TEMPLATE_VERSION=v3.12.2

# Elasticearch cluster configuration environment variables
# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
Expand Down
2 changes: 1 addition & 1 deletion kibana/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM docker.elastic.co/kibana/kibana:7.6.2
USER kibana
ARG ELASTIC_VERSION=7.6.2
ARG WAZUH_VERSION=3.12.1
ARG WAZUH_VERSION=3.12.2
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"

WORKDIR /usr/share/kibana
Expand Down
4 changes: 2 additions & 2 deletions wazuh/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ FROM phusion/baseimage:latest

ARG FILEBEAT_VERSION=7.6.2

ARG WAZUH_VERSION=3.12.1-1
ARG WAZUH_VERSION=3.12.2-1

ENV API_USER="foo" \
API_PASS="bar"

ARG TEMPLATE_VERSION="v3.12.1"
ARG TEMPLATE_VERSION="v3.12.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 && \
Expand Down

0 comments on commit 75e7f3d

Please sign in to comment.