Skip to content

Commit

Permalink
Merge pull request #663 from wazuh/bump_4_3_3
Browse files Browse the repository at this point in the history
Bump 4.3.3 to 4.3 Branch
  • Loading branch information
alberpilot authored May 31, 2022
2 parents 4d75504 + 3f0ad72 commit d053ff8
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/.goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.3.2
- 4.3.3
port:
tcp:1514:
listening: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
version: v0.3.16

- name: Execute Goss tests (wazuh-odfe)
run: dgoss run wazuh/wazuh-manager:4.3.2
run: dgoss run wazuh/wazuh-manager:4.3.3
env:
GOSS_SLEEP: 30
GOSS_FILE: .github/.goss.yaml
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.

## Wazuh Docker v4.3.3
### Added

- Update Wazuh to version [4.3.3](https://github.com/wazuh/wazuh/blob/v4.3.3/CHANGELOG.md#v433)

## Wazuh Docker v4.3.2
### Added

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ WAZUH_MONITORING_REPLICAS=0 #

| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.3.3 | | |
| v4.3.2 | | |
| v4.3.1 | | |
| v4.3.0 | | |
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="4.3.2"
REVISION="40312"
WAZUH-DOCKER_VERSION="4.3.3"
REVISION="40314"
6 changes: 3 additions & 3 deletions build-docker-images/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: '3.7'
services:
wazuh.manager:
build: wazuh-manager/
image: wazuh/wazuh-manager:4.3.2
image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.manager
restart: always
ports:
Expand Down Expand Up @@ -32,7 +32,7 @@ services:

wazuh.indexer:
build: wazuh-indexer/
image: wazuh/wazuh-indexer:4.3.2
image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh.indexer
restart: always
ports:
Expand All @@ -49,7 +49,7 @@ services:

wazuh.dashboard:
build: wazuh-dashboard/
image: wazuh/wazuh-dashboard:4.3.2
image: wazuh/wazuh-dashboard:4.3.3
hostname: wazuh.dashboard
restart: always
ports:
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-dashboard/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder

ARG WAZUH_VERSION=4.3.2
ARG WAZUH_VERSION=4.3.3
ARG INSTALL_DIR=/usr/share/wazuh-dashboard

# Update and install dependencies
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-indexer/config/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME}
# Package build options
export USER=${NAME}
export GROUP=${NAME}
export VERSION=4.3.2
export VERSION=4.3.3
export LOG_DIR=/var/log/${NAME}
export LIB_DIR=/var/lib/${NAME}
export PID_DIR=/run/${NAME}
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-manager/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal

ARG WAZUH_VERSION=4.3.2
ARG WAZUH_VERSION=4.3.3
ARG TEMPLATE_VERSION=4.3
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
Expand Down
12 changes: 6 additions & 6 deletions multi-node/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.7'

services:
wazuh.master:
image: wazuh/wazuh-manager:4.3.2
image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.master
restart: always
ports:
Expand Down Expand Up @@ -38,7 +38,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

wazuh.worker:
image: wazuh/wazuh-manager:4.3.2
image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.worker
restart: always
environment:
Expand Down Expand Up @@ -67,7 +67,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf

wazuh1.indexer:
image: wazuh/wazuh-indexer:4.3.2
image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh1.indexer
restart: always
ports:
Expand All @@ -93,7 +93,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

wazuh2.indexer:
image: wazuh/wazuh-indexer:4.3.2
image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh2.indexer
restart: always
environment:
Expand All @@ -115,7 +115,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

wazuh3.indexer:
image: wazuh/wazuh-indexer:4.3.2
image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh3.indexer
restart: always
environment:
Expand All @@ -137,7 +137,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.2
image: wazuh/wazuh-dashboard:4.3.3
hostname: wazuh.dashboard
restart: always
ports:
Expand Down
6 changes: 3 additions & 3 deletions single-node/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.7'

services:
wazuh.manager:
image: wazuh/wazuh-manager:4.3.2
image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.manager
restart: always
ports:
Expand Down Expand Up @@ -39,7 +39,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

wazuh.indexer:
image: wazuh/wazuh-indexer:4.3.2
image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh.indexer
restart: always
ports:
Expand All @@ -64,7 +64,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.2
image: wazuh/wazuh-dashboard:4.3.3
hostname: wazuh.dashboard
restart: always
ports:
Expand Down

0 comments on commit d053ff8

Please sign in to comment.