Merge remote-tracking branch 'origin/master' into 3.2

This commit is contained in:
root 2018-05-31 20:36:35 -07:00
commit adffdd7a33

View File

@ -87,6 +87,7 @@ RUN addgroup zabbix && \
apk update && \ apk update && \
apk add ${APK_FLAGS_PERSISTANT} \ apk add ${APK_FLAGS_PERSISTANT} \
bash \ bash \
coreutils \
iputils \ iputils \
libldap && \ libldap && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*