Update License and copyright

Update Dockerfile

README.md

@@ -69,6 +69,10 @@ These Docker containers are based on:
 
 We thank you them and everyone else who has contributed to this project.
 
+## License and copyright
+
+Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
+
 ## Wazuh official website
 
 [Wazuh website](http://wazuh.com)

docker-compose.yml

@@ -1,3 +1,4 @@
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 version: '2'
 
 services:
@@ -10,6 +11,7 @@ services:
       - "1515:1515"
       - "514:514/udp"
       - "55000:55000"
+#      - "1516:1516"
     networks:
         - docker_elk
 #    volumes:
@@ -39,7 +41,7 @@ services:
       - LS_HEAP_SIZE=2048m
       - XPACK_MONITORING_ENABLED=false
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.2.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.2.3
     hostname: elasticsearch
     restart: always
     ports:

kibana/Dockerfile

@@ -1,12 +1,13 @@
-FROM docker.elastic.co/kibana/kibana:6.2.2
-
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
+FROM docker.elastic.co/kibana/kibana:6.2.3
+ARG WAZUH_APP_VERSION=3.2.1_6.2.3
 USER root
 
 COPY ./config/kibana.yml /usr/share/kibana/config/kibana.yml
 
 COPY config/wait-for-it.sh /wait-for-it.sh
 
-ADD https://packages.wazuh.com/wazuhapp/wazuhapp-3.2.1_6.2.2.zip /tmp
+ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 
 ADD https://raw.githubusercontent.com/wazuh/wazuh/3.2/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config
 
@@ -14,7 +15,7 @@ ADD https://raw.githubusercontent.com/wazuh/wazuh/3.2/extensions/elasticsearch/w
 
 ADD https://raw.githubusercontent.com/wazuh/wazuh/3.2/extensions/elasticsearch/alert_sample.json /usr/share/kibana/config
 
-RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-3.2.1_6.2.2.zip
+RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
 
 RUN chown -R kibana.kibana /usr/share/kibana
 

kibana/config/kibana.yml

@@ -96,4 +96,4 @@ xpack.grokdebugger.enabled: false
 xpack.graph.enabled: false
 xpack.ml.enabled: false
 xpack.monitoring.enabled: false
-xpack.reporting.enabled: false
+xpack.reporting.enabled: false

kibana/config/wait-for-it.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 
 set -e
 

logstash/Dockerfile

@@ -1,3 +1,4 @@
-FROM docker.elastic.co/logstash/logstash:6.2.2
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
+FROM docker.elastic.co/logstash/logstash:6.2.3
 
 COPY config/logstash.conf /etc/logstash/conf.d/logstash.conf

logstash/config/logstash.conf

@@ -1,3 +1,4 @@
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 # Wazuh - Logstash configuration file
 ## Remote Wazuh Manager - Filebeat input
 input {

logstash/config/run.sh

@@ -1,12 +1,5 @@
 #!/bin/bash
-
-#
-# OSSEC container bootstrap. See the README for information of the environment
-# variables expected by this script.
-#
-
-#
-
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 #
 # Apply Templates
 #

nginx/Dockerfile

@@ -1,7 +1,8 @@
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM nginx:latest
 
 RUN apt-get update && apt-get install -y openssl apache2-utils
 
-COPY ./config/run.sh /run.sh
+COPY config/run.sh /run.sh
 
 RUN chmod 755 /run.sh

nginx/config/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 set -e
 
 if [ ! -d /etc/pki/tls/certs ]; then

wazuh/Dockerfile

@@ -1,5 +1,7 @@
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.2.2
+ARG FILEBEAT_VERSION=6.2.3
+ARG WAZUH_VERSION=3.2.1-1
 
 RUN apt-get update; apt-get -y dist-upgrade
 RUN apt-get -y install openssl postfix bsd-mailx curl apt-transport-https lsb-release
@@ -9,7 +11,7 @@ RUN curl --silent --location https://deb.nodesource.com/setup_6.x | bash - &&\
     apt-get install -y nodejs
 RUN curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | apt-key add -
 RUN echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee -a /etc/apt/sources.list.d/wazuh.list
-RUN apt-get update && apt-get -y install wazuh-manager=3.2.1-1 wazuh-api=3.2.1-1 expect && apt-get clean
+RUN apt-get update && apt-get -y install wazuh-manager=${WAZUH_VERSION} wazuh-api=${WAZUH_VERSION} expect && apt-get clean
 
 ADD config/data_dirs.env /data_dirs.env
 ADD config/init.bash /init.bash
@@ -30,7 +32,7 @@ RUN chmod 755 /tmp/run.sh
 VOLUME ["/var/ossec/data"]
 VOLUME ["/etc/filebeat"]
 
-EXPOSE 55000/tcp 1514/udp 1515/tcp 514/udp
+EXPOSE 55000/tcp 1514/udp 1515/tcp 514/udp 1516/tcp
 
 # Run supervisord so that the container will stay alive
 

wazuh/config/filebeat.yml

@@ -1,3 +1,4 @@
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 filebeat:
  prospectors:
   - input_type: log

wazuh/config/init.bash

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 #
 # Initialize the custom data directory layout
 #

wazuh/config/run.sh

@@ -1,13 +1,5 @@
 #!/bin/bash
-
-#
-# OSSEC container bootstrap. See the README for information of the environment
-# variables expected by this script.
-#
-
-#
-
-#
+# Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 # Startup the services
 #