Skip to content

Commit

Permalink
Removed font processing. Using default font
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed May 29, 2019
2 parents c1f6fec + cf651a2 commit 48604a1
Show file tree
Hide file tree
Showing 31 changed files with 7 additions and 459 deletions.
9 changes: 1 addition & 8 deletions web-apache-mysql/alpine/Dockerfile
View file
Expand Up @@ -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/*

Expand All @@ -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 && \
Expand All @@ -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/*
Expand Down
21 changes: 0 additions & 21 deletions web-apache-mysql/alpine/conf/tmp/font-config
View file

This file was deleted.

7 changes: 0 additions & 7 deletions web-apache-mysql/centos/Dockerfile
View file
Expand Up @@ -8,24 +8,18 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.1
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} && \
mkdir /tmp/zabbix/ && \
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
Expand Down Expand Up @@ -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' && \
Expand Down
21 changes: 0 additions & 21 deletions web-apache-mysql/centos/conf/tmp/font-config
View file

This file was deleted.

12 changes: 1 addition & 11 deletions web-apache-mysql/ubuntu/Dockerfile
View file
Expand Up @@ -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/*
Expand All @@ -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/ && \
Expand All @@ -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' | \
Expand All @@ -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 && \
Expand Down
21 changes: 0 additions & 21 deletions web-apache-mysql/ubuntu/conf/tmp/font-config
View file

This file was deleted.

9 changes: 1 addition & 8 deletions web-apache-pgsql/alpine/Dockerfile
View file
Expand Up @@ -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/*

Expand All @@ -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 && \
Expand All @@ -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/*
Expand Down
21 changes: 0 additions & 21 deletions web-apache-pgsql/alpine/conf/tmp/font-config
View file

This file was deleted.

7 changes: 0 additions & 7 deletions web-apache-pgsql/centos/Dockerfile
View file
Expand Up @@ -8,8 +8,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.1
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 \
Expand All @@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -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' && \
Expand Down
21 changes: 0 additions & 21 deletions web-apache-pgsql/centos/conf/tmp/font-config
View file

This file was deleted.

21 changes: 0 additions & 21 deletions web-apache-pgsql/ubuntu/conf/tmp/font-config
View file

This file was deleted.

9 changes: 1 addition & 8 deletions web-nginx-mysql/alpine/Dockerfile
View file
Expand Up @@ -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=4.2
Expand All @@ -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 \
Expand All @@ -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/*
Expand Down
21 changes: 0 additions & 21 deletions web-nginx-mysql/alpine/conf/tmp/font-config
View file

This file was deleted.

0 comments on commit 48604a1

Please sign in to comment.