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

This commit is contained in:
root 2018-05-31 20:37:14 -07:00
commit e5b94d728b

View File

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