conflicts resolved in merge 3.9.1_6.8.0 over k8s branch

This commit is contained in:
AlfonsoRBJ
2019-05-28 12:43:16 +02:00
12 changed files with 54 additions and 37 deletions
+7 -7
View File
@@ -1,16 +1,16 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/kibana/kibana:6.7.1
ARG WAZUH_APP_VERSION=3.9.0_6.7.1
FROM docker.elastic.co/kibana/kibana:6.8.0
ARG WAZUH_APP_VERSION=3.9.1_6.8.0
USER root
ADD https://packages.wazuh.com/wazuhapp/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/*
COPY config/entrypoint.sh /entrypoint.sh
RUN chmod 755 /entrypoint.sh
COPY config/entrypoint.sh ./entrypoint.sh
RUN chmod 755 ./entrypoint.sh
USER kibana
@@ -75,4 +75,4 @@ RUN ./welcome_wazuh.sh
RUN /usr/local/bin/kibana-docker --optimize
ENTRYPOINT /entrypoint.sh
ENTRYPOINT ./entrypoint.sh