revert docker image tag for 4.14.3 rc3 (#2202)

Bump 4.14.3 branch

.env

@@ -2,5 +2,5 @@ WAZUH_VERSION=4.14.3
 WAZUH_IMAGE_VERSION=4.14.3
 WAZUH_TAG_REVISION=1
 FILEBEAT_TEMPLATE_BRANCH=4.14.3
-WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
+WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.5.tar.gz
 WAZUH_UI_REVISION=1

.github/workflows/Procedure_push_docker_images.yml

@@ -13,7 +13,7 @@ on:
         required: true
       filebeat_module_version:
         description: 'Filebeat module version'
-        default: '0.4'
+        default: '0.5'
         required: true
       revision:
         description: 'Package revision'
@@ -41,7 +41,7 @@ on:
         type: string
       filebeat_module_version:
         description: 'Filebeat module version'
-        default: '0.4'
+        default: '0.5'
         required: true
         type: string
       revision:

.github/workflows/push.yml

@@ -11,7 +11,8 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Build Wazuh images
-      run: build-docker-images/build-images.sh
+      run: ./build-images.sh
+      working-directory: ./build-docker-images
 
     - name: Create enviroment variables
       run: cat .env > $GITHUB_ENV

CHANGELOG.md

@@ -5,10 +5,15 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-- None
+- Update indexer-certs-gen README.md for clarity on procedure ([#2132](https://github.com/wazuh/wazuh-docker/pull/2132))
+- Update certs generator image version to 0.0.4 ([#2130](https://github.com/wazuh/wazuh-docker/pull/2130))
 
 ### Changed
 
+- Add IMAGE_TAG stage reference ([#2176](https://github.com/wazuh/wazuh-docker/pull/2176))
+- Modify run_as parameter value - v4.14.3 ([#2157](https://github.com/wazuh/wazuh-docker/pull/2157))
+- Adapt Wazuh Agent Dockerfile for multi-architecture support ([#2149](https://github.com/wazuh/wazuh-docker/pull/2149))
+- Agent group parameter added ([#2127](https://github.com/wazuh/wazuh-docker/pull/2127))
 - Adapt to multi architecture build ([#2120](https://github.com/wazuh/wazuh-docker/pull/2120))
 
 ### Fixed
@@ -28,6 +33,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Filebeat module version update ([#2115](https://github.com/wazuh/wazuh-docker/pull/2115))
 - The location of the remove command for the wazuh-authd certificates has been changed. ([#2094](https://github.com/wazuh/wazuh-docker/pull/2094))
 - Removed sslmanager key from the docker manager image to 4.14.2. ([#2093](https://github.com/wazuh/wazuh-docker/pull/2093))
 

VERSION.json

@@ -1,4 +1,4 @@
 {
     "version": "4.14.3",
-    "stage": "alpha0"
+    "stage": "rc3"
 }

build-docker-images/README.md

@@ -1,32 +1,40 @@
 # Wazuh Docker Image Builder
 
-The creation of the images for the Wazuh stack deployment in Docker is done with the build-images.yml script
+The creation of the images for the Wazuh stack deployment in Docker is done with the `build-docker-images/build-images.sh` script
-
-To execute the process, the following must be executed in the root of the wazuh-docker repository:
-
-```
-$ build-docker-images/build-images.sh
-```
 
 This script initializes the environment variables needed to build each of the images.
 
-The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:
+To execute it, make sure to be in the `build-docker-images` directory:
 
+```bash
+cd build-docker-images
 ```
-$ build-docker-images/build-images.sh -v 4.14.3
+
+Then execute:
+
+```bash
+./build-images.sh
+```
+
+The script also allows to build images from other versions of Wazuh by using the `-v` or `--version` argument:
+
+```bash
+./build-images.sh -v 4.14.3
 ```
 
 To get all the available script options use the -h or --help option:
 
-```
+```bash
-$ build-docker-images/build-images.sh -h
+./build-images.sh -h
 
-Usage: build-docker-images/build-images.sh [OPTIONS]
+Usage: ./build-images.sh [OPTIONS]
 
     -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
-    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.4.
+    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.5.
     -r, --revision <rev>         [Optional] Package revision. By default 1
+    -rg, --registry <reg>        [Optional] Set the Docker registry to push the images.
     -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.14.3.
+    -m, --multiarch              [Optional] Enable multi-architecture builds.
     -h, --help                   Show this help.
 
 ```

build-docker-images/build-images.sh

@@ -1,6 +1,4 @@
-IMAGE_TAG=4.14.3
+#!/bin/bash
-WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
-WAZUH_REGISTRY=docker.io
 
 # Wazuh package generator
 # Copyright (C) 2023, Wazuh Inc.
@@ -10,10 +8,14 @@ WAZUH_REGISTRY=docker.io
 # License (version 2) as published by the FSF - Free Software
 # Foundation.
 
+IMAGE_TAG=4.14.3
+WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
+WAZUH_REGISTRY=docker.io
+
 WAZUH_IMAGE_VERSION="4.14.3"
 WAZUH_TAG_REVISION="1"
 WAZUH_DEV_STAGE=""
-FILEBEAT_MODULE_VERSION="0.4"
+FILEBEAT_MODULE_VERSION="0.5"
 
 # -----------------------------------------------------------------------------
 
@@ -41,6 +43,7 @@ build() {
 
     if  [ "${WAZUH_DEV_STAGE}" ];then
         FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}-${WAZUH_DEV_STAGE,,}"
+        IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${WAZUH_DEV_STAGE,,}"
         if ! curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then
             echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
             clean 1
@@ -48,8 +51,10 @@ build() {
     else
         if curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/v${FILEBEAT_TEMPLATE_BRANCH}"; then
             FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}"
+            IMAGE_TAG="${WAZUH_IMAGE_VERSION}"
         elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then
             FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}"
+            IMAGE_TAG="${WAZUH_IMAGE_VERSION}"
         else
             echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
             clean 1
@@ -91,10 +96,9 @@ help() {
     echo
     echo "Usage: $0 [OPTIONS]"
     echo
-    echo "    -d, --dev <ref>              [Optional] Set the development stage you want to build, example alpha0 or beta1, not used by default."
+    echo "    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc4 or beta1, not used by default."
     echo "    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default ${FILEBEAT_MODULE_VERSION}."
     echo "    -r, --revision <rev>         [Optional] Package revision. By default ${WAZUH_TAG_REVISION}"
-    echo "    -ref, --reference <ref>      [Optional] Set the Wazuh reference to build development images. By default, the latest stable release."
     echo "    -rg, --registry <reg>        [Optional] Set the Docker registry to push the images."
     echo "    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, ${WAZUH_IMAGE_VERSION}."
     echo "    -m, --multiarch              [Optional] Enable multi-architecture builds."
@@ -140,14 +144,6 @@ main() {
                 help 1
             fi
             ;;
-        "-ref"|"--reference")
-            if [ -n "${2}" ]; then
-                WAZUH_TAG_REFERENCE="${2}"
-                shift 2
-            else
-                help 1
-            fi
-            ;;
         "-rg"|"--registry")
             if [ -n "${2}" ]; then
                 WAZUH_REGISTRY="${2}"

build-docker-images/wazuh-agent/Dockerfile

@@ -10,7 +10,9 @@ ARG WAZUH_MANAGER='CHANGE_MANAGER_IP'
 ARG WAZUH_MANAGER_PORT='CHANGE_MANAGER_PORT'
 ARG WAZUH_REGISTRATION_SERVER='CHANGE_ENROLL_IP'
 ARG WAZUH_REGISTRATION_PORT='CHANGE_ENROLL_PORT'
-ARG WAZUH_AGENT_NAME='CHANGEE_AGENT_NAME'
+ARG WAZUH_AGENT_NAME='CHANGE_AGENT_NAME'
+ARG WAZUH_AGENT_GROUPS='CHANGE_AGENT_GROUPS'
+ARG TARGETARCH
 
 COPY config/check_repository.sh /
 
@@ -23,11 +25,13 @@ RUN source /check_repository.sh
 RUN yum install wazuh-agent-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
     yum clean all && \
     sed -i '/<authorization_pass_path>/d' /var/ossec/etc/ossec.conf && \
-    curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz \
+    S6_ARCH="amd64" && \
-    -o /tmp/s6-overlay-amd64.tar.gz && \
+    if [ "${TARGETARCH}" = "arm64" ]; then S6_ARCH="aarch64"; fi && \
-    tar xzf /tmp/s6-overlay-amd64.tar.gz -C / --exclude="./bin" && \
+    curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-${S6_ARCH}.tar.gz \
-    tar xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin && \
+    -o /tmp/s6-overlay-${S6_ARCH}.tar.gz && \
-    rm  /tmp/s6-overlay-amd64.tar.gz
+    tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / --exclude="./bin" && \
+    tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C /usr ./bin && \
+    rm  /tmp/s6-overlay-${S6_ARCH}.tar.gz
 
 COPY config/etc/ /etc/
 

build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init

@@ -9,6 +9,7 @@ WAZUH_REGISTRATION_SERVER=${WAZUH_REGISTRATION_SERVER:-$WAZUH_MANAGER_SERVER}
 WAZUH_REGISTRATION_PORT=${WAZUH_REGISTRATION_PORT:-"1515"}
 WAZUH_REGISTRATION_PASSWORD=$WAZUH_REGISTRATION_PASSWORD
 WAZUH_AGENT_NAME=${WAZUH_AGENT_NAME:-"wazuh-agent-$HOSTNAME"}
+WAZUH_AGENT_GROUPS=${WAZUH_AGENT_GROUPS:-"default"}
 
 ##############################################################################
 # Aux functions
@@ -66,7 +67,8 @@ set_manager_conn() {
   sed -i "s#<port>CHANGE_MANAGER_PORT</port>#<port>$WAZUH_MANAGER_PORT</port>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
   sed -i "s#<manager_address>CHANGE_ENROLL_IP</manager_address>#<manager_address>$WAZUH_REGISTRATION_SERVER</manager_address>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
   sed -i "s#<port>CHANGE_ENROLL_PORT</port>#<port>$WAZUH_REGISTRATION_PORT</port>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
-  sed -i "s#<agent_name>CHANGEE_AGENT_NAME</agent_name>#<agent_name>$WAZUH_AGENT_NAME</agent_name>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
+  sed -i "s#<agent_name>CHANGE_AGENT_NAME</agent_name>#<agent_name>$WAZUH_AGENT_NAME</agent_name>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
+  sed -i "s#<groups>CHANGE_AGENT_GROUPS</groups>#<groups>$WAZUH_AGENT_GROUPS</groups>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
   [ -n "$WAZUH_REGISTRATION_PASSWORD" ] && \
   echo "$WAZUH_REGISTRATION_PASSWORD" > ${WAZUH_INSTALL_PATH}/etc/authd.pass && \
   chown root:wazuh ${WAZUH_INSTALL_PATH}/etc/authd.pass && \

build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh

@@ -5,7 +5,7 @@ wazuh_url="${WAZUH_API_URL:-https://wazuh}"
 wazuh_port="${API_PORT:-55000}"
 api_username="${API_USERNAME:-wazuh-wui}"
 api_password="${API_PASSWORD:-wazuh-wui}"
-api_run_as="${RUN_AS:-false}"
+api_run_as="${RUN_AS:-true}"
 
 dashboard_config_file="/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml"
 

docs/dev/build-image.md

@@ -23,8 +23,8 @@ $ build-docker-images/build-images.sh -h
 
 Usage: build-docker-images/build-images.sh [OPTIONS]
 
-    -d, --dev <ref>              [Optional] Set the development stage you want to build, example alpha0 or beta1, not used by default.
+    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc4 or beta1, not used by default.
-    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.4.
+    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.5.
     -r, --revision <rev>         [Optional] Package revision. By default 1
     -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.14.3.
     -h, --help                   Show this help.

docs/ref/configuration/environment-variables.md

@@ -4,11 +4,14 @@ This document outlines the environment variables applicable to the Wazuh Docker
 
 ## Table of Contents
 
-- [Wazuh Manager](#wazuh-manager)
+- [Environment Variables in Wazuh Docker Deployment](#environment-variables-in-wazuh-docker-deployment)
-- [Wazuh Indexer](#wazuh-indexer)
+  - [Table of Contents](#table-of-contents)
-- [Wazuh Dashboard](#wazuh-dashboard)
+  - [Wazuh Manager](#wazuh-manager)
-- [Wazuh Agent](#wazuh-agent)
+  - [Wazuh Indexer](#wazuh-indexer)
-- [Overriding Configuration Files with Environment Variables](#overriding-configuration-files-with-environment-variables)
+  - [Wazuh Dashboard](#wazuh-dashboard)
+  - [Wazuh Agent](#wazuh-agent)
+  - [Overriding Configuration Files with Environment Variables](#overriding-configuration-files-with-environment-variables)
+    - [Examples:](#examples)
 
 ---
 
@@ -88,6 +91,7 @@ environment:
   - WAZUH_REGISTRATION_SERVER=wazuh.manager
   - WAZUH_REGISTRATION_PORT=1515
   - WAZUH_AGENT_NAME=my-agent
+  - WAZUH_AGENT_GROUPS=default
   - WAZUH_REGISTRATION_PASSWORD=StrongPassword
 ```
 

indexer-certs-creator/README.md

@@ -4,18 +4,23 @@ The dockerfile hosted in this directory is used to build the image required for
 
 ## Pre-requisites
 
-### QEMU
+1. Verify the Docker Buildx plugin is properly set up
-
+2. For multi-architecture image builds:
-Set up QEMU to enable building multi-architecture Docker images
+    - Ensure QEMU is installed
+    - Check permissions to push images to a Docker registry
 
 Useful documentation:
 
+- https://docs.docker.com/build/building/multi-platform/
 - https://www.qemu.org/download/
-- https://docs.docker.com/build/building/multi-platform/#qemu
 
 ## Procedure
 
-Run the following script to build the wazuh-certs-generator docker image
+Execute the following to run the script used to build the wazuh-certs-generator docker image
+
+```console
+cd indexer-certs-creator
+```
 
 ```console
 ./build-image.sh -v <IMAGE_TAG> [-m] [-rg <REGISTRY>]

multi-node/config/wazuh_dashboard/wazuh.yml

@@ -4,4 +4,4 @@ hosts:
       port: 55000
       username: wazuh-wui
       password: "MyS3cr37P450r.*-"
-      run_as: false
+      run_as: true

multi-node/generate-indexer-certs.yml

@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 services:
   generator:
-    image: wazuh/wazuh-certs-generator:0.0.3
+    image: wazuh/wazuh-certs-generator:0.0.4
     hostname: wazuh-certs-generator
     environment:
       - CERT_TOOL_VERSION=4.14

single-node/config/wazuh_dashboard/wazuh.yml

@@ -4,4 +4,4 @@ hosts:
       port: 55000
       username: wazuh-wui
       password: "MyS3cr37P450r.*-"
-      run_as: false
+      run_as: true

single-node/generate-indexer-certs.yml

@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 services:
   generator:
-    image: wazuh/wazuh-certs-generator:0.0.3
+    image: wazuh/wazuh-certs-generator:0.0.4
     hostname: wazuh-certs-generator
     environment:
       - CERT_TOOL_VERSION=4.14

wazuh-agent/config/wazuh-agent-conf

@@ -20,8 +20,9 @@
       <enabled>yes</enabled>
       <manager_address>CHANGE_ENROLL_IP</manager_address>
       <port>CHANGE_ENROLL_PORT</port>
-      <agent_name>CHANGEE_AGENT_NAME</agent_name>
+      <agent_name>CHANGE_AGENT_NAME</agent_name>
       <authorization_pass_path>etc/authd.pass</authorization_pass_path>
+      <groups>CHANGE_AGENT_GROUPS</groups>
     </enrollment>
   </client>
 

wazuh-agent/docker-compose.yml

@@ -6,4 +6,4 @@ services:
     environment:
       - WAZUH_MANAGER_SERVER=<WAZUH_MANAGER_IP>
     volumes:
-      - ./config/wazuh-agent-conf:/wazuh-config-mount/etc/ossec.conf
+      - ./config/wazuh-agent-conf:/wazuh-config-mount/etc/ossec.conf