From e826236a28270255c78209021aafdd984cd9eeda Mon Sep 17 00:00:00 2001
From: Raul Del Pozo Moreno <raul.delpozo@wazuh.com>
Date: Thu, 18 May 2023 21:30:38 +0200
Subject: [PATCH] Added missing config

---
 .github/.goss.yaml                                 |  2 +-
 .github/workflows/push.yml                         |  4 ++--
 CHANGELOG.md                                       | 12 +++++++++++-
 README.md                                          |  2 ++
 build-docker-images/build-images.yml               |  8 ++++++--
 build-docker-images/wazuh-dashboard/Dockerfile     |  3 ++-
 build-docker-images/wazuh-indexer/config/config.sh |  2 +-
 build-docker-images/wazuh-manager/Dockerfile       |  5 ++++-
 8 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/.github/.goss.yaml b/.github/.goss.yaml
index 76e84db8..1b5128fd 100644
--- a/.github/.goss.yaml
+++ b/.github/.goss.yaml
@@ -56,7 +56,7 @@ package:
   wazuh-manager:
     installed: true
     versions:
-    - 4.5.0
+    - 4.5.0-1
 port:
   tcp:1514:
     listening: true
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 3c84f3f9..51077968 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -49,8 +49,8 @@ jobs:
       with:
         version: v0.3.16
 
-    - name: Execute Goss tests (wazuh-odfe)
-      run: dgoss run wazuh/wazuh-manager:4.5.0
+    - name: Execute Goss tests (wazuh-manager)
+      run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}}
       env:
         GOSS_SLEEP: 30
         GOSS_FILE: .github/.goss.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b2686dc..846e139c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,16 @@ All notable changes to this project will be documented in this file.
 
 - Update Wazuh to version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450)
 
+## Wazuh Docker v4.4.2
+### Added
+
+- Update Wazuh to version [4.4.2](https://github.com/wazuh/wazuh/blob/v4.4.2/CHANGELOG.md#v442)
+
+## Wazuh Docker v4.4.1
+### Added
+
+- Update Wazuh to version [4.4.1](https://github.com/wazuh/wazuh/blob/v4.4.1/CHANGELOG.md#v441)
+
 ## Wazuh Docker v4.4.0
 ### Added
 
@@ -14,7 +24,7 @@ All notable changes to this project will be documented in this file.
 ## Wazuh Docker v4.3.11
 ### Added
 
-- Update Wazuh to version [4.3.11](https://github.com/wazuh/wazuh/blob/v4.3.11/CHANGELOG.md#v4310)
+- Update Wazuh to version [4.3.11](https://github.com/wazuh/wazuh/blob/v4.3.11/CHANGELOG.md#v4311)
 
 ## Wazuh Docker v4.3.10
 ### Added
diff --git a/README.md b/README.md
index 76fd976f..e5feee46 100644
--- a/README.md
+++ b/README.md
@@ -196,6 +196,8 @@ WAZUH_MONITORING_REPLICAS=0         ##
 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
 | v4.5.0        |         |        |
+| v4.4.2        |         |        |
+| v4.4.1        |         |        |
 | v4.4.0        |         |        |
 | v4.3.11       |         |        |
 | v4.3.10       |         |        |
diff --git a/build-docker-images/build-images.yml b/build-docker-images/build-images.yml
index f65c26be..52984bf9 100644
--- a/build-docker-images/build-images.yml
+++ b/build-docker-images/build-images.yml
@@ -3,8 +3,12 @@ version: '3.7'
 
 services:
   wazuh.manager:
-    build:  wazuh-manager/
-    image: wazuh/wazuh-manager:4.5.0
+    build:
+      context: wazuh-manager/
+      args:
+        WAZUH_VERSION: ${WAZUH_VERSION}
+        WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
+    image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION}
     hostname: wazuh.manager
     restart: always
     ports:
diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile
index 003d7d21..1b95ca88 100644
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -1,7 +1,8 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal AS builder
 
-ARG WAZUH_VERSION=4.5.0
+ARG WAZUH_VERSION
+ARG WAZUH_TAG_REVISION
 ARG INSTALL_DIR=/usr/share/wazuh-dashboard
 ARG WAZUH_UI_REVISION=1
 
diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh
index ea4ec95c..82a7c50d 100644
--- a/build-docker-images/wazuh-indexer/config/config.sh
+++ b/build-docker-images/wazuh-indexer/config/config.sh
@@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME}
 # Package build options
 export USER=${NAME}
 export GROUP=${NAME}
-export VERSION=4.5.0
+export VERSION=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
 export LOG_DIR=/var/log/${NAME}
 export LIB_DIR=/var/lib/${NAME}
 export PID_DIR=/run/${NAME}
diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
index 4d5f9d6c..c1894489 100644
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -1,7 +1,10 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal
 
-ARG WAZUH_VERSION=4.5.0
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+
+ARG WAZUH_VERSION
+ARG WAZUH_TAG_REVISION
 ARG TEMPLATE_VERSION=4.5
 ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2