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

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

View File

@ -88,6 +88,7 @@ RUN addgroup zabbix && \
apk update && \
apk add ${APK_FLAGS_PERSISTANT} \
bash \
coreutils \
iputils \
libldap \
pcre && \