Merge branch 'master' into trunk

This commit is contained in:
root
2019-04-09 23:36:25 +03:00
64 changed files with 201 additions and 142 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
@ -35,7 +35,7 @@ RUN addgroup zabbix && \
bash \
curl \
mariadb-client \
mariadb-client-libs \
mariadb-connector-c \
nginx \
php7-bcmath \
php7-ctype \