Merge pull request #98 from zabbix/master

Master
This commit is contained in:
Alexey Pustovalov
2017-04-28 16:28:13 +03:00
committed by GitHub
25 changed files with 25 additions and 21 deletions

View File

@ -1,5 +1,5 @@
FROM alpine:3.4
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"

View File

@ -1,5 +1,5 @@
FROM ubuntu:trusty
MAINTAINER Alexey Pustovalov <alexey.pustovalov@zabbix.com>
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG APT_FLAGS_COMMON="-qq -y"
ARG APT_FLAGS_PERSISTANT="${APT_FLAGS_COMMON} --no-install-recommends"