extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-30 14:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed font processing. Using default font

Browse Source
This commit is contained in:
root
2019-05-29 13:24:06 +03:00
parent bc9b88be63
commit cf651a2e5d
31 changed files with 7 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web-nginx-mysql/ubuntu/Dockerfile
View File

@ -63,8 +63,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
php7.2-mbstring \
php7.2-mysql \
php7.2-xml \
supervisor \
ttf-dejavu-core && \
supervisor && \
DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
wget && \
apt-get ${APT_FLAGS_COMMON} autoremove && \
@ -84,12 +83,9 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
org.label-schema.vcs-url="${ZBX_SOURCES}" \
org.label-schema.docker.cmd="docker run --name zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"
COPY ["conf/tmp/font-config", "/tmp/font-config"]
RUN apt-get ${APT_FLAGS_COMMON} update && \
DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_DEV} install \
gettext \
patch \
ca-certificates \
git && \
cd /usr/share/ && \
@ -98,14 +94,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/frontends/php/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
cd /usr/share/zabbix/ && \
patch -p3 < /tmp/font-config && \
rm /tmp/font-config && \
rm -f conf/zabbix.conf.php && \
rm -rf tests && \
rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \
./locale/make_mo.sh && \
update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \
zabbix-frontend-font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf 10 && \
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' | \
@ -116,7 +107,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \
DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
gettext \
patch \
ca-certificates \
git && \
apt-get ${APT_FLAGS_COMMON} autoremove && \

21
web-nginx-mysql/ubuntu/conf/tmp/font-config
View File

@ -1,21 +0,0 @@
diff -Nru zabbix-2.5.0.orig/frontends/php/include/defines.inc.php zabbix-2.5.0/frontends/php/include/defines.inc.php
--- zabbix-2.5.0.orig/frontends/php/include/defines.inc.php 2015-08-19 17:27:39.000000000 +0900
+++ zabbix-2.5.0/frontends/php/include/defines.inc.php 2015-08-22 15:20:12.000000000 +0900
@@ -42,7 +42,7 @@
define('ZBX_WIDGET_ROWS', 20);
define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18)
-define('ZBX_GRAPH_FONT_NAME', 'DejaVuSans'); // font file name
+define('ZBX_GRAPH_FONT_NAME', 'graphfont'); // font file name
define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up
define('ZBX_SCRIPT_TIMEOUT', 60); // in seconds
@@ -90,7 +90,7 @@
define('EVENTS_OPTION_ALL', 2);
define('EVENTS_OPTION_NOT_ACK', 3);
-define('ZBX_FONT_NAME', 'DejaVuSans');
+define('ZBX_FONT_NAME', 'graphfont');
define('ZBX_AUTH_INTERNAL', 0);
define('ZBX_AUTH_LDAP', 1);