mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-12-17 03:50:46 +01:00
Merge branch 'master' into trunk
This commit is contained in:
commit
6465a70acc
@ -80,6 +80,9 @@ RUN groupadd --system zabbix && \
|
|||||||
php-mysql \
|
php-mysql \
|
||||||
php-xml && \
|
php-xml && \
|
||||||
ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
||||||
|
cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
|
||||||
|
cut -d"'" -f 2 | sort | \
|
||||||
|
xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \
|
||||||
yum ${YUM_FLAGS_PERSISTANT} clean all && \
|
yum ${YUM_FLAGS_PERSISTANT} clean all && \
|
||||||
rm -rf /var/cache/yum/
|
rm -rf /var/cache/yum/
|
||||||
|
|
||||||
|
@ -81,6 +81,9 @@ RUN groupadd --system zabbix && \
|
|||||||
php-xml \
|
php-xml \
|
||||||
postgresql && \
|
postgresql && \
|
||||||
ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
||||||
|
cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
|
||||||
|
cut -d"'" -f 2 | sort | \
|
||||||
|
xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \
|
||||||
yum ${YUM_FLAGS_PERSISTENT} clean all && \
|
yum ${YUM_FLAGS_PERSISTENT} clean all && \
|
||||||
rm -rf /var/cache/yum/
|
rm -rf /var/cache/yum/
|
||||||
|
|
||||||
|
@ -82,6 +82,9 @@ RUN groupadd --system zabbix && \
|
|||||||
php-xml \
|
php-xml \
|
||||||
supervisor && \
|
supervisor && \
|
||||||
ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
||||||
|
cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
|
||||||
|
cut -d"'" -f 2 | sort | \
|
||||||
|
xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \
|
||||||
rm -f /etc/php-fpm.d/www.conf && \
|
rm -f /etc/php-fpm.d/www.conf && \
|
||||||
mkdir -p /var/lib/php/ && \
|
mkdir -p /var/lib/php/ && \
|
||||||
chown --quiet -R nginx:nginx /var/lib/php/ && \
|
chown --quiet -R nginx:nginx /var/lib/php/ && \
|
||||||
|
@ -81,6 +81,9 @@ RUN groupadd --system zabbix && \
|
|||||||
php-pgsql \
|
php-pgsql \
|
||||||
php-xml && \
|
php-xml && \
|
||||||
ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
||||||
|
cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
|
||||||
|
cut -d"'" -f 2 | sort | \
|
||||||
|
xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \
|
||||||
rm -f /etc/php-fpm.d/www.conf && \
|
rm -f /etc/php-fpm.d/www.conf && \
|
||||||
mkdir -p /var/lib/php/ && \
|
mkdir -p /var/lib/php/ && \
|
||||||
chown --quiet -R nginx:nginx /var/lib/php/ && \
|
chown --quiet -R nginx:nginx /var/lib/php/ && \
|
||||||
|
@ -172,6 +172,9 @@ RUN groupadd --system zabbix && \
|
|||||||
chown --quiet -R nginx:nginx /var/lib/php/ && \
|
chown --quiet -R nginx:nginx /var/lib/php/ && \
|
||||||
ls -lah /usr/share/zabbix/ && \
|
ls -lah /usr/share/zabbix/ && \
|
||||||
ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
|
||||||
|
cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
|
||||||
|
cut -d"'" -f 2 | sort | \
|
||||||
|
xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \
|
||||||
yum ${YUM_FLAGS_PERSISTENT} clean all && \
|
yum ${YUM_FLAGS_PERSISTENT} clean all && \
|
||||||
rm -rf /var/cache/yum/
|
rm -rf /var/cache/yum/
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user