paulmataruso/wazuh-docker-mirror
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-11-11 17:35:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump release 4.5.0

Browse Source
This commit is contained in:
vcerenu
2022-05-23 09:57:31 -03:00
committed by Raul Del Pozo Moreno
parent 2cbf64dafa
commit 697b7538cc
15 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/.goss.yaml vendored
View File

@@ -56,7 +56,7 @@ package:
wazuh-manager: wazuh-manager:
installed: true installed: true
versions: versions:
- 4.4.1-1 - 4.5.0
port: port:
tcp:1514: tcp:1514:
listening: true listening: true

4
.github/workflows/push.yml vendored
View File

@@ -49,8 +49,8 @@ jobs:
with: with:
version: v0.3.16 version: v0.3.16
- name: Execute Goss tests (wazuh-manager) - name: Execute Goss tests (wazuh-odfe)
run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}} run: dgoss run wazuh/wazuh-manager:4.5.0
env: env:
GOSS_SLEEP: 30 GOSS_SLEEP: 30
GOSS_FILE: .github/.goss.yaml GOSS_FILE: .github/.goss.yaml

4
CHANGELOG.md
View File

@@ -1,10 +1,10 @@
# 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 v4.4.1 ## Wazuh Docker v4.5.0
### Added ### Added
- Update Wazuh to version [4.4.1](https://github.com/wazuh/wazuh/blob/v4.4.1/CHANGELOG.md#v441) - Update Wazuh to version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450)
## Wazuh Docker v4.4.0 ## Wazuh Docker v4.4.0
### Added ### Added

2
README.md
View File

@@ -195,7 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK | | Wazuh version | ODFE | XPACK |
|---------------|---------|--------| |---------------|---------|--------|
| v4.4.1 | | | | v4.5.0 | | |
| v4.4.0 | | | | v4.4.0 | | |
| v4.3.10 | | | | v4.3.10 | | |
| v4.3.9 | | | | v4.3.9 | | |

4
VERSION
View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.4.1" WAZUH-DOCKER_VERSION="4.5.0"
REVISION="40406" REVISION="40500"

24
build-docker-images/build-images.yml
View File

@@ -3,12 +3,8 @@ version: '3.7'
services: services:
wazuh.manager: wazuh.manager:
build: build: wazuh-manager/
context: wazuh-manager/ image: wazuh/wazuh-manager:4.5.0
args:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION}
hostname: wazuh.manager hostname: wazuh.manager
restart: always restart: always
ports: ports:
@@ -35,12 +31,8 @@ services:
- filebeat_var:/var/lib/filebeat - filebeat_var:/var/lib/filebeat
wazuh.indexer: wazuh.indexer:
build: build: wazuh-indexer/
context: wazuh-indexer/ image: wazuh/wazuh-indexer:4.5.0
args:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
image: wazuh/wazuh-indexer:${WAZUH_IMAGE_VERSION}
hostname: wazuh.indexer hostname: wazuh.indexer
restart: always restart: always
ports: ports:
@@ -56,12 +48,8 @@ services:
hard: 65536 hard: 65536
wazuh.dashboard: wazuh.dashboard:
build: build: wazuh-dashboard/
context: wazuh-dashboard/ image: wazuh/wazuh-dashboard:4.5.0
args:
WAZUH_VERSION: ${WAZUH_VERSION}
WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION}
hostname: wazuh.dashboard hostname: wazuh.dashboard
restart: always restart: always
ports: ports:

3
build-docker-images/wazuh-dashboard/Dockerfile
View File

@@ -1,8 +1,7 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder FROM ubuntu:focal AS builder
ARG WAZUH_VERSION ARG WAZUH_VERSION=4.5.0
ARG WAZUH_TAG_REVISION
ARG INSTALL_DIR=/usr/share/wazuh-dashboard ARG INSTALL_DIR=/usr/share/wazuh-dashboard
ARG WAZUH_UI_REVISION=1 ARG WAZUH_UI_REVISION=1

4
build-docker-images/wazuh-dashboard/config/config.sh
View File

@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables ## Variables
CERT_TOOL=wazuh-certs-tool.sh CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.3/ PACKAGES_URL=https://packages.wazuh.com/4.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/ PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
## Check if the cert tool exists in S3 buckets ## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}') CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

6
build-docker-images/wazuh-indexer/config/config.sh
View File

@@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME}
# Package build options # Package build options
export USER=${NAME} export USER=${NAME}
export GROUP=${NAME} export GROUP=${NAME}
export VERSION=${WAZUH_VERSION}-${WAZUH_TAG_REVISION} export VERSION=4.5.0
export LOG_DIR=/var/log/${NAME} export LOG_DIR=/var/log/${NAME}
export LIB_DIR=/var/lib/${NAME} export LIB_DIR=/var/lib/${NAME}
export PID_DIR=/run/${NAME} export PID_DIR=/run/${NAME}
@@ -53,8 +53,8 @@ tar -xf ${INDEXER_FILE}
## Variables ## Variables
CERT_TOOL=wazuh-certs-tool.sh CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.3/ PACKAGES_URL=https://packages.wazuh.com/4.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/ PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
## Check if the cert tool exists in S3 buckets ## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}') CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

7
build-docker-images/wazuh-manager/Dockerfile
View File

@@ -1,11 +1,8 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal FROM ubuntu:focal
RUN rm /bin/sh && ln -s /bin/bash /bin/sh ARG WAZUH_VERSION=4.5.0
ARG TEMPLATE_VERSION=4.5
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG TEMPLATE_VERSION=4.3
ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2 ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_VERSION=4.4.0-1 ARG WAZUH_VERSION=4.4.0-1

4
indexer-certs-creator/config/entrypoint.sh
View File

@@ -8,8 +8,8 @@
## Variables ## Variables
CERT_TOOL=wazuh-certs-tool.sh CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.3/ PACKAGES_URL=https://packages.wazuh.com/4.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/ PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
## Check if the cert tool exists in S3 buckets ## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}') CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

3
multi-node/config/wazuh_cluster/wazuh_worker.conf
View File

@@ -222,6 +222,9 @@
<global> <global>
<white_list>127.0.0.1</white_list> <white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list> <white_list>^localhost.localdomain$</white_list>
<white_list>4.5.0.1</white_list>
<white_list>4.5.0.2</white_list>
<white_list>208.67.220.220</white_list>
</global> </global>
<command> <command>

12
multi-node/docker-compose.yml
View File

@@ -3,7 +3,7 @@ version: '3.7'
services: services:
wazuh.master: wazuh.master:
image: wazuh/wazuh-manager:4.4.1 image: wazuh/wazuh-manager:4.5.0
hostname: wazuh.master hostname: wazuh.master
restart: always restart: always
ports: ports:
@@ -38,7 +38,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker: wazuh.worker:
image: wazuh/wazuh-manager:4.4.1 image: wazuh/wazuh-manager:4.5.0
hostname: wazuh.worker hostname: wazuh.worker
restart: always restart: always
environment: environment:
@@ -67,7 +67,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer: wazuh1.indexer:
image: wazuh/wazuh-indexer:4.4.1 image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh1.indexer hostname: wazuh1.indexer
restart: always restart: always
ports: ports:
@@ -93,7 +93,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh2.indexer: wazuh2.indexer:
image: wazuh/wazuh-indexer:4.4.1 image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh2.indexer hostname: wazuh2.indexer
restart: always restart: always
environment: environment:
@@ -115,7 +115,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh3.indexer: wazuh3.indexer:
image: wazuh/wazuh-indexer:4.4.1 image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh3.indexer hostname: wazuh3.indexer
restart: always restart: always
environment: environment:
@@ -137,7 +137,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard: wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.4.1 image: wazuh/wazuh-dashboard:4.5.0
hostname: wazuh.dashboard hostname: wazuh.dashboard
restart: always restart: always
ports: ports:

3
single-node/config/wazuh_cluster/wazuh_manager.conf
View File

@@ -222,6 +222,9 @@
<global> <global>
<white_list>127.0.0.1</white_list> <white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list> <white_list>^localhost.localdomain$</white_list>
<white_list>4.5.0.1</white_list>
<white_list>4.5.0.2</white_list>
<white_list>208.67.220.220</white_list>
</global> </global>
<command> <command>

6
single-node/docker-compose.yml
View File

@@ -3,7 +3,7 @@ version: '3.7'
services: services:
wazuh.manager: wazuh.manager:
image: wazuh/wazuh-manager:4.4.1 image: wazuh/wazuh-manager:4.5.0
hostname: wazuh.manager hostname: wazuh.manager
restart: always restart: always
ports: ports:
@@ -39,7 +39,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer: wazuh.indexer:
image: wazuh/wazuh-indexer:4.4.1 image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh.indexer hostname: wazuh.indexer
restart: always restart: always
ports: ports:
@@ -64,7 +64,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard: wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.4.1 image: wazuh/wazuh-dashboard:4.5.0
hostname: wazuh.dashboard hostname: wazuh.dashboard
restart: always restart: always
ports: ports: