yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests 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
build-docker-images/docker-compose.yml
+3 -3
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:
build-docker-images/wazuh-dashboard/Dockerfile
+1 -1
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
build-docker-images/wazuh-dashboard/config/config.sh
+2 -2
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}')
build-docker-images/wazuh-indexer/config/config.sh
+3 -3
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}')
build-docker-images/wazuh-manager/Dockerfile
+2 -2
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"