Fixed conflicts

This commit is contained in:
manuasir
2019-06-03 19:00:40 +02:00
2 changed files with 19 additions and 4 deletions
+3 -4
View File
@@ -8,9 +8,8 @@ ADD https://packages.wazuh.com/wazuhapp/wazuhapp-3.9.1_7.1.0.zip /tmp
RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
RUN rm -rf /tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
COPY config/entrypoint.sh /entrypoint.sh
RUN chmod 755 /entrypoint.sh
COPY config/entrypoint.sh ./entrypoint.sh
RUN chmod 755 ./entrypoint.sh
USER kibana
@@ -73,4 +72,4 @@ RUN ./welcome_wazuh.sh
RUN /usr/local/bin/kibana-docker --optimize
ENTRYPOINT /entrypoint.sh
ENTRYPOINT ./entrypoint.sh