Update Wazuh app for cloud-0.21 (#338)

Former-commit-id: 3949283bd3

VERSION

@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.10.2_7.3.2"
+WAZUH-DOCKER_VERSION="3.11.5_7.3.2"
-REVISION="31020"
+REVISION="31150"

kibana/Dockerfile

@@ -1,7 +1,7 @@
 # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM docker.elastic.co/kibana/kibana:7.4.2
 ARG ELASTIC_VERSION=7.4.2
-ARG WAZUH_VERSION=3.11.4
+ARG WAZUH_VERSION=3.11.5
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 
 USER root

kibana/config/wazuhapp-3.11.4_7.4.2.zip.REMOVED.git-id

@@ -1 +0,0 @@
-a58d8e7a4edaa0b4aa7e5fa76e16e49f884faddf

kibana/config/wazuhapp-3.11.5_7.4.2.zip.REMOVED.git-id

@@ -0,0 +1 @@
+d3370881d16407941e250126bd331db13e7c8b63

wazuh/Dockerfile

@@ -3,15 +3,18 @@ FROM phusion/baseimage:latest
 
 # Arguments
 ARG FILEBEAT_VERSION=7.4.2
-ARG WAZUH_VERSION=3.11.4-1
+ARG WAZUH_VERSION=3.11.5-1
 
 # Environment variables
 ENV API_USER="foo" \
    API_PASS="bar"
 
-ARG TEMPLATE_VERSION="v3.11.4"
+ARG TEMPLATE_VERSION="v3.11.5"
 ENV FILEBEAT_DESTINATION="elasticsearch"
 
+COPY config/wazuh-manager_3.11.5-1_amd64.deb /wazuh-manager_3.11.5-1_amd64.deb
+COPY config/wazuh-api_3.11.5-1_amd64.deb /wazuh-api_3.11.5-1_amd64.deb
+
 # Install packages
 RUN set -x && \
     echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \
@@ -26,8 +29,14 @@ RUN set -x && \
     apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
     apt-get --no-install-recommends --no-install-suggests -y install openssl apt-transport-https vim expect python-boto python-pip python-cryptography && \
     apt-get --no-install-recommends --no-install-suggests -y install postfix bsd-mailx mailutils libsasl2-2 ca-certificates libsasl2-modules && \
-    apt-get --no-install-recommends --no-install-suggests -y install wazuh-manager=${WAZUH_VERSION} && \
+#   apt-get --no-install-recommends --no-install-suggests -y install wazuh-manager=${WAZUH_VERSION} && \
-    apt-get --no-install-recommends --no-install-suggests -y install nodejs wazuh-api=${WAZUH_VERSION} && \
+    dpkg -i /wazuh-manager_3.11.5-1_amd64.deb && apt-get install -f && \
+#   apt-get --no-install-recommends --no-install-suggests -y install nodejs wazuh-api=${WAZUH_VERSION} && \
+    apt-get --no-install-recommends --no-install-suggests -y install nodejs && \
+    dpkg -i /wazuh-api_3.11.5-1_amd64.deb && apt-get install -f && \
+#   Disable updates to this package
+    echo "wazuh-manager hold" | dpkg --set-selections && \
+    echo "wazuh-api hold" | dpkg --set-selections && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     rm -f /var/ossec/logs/alerts/*/*/* && \
@@ -37,6 +46,7 @@ RUN set -x && \
     rm -f /var/ossec/logs/cluster/*/*/* && \
     rm -f /var/ossec/logs/ossec/*/*/* && \
     rm /var/ossec/var/run/* && \
+    rm /wazuh-manager_3.11.5-1_amd64.deb && \
     curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${FILEBEAT_VERSION}-amd64.deb && \
     dpkg -i filebeat-${FILEBEAT_VERSION}-amd64.deb && rm -f filebeat-${FILEBEAT_VERSION}-amd64.deb
 

wazuh/config/wazuh-manager_3.11.5-1_amd64.deb.REMOVED.git-id

@@ -0,0 +1 @@
+b4bbb79aca532ca4f5321a89f9dffae1f934bc6f