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
+2 -2
View File
@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM phusion/baseimage:latest
ARG FILEBEAT_VERSION=6.7.0
ARG WAZUH_VERSION=3.9.0-1
ARG FILEBEAT_VERSION=6.8.0
ARG WAZUH_VERSION=3.9.1-1
ENV API_USER="foo" \
API_PASS="bar"