Merge branch 'master' into 4.0

This commit is contained in:
root 2019-04-18 23:19:49 +03:00
commit c897f60267

View File

@ -46,7 +46,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \ apt-get ${APT_FLAGS_PERSISTENT} install \
snmp-mibs-downloader \ snmp-mibs-downloader \
snmpd \ snmptrapd \
supervisor && \ supervisor && \
download-mibs && \ download-mibs && \
dpkg -i /tmp/snmptrapfmt_1.14+nmu1ubuntu2_amd64.deb && \ dpkg -i /tmp/snmptrapfmt_1.14+nmu1ubuntu2_amd64.deb && \