diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index d2f7b4e2fb..c722a956b0 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -50,8 +50,7 @@ RUN addgroup zabbix && \ php7-simplexml \ php7-sockets \ php7-xmlreader \ - php7-xmlwriter \ - ttf-dejavu && \ + php7-xmlwriter && \ apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \ rm -rf /var/cache/apk/* @@ -65,8 +64,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}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}:alpine-${ZBX_VERSION}" -ADD conf/tmp/font-config /tmp/font-config - RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ gettext \ git && \ @@ -76,13 +73,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/* diff --git a/web-apache-mysql/alpine/conf/tmp/font-config b/web-apache-mysql/alpine/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-apache-mysql/alpine/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index f5da3c7634..714765517e 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -8,12 +8,9 @@ ARG ZBX_VERSION=${MAJOR_VERSION} 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 \ - patch \ git && \ cd /tmp/ && \ git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ @@ -21,11 +18,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 @@ -82,7 +76,6 @@ RUN groupadd --system zabbix && \ php-mbstring \ php-mysql \ php-xml && \ - 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' && \ diff --git a/web-apache-mysql/centos/conf/tmp/font-config b/web-apache-mysql/centos/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-apache-mysql/centos/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 5ce3b7395c..2fadb7fa27 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -47,8 +47,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ php7.2-ldap \ php7.2-mbstring \ php7.2-mysql \ - php7.2-xml \ - ttf-dejavu-core && \ + php7.2-xml && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* @@ -63,12 +62,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/ && \ @@ -77,14 +73,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' | \ @@ -95,7 +86,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 && \ diff --git a/web-apache-mysql/ubuntu/conf/tmp/font-config b/web-apache-mysql/ubuntu/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-apache-mysql/ubuntu/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index d05ddf411c..fd7e2cf570 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -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/* diff --git a/web-apache-pgsql/alpine/conf/tmp/font-config b/web-apache-pgsql/alpine/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-apache-pgsql/alpine/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index 66011ceb30..312fe4b790 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -8,8 +8,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION} 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' && \ diff --git a/web-apache-pgsql/centos/conf/tmp/font-config b/web-apache-pgsql/centos/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-apache-pgsql/centos/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-apache-pgsql/ubuntu/conf/tmp/font-config b/web-apache-pgsql/ubuntu/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-apache-pgsql/ubuntu/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 213d4cf247..9c74c3efcc 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -51,8 +51,7 @@ RUN addgroup zabbix && \ php7-sockets \ php7-xmlreader \ php7-xmlwriter \ - supervisor \ - ttf-dejavu && \ + supervisor && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=master @@ -65,8 +64,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}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}:alpine-${ZBX_VERSION}" -COPY ["conf/tmp/font-config", "/tmp/font-config"] - RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ coreutils \ gettext \ @@ -77,13 +74,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/* diff --git a/web-nginx-mysql/alpine/conf/tmp/font-config b/web-nginx-mysql/alpine/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-nginx-mysql/alpine/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index d0b7674e10..1b8850216d 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -9,8 +9,6 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx -COPY ["conf/tmp/font-config", "/tmp/font-config"] - RUN yum --quiet makecache && \ yum ${YUM_FLAGS_DEV} install \ gettext \ @@ -22,11 +20,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 @@ -72,7 +67,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 \ mariadb \ nginx \ @@ -84,7 +78,6 @@ RUN groupadd --system zabbix && \ php-mysql \ php-xml \ supervisor && \ - 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' && \ diff --git a/web-nginx-mysql/centos/conf/tmp/font-config b/web-nginx-mysql/centos/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-nginx-mysql/centos/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 45ac03589b..1cffb6916f 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -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 && \ diff --git a/web-nginx-mysql/ubuntu/conf/tmp/font-config b/web-nginx-mysql/ubuntu/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-nginx-mysql/ubuntu/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index b821328110..cd92468ff4 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -50,8 +50,7 @@ RUN addgroup zabbix && \ php7-xmlreader \ php7-xmlwriter \ postgresql-client \ - supervisor \ - ttf-dejavu && \ + supervisor && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=master @@ -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 \ coreutils \ gettext \ @@ -76,13 +73,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/* diff --git a/web-nginx-pgsql/alpine/conf/tmp/font-config b/web-nginx-pgsql/alpine/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-nginx-pgsql/alpine/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index a288b7b6c5..a7ca6a80e5 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -9,12 +9,9 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx -COPY ["conf/tmp/font-config", "/tmp/font-config"] - RUN yum --quiet makecache && \ yum ${YUM_FLAGS_DEV} install \ gettext \ - patch \ git && \ cd /tmp/ && \ git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ @@ -22,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 @@ -72,7 +66,6 @@ RUN groupadd --system zabbix && \ yum ${YUM_FLAGS_COMMON} makecache && \ yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ yum ${YUM_FLAGS_PERSISTENT} install supervisor \ - dejavu-sans-fonts \ curl \ nginx \ postgresql \ @@ -83,7 +76,6 @@ RUN groupadd --system zabbix && \ php-mbstring \ php-pgsql \ php-xml && \ - 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' && \ diff --git a/web-nginx-pgsql/centos/conf/tmp/font-config b/web-nginx-pgsql/centos/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-nginx-pgsql/centos/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index c6dacf38b5..e76facd17a 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -63,8 +63,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ php7.2-xml \ php7.2-pgsql \ postgresql-client \ - 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}-pgsql --link postgres-server:postgres --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-pgsql: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 && \ diff --git a/web-nginx-pgsql/ubuntu/conf/tmp/font-config b/web-nginx-pgsql/ubuntu/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/web-nginx-pgsql/ubuntu/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile index 3b79dfb960..7d83571dbe 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -11,8 +11,6 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \ MYSQL_ALLOW_EMPTY_PASSWORD=true ZBX_ADD_SERVER=true ZBX_ADD_WEB=true DB_SERVER_HOST=localhost MYSQL_USER=zabbix ZBX_ADD_JAVA_GATEWAY=true ZBX_JAVAGATEWAY_ENABLE=true ZBX_JAVAGATEWAY=localhost -COPY ["conf/tmp/font-config", "/tmp/font-config"] - RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ bash \ alpine-sdk \ @@ -68,10 +66,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ gzip database/${ZBX_DB_TYPE}/create.sql && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/*.xml && \ cd frontends/php/ && \ - patch -p3 < /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ - rm /tmp/zabbix-${ZBX_VERSION}/frontends/php/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh FROM alpine:3.4 @@ -138,7 +134,6 @@ RUN addgroup zabbix && \ mkdir -p /var/lib/zabbix/ssl/ssl_ca && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \ - ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ apk update && \ apk add ${APK_FLAGS_PERSISTENT} \ tini \ @@ -168,7 +163,6 @@ RUN addgroup zabbix && \ php5-sockets \ php5-xmlreader \ supervisor \ - ttf-dejavu \ unixodbc && \ rm -rf /var/cache/apk/* diff --git a/zabbix-appliance/alpine/conf/tmp/font-config b/zabbix-appliance/alpine/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/zabbix-appliance/alpine/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/zabbix-appliance/centos/Dockerfile b/zabbix-appliance/centos/Dockerfile index c0ec1929af..a29f8aaec0 100644 --- a/zabbix-appliance/centos/Dockerfile +++ b/zabbix-appliance/centos/Dockerfile @@ -10,8 +10,6 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \ MYSQL_ALLOW_EMPTY_PASSWORD=true ZBX_ADD_SERVER=true ZBX_ADD_WEB=true DB_SERVER_HOST=localhost MYSQL_USER=zabbix ZBX_ADD_JAVA_GATEWAY=true ZBX_JAVAGATEWAY_ENABLE=true ZBX_JAVAGATEWAY=localhost -COPY ["conf/tmp/font-config", "/tmp/font-config"] - RUN yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-devel-1.4-2.el7.centos.x86_64.rpm \ http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \ yum --quiet makecache && \ @@ -29,7 +27,6 @@ RUN yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86 net-snmp-devel \ OpenIPMI-devel \ openldap-devel \ - patch \ git \ unixODBC-devel && \ cd /tmp/ && \ @@ -69,10 +66,8 @@ RUN yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86 gzip database/${ZBX_DB_TYPE}/create.sql && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/*.xml && \ cd frontends/php/ && \ - patch -p3 < /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ - rm /tmp/zabbix-${ZBX_VERSION}/frontends/php/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh FROM centos:centos7 @@ -149,7 +144,6 @@ RUN groupadd --system zabbix && \ traceroute \ curl \ OpenIPMI-libs \ - dejavu-sans-fonts \ java-1.8.0-openjdk-headless \ libcurl \ libxml2 \ @@ -173,7 +167,6 @@ RUN groupadd --system zabbix && \ mkdir -p /var/lib/php/ && \ chown --quiet -R nginx:nginx /var/lib/php/ && \ ls -lah /usr/share/zabbix/ && \ - 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' && \ diff --git a/zabbix-appliance/centos/conf/tmp/font-config b/zabbix-appliance/centos/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/zabbix-appliance/centos/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index 5eaa33747f..ecb4124d81 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -54,7 +54,6 @@ COPY ["licenses", "/licenses"] ### Add necessary Red Hat repos here RUN INSTALL_PKGS="OpenIPMI-libs \ curl \ - dejavu-sans-fonts \ fping \ iksemel \ java-1.8.0-openjdk-headless \ @@ -113,8 +112,6 @@ RUN INSTALL_PKGS="OpenIPMI-libs \ rm -rf /var/lib/yum/yumdb/* && \ rm -rf /usr/lib/udev/hwdb.d/* -COPY ["conf/tmp/font-config", "/tmp/font-config"] - RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supported" && \ INSTALL_PKGS="autoconf \ automake \ @@ -131,7 +128,6 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte net-snmp-devel \ OpenIPMI-devel \ openldap-devel \ - patch \ git \ unixODBC-devel" && \ yum -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ @@ -188,13 +184,9 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte 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 && \ yum ${YUM_FLAGS_COMMON} history undo `yum history | sed -n 4p |column -t | cut -d' ' -f1` && \ yum ${YUM_FLAGS_COMMON} clean all && \ rm -rf /var/cache/yum && \ diff --git a/zabbix-appliance/rhel/conf/tmp/font-config b/zabbix-appliance/rhel/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/zabbix-appliance/rhel/conf/tmp/font-config +++ /dev/null @@ -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); diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile index 3dc6a28374..87c8881040 100644 --- a/zabbix-appliance/ubuntu/Dockerfile +++ b/zabbix-appliance/ubuntu/Dockerfile @@ -12,8 +12,6 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \ MYSQL_ALLOW_EMPTY_PASSWORD=true ZBX_ADD_SERVER=true ZBX_ADD_WEB=true DB_SERVER_HOST=localhost MYSQL_USER=zabbix ZBX_ADD_JAVA_GATEWAY=true ZBX_JAVAGATEWAY_ENABLE=true ZBX_JAVAGATEWAY=localhost -COPY ["conf/tmp/font-config", "/tmp/font-config"] - RUN apt-get ${APT_FLAGS_COMMON} update && \ DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_DEV} install locales && \ locale-gen $LC_ALL && \ @@ -34,7 +32,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libxml2-dev \ make \ openjdk-8-jdk \ - patch \ pkg-config \ git \ unixodbc-dev && \ @@ -75,10 +72,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ gzip database/${ZBX_DB_TYPE}/create.sql && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/*.xml && \ cd frontends/php/ && \ - patch -p3 < /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ - rm /tmp/zabbix-${ZBX_VERSION}/frontends/php/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh FROM ubuntu:bionic @@ -195,11 +190,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ php7.2-xml \ snmp-mibs-downloader \ supervisor \ - ttf-dejavu-core \ ca-certificates \ unixodbc && \ - 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' | \ diff --git a/zabbix-appliance/ubuntu/conf/tmp/font-config b/zabbix-appliance/ubuntu/conf/tmp/font-config deleted file mode 100644 index f28ef2e177..0000000000 --- a/zabbix-appliance/ubuntu/conf/tmp/font-config +++ /dev/null @@ -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);