Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
Jose M committed Aug 16, 2019
1 parent 95c473e commit c94b82b
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 15 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.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

### Added
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.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

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.9.3_7.2.0"
REVISION="3930"
WAZUH-DOCKER_VERSION="3.9.5_7.3.0"
REVISION="3950"
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.9.3_7.2.0-oss
image: wazuh/wazuh:3.9.5_7.3.0-oss
hostname: wazuh-manager
restart: always
ports:
Expand All @@ -13,7 +13,7 @@ services:
- "55000:55000"

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
restart: always
ports:
Expand All @@ -30,7 +30,7 @@ services:
mem_limit: 2g

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
restart: always
depends_on:
Expand All @@ -39,7 +39,7 @@ services:
- elasticsearch:elasticsearch
- wazuh:wazuh
nginx:
image: wazuh/wazuh-nginx:3.9.3_7.2.0
image: wazuh/wazuh-nginx:3.9.5_7.3.0
hostname: nginx
restart: always
environment:
Expand Down
4 changes: 2 additions & 2 deletions elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 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}
ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip"

Expand All @@ -14,7 +14,7 @@ ENV API_USER="foo" \

ENV ENABLE_CONFIGURE_S3="false"

ARG TEMPLATE_VERSION=v3.9.3
ARG TEMPLATE_VERSION=v3.9.5

# Elasticearch cluster configuration environment variables
# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
Expand Down
6 changes: 3 additions & 3 deletions kibana/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/kibana/kibana-oss:7.2.0
ARG ELASTIC_VERSION=7.2.0
ARG WAZUH_VERSION=3.9.3
FROM docker.elastic.co/kibana/kibana-oss:7.3.0
ARG ELASTIC_VERSION=7.3.0
ARG WAZUH_VERSION=3.9.5
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"

USER root
Expand Down
6 changes: 3 additions & 3 deletions wazuh/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
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" \
API_PASS="bar"

ARG TEMPLATE_VERSION="v3.9.3"
ARG TEMPLATE_VERSION="v3.9.5"

# 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 c94b82b

Please sign in to comment.