paulmataruso/wazuh-docker-orginal
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-11-03 13:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolving conflicts

Browse Source
This commit is contained in:
vcerenu
2023-10-23 05:25:42 -03:00
parent 0c7d298eea aa88dad36a
commit 781e6a4082
10 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build-docker-images/wazuh-manager/Dockerfile
View File

@@ -5,7 +5,11 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
<<<<<<< HEAD
ARG FILEBEAT_TEMPLATE_BRANCH
=======
ARG TEMPLATE_VERSION=v4.7.1
>>>>>>> aa88dad36ac99f8a1b1470a8c1b4749a80157d7e
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE