Add versioning for Manager and API

CHANGELOG.md

@@ -1,12 +1,6 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## Wazuh Docker v3.9.2_6.8.0
-
-### Added
-
-- Update to Wazuh version 3.9.2_6.8.0
-
 ## Wazuh Docker v3.9.1_6.8.0
 
 ### Added

README.md

@@ -63,7 +63,7 @@ In addition, a docker-compose file is provided to launch the containers mentione
 
 * `stable` branch on correspond to the latest Wazuh-Docker stable version.
 * `master` branch contains the latest code, be aware of possible bugs on this branch.
-* `Wazuh.Version_ElasticStack.Version` (for example 3.9.2_6.8.0) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
+* `Wazuh.Version_ElasticStack.Version` (for example 3.9.1_6.8.2) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
 
 ## Credits and Thank you
 

VERSION

@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.9.2_6.8.0"
+WAZUH-DOCKER_VERSION="3.9.1_6.8.0"
-REVISION="3920"
+REVISION="3901"

docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.9.2_6.8.0
+    image: wazuh/wazuh:3.9.1_6.8.0
     hostname: wazuh-manager
     restart: always
     ports:
@@ -14,7 +14,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.9.2_6.8.0
+    image: wazuh/wazuh-logstash:3.9.1_6.8.0
     hostname: logstash
     restart: always
     links:
@@ -26,7 +26,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: wazuh/wazuh-elasticsearch:3.9.2_6.8.0
+    image: wazuh/wazuh-elasticsearch:3.9.1_6.8.0
     hostname: elasticsearch
     restart: always
     ports:
@@ -43,7 +43,7 @@ services:
         hard: -1
     mem_limit: 2g
   kibana:
-    image: wazuh/wazuh-kibana:3.9.2_6.8.0
+    image: wazuh/wazuh-kibana:3.9.1_6.8.0
     hostname: kibana
     restart: always
     depends_on:
@@ -52,7 +52,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.9.2_6.8.0
+    image: wazuh/wazuh-nginx:3.9.1_6.8.0
     hostname: nginx
     restart: always
     environment:

elasticsearch/Dockerfile

@@ -13,7 +13,7 @@ ENV XPACK_ML="true"
 
 ENV ENABLE_CONFIGURE_S3="false"
 
-ENV TEMPLATE_VERSION=v3.9.2
+ENV TEMPLATE_VERSION=v3.9.1
 
 # Elasticearch cluster configuration environment variables
 # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration

kibana/Dockerfile

@@ -1,11 +1,11 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM docker.elastic.co/kibana/kibana:6.8.0
-ARG WAZUH_APP_VERSION=3.9.2_6.8.0
+ARG WAZUH_APP_VERSION=3.9.1_6.8.0
 USER root
 
-ADD https://packages-dev.wazuh.com/pre-release/app/kibana/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
+ADD https://packages-dev.wazuh.com/pre-release/app/kibana/wazuhapp-3.9.1_6.8.0.zip /tmp
 
-RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\
+RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-3.9.1_6.8.0.zip &&\
     chown -R kibana:kibana /usr/share/kibana &&\
     rm -rf /tmp/*
 
@@ -41,15 +41,15 @@ ENV PATTERN="" \
     WAZUH_MONITORING_REPLICAS="" \
     ADMIN_PRIVILEGES=""
 
-ARG XPACK_CANVAS="false"
+ARG XPACK_CANVAS="true"
-ARG XPACK_LOGS="false"
+ARG XPACK_LOGS="true"
-ARG XPACK_INFRA="false"
+ARG XPACK_INFRA="true"
-ARG XPACK_ML="false"
+ARG XPACK_ML="true"
-ARG XPACK_DEVTOOLS="false"
+ARG XPACK_DEVTOOLS="true"
-ARG XPACK_MONITORING="false"
+ARG XPACK_MONITORING="true"
-ARG XPACK_APM="false"
+ARG XPACK_APM="true"
 
-ARG CHANGE_WELCOME="true"
+ARG CHANGE_WELCOME="false"
 
 COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./
 

wazuh/Dockerfile

@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
 ARG FILEBEAT_VERSION=6.8.0
-ARG WAZUH_VERSION=3.9.2-1
+ARG WAZUH_VERSION=3.9.1-1
 
 ENV API_USER="foo" \
     API_PASS="bar"