Merge branch 'master' into 3.0

This commit is contained in:
root
2019-04-12 12:34:57 +03:00
5 changed files with 5 additions and 0 deletions

View File

@@ -60,6 +60,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

@@ -57,6 +57,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

@@ -64,6 +64,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

@@ -64,6 +64,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

@@ -185,6 +185,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 && \