paulmataruso/wazuh-docker-mirror
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-10-31 03:53:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updating to Wazuh v3.12. Also license year update.

Browse Source
This commit is contained in:
Zenidd
2020-03-20 16:42:36 +01:00
parent 320061f022
commit 90074777da
26 changed files with 68 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -1,6 +1,14 @@
# Change Log # Change Log
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## Wazuh Docker v3.11.4_7.6.1
### Added
- Update to Wazuh version 3.12.0_7.6.1
## Wazuh Docker v3.11.4_7.6.1 ## Wazuh Docker v3.11.4_7.6.1
### Added ### Added

2
LICENSE
View File

@@ -1,5 +1,5 @@
Portions Copyright (C) 2019 Wazuh, Inc. Portions Copyright (C) 2020 Wazuh, Inc.
Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc. Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc.
This program is a free software; you can redistribute it and/or modify This program is a free software; you can redistribute it and/or modify

2
README.md
View File

@@ -70,7 +70,7 @@ We thank you them and everyone else who has contributed to this project.
## License and copyright ## License and copyright
Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
## Web references ## Web references

10
docker-compose.yml
View File

@@ -1,9 +1,9 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
version: '2' version: '2'
services: services:
wazuh: wazuh:
image: wazuh/wazuh:3.11.4_7.6.1 image: wazuh/wazuh:3.12.4_7.6.1
hostname: wazuh-manager hostname: wazuh-manager
restart: always restart: always
ports: ports:
@@ -13,7 +13,7 @@ services:
- "55000:55000" - "55000:55000"
elasticsearch: elasticsearch:
image: wazuh/wazuh-elasticsearch:3.11.4_7.6.1 image: wazuh/wazuh-elasticsearch:3.12.4_7.6.1
hostname: elasticsearch hostname: elasticsearch
restart: always restart: always
ports: ports:
@@ -30,7 +30,7 @@ services:
mem_limit: 2g mem_limit: 2g
kibana: kibana:
image: wazuh/wazuh-kibana:3.11.4_7.6.1 image: wazuh/wazuh-kibana:3.12.4_7.6.1
hostname: kibana hostname: kibana
restart: always restart: always
depends_on: depends_on:
@@ -40,7 +40,7 @@ services:
- wazuh:wazuh - wazuh:wazuh
nginx: nginx:
image: wazuh/wazuh-nginx:3.11.4_7.6.1 image: wazuh/wazuh-nginx:3.12.4_7.6.1
hostname: nginx hostname: nginx
restart: always restart: always
environment: environment:

4
elasticsearch/Dockerfile
View File

@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
ARG ELASTIC_VERSION=7.6.1 ARG ELASTIC_VERSION=7.6.1
FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION} FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
ARG ELASTIC_VERSION ARG ELASTIC_VERSION
@@ -16,7 +16,7 @@ ENV XPACK_ML="true"
ENV ENABLE_CONFIGURE_S3="false" ENV ENABLE_CONFIGURE_S3="false"
ARG TEMPLATE_VERSION=v3.11.4 ARG TEMPLATE_VERSION=v3.12.0
# Elasticearch cluster configuration environment variables # Elasticearch cluster configuration environment variables
# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration

2
elasticsearch/config/config_cluster.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
elastic_config_file="/usr/share/elasticsearch/config/elasticsearch.yml" elastic_config_file="/usr/share/elasticsearch/config/elasticsearch.yml"

2
elasticsearch/config/configure_s3.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
set -e set -e

2
elasticsearch/config/entrypoint.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
# For more information https://github.com/elastic/elasticsearch-docker/blob/6.8.0/build/elasticsearch/bin/docker-entrypoint.sh # For more information https://github.com/elastic/elasticsearch-docker/blob/6.8.0/build/elasticsearch/bin/docker-entrypoint.sh

2
elasticsearch/config/load_settings.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
set -e set -e

2
kibana/Dockerfile
View File

@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/kibana/kibana:7.6.1 FROM docker.elastic.co/kibana/kibana:7.6.1
USER kibana USER kibana
ARG ELASTIC_VERSION=7.6.1 ARG ELASTIC_VERSION=7.6.1

2
kibana/config/entrypoint.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
set -e set -e

2
kibana/config/kibana_settings.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
WAZUH_MAJOR=3 WAZUH_MAJOR=3

4
kibana/config/wazuh_app_config.sh
View File

@@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
wazuh_url="${WAZUH_API_URL:-https://wazuh}" wazuh_url="${WAZUH_API_URL:-https://wazuh}"
wazuh_port="${API_PORT:-55000}" wazuh_port="${API_PORT:-55000}"
api_user="${API_USER:-foo}" api_user="${API_USER:-foo}"
api_password="${API_PASS:-bar}" api_password="${API_PASS:-bar}"
kibana_config_file="/usr/share/kibana/plugins/wazuh/wazuh.yml" kibana_config_file="/usr/share/kibana/optimize/wazuh/config/wazuh.yml"
declare -A CONFIG_MAP=( declare -A CONFIG_MAP=(
[pattern]=$PATTERN [pattern]=$PATTERN

3
kibana/config/welcome_wazuh.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
if [[ $CHANGE_WELCOME == "true" ]] if [[ $CHANGE_WELCOME == "true" ]]
then then
@@ -21,4 +21,3 @@ then
sed -i 's#visible: true#visible: false#g' $kibana_path/node_modules/x-pack/plugins/rollup/public/crud_app/index.js sed -i 's#visible: true#visible: false#g' $kibana_path/node_modules/x-pack/plugins/rollup/public/crud_app/index.js
sed -i 's#visible: true#visible: false#g' $kibana_path/node_modules/x-pack/plugins/license_management/public/management_section.js sed -i 's#visible: true#visible: false#g' $kibana_path/node_modules/x-pack/plugins/license_management/public/management_section.js
fi fi

2
kibana/config/xpack_config.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
kibana_config_file="/usr/share/kibana/config/kibana.yml" kibana_config_file="/usr/share/kibana/config/kibana.yml"
if grep -Fq "#xpack features" "$kibana_config_file"; if grep -Fq "#xpack features" "$kibana_config_file";

2
nginx/Dockerfile
View File

@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
FROM nginx:latest FROM nginx:latest
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive

2
nginx/config/entrypoint.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
set -e set -e

6
wazuh/Dockerfile
View File

@@ -1,14 +1,14 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
FROM phusion/baseimage:latest FROM phusion/baseimage:latest
ARG FILEBEAT_VERSION=7.6.1 ARG FILEBEAT_VERSION=7.6.1
ARG WAZUH_VERSION=3.11.4-1 ARG WAZUH_VERSION=3.12.0-1
ENV API_USER="foo" \ ENV API_USER="foo" \
API_PASS="bar" API_PASS="bar"
ARG TEMPLATE_VERSION="v3.11.4" ARG TEMPLATE_VERSION="v3.12.0"
# Set repositories. # Set repositories.
RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \ RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \

2
wazuh/config/00-wazuh.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
# Wazuh container bootstrap. See the README for information of the environment # Wazuh container bootstrap. See the README for information of the environment
# variables expected by this script. # variables expected by this script.

3
wazuh/config/01-config_filebeat.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
set -e set -e
@@ -16,4 +16,3 @@ fi
curl -s "https://packages.wazuh.com/3.x/filebeat/${WAZUH_FILEBEAT_MODULE}" | tar -xvz -C /usr/share/filebeat/module curl -s "https://packages.wazuh.com/3.x/filebeat/${WAZUH_FILEBEAT_MODULE}" | tar -xvz -C /usr/share/filebeat/module
mkdir -p /usr/share/filebeat/module/wazuh mkdir -p /usr/share/filebeat/module/wazuh
chmod 755 -R /usr/share/filebeat/module/wazuh chmod 755 -R /usr/share/filebeat/module/wazuh

2
wazuh/config/entrypoint.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
# It will run every .sh script located in entrypoint-scripts folder in lexicographical order # It will run every .sh script located in entrypoint-scripts folder in lexicographical order
for script in `ls /entrypoint-scripts/*.sh | sort -n`; do for script in `ls /entrypoint-scripts/*.sh | sort -n`; do

2
wazuh/config/filebeat.runit.service
View File

@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
service filebeat start service filebeat start
tail -f /var/log/filebeat/filebeat tail -f /var/log/filebeat/filebeat

2
wazuh/config/init.bash
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
# Initialize the custom data directory layout # Initialize the custom data directory layout
source /data_dirs.env source /data_dirs.env

2
wazuh/config/postfix.runit.service
View File

@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
service postfix start service postfix start
tail -f /var/log/mail.log tail -f /var/log/mail.log

3
wazuh/config/wazuh-api.runit.service
View File

@@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
service wazuh-api start service wazuh-api start
tail -f /var/ossec/data/logs/api.log tail -f /var/ossec/data/logs/api.log

3
wazuh/config/wazuh.runit.service
View File

@@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
service wazuh-manager start service wazuh-manager start
tail -f /var/ossec/data/logs/ossec.log tail -f /var/ossec/data/logs/ossec.log