Merge pull request #1068 from wazuh/merge-4.7.1-into-4.8.0

Merge 4.7.1 into 4.8.0
wazuh · Oct 23, 2023 · 4061858 · 4061858
2 parents 7474e83 + 274c0bc
commit 4061858
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,11 @@ All notable changes to this project will be documented in this file.
 
 - Update Wazuh to version [4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460)
 
+## Wazuh Docker v4.5.4
+### Added
+
+- Update Wazuh to version [4.5.4](https://github.com/wazuh/wazuh/blob/v4.5.4/CHANGELOG.md#v454)
+
 ## Wazuh Docker v4.5.3
 ### Added
 

diff --git a/README.md b/README.md
@@ -199,6 +199,7 @@ WAZUH_MONITORING_REPLICAS=0         ##
 | v4.7.1        |         |        |
 | v4.7.0        |         |        |
 | v4.6.0        |         |        |
+| v4.5.4        |         |        |
 | v4.5.3        |         |        |
 | v4.5.2        |         |        |
 | v4.5.1        |         |        |

diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
@@ -5,7 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
 ARG WAZUH_VERSION
 ARG WAZUH_TAG_REVISION
-ARG TEMPLATE_VERSION=v4.8.0
+ARG FILEBEAT_TEMPLATE_BRANCH
 ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
 ARG WAZUH_FILEBEAT_MODULE