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

Merge 4.3.3 into 4.4

Browse Source
This commit is contained in:
vcerenu
2022-06-01 12:29:05 -03:00
parent 8889c1237d 5d88983066
commit 0dd044de68
13 changed files with 34 additions and 28 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:
installed: true
versions:
- 4.3.3
- 4.4.0
port:
tcp:1514:
listening: true

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

@@ -25,7 +25,7 @@ jobs:
version: v0.3.16
- name: Execute Goss tests (wazuh-odfe)
run: dgoss run wazuh/wazuh-manager:4.3.3
run: dgoss run wazuh/wazuh-manager:4.4.0
env:
GOSS_SLEEP: 30
GOSS_FILE: .github/.goss.yaml

5
CHANGELOG.md
View File

@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.4.0
### Added
- Update Wazuh to version [4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440)
## Wazuh Docker v4.3.3
### Added

1
README.md
View File

@@ -193,6 +193,7 @@ WAZUH_MONITORING_REPLICAS=0 #
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.4.0 | | |
| v4.3.3 | | |
| v4.3.2 | | |
| v4.3.1 | | |

4
VERSION
View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.3.3"
REVISION="40314"
WAZUH-DOCKER_VERSION="4.4.0"
REVISION="40400"

6
build-docker-images/docker-compose.yml
View File

@@ -4,7 +4,7 @@ version: '3.7'
services:
wazuh.manager:
build: wazuh-manager/
image: wazuh/wazuh-manager:4.3.3
image: wazuh/wazuh-manager:4.4.0
hostname: wazuh.manager
restart: always
ports:
@@ -32,7 +32,7 @@ services:
wazuh.indexer:
build: wazuh-indexer/
image: wazuh/wazuh-indexer:4.3.3
image: wazuh/wazuh-indexer:4.4.0
hostname: wazuh.indexer
restart: always
ports:
@@ -49,7 +49,7 @@ services:
wazuh.dashboard:
build: wazuh-dashboard/
image: wazuh/wazuh-dashboard:4.3.3
image: wazuh/wazuh-dashboard:4.4.0
hostname: wazuh.dashboard
restart: always
ports:

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

@@ -1,7 +1,7 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder
ARG WAZUH_VERSION=4.3.3
ARG WAZUH_VERSION=4.4.0
ARG INSTALL_DIR=/usr/share/wazuh-dashboard
# Update and install dependencies

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

@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.3/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
## 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}')

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

@@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME}
# Package build options
export USER=${NAME}
export GROUP=${NAME}
export VERSION=4.3.3
export VERSION=4.4.0
export LOG_DIR=/var/log/${NAME}
export LIB_DIR=/var/lib/${NAME}
export PID_DIR=/run/${NAME}
@@ -30,8 +30,8 @@ tar -xf ${INDEXER_FILE}
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.3/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
## 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}')

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

@@ -1,8 +1,8 @@
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal
ARG WAZUH_VERSION=4.3.3
ARG TEMPLATE_VERSION=4.3
ARG WAZUH_VERSION=4.4.0
ARG TEMPLATE_VERSION=4.4
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"

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

@@ -8,8 +8,8 @@
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.3/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
## 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}')
@@ -54,8 +54,8 @@ cp /certificates/root-ca.key /certificates/root-ca-manager.key
chown 999:997 /certificates/root-ca-manager.pem
chown 999:997 /certificates/root-ca-manager.key
for i in ${node_names[@]};
do
for i in ${node_names[@]};
do
chown 999:997 "/certificates/${i}.pem"
chown 999:997 "/certificates/${i}-key.pem"
done

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

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.3.3
image: wazuh/wazuh-manager:4.4.0
hostname: wazuh.master
restart: always
ports:
@@ -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.3
image: wazuh/wazuh-manager:4.4.0
hostname: wazuh.worker
restart: always
environment:
@@ -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.3
image: wazuh/wazuh-indexer:4.4.0
hostname: wazuh1.indexer
restart: always
ports:
@@ -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.3
image: wazuh/wazuh-indexer:4.4.0
hostname: wazuh2.indexer
restart: always
environment:
@@ -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.3
image: wazuh/wazuh-indexer:4.4.0
hostname: wazuh3.indexer
restart: always
environment:
@@ -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.3
image: wazuh/wazuh-dashboard:4.4.0
hostname: wazuh.dashboard
restart: always
ports:

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

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.3.3
image: wazuh/wazuh-manager:4.4.0
hostname: wazuh.manager
restart: always
ports:
@@ -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.3
image: wazuh/wazuh-indexer:4.4.0
hostname: wazuh.indexer
restart: always
ports:
@@ -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.3
image: wazuh/wazuh-dashboard:4.4.0
hostname: wazuh.dashboard
restart: always
ports: