Merge branch 'master' into 4.2

This commit is contained in:
root
2019-04-09 23:36:02 +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 \

View File

@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
# Zabbix web interface images
These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.4, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)