Merge branch 'master' into 4.0

This commit is contained in:
root 2019-01-14 00:24:34 +02:00
commit 36c9aa371b

View File

@ -196,8 +196,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
cut -d"'" -f 2 | sort | \ cut -d"'" -f 2 | sort | \
xargs -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ xargs -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \
dpkg-reconfigure locales && \ dpkg-reconfigure locales && \
apt-get ${APT_FLAGS_COMMON} purge \
wget && \
apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \ apt-get ${APT_FLAGS_COMMON} clean && \
mkdir -p /var/lib/php7 && \ mkdir -p /var/lib/php7 && \