Merge from master

This commit is contained in:
root
2018-05-10 19:11:24 -07:00
43 changed files with 669 additions and 43 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.7
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE