Merge branch 'master' into 4.0

This commit is contained in:
root 2019-04-12 12:35:37 +03:00
commit 15e1e8f3b6
5 changed files with 5 additions and 0 deletions

View File

@ -62,6 +62,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
libxml2 \
mysql-client \
snmp-mibs-downloader \
ca-certificates \
unixodbc && \
apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \

View File

@ -59,6 +59,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
libssl1.1 \
libxml2 \
snmp-mibs-downloader \
ca-certificates \
unixodbc && \
apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \

View File

@ -66,6 +66,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
libxml2 \
mysql-client \
snmp-mibs-downloader \
ca-certificates \
unixodbc && \
apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \

View File

@ -66,6 +66,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
libxml2 \
postgresql-client \
snmp-mibs-downloader \
ca-certificates \
unixodbc && \
apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \

View File

@ -189,6 +189,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
snmp-mibs-downloader \
supervisor \
ttf-dejavu-core \
ca-certificates \
unixodbc && \
update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \
zabbix-frontend-font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf 10 && \