mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-11-04 05:53:16 +00:00 
			
		
		
		
	Changed versions: wazuh 3.9.4 and kibana 6.8.2
This commit is contained in:
		@@ -1,5 +1,5 @@
 | 
				
			|||||||
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
					# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
				
			||||||
FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.1
 | 
					FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV ALERTS_SHARDS="1" \
 | 
					ENV ALERTS_SHARDS="1" \
 | 
				
			||||||
    ALERTS_REPLICAS="0"
 | 
					    ALERTS_REPLICAS="0"
 | 
				
			||||||
@@ -11,7 +11,7 @@ ENV XPACK_ML="true"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
ENV ENABLE_CONFIGURE_S3="false"
 | 
					ENV ENABLE_CONFIGURE_S3="false"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV TEMPLATE_VERSION=v3.9.3
 | 
					ENV TEMPLATE_VERSION=v3.9.4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This CA is created for testing. Please set your own CA zip containing the key and the signed certificate. 
 | 
					# This CA is created for testing. Please set your own CA zip containing the key and the signed certificate. 
 | 
				
			||||||
@@ -61,7 +61,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
RUN chmod +x ./load_settings.sh
 | 
					RUN chmod +x ./load_settings.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.8.1.zip
 | 
					RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.8.2.zip
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY config/configure_s3.sh ./config/configure_s3.sh
 | 
					COPY config/configure_s3.sh ./config/configure_s3.sh
 | 
				
			||||||
RUN chmod 755 ./config/configure_s3.sh
 | 
					RUN chmod 755 ./config/configure_s3.sh
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
					# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
				
			||||||
FROM docker.elastic.co/kibana/kibana:6.8.1
 | 
					FROM docker.elastic.co/kibana/kibana:6.8.2
 | 
				
			||||||
ARG WAZUH_APP_VERSION=3.9.3_6.8.1
 | 
					ARG WAZUH_APP_VERSION=3.9.4_6.8.2
 | 
				
			||||||
USER root
 | 
					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-${WAZUH_APP_VERSION}.zip /tmp
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
					# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
				
			||||||
FROM docker.elastic.co/logstash/logstash:6.8.1
 | 
					FROM docker.elastic.co/logstash/logstash:6.8.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh
 | 
					COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,15 +2,13 @@
 | 
				
			|||||||
FROM phusion/baseimage:latest
 | 
					FROM phusion/baseimage:latest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Arguments
 | 
					# Arguments
 | 
				
			||||||
ARG FILEBEAT_VERSION=6.8.1
 | 
					ARG FILEBEAT_VERSION=6.8.2
 | 
				
			||||||
ARG WAZUH_VERSION=3.9.3-1
 | 
					ARG WAZUH_VERSION=3.9.4-1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Environment variables
 | 
					# Environment variables
 | 
				
			||||||
ENV API_USER="foo" \
 | 
					ENV API_USER="foo" \
 | 
				
			||||||
    API_PASS="bar"
 | 
					    API_PASS="bar"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY config/wazuh-manager_3.9.3-3.9.3-2_amd64.deb /tmp/wazuh-manager_3.9.3-3.9.3-2_amd64.deb
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Install packages
 | 
					# Install packages
 | 
				
			||||||
RUN set -x && \
 | 
					RUN set -x && \
 | 
				
			||||||
    echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \
 | 
					    echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \
 | 
				
			||||||
@@ -25,8 +23,8 @@ RUN set -x && \
 | 
				
			|||||||
    apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
 | 
					    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 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 postfix bsd-mailx mailutils libsasl2-2 ca-certificates libsasl2-modules && \
 | 
				
			||||||
    apt-get --no-install-recommends --no-install-suggests -y install /tmp/wazuh-manager_3.9.3-3.9.3-2_amd64.deb
 | 
					    apt-get --no-install-recommends --no-install-suggests -y install wazuh-manager=${WAZUH_VERSION} && \
 | 
				
			||||||
RUN 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 wazuh-api=${WAZUH_VERSION} && \
 | 
				
			||||||
    apt-get clean && \
 | 
					    apt-get clean && \
 | 
				
			||||||
    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
 | 
					    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
 | 
				
			||||||
    rm -f /var/ossec/logs/alerts/*/*/* && \
 | 
					    rm -f /var/ossec/logs/alerts/*/*/* && \
 | 
				
			||||||
@@ -39,7 +37,6 @@ RUN apt-get --no-install-recommends --no-install-suggests -y install nodejs wazu
 | 
				
			|||||||
    curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-${FILEBEAT_VERSION}-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
 | 
					    dpkg -i filebeat-${FILEBEAT_VERSION}-amd64.deb && rm -f filebeat-${FILEBEAT_VERSION}-amd64.deb
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
# Services
 | 
					# Services
 | 
				
			||||||
RUN mkdir /etc/service/wazuh && \
 | 
					RUN mkdir /etc/service/wazuh && \
 | 
				
			||||||
    mkdir /etc/service/wazuh-api && \
 | 
					    mkdir /etc/service/wazuh-api && \
 | 
				
			||||||
@@ -98,5 +95,12 @@ COPY config/01-wazuh.sh /entrypoint-scripts/01-wazuh.sh
 | 
				
			|||||||
RUN chmod 755 /entrypoint.sh && \
 | 
					RUN chmod 755 /entrypoint.sh && \
 | 
				
			||||||
    chmod 755 /entrypoint-scripts/01-wazuh.sh
 | 
					    chmod 755 /entrypoint-scripts/01-wazuh.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Workaround. 
 | 
				
			||||||
 | 
					# Issues: Wazuh-api
 | 
				
			||||||
 | 
					# https://github.com/wazuh/wazuh-api/issues/440  
 | 
				
			||||||
 | 
					# https://github.com/wazuh/wazuh-api/issues/443
 | 
				
			||||||
 | 
					COPY --chown=root:ossec config/agents.js /var/ossec/api/controllers/agents.js
 | 
				
			||||||
 | 
					RUN chmod 770 /var/ossec/api/controllers/agents.js
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Run all services
 | 
					# Run all services
 | 
				
			||||||
ENTRYPOINT ["/entrypoint.sh"]
 | 
					ENTRYPOINT ["/entrypoint.sh"]
 | 
				
			||||||
		Reference in New Issue
	
	Block a user