extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 08:35:05 +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:26:03 +03:00
parent e7d479c36f cf651a2e5d
commit ecd6247c48
31 changed files with 7 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web-apache-pgsql/alpine/Dockerfile
View File

@ -49,8 +49,7 @@ RUN addgroup zabbix && \
php7-sockets \
php7-xmlreader \
php7-xmlwriter \
postgresql-client \
ttf-dejavu && \
postgresql-client && \
apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \
rm -rf /var/cache/apk/*
@ -64,8 +63,6 @@ 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}-pgsql --link postgres-server:postgres --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-pgsql:alpine-${ZBX_VERSION}"
COPY ["conf/tmp/font-config", "/tmp/font-config"]
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
gettext \
git && \
@ -75,13 +72,9 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
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 && \
ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
apk del ${APK_FLAGS_COMMON} --purge \
build-dependencies && \
rm -rf /var/cache/apk/*

21
web-apache-pgsql/alpine/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
@@ -51,7 +51,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
@@ -96,7 +96,7 @@
define('ZBX_ACK_STS_WITH_UNACK', 2);
define('ZBX_ACK_STS_WITH_LAST_UNACK', 3);
-define('ZBX_FONT_NAME', 'DejaVuSans');
+define('ZBX_FONT_NAME', 'graphfont');
define('ZBX_AUTH_INTERNAL', 0);
define('ZBX_AUTH_LDAP', 1);

7
web-apache-pgsql/centos/Dockerfile
View File

@ -8,8 +8,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.7
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
COPY ["conf/tmp/font-config", "/tmp/font-config"]
RUN yum --quiet makecache && \
yum ${YUM_FLAGS_DEV} install \
gettext \
@ -21,11 +19,8 @@ RUN yum --quiet makecache && \
cp -R /tmp/zabbix-${ZBX_VERSION}/frontends/php/* /tmp/zabbix/ && \
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
cd /tmp/zabbix/ && \
patch -p3 < /tmp/font-config && \
rm /tmp/font-config && \
rm -f conf/zabbix.conf.php && \
rm -rf tests && \
rm /tmp/zabbix/fonts/DejaVuSans.ttf && \
./locale/make_mo.sh
FROM centos:centos7
@ -71,7 +66,6 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_COMMON} makecache && \
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
yum ${YUM_FLAGS_PERSISTENT} install \
dejavu-sans-fonts \
curl \
httpd \
mod_ssl \
@ -83,7 +77,6 @@ RUN groupadd --system zabbix && \
php-pgsql \
php-xml \
postgresql && \
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' && \

21
web-apache-pgsql/centos/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);

21
web-apache-pgsql/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);