Add developement option when tag name is only version without stage

Add IMAGE_TAG stage reference

.github/workflows/Procedure_push_docker_images.yml

@@ -152,19 +152,22 @@ jobs:
 
     - name: Build Wazuh images
       run: |
-        if [ "${{ inputs.dev }}" = true ]; then
-          IMAGE_TAG="${{ inputs.image_tag }}-${{ inputs.reference }}"
-          ./build-images.sh -v ${{ inputs.image_tag }} -r $REVISION -d "dev" -rg $IMAGE_REGISTRY -m -ref ${{ inputs.reference }}
-        else
-          if [[ "$IMAGE_TAG" == *"-"* ]]; then
-            IFS='-' read -r -a tokens <<< "$IMAGE_TAG"
-            if [ -z "${tokens[1]}" ]; then
-              echo "Invalid image tag: $IMAGE_TAG"
-              exit 1
-            fi
-            DEV_STAGE=${tokens[1]}
-            WAZUH_VER=${tokens[0]}
+        if [[ "$IMAGE_TAG" == *"-"* ]]; then
+          IFS='-' read -r -a tokens <<< "$IMAGE_TAG"
+          if [ -z "${tokens[1]}" ]; then
+            echo "Invalid image tag: $IMAGE_TAG"
+            exit 1
+          fi
+          DEV_STAGE=${tokens[1]}
+          WAZUH_VER=${tokens[0]}
+          if [ "${{ inputs.dev }}" = true ]; then
+            ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m -ref ${{ inputs.reference }}
+          else 
             ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m
+          fi
+        else
+          if [ "${{ inputs.dev }}" = true ]; then
+            ./build-images.sh -v $IMAGE_TAG -r $REVISION -d "dev" -rg $IMAGE_REGISTRY -m -ref ${{ inputs.reference }}
           else
             ./build-images.sh -v $IMAGE_TAG -r $REVISION -rg $IMAGE_REGISTRY -m
           fi

CHANGELOG.md

@@ -9,6 +9,10 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Add IMAGE_TAG stage reference ([#2178](https://github.com/wazuh/wazuh-docker/pull/2178))
+- Delete Wazuh agent configuration files ([#2173](https://github.com/wazuh/wazuh-docker/pull/2173))
+- Modify run_as parameter value - main ([#2158](https://github.com/wazuh/wazuh-docker/pull/2158))
+- Change macOS and Windows deployment documentation ([#2150](https://github.com/wazuh/wazuh-docker/issues/2150))
 - Modify docker build image process ([#2131](https://github.com/wazuh/wazuh-docker/issues/2131))
 - Update documentation for Wazuh Docker image builder and workflow usage ([#2136](https://github.com/wazuh/wazuh-docker/issues/2136))
 - Configure deployment with environment variables ([#2081](https://github.com/wazuh/wazuh-docker/pull/2081))
@@ -19,7 +23,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
- Delete etc/lists references ([#2129](https://github.com/wazuh/wazuh-docker/pull/2129))
+- Delete etc/lists references ([#2129](https://github.com/wazuh/wazuh-docker/pull/2129))
 
 ### Deleted
 
@@ -33,6 +37,8 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- 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))
 

build-docker-images/build-images.sh

@@ -60,7 +60,22 @@ build() {
             curl -fsSL -o "$ARTIFACT_URLS_FILE" "https://packages-dev.wazuh.com/${WAZUH_MINOR_VERSION}/${ARTIFACT_URLS_FILE}"
         fi
     fi
+    
     awk -F':' '{name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' $ARTIFACT_URLS_FILE > artifacts_env.txt
+    
+    if  [ "${WAZUH_DEV_STAGE}" ];then
+        if  [ "${WAZUH_TAG_REFERENCE}" ];then
+            IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${WAZUH_DEV_STAGE,,}-${WAZUH_TAG_REFERENCE}"   
+        else
+            IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${WAZUH_DEV_STAGE,,}"
+        fi
+    else
+        if  [ "${WAZUH_TAG_REFERENCE}" ];then
+            IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${WAZUH_TAG_REFERENCE}"
+        else
+            IMAGE_TAG="${WAZUH_IMAGE_VERSION}"
+        fi
+    fi
 
     echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > ../.env
     echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> ../.env

build-docker-images/wazuh-agent/Dockerfile

@@ -11,6 +11,7 @@ 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='CHANGE_AGENT_NAME'
+ARG WAZUH_AGENT_GROUPS='CHANGE_AGENT_GROUPS'
 ARG TARGETARCH
 ARG wazuh_agent_url_amd64_rpm
 ARG wazuh_agent_url_arm64_rpm

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

@@ -25,7 +25,7 @@ WAZUH_API_URL="${WAZUH_API_URL:-https://localhost}"
 API_PORT="${API_PORT:-55000}"
 API_USERNAME="${API_USERNAME:-wazuh-wui}"
 API_PASSWORD="${API_PASSWORD:-wazuh-wui}"
-RUN_AS="${RUN_AS:-false}"
+RUN_AS="${RUN_AS:-true}"
 
 # Optional Wazuh app configurations
 PATTERN="${PATTERN:-}"

docs/book.toml

@@ -2,6 +2,5 @@
 title = "Wazuh Docker Documentation"
 description = "Technical documentation for Wazuh Docker deployment."
 authors = ["Victor Erenu"]
-multilingual = false
 src = "."
 language = "en"

docs/ref/getting-started/requirements.md

@@ -24,17 +24,17 @@ These are general recommendations. Actual needs may vary based on the number of
 * **Network**:
     * A stable network connection with sufficient bandwidth, especially if agents are reporting from remote locations.
 
-### Software:
+### Software Prerequisites:
+
+#### Linux:
 
-* **Operating System**:
-    * A 64-bit Linux distribution is preferred (e.g., Ubuntu, CentOS, RHEL, Debian).
 * **Docker Engine**:
     * Version `20.10.0` or newer.
     * Install Docker by following the official instructions: [Install Docker Engine](https://docs.docker.com/engine/install/).
 * **Git Client**:
     * Required for cloning the `wazuh-docker` repository.
 * **Web Browser**:
-    * A modern web browser (e.g., Chrome, Firefox, Edge, Safari) for accessing the Wazuh Dashboard.
+    * A modern web browser (e.g., Chrome, Firefox, Edge, Safari) for accessing the Wazuh dashboard.
 * **`vm.max_map_count` (Linux Hosts for Wazuh Indexer/OpenSearch)**:
     * The Wazuh Indexer (OpenSearch) requires a higher `vm.max_map_count` setting than the default on most Linux systems.
     * Set it permanently:
@@ -48,6 +48,33 @@ These are general recommendations. Actual needs may vary based on the number of
             ```
     * This is crucial for the stability of the Wazuh Indexer.
 
+#### Windows:
+
+* **Docker Desktop**
+    * Install Docker Desktop by following the official instructions: [Install Docker Desktop](https://docs.docker.com/desktop/setup/install/windows-install/).
+* **WSL Linux distribution**
+    * Install Ubuntu or other compatible Linux distribution (bash in Alpine is not comptible with wazuh-certs-tool.sh): [Install Ubuntu on WSL](https://documentation.ubuntu.com/wsl/stable/howto/install-ubuntu-wsl2/)
+* **Git Client**:
+    * Required for cloning the `wazuh-docker` repository.
+* **Web Browser**:
+    * A modern web browser (e.g., Chrome, Firefox, Edge, Safari) for accessing the Wazuh dashboard.
+
+#### macOS:
+
+* **Docker Desktop**
+    * Install Docker Desktop by following the official instructions: [Install Docker Desktop](https://docs.docker.com/desktop/setup/install/mac-install/).
+* **Bash Shell**
+* **GNU versions of apps**:
+    * [Install GNU sed](https://formulae.brew.sh/formula/gnu-sed).
+    * [Install GNU awk](https://formulae.brew.sh/formula/gawk).
+    * [Install GNU grep](https://formulae.brew.sh/formula/grep).
+* **OpenSSL**:
+    * [Install OpenSSL](https://formulae.brew.sh/formula/openssl@3).
+* **Git Client**:
+    * Required for cloning the `wazuh-docker` repository.
+* **Web Browser**:
+    * A modern web browser (e.g., Chrome, Firefox, Edge, Safari) for accessing the Wazuh dashboard.
+
 ## Network Ports
 
 Ensure that the necessary network ports are open and available on the Docker host and any firewalls:

multi-node/docker-compose.yml

@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 services:
   wazuh.master:
-    image: wazuh/wazuh-manager:5.0.0-alpha0
+    image: wazuh/wazuh-manager:5.0.0
     hostname: wazuh.master
     container_name: multi-node-wazuh.master
     restart: always
@@ -38,7 +38,7 @@ services:
       - ./wazuh-certificates/wazuh.master.pem:/var/ossec/etc/certs/server.pem
       - ./wazuh-certificates/wazuh.master-key.pem:/var/ossec/etc/certs/server-key.pem
   wazuh.worker:
-    image: wazuh/wazuh-manager:5.0.0-alpha0
+    image: wazuh/wazuh-manager:5.0.0
     hostname: wazuh.worker
     container_name: multi-node-wazuh.worker
     restart: always
@@ -72,7 +72,7 @@ services:
       - ./wazuh-certificates/wazuh.worker-key.pem:/var/ossec/etc/certs/server-key.pem
 
   wazuh1.indexer:
-    image: wazuh/wazuh-indexer:5.0.0-alpha0
+    image: wazuh/wazuh-indexer:5.0.0
     hostname: wazuh1.indexer
     container_name: multi-node-wazuh1.indexer
     restart: always
@@ -104,7 +104,7 @@ services:
       - ./wazuh-certificates/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem
 
   wazuh2.indexer:
-    image: wazuh/wazuh-indexer:5.0.0-alpha0
+    image: wazuh/wazuh-indexer:5.0.0
     hostname: wazuh2.indexer
     container_name: multi-node-wazuh2.indexer
     restart: always
@@ -132,7 +132,7 @@ services:
       - ./wazuh-certificates/wazuh2.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
 
   wazuh3.indexer:
-    image: wazuh/wazuh-indexer:5.0.0-alpha0
+    image: wazuh/wazuh-indexer:5.0.0
     hostname: wazuh3.indexer
     container_name: multi-node-wazuh3.indexer
     restart: always
@@ -160,7 +160,7 @@ services:
       - ./wazuh-certificates/wazuh3.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:5.0.0-alpha0
+    image: wazuh/wazuh-dashboard:5.0.0
     hostname: wazuh.dashboard
     container_name: multi-node-wazuh.dashboard
     restart: always

single-node/docker-compose.yml

@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 services:
   wazuh.manager:
-    image: wazuh/wazuh-manager:5.0.0-alpha0
+    image: wazuh/wazuh-manager:5.0.0
     hostname: wazuh.manager
     container_name: single-node-wazuh.manager
     restart: always
@@ -39,7 +39,7 @@ services:
       - ./wazuh-certificates/wazuh.manager-key.pem:/var/ossec/etc/certs/server-key.pem
 
   wazuh.indexer:
-    image: wazuh/wazuh-indexer:5.0.0-alpha0
+    image: wazuh/wazuh-indexer:5.0.0
     hostname: wazuh.indexer
     container_name: single-node-wazuh.indexer
     restart: always
@@ -70,7 +70,7 @@ services:
       - ./wazuh-certificates/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:5.0.0-alpha0
+    image: wazuh/wazuh-dashboard:5.0.0
     hostname: wazuh.dashboard
     container_name: single-node-wazuh.dashboard
     restart: always

wazuh-agent/config/wazuh-agent-conf

@@ -1,195 +0,0 @@
-<!--
-  Wazuh - Agent - Default configuration for amzn 2023
-  More info at: https://documentation.wazuh.com
-  Mailing list: https://groups.google.com/forum/#!forum/wazuh
--->
-
-<ossec_config>
-  <client>
-    <server>
-      <address>CHANGE_MANAGER_IP</address>
-      <port>CHANGE_MANAGER_PORT</port>
-      <protocol>tcp</protocol>
-    </server>
-    <config-profile>amzn, amzn2023</config-profile>
-    <notify_time>10</notify_time>
-    <time-reconnect>60</time-reconnect>
-    <auto_restart>yes</auto_restart>
-    <crypto_method>aes</crypto_method>
-    <enrollment>
-      <enabled>yes</enabled>
-      <manager_address>CHANGE_ENROLL_IP</manager_address>
-      <port>CHANGE_ENROLL_PORT</port>
-      <agent_name>CHANGE_AGENT_NAME</agent_name>
-      <authorization_pass_path>etc/authd.pass</authorization_pass_path>
-      <groups>CHANGE_AGENT_GROUPS</groups>
-    </enrollment>
-  </client>
-
-  <client_buffer>
-    <!-- Agent buffer options -->
-    <disabled>no</disabled>
-    <queue_size>5000</queue_size>
-    <events_per_second>500</events_per_second>
-  </client_buffer>
-
-  <!-- Policy monitoring -->
-  <rootcheck>
-    <disabled>no</disabled>
-    <check_files>yes</check_files>
-    <check_trojans>yes</check_trojans>
-    <check_dev>yes</check_dev>
-    <check_sys>yes</check_sys>
-    <check_pids>yes</check_pids>
-    <check_ports>yes</check_ports>
-    <check_if>yes</check_if>
-
-    <!-- Frequency that rootcheck is executed - every 12 hours -->
-    <frequency>43200</frequency>
-
-    <rootkit_files>etc/shared/rootkit_files.txt</rootkit_files>
-    <rootkit_trojans>etc/shared/rootkit_trojans.txt</rootkit_trojans>
-
-    <skip_nfs>yes</skip_nfs>
-
-    <ignore>/var/lib/containerd</ignore>
-    <ignore>/var/lib/docker/overlay2</ignore>
-  </rootcheck>
-
-  <wodle name="cis-cat">
-    <disabled>yes</disabled>
-    <timeout>1800</timeout>
-    <interval>1d</interval>
-    <scan-on-start>yes</scan-on-start>
-
-    <java_path>wodles/java</java_path>
-    <ciscat_path>wodles/ciscat</ciscat_path>
-  </wodle>
-
-  <!-- Osquery integration -->
-  <wodle name="osquery">
-    <disabled>yes</disabled>
-    <run_daemon>yes</run_daemon>
-    <log_path>/var/log/osquery/osqueryd.results.log</log_path>
-    <config_path>/etc/osquery/osquery.conf</config_path>
-    <add_labels>yes</add_labels>
-  </wodle>
-
-  <!-- System inventory -->
-  <wodle name="syscollector">
-    <disabled>no</disabled>
-    <interval>1h</interval>
-    <scan_on_start>yes</scan_on_start>
-    <hardware>yes</hardware>
-    <os>yes</os>
-    <network>yes</network>
-    <packages>yes</packages>
-    <ports all="yes">yes</ports>
-    <processes>yes</processes>
-
-    <!-- Database synchronization settings -->
-    <synchronization>
-      <max_eps>10</max_eps>
-    </synchronization>
-  </wodle>
-
-  <sca>
-    <enabled>yes</enabled>
-    <scan_on_start>yes</scan_on_start>
-    <interval>12h</interval>
-    <skip_nfs>yes</skip_nfs>
-  </sca>
-
-  <!-- File integrity monitoring -->
-  <syscheck>
-    <disabled>no</disabled>
-
-    <!-- Frequency that syscheck is executed default every 12 hours -->
-    <frequency>43200</frequency>
-
-    <scan_on_start>yes</scan_on_start>
-
-    <!-- Directories to check  (perform all possible verifications) -->
-    <directories>/etc,/usr/bin,/usr/sbin</directories>
-    <directories>/bin,/sbin,/boot</directories>
-
-    <!-- Files/directories to ignore -->
-    <ignore>/etc/mtab</ignore>
-    <ignore>/etc/hosts.deny</ignore>
-    <ignore>/etc/mail/statistics</ignore>
-    <ignore>/etc/random-seed</ignore>
-    <ignore>/etc/random.seed</ignore>
-    <ignore>/etc/adjtime</ignore>
-    <ignore>/etc/httpd/logs</ignore>
-    <ignore>/etc/utmpx</ignore>
-    <ignore>/etc/wtmpx</ignore>
-    <ignore>/etc/cups/certs</ignore>
-    <ignore>/etc/dumpdates</ignore>
-    <ignore>/etc/svc/volatile</ignore>
-
-    <!-- File types to ignore -->
-    <ignore type="sregex">.log$|.swp$</ignore>
-
-    <!-- Check the file, but never compute the diff -->
-    <nodiff>/etc/ssl/private.key</nodiff>
-
-    <skip_nfs>yes</skip_nfs>
-    <skip_dev>yes</skip_dev>
-    <skip_proc>yes</skip_proc>
-    <skip_sys>yes</skip_sys>
-
-    <!-- Nice value for Syscheck process -->
-    <process_priority>10</process_priority>
-
-    <!-- Maximum output throughput -->
-    <max_eps>50</max_eps>
-
-    <!-- Database synchronization settings -->
-    <synchronization>
-      <enabled>yes</enabled>
-      <interval>5m</interval>
-      <max_eps>10</max_eps>
-    </synchronization>
-  </syscheck>
-
-  <!-- Log analysis -->
-  <localfile>
-    <log_format>command</log_format>
-    <command>df -P</command>
-    <frequency>360</frequency>
-  </localfile>
-
-  <localfile>
-    <log_format>full_command</log_format>
-    <command>netstat -tulpn | sed 's/\([[:alnum:]]\+\)\ \+[[:digit:]]\+\ \+[[:digit:]]\+\ \+\(.*\):\([[:digit:]]*\)\ \+\([0-9\.\:\*]\+\).\+\ \([[:digit:]]*\/[[:alnum:]\-]*\).*/\1 \2 == \3 == \4 \5/' | sort -k 4 -g | sed 's/ == \(.*\) ==/:\1/' | sed 1,2d</command>
-    <alias>netstat listening ports</alias>
-    <frequency>360</frequency>
-  </localfile>
-
-  <localfile>
-    <log_format>full_command</log_format>
-    <command>last -n 20</command>
-    <frequency>360</frequency>
-  </localfile>
-
-  <!-- Active response -->
-  <active-response>
-    <disabled>no</disabled>
-    <ca_store>etc/wpk_root.pem</ca_store>
-    <ca_verification>yes</ca_verification>
-  </active-response>
-
-  <!-- Choose between "plain", "json", or "plain,json" for the format of internal logs -->
-  <logging>
-    <log_format>plain</log_format>
-  </logging>
-
-</ossec_config>
-
-<ossec_config>
-  <localfile>
-    <log_format>syslog</log_format>
-    <location>/var/ossec/logs/active-responses.log</location>
-  </localfile>
-
-</ossec_config>

wazuh-agent/docker-compose.yml

@@ -1,9 +1,7 @@
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 services:
   wazuh.agent:
-    image: wazuh/wazuh-agent:5.0.0-alpha0
+    image: wazuh/wazuh-agent:5.0.0
     restart: always
     environment:
       - WAZUH_MANAGER_SERVER=<WAZUH_MANAGER_IP>
-    volumes:
-      - ./config/wazuh-agent-conf:/wazuh-config-mount/etc/ossec.conf