Merge branch 'master' into 5.0

This commit is contained in:
Alexey Pustovalov
2021-06-10 02:23:02 +03:00
3 changed files with 1 additions and 7 deletions

View File

@ -85,7 +85,6 @@ RUN set -eux && \
rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \
ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \
./locale/make_mo.sh && \
mkdir -p /var/lib/locales/supported.d/ && \
rm -f /var/lib/locales/supported.d/local && \
cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \