Merge branch 'master' into 5.0

This commit is contained in:
Alexey Pustovalov
2020-05-12 10:11:30 +03:00
35 changed files with 134 additions and 66 deletions

View File

@ -58,6 +58,7 @@ RUN set -eux && \
rm -f /etc/nginx/conf.d/*.conf && \
rm -rf /var/cache/nginx/ && \
rm -f /etc/php/7.2/fpm/pool.d/www.conf && \
ln -sf /dev/fd/2 /var/log/nginx/error.log && \
DEBIAN_FRONTEND=noninteractive apt-get -y purge gpg dirmngr gpg-agent && \
apt-get -y autoremove && \
apt-get -y clean && \