From bde4351a2a90998b0538c291ebd0328831289616 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Mon, 3 Feb 2020 13:18:03 +0100 Subject: [PATCH 01/12] Update Nginx config syntax --- nginx/config/entrypoint.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh index 468c8a92..06b24c3f 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/config/entrypoint.sh @@ -60,9 +60,8 @@ server { } server { - listen ${NGINX_PORT} default_server; - listen [::]:${NGINX_PORT}; - ssl on; + listen ${NGINX_PORT} default_server ssl; + listen [::]:${NGINX_PORT} ssl; ssl_certificate /etc/nginx/conf.d/ssl/certs/kibana-access.pem; ssl_certificate_key /etc/nginx/conf.d/ssl/private/kibana-access.key; location / { From 6412cb90f9153dd0aa1fcb7a5e7afaa2bd8e3fc6 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Mon, 3 Feb 2020 16:36:26 +0100 Subject: [PATCH 02/12] Switch entrypoint to json format --- nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 2ca20d6f..65c235ff 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -16,4 +16,4 @@ VOLUME ["/etc/nginx/conf.d"] ENV NGINX_NAME="foo" \ NGINX_PWD="bar" -ENTRYPOINT /entrypoint.sh +ENTRYPOINT [ "/entrypoint.sh" ] From 6afb9d07792a27625a4866f3a489b4eb847c6300 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Mon, 3 Feb 2020 16:38:22 +0100 Subject: [PATCH 03/12] Exec nginx as PID 1 --- nginx/config/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh index 468c8a92..94d29a98 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/config/entrypoint.sh @@ -76,4 +76,4 @@ server { } EOF -nginx -g 'daemon off;' +exec nginx -g 'daemon off;' From e2559957da752cf9c77db68f836f66018b410579 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Tue, 4 Feb 2020 12:23:24 +0100 Subject: [PATCH 04/12] Use batch mode on htpasswd --- nginx/config/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh index 468c8a92..25ee6b54 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/config/entrypoint.sh @@ -30,14 +30,14 @@ if [ ! -f /etc/nginx/conf.d/kibana.htpasswd ]; then do IFS=':' read -r -a credentials <<< "${users[index]}" if [ $index -eq 0 ]; then - echo ${credentials[1]}|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd ${credentials[0]} >/dev/null + htpasswd -b -c /etc/nginx/conf.d/kibana.htpasswd ${credentials[0]} ${credentials[1]} >/dev/null else - echo ${credentials[1]}|htpasswd -i /etc/nginx/conf.d/kibana.htpasswd ${credentials[0]} >/dev/null + htpasswd -b /etc/nginx/conf.d/kibana.htpasswd ${credentials[0]} ${credentials[1]} >/dev/null fi done else # NGINX_PWD and NGINX_NAME are declared in nginx/Dockerfile - echo $NGINX_PWD|htpasswd -i -c /etc/nginx/conf.d/kibana.htpasswd $NGINX_NAME >/dev/null + htpasswd -b -c /etc/nginx/conf.d/kibana.htpasswd $NGINX_NAME $NGINX_PWD >/dev/null fi else echo "Kibana credentials already configured" From c13680e0848b08880f66ba13bed660b4fadce0c1 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Wed, 5 Feb 2020 12:19:40 +0100 Subject: [PATCH 05/12] Enable HTTP v2 --- nginx/config/entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh index 06b24c3f..d366355f 100644 --- a/nginx/config/entrypoint.sh +++ b/nginx/config/entrypoint.sh @@ -60,8 +60,8 @@ server { } server { - listen ${NGINX_PORT} default_server ssl; - listen [::]:${NGINX_PORT} ssl; + listen ${NGINX_PORT} default_server ssl http2; + listen [::]:${NGINX_PORT} ssl http2; ssl_certificate /etc/nginx/conf.d/ssl/certs/kibana-access.pem; ssl_certificate_key /etc/nginx/conf.d/ssl/private/kibana-access.key; location / { From 3b1814ec7bb36d3816e7de96738750794db9581a Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Thu, 5 Mar 2020 19:15:50 +0100 Subject: [PATCH 06/12] Bump versions to 3.11.4_7.6.1 --- VERSION | 4 ++-- elasticsearch/Dockerfile | 4 ++-- kibana/Dockerfile | 6 +++--- wazuh/Dockerfile | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/VERSION b/VERSION index 7e59f57a..217ddf10 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.11.3_7.5.2" -REVISION="31130" +WAZUH-DOCKER_VERSION="3.11.4_7.6.1" +REVISION="31140" diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 2c7eacb2..28ed20ab 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -ARG ELASTIC_VERSION=7.5.2 +ARG ELASTIC_VERSION=7.6.1 FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION} ARG ELASTIC_VERSION ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip" @@ -16,7 +16,7 @@ ENV XPACK_ML="true" ENV ENABLE_CONFIGURE_S3="false" -ARG TEMPLATE_VERSION=v3.11.3 +ARG TEMPLATE_VERSION=v3.11.4 # Elasticearch cluster configuration environment variables # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 9c79c12c..02479d66 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,8 +1,8 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:7.5.2 +FROM docker.elastic.co/kibana/kibana:7.6.1 USER kibana -ARG ELASTIC_VERSION=7.5.2 -ARG WAZUH_VERSION=3.11.3 +ARG ELASTIC_VERSION=7.6.1 +ARG WAZUH_VERSION=3.11.4 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" #ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /usr/share/kibana/ diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index e6d3e55c..796659a4 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,14 +1,14 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=7.5.2 +ARG FILEBEAT_VERSION=7.6.1 -ARG WAZUH_VERSION=3.11.3-1 +ARG WAZUH_VERSION=3.11.4-1 ENV API_USER="foo" \ API_PASS="bar" -ARG TEMPLATE_VERSION="v3.11.3" +ARG TEMPLATE_VERSION="v3.11.4" # Set repositories. RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \ From ced83faef04405e22f313e27b69164b99fe794aa Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Thu, 5 Mar 2020 19:16:33 +0100 Subject: [PATCH 07/12] Bump docker-compose --- docker-compose.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 54e11d70..09b62729 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.11.3_7.5.2 + image: wazuh/wazuh:3.11.4_7.6.1 hostname: wazuh-manager restart: always ports: @@ -13,7 +13,7 @@ services: - "55000:55000" elasticsearch: - image: wazuh/wazuh-elasticsearch:3.11.3_7.5.2 + image: wazuh/wazuh-elasticsearch:3.11.4_7.6.1 hostname: elasticsearch restart: always ports: @@ -30,7 +30,7 @@ services: mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.11.3_7.5.2 + image: wazuh/wazuh-kibana:3.11.4_7.6.1 hostname: kibana restart: always depends_on: @@ -38,8 +38,9 @@ services: links: - elasticsearch:elasticsearch - wazuh:wazuh + nginx: - image: wazuh/wazuh-nginx:3.11.3_7.5.2 + image: wazuh/wazuh-nginx:3.11.4_7.6.1 hostname: nginx restart: always environment: From 627e9517d8c8649ec84c03cb7bd0f164d8af79c3 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Thu, 5 Mar 2020 19:28:55 +0100 Subject: [PATCH 08/12] Update changelog --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 041bdef4..33e3bc7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.11.4_7.6.2 + +### Added + +- Update to Wazuh version 3.11.4_7.6.2 + +- Enable HTTP v2 on nginx ([@xr09](https://github.com/xr09)) [#308](https://github.com/wazuh/wazuh-docker/pull/308) + +### Fixed + +- Updated nginx config syntax ([@xr09](https://github.com/xr09)) [#303](https://github.com/wazuh/wazuh-docker/pull/303) + + ## Wazuh Docker v3.11.3_7.5.2 ### Added From 26679d46f62ef646a925dc5f5ea64f47ff62e663 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Fri, 6 Mar 2020 15:34:37 +0100 Subject: [PATCH 09/12] Increase max old space size for kibana optimize --- kibana/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 02479d66..087a7e34 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -71,6 +71,6 @@ RUN chmod +x ./welcome_wazuh.sh RUN ./welcome_wazuh.sh USER kibana -RUN /usr/local/bin/kibana-docker --optimize +RUN NODE_OPTIONS="--max-old-space-size=2048" /usr/local/bin/kibana-docker --optimize ENTRYPOINT ./entrypoint.sh From c9a43bd5ffa268201a75d061edaa5f67a7b11d69 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Fri, 6 Mar 2020 16:43:02 +0100 Subject: [PATCH 10/12] Install Wazuh plugin from kibana folder --- kibana/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 087a7e34..08e41379 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -5,11 +5,10 @@ ARG ELASTIC_VERSION=7.6.1 ARG WAZUH_VERSION=3.11.4 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" -#ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /usr/share/kibana/ - -RUN /usr/share/kibana/bin/kibana-plugin install https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip -# RUN rm -rf /tmp/wazuhapp-${WAZUH_APP_VERSION}.zip +WORKDIR /usr/share/kibana +RUN ./bin/kibana-plugin install https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip +WORKDIR / USER root COPY config/entrypoint.sh ./entrypoint.sh RUN chmod 755 ./entrypoint.sh From 707fe878048779790c4c75808c8203de16b785f6 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Fri, 6 Mar 2020 17:34:25 +0100 Subject: [PATCH 11/12] Fix typo --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33e3bc7a..0844f0de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v3.11.4_7.6.2 +## Wazuh Docker v3.11.4_7.6.1 ### Added -- Update to Wazuh version 3.11.4_7.6.2 +- Update to Wazuh version 3.11.4_7.6.1 - Enable HTTP v2 on nginx ([@xr09](https://github.com/xr09)) [#308](https://github.com/wazuh/wazuh-docker/pull/308) From 125f83e6dfcfe3e8b5fa6dc8d9872723e73ac7fa Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com> Date: Fri, 6 Mar 2020 17:40:27 +0100 Subject: [PATCH 12/12] Update CHANGELOG.md Co-Authored-By: Manuel J. Bernal --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0844f0de..9d3f3d16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- Updated nginx config syntax ([@xr09](https://github.com/xr09)) [#303](https://github.com/wazuh/wazuh-docker/pull/303) +- Updated NGINX config syntax ([@xr09](https://github.com/xr09)) [#303](https://github.com/wazuh/wazuh-docker/pull/303) ## Wazuh Docker v3.11.3_7.5.2