mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-10-31 03:53:33 +00:00 
			
		
		
		
	Fixed conflicts
This commit is contained in:
		| @@ -3,9 +3,9 @@ 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/* | ||||
|  | ||||
|   | ||||
| @@ -16,8 +16,8 @@ RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee / | ||||
|  | ||||
| RUN add-apt-repository universe && apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \ | ||||
|    apt-get --no-install-recommends --no-install-suggests -y install openssl postfix bsd-mailx python-boto python-pip  \ | ||||
|    apt-transport-https vim expect nodejs python-cryptography mailutils libsasl2-modules wazuh-manager=${WAZUH_VERSION} \ | ||||
|    wazuh-api=${WAZUH_VERSION} && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -f \ | ||||
|    apt-transport-https vim expect nodejs python-cryptography mailutils libsasl2-modules wazuh-manager \ | ||||
|    wazuh-api && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -f \ | ||||
|    /var/ossec/logs/alerts/*/*/*.log && rm -f /var/ossec/logs/alerts/*/*/*.json && rm -f \ | ||||
|    /var/ossec/logs/archives/*/*/*.log && rm -f /var/ossec/logs/archives/*/*/*.json && rm -f \ | ||||
|    /var/ossec/logs/firewall/*/*/*.log && rm -f /var/ossec/logs/firewall/*/*/*.json | ||||
|   | ||||
		Reference in New Issue
	
	Block a user