From 13ba5ee7311dc11842d4b1ac9f9cb144150e73f5 Mon Sep 17 00:00:00 2001
From: AlfonsoRBJ <sitoruizbravo@hotmail.com>
Date: Thu, 14 Jan 2021 17:22:43 +0100
Subject: [PATCH] Update to wazuh 4.0.4 (#428)

Former-commit-id: e58c2b25d85dc984d8c0a7c4dbedc077edf55611
---
 wazuh/Dockerfile                                         | 9 +++------
 .../wazuh-manager-4.0.3-1.x86_64.rpm.REMOVED.git-id      | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 wazuh/config/wazuh-manager-4.0.3-1.x86_64.rpm.REMOVED.git-id

diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 8d5df1f2..0ba67b1d 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -3,7 +3,7 @@ FROM waystonesystems/baseimage-centos:0.2.0
 
 # Arguments
 ARG FILEBEAT_VERSION=7.9.1
-ARG WAZUH_VERSION=4.0.3-1
+ARG WAZUH_VERSION=4.0.4-1
 
 # Environment variables
 ENV API_USER="foo" \
@@ -24,9 +24,6 @@ baseurl=https://packages.wazuh.com/4.x/yum/\n\
 protect=1\n'\
 >> /etc/yum.repos.d/wazuh.repo
 
-# Copy Wazuh Manager custom package
-COPY config/wazuh-manager-4.0.3-1.x86_64.rpm /tmp/wazuh-manager-4.0.3-1.x86_64.rpm
-
 # Install packages
 RUN set -x && \
     curl -sL https://rpm.nodesource.com/setup_8.x | bash - && \
@@ -36,7 +33,7 @@ RUN set -x && \
     yum upgrade -y &&\
     yum install -y openssl vim expect python-boto python-pip python-cryptography && \
     yum install -y postfix bsd-mailx mailx ca-certificates && \
-    yum install -y /tmp/wazuh-manager-4.0.3-1.x86_64.rpm && \
+    yum install -y wazuh-manager-${WAZUH_VERSION} && \
     yum clean all && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     rm -f /var/ossec/logs/alerts/*/*/* && \
@@ -124,4 +121,4 @@ ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/e
 RUN chmod go-w /etc/filebeat/wazuh-template.json 
 
 # Run all services
-ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/wazuh/config/wazuh-manager-4.0.3-1.x86_64.rpm.REMOVED.git-id b/wazuh/config/wazuh-manager-4.0.3-1.x86_64.rpm.REMOVED.git-id
deleted file mode 100644
index b590a4f5..00000000
--- a/wazuh/config/wazuh-manager-4.0.3-1.x86_64.rpm.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-ad2d636c325fddb78af5dedc55db63428c09d671
\ No newline at end of file