diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 5e4e32414..cf65ac9c6 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -3,9 +3,9 @@ FROM alpine:3.9 as builder ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=agent @@ -17,12 +17,12 @@ RUN apk update && \ openssl-dev \ openldap-dev \ pcre-dev \ - subversion \ + git \ coreutils && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -48,9 +48,9 @@ ARG VCS_REF ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index 0788014fe..080ad4bcc 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=agent @@ -16,12 +16,12 @@ RUN yum --quiet makecache && \ make \ openssl-devel \ openldap-devel \ - subversion \ + git \ gcc && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`set -o pipefail && svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -47,9 +47,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none ENV TINI_VERSION v0.18.0 diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index f0b156498..44c1310cb 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -3,9 +3,9 @@ FROM ubuntu:bionic as builder ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ ZBX_TYPE=agent ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} @@ -21,12 +21,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libssl-dev \ make \ pkg-config \ - subversion \ + git \ + ca-certificates \ gcc && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -51,9 +52,9 @@ ARG VCS_REF ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none \ ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index f9478a417..32d1ef525 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -34,9 +34,9 @@ RUN addgroup zabbix && \ openjdk8-jre-base && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -49,12 +49,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ automake \ coreutils \ openjdk8 \ - subversion \ alpine-sdk && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ ./bootstrap.sh && \ @@ -74,9 +73,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ - rm -rf /var/cache/apk/* && \ - rm -rf /root/.subversion && \ - rm -rf /var/svn + rm -rf /var/cache/apk/* EXPOSE 10052/TCP diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index 2c09e71ce..f4a20987a 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=java-gateway @@ -15,12 +15,12 @@ RUN yum --quiet makecache && \ automake \ java-1.8.0-openjdk-devel \ make \ - subversion \ + git \ gcc && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ ./bootstrap.sh && \ @@ -43,9 +43,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index cfaa912df..c02078b46 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -41,9 +41,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -59,12 +59,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make \ openjdk-8-jdk \ pkg-config \ - subversion \ + git \ gcc && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ ./bootstrap.sh && \ @@ -89,12 +89,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make \ openjdk-8-jdk \ pkg-config \ - subversion \ + git \ gcc && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /root/.subversion + rm -rf /var/lib/apt/lists/* EXPOSE 10052/TCP diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index 3fd14f66b..56896354e 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -59,9 +59,9 @@ RUN addgroup zabbix && \ fping && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -86,9 +86,9 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ unixodbc-dev \ alpine-sdk && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index edeb9c29b..a517a57b1 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=proxy ZBX_DB_TYPE=mysql @@ -23,12 +23,12 @@ RUN yum --quiet makecache && \ net-snmp-devel \ OpenIPMI-devel \ openldap-devel \ - subversion \ + git \ unixODBC-devel && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -64,9 +64,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=proxy ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 12cf5faf6..233957d11 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -68,9 +68,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -97,12 +97,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libxml2-dev \ make \ pkg-config \ - subversion \ + git \ unixodbc-dev && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -152,11 +152,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libxml2-dev \ make \ pkg-config \ - subversion \ + git \ unixodbc-dev && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ rm -rf /var/lib/apt/lists/* && \ - rm -rf /root/.subversion && \ chmod +x /sbin/tini EXPOSE 10051/TCP diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 8eef5f495..0f2425f08 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -57,9 +57,9 @@ RUN addgroup zabbix && \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -81,12 +81,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openldap-dev \ pcre-dev \ sqlite-dev \ - subversion \ + git \ unixodbc-dev && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -119,8 +119,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ - rm -rf /var/cache/apk/* && \ - rm -rf /root/.subversion + rm -rf /var/cache/apk/* EXPOSE 10051/TCP diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index dc8be420d..3aedf57da 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 @@ -23,12 +23,12 @@ RUN yum --quiet makecache && \ OpenIPMI-devel \ openldap-devel \ sqlite-devel \ - subversion \ + git \ unixODBC-devel && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -64,9 +64,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 ZBX_OPT_TYPE=none diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 37d80dac2..decee7fdc 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -65,9 +65,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -94,12 +94,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libxml2-dev \ make \ pkg-config \ - subversion \ + git \ unixodbc-dev && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} |grep " Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -146,11 +146,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libxml2-dev \ make \ pkg-config \ - subversion \ + git \ unixodbc-dev && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ rm -rf /var/lib/apt/lists/* && \ - rm -rf /root/.subversion && \ chmod +x /sbin/tini EXPOSE 10051/TCP diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index effe4d97b..66668d58e 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -61,9 +61,9 @@ RUN addgroup zabbix && \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -85,12 +85,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openipmi-dev \ openldap-dev \ pcre-dev \ - subversion \ + git \ unixodbc-dev && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -130,8 +130,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ - rm -rf /var/cache/apk/* && \ - rm -rf /root/.subversion + rm -rf /var/cache/apk/* EXPOSE 10051/TCP diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index d2fbc97f3..eeebffe91 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none @@ -25,12 +25,12 @@ RUN yum --quiet makecache && \ net-snmp-devel \ OpenIPMI-devel \ openldap-devel \ - subversion \ + git \ unixODBC-devel && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -69,9 +69,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index deea1dd9c..ffaed9760 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -72,9 +72,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -102,12 +102,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libxml2-dev \ make \ pkg-config \ - subversion \ + git \ unixodbc-dev && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -161,7 +161,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libxml2-dev \ make \ pkg-config \ - subversion \ + git \ unixodbc-dev && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ rm -rf /var/lib/apt/lists/* && \ diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 5f13f28f5..6fbb0caa0 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -61,9 +61,9 @@ RUN addgroup zabbix && \ unixodbc && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -85,12 +85,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openldap-dev \ pcre-dev \ postgresql-dev \ - subversion \ + git \ unixodbc-dev && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -131,8 +131,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ - rm -rf /var/cache/apk/* && \ - rm -rf /root/.subversion + rm -rf /var/cache/apk/* EXPOSE 10051/TCP diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index 23ed12084..868cb804d 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none @@ -25,12 +25,12 @@ RUN yum --quiet makecache && \ OpenIPMI-devel \ openldap-devel \ postgresql-devel \ - subversion \ + git \ unixODBC-devel && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -69,9 +69,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index a4b5b6bd9..a812a83be 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -72,9 +72,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -102,12 +102,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libxml2-dev \ make \ pkg-config \ - subversion \ + git \ unixodbc-dev && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ ./bootstrap.sh && \ export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \ @@ -162,7 +162,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ libxml2-dev \ make \ pkg-config \ - subversion \ + git \ unixodbc-dev && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ rm -rf /var/lib/apt/lists/* && \ diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile index 0ce8c3b90..b34720d98 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -18,9 +18,9 @@ LABEL org.label-schema.name="zabbix-snmptraps-alpine" \ org.label-schema.schema-version="1.0" \ org.label-schema.license="GPL v2.0" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/snmptraps/centos/Dockerfile b/snmptraps/centos/Dockerfile index 0a4f45105..7f93ffaa2 100644 --- a/snmptraps/centos/Dockerfile +++ b/snmptraps/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} COPY ["snmptrapfmt_1.14+nmu1ubuntu2.tar.gz", "/tmp/"] @@ -34,9 +34,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL diff --git a/snmptraps/ubuntu/Dockerfile b/snmptraps/ubuntu/Dockerfile index b60cacf3f..a204a9bcc 100644 --- a/snmptraps/ubuntu/Dockerfile +++ b/snmptraps/ubuntu/Dockerfile @@ -19,9 +19,9 @@ LABEL org.label-schema.name="zabbix-snmptraps-ubuntu" \ org.label-schema.schema-version="1.0" \ org.label-schema.license="GPL v2.0" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 28385a459..45e44bf39 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -55,9 +55,9 @@ RUN addgroup zabbix && \ apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -69,21 +69,24 @@ ADD conf/tmp/font-config /tmp/font-config RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ gettext \ - subversion && \ + git && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + mkdir /usr/share/zabbix/ && \ + 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 && \ + rm /usr/share/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh && \ - ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ + ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/assets/fonts/graphfont.ttf && \ + chown --quiet -R apache:apache /usr/share/zabbix/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ - rm -rf /var/cache/apk/* && \ - rm -rf /root/.subversion + rm -rf /var/cache/apk/* EXPOSE 80/TCP 443/TCP diff --git a/web-apache-mysql/alpine/conf/tmp/font-config b/web-apache-mysql/alpine/conf/tmp/font-config index 86f24aba6..23d261a14 100644 --- a/web-apache-mysql/alpine/conf/tmp/font-config +++ b/web-apache-mysql/alpine/conf/tmp/font-config @@ -1,16 +1,16 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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 @@ +@@ -111,7 +111,7 @@ define('ZBX_ACK_STS_WITH_UNACK', 2); define('ZBX_ACK_STS_WITH_LAST_UNACK', 3); diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 56496a0c4..0853b83c3 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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"] @@ -14,15 +14,18 @@ RUN yum --quiet makecache && \ yum ${YUM_FLAGS_DEV} install \ gettext \ patch \ - subversion && \ + git && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --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 && \ + rm /tmp/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh FROM centos:centos7 @@ -34,9 +37,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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=apache @@ -79,10 +82,11 @@ RUN groupadd --system zabbix && \ php-mbstring \ php-mysql \ 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/assets/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' && \ + chown --quiet -R apache:apache /usr/share/zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ diff --git a/web-apache-mysql/centos/conf/tmp/font-config b/web-apache-mysql/centos/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/web-apache-mysql/centos/conf/tmp/font-config +++ b/web-apache-mysql/centos/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index efd37e80f..ecee1f0a3 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -53,9 +53,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -69,17 +69,21 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_DEV} install \ gettext \ patch \ - subversion && \ + ca-certificates \ + git && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + mkdir /usr/share/zabbix/ && \ + 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 && \ + rm /usr/share/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh && \ - update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \ + update-alternatives --install /usr/share/zabbix/assets/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 && \ @@ -89,14 +93,15 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ dpkg-reconfigure locales && \ find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \ find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \ + chown --quiet -R www-data:www-data /usr/share/zabbix && \ apt-get ${APT_FLAGS_COMMON} purge \ gettext \ patch \ - subversion && \ + ca-certificates \ + git && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /root/.subversion + rm -rf /var/lib/apt/lists/* EXPOSE 80/TCP 443/TCP diff --git a/web-apache-mysql/ubuntu/conf/tmp/font-config b/web-apache-mysql/ubuntu/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/web-apache-mysql/ubuntu/conf/tmp/font-config +++ b/web-apache-mysql/ubuntu/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index 89910a5e4..d1b626586 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -54,9 +54,9 @@ RUN addgroup zabbix && \ apk add ${APK_FLAGS_PERSISTENT} --no-scripts apache2-ssl && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -68,21 +68,24 @@ COPY ["conf/tmp/font-config", "/tmp/font-config"] RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ gettext \ - subversion && \ + git && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + mkdir /usr/share/zabbix/ && \ + 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 && \ + rm /usr/share/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh && \ - ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ + ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/assets/fonts/graphfont.ttf && \ + chown --quiet -R apache:apache /usr/share/zabbix/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ - rm -rf /var/cache/apk/* && \ - rm -rf /root/.subversion + rm -rf /var/cache/apk/* EXPOSE 80/TCP 443/TCP diff --git a/web-apache-pgsql/alpine/conf/tmp/font-config b/web-apache-pgsql/alpine/conf/tmp/font-config index 86f24aba6..23d261a14 100644 --- a/web-apache-pgsql/alpine/conf/tmp/font-config +++ b/web-apache-pgsql/alpine/conf/tmp/font-config @@ -1,16 +1,16 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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 @@ +@@ -111,7 +111,7 @@ define('ZBX_ACK_STS_WITH_UNACK', 2); define('ZBX_ACK_STS_WITH_LAST_UNACK', 3); diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index a8d64ed39..c99f479ea 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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"] @@ -14,15 +14,18 @@ RUN yum --quiet makecache && \ yum ${YUM_FLAGS_DEV} install \ gettext \ patch \ - subversion && \ + git && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --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 && \ + rm /tmp/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh FROM centos:centos7 @@ -34,9 +37,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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=apache @@ -80,10 +83,11 @@ RUN groupadd --system zabbix && \ php-pgsql \ php-xml \ 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/assets/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' && \ + chown --quiet -R apache:apache /usr/share/zabbix && \ yum ${YUM_FLAGS_PERSISTENT} clean all && \ rm -rf /var/cache/yum/ diff --git a/web-apache-pgsql/centos/conf/tmp/font-config b/web-apache-pgsql/centos/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/web-apache-pgsql/centos/conf/tmp/font-config +++ b/web-apache-pgsql/centos/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 6eefe8708..c49f5463a 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -53,9 +53,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} clean && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -69,17 +69,21 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_DEV} install \ gettext \ patch \ - subversion && \ + ca-certificates \ + git && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + mkdir /usr/share/zabbix/ && \ + 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 && \ + rm /usr/share/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh && \ - update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \ + update-alternatives --install /usr/share/zabbix/assets/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 && \ @@ -89,14 +93,15 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ dpkg-reconfigure locales && \ find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \ find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \ + chown --quiet -R www-data:www-data /usr/share/zabbix && \ apt-get ${APT_FLAGS_COMMON} purge \ gettext \ patch \ - subversion && \ + ca-certificates \ + git && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /root/.subversion + rm -rf /var/lib/apt/lists/* EXPOSE 80/TCP 443/TCP diff --git a/web-apache-pgsql/ubuntu/conf/tmp/font-config b/web-apache-pgsql/ubuntu/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/web-apache-pgsql/ubuntu/conf/tmp/font-config +++ b/web-apache-pgsql/ubuntu/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 40700dcad..2525906b9 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -55,9 +55,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -70,22 +70,24 @@ COPY ["conf/tmp/font-config", "/tmp/font-config"] RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ coreutils \ gettext \ - subversion && \ + git && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + mkdir /usr/share/zabbix/ && \ + 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 && \ + rm /usr/share/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh && \ - ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ + ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/assets/fonts/graphfont.ttf && \ + chown --quiet -R nginx:nginx /usr/share/zabbix/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ - rm -rf /var/cache/apk/* && \ - rm -rf /root/.subversion && \ - rm -rf /var/svn + rm -rf /var/cache/apk/* EXPOSE 80/TCP 443/TCP diff --git a/web-nginx-mysql/alpine/conf/tmp/font-config b/web-nginx-mysql/alpine/conf/tmp/font-config index 86f24aba6..23d261a14 100644 --- a/web-nginx-mysql/alpine/conf/tmp/font-config +++ b/web-nginx-mysql/alpine/conf/tmp/font-config @@ -1,16 +1,16 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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 @@ +@@ -111,7 +111,7 @@ define('ZBX_ACK_STS_WITH_UNACK', 2); define('ZBX_ACK_STS_WITH_LAST_UNACK', 3); diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 2194d0c96..4a19b6085 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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 @@ -15,15 +15,18 @@ RUN yum --quiet makecache && \ yum ${YUM_FLAGS_DEV} install \ gettext \ patch \ - subversion && \ + git && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --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 && \ + rm /tmp/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh FROM centos:centos7 @@ -35,9 +38,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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 @@ -81,13 +84,14 @@ RUN groupadd --system zabbix && \ php-mysql \ php-xml \ 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/assets/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 && \ mkdir -p /var/lib/php/ && \ chown --quiet -R nginx:nginx /var/lib/php/ && \ + chown --quiet -R nginx:nginx /usr/share/zabbix && \ yum ${YUM_FLAGS_PERSISTENT} clean all && \ rm -rf /var/cache/yum/ diff --git a/web-nginx-mysql/centos/conf/tmp/font-config b/web-nginx-mysql/centos/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/web-nginx-mysql/centos/conf/tmp/font-config +++ b/web-nginx-mysql/centos/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index deb4cdade..d8f110857 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -65,9 +65,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -81,17 +81,21 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_DEV} install \ gettext \ patch \ - subversion && \ + ca-certificates \ + git && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + mkdir /usr/share/zabbix/ && \ + 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 && \ + rm /usr/share/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh && \ - update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \ + update-alternatives --install /usr/share/zabbix/assets/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 && \ @@ -101,14 +105,15 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ dpkg-reconfigure locales && \ find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \ find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \ + chown --quiet -R www-data:www-data /usr/share/zabbix && \ apt-get ${APT_FLAGS_COMMON} purge \ gettext \ patch \ - subversion && \ + ca-certificates \ + git && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /root/.subversion + rm -rf /var/lib/apt/lists/* EXPOSE 80/TCP 443/TCP diff --git a/web-nginx-mysql/ubuntu/conf/tmp/font-config b/web-nginx-mysql/ubuntu/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/web-nginx-mysql/ubuntu/conf/tmp/font-config +++ b/web-nginx-mysql/ubuntu/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 03551f3a3..f472a7e0f 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -54,9 +54,9 @@ RUN addgroup zabbix && \ ttf-dejavu && \ rm -rf /var/cache/apk/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -69,22 +69,24 @@ COPY ["conf/tmp/font-config", "/tmp/font-config"] RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ coreutils \ gettext \ - subversion && \ + git && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + mkdir /usr/share/zabbix/ && \ + 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 && \ + rm /usr/share/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh && \ - ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \ + ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/assets/fonts/graphfont.ttf && \ + chown --quiet -R nginx:nginx /usr/share/zabbix/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ - rm -rf /var/cache/apk/* && \ - rm -rf /root/.subversion && \ - rm -rf /var/svn + rm -rf /var/cache/apk/* EXPOSE 80/TCP 443/TCP diff --git a/web-nginx-pgsql/alpine/conf/tmp/font-config b/web-nginx-pgsql/alpine/conf/tmp/font-config index 86f24aba6..23d261a14 100644 --- a/web-nginx-pgsql/alpine/conf/tmp/font-config +++ b/web-nginx-pgsql/alpine/conf/tmp/font-config @@ -1,16 +1,16 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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 @@ +@@ -111,7 +111,7 @@ define('ZBX_ACK_STS_WITH_UNACK', 2); define('ZBX_ACK_STS_WITH_LAST_UNACK', 3); diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index de439e4d7..a932a3ca2 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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 @@ -15,15 +15,18 @@ RUN yum --quiet makecache && \ yum ${YUM_FLAGS_DEV} install \ gettext \ patch \ - subversion && \ + git && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --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 && \ + rm /tmp/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh FROM centos:centos7 @@ -35,9 +38,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +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 @@ -80,13 +83,14 @@ RUN groupadd --system zabbix && \ php-mbstring \ php-pgsql \ 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/assets/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 && \ mkdir -p /var/lib/php/ && \ chown --quiet -R nginx:nginx /var/lib/php/ && \ + chown --quiet -R nginx:nginx /usr/share/zabbix && \ yum ${YUM_FLAGS_PERSISTENT} clean all && \ rm -rf /var/cache/yum/ diff --git a/web-nginx-pgsql/centos/conf/tmp/font-config b/web-nginx-pgsql/centos/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/web-nginx-pgsql/centos/conf/tmp/font-config +++ b/web-nginx-pgsql/centos/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 61b9224ba..bc45129ec 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -65,9 +65,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ rm -rf /var/cache/nginx/* && \ rm -rf /var/lib/apt/lists/* -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ @@ -81,17 +81,21 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_DEV} install \ gettext \ patch \ - subversion && \ + ca-certificates \ + git && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + mkdir /usr/share/zabbix/ && \ + 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 && \ + rm /usr/share/zabbix/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh && \ - update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \ + update-alternatives --install /usr/share/zabbix/assets/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 && \ @@ -101,14 +105,15 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ dpkg-reconfigure locales && \ find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \ find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \ + chown --quiet -R www-data:www-data /usr/share/zabbix && \ apt-get ${APT_FLAGS_COMMON} purge \ gettext \ patch \ - subversion && \ + ca-certificates \ + git && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /root/.subversion + rm -rf /var/lib/apt/lists/* EXPOSE 80/TCP 443/TCP diff --git a/web-nginx-pgsql/ubuntu/conf/tmp/font-config b/web-nginx-pgsql/ubuntu/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/web-nginx-pgsql/ubuntu/conf/tmp/font-config +++ b/web-nginx-pgsql/ubuntu/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile index c6d0eeeba..a3ef9fb0f 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -3,9 +3,9 @@ FROM alpine:3.4 as builder ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \ @@ -30,12 +30,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ openjdk8 \ openldap-dev \ pcre-dev \ - subversion \ + git \ unixodbc-dev && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ @@ -73,7 +73,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ patch -p3 < /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ - rm /tmp/zabbix-${ZBX_VERSION}/frontends/php/fonts/DejaVuSans.ttf && \ + rm -f /tmp/zabbix-${ZBX_VERSION}/frontends/php/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh FROM alpine:3.4 @@ -85,9 +85,9 @@ ARG VCS_REF ARG APK_FLAGS_COMMON="" ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \ @@ -140,7 +140,7 @@ 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 && \ + chown --quiet -R nginx:nginx /usr/share/zabbix/ && \ apk update && \ apk add ${APK_FLAGS_PERSISTENT} \ tini \ diff --git a/zabbix-appliance/alpine/conf/tmp/font-config b/zabbix-appliance/alpine/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/zabbix-appliance/alpine/conf/tmp/font-config +++ b/zabbix-appliance/alpine/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/zabbix-appliance/centos/Dockerfile b/zabbix-appliance/centos/Dockerfile index 94098dc43..5349bb1cb 100644 --- a/zabbix-appliance/centos/Dockerfile +++ b/zabbix-appliance/centos/Dockerfile @@ -3,9 +3,9 @@ FROM centos:centos7 as builder ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git 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 @@ -31,12 +31,12 @@ RUN yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86 OpenIPMI-devel \ openldap-devel \ patch \ - subversion \ + git \ unixODBC-devel && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ @@ -73,7 +73,7 @@ RUN yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86 patch -p3 < /tmp/font-config && \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ - rm /tmp/zabbix-${ZBX_VERSION}/frontends/php/fonts/DejaVuSans.ttf && \ + rm /tmp/zabbix-${ZBX_VERSION}/frontends/php/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh FROM centos:centos7 @@ -85,9 +85,9 @@ ARG VCS_REF ARG YUM_FLAGS_COMMON="-y" ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \ @@ -173,10 +173,11 @@ 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 && \ + ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/zabbix/assets/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' && \ + chown --quiet -R nginx:nginx /usr/share/zabbix && \ yum ${YUM_FLAGS_PERSISTENT} clean all && \ rm -rf /var/cache/yum/ && \ chmod +x /sbin/tini diff --git a/zabbix-appliance/centos/conf/tmp/font-config b/zabbix-appliance/centos/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/zabbix-appliance/centos/conf/tmp/font-config +++ b/zabbix-appliance/centos/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index 58892fb9d..2f4fc34e4 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -15,7 +15,11 @@ ARG MAJOR_VERSION=4.0 ARG RELEASE=0 ARG ZBX_VERSION=${MAJOR_VERSION}.${RELEASE} +<<<<<<< HEAD ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +======= +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git +>>>>>>> master ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} LABEL name="zabbix/zabbix-appliance" \ @@ -132,13 +136,13 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte OpenIPMI-devel \ openldap-devel \ patch \ - subversion \ + git \ unixODBC-devel" && \ yum -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ @@ -183,7 +187,10 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/ && \ - svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \ + git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ + mkdir /usr/share/zabbix/ && \ + 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 && \ @@ -198,8 +205,7 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte rm -rf /var/lib/yum/yumdb/* && \ rm -rf /usr/lib/udev/hwdb.d/* && \ rm -rf /etc/udev/hwdb.bin && \ - rm -rf /root/.pki && \ - rm -rf /root/.subversion + rm -rf /root/.pki EXPOSE 80/TCP 443/TCP 10051/TCP diff --git a/zabbix-appliance/rhel/conf/tmp/font-config b/zabbix-appliance/rhel/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/zabbix-appliance/rhel/conf/tmp/font-config +++ b/zabbix-appliance/rhel/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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'); diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile index dd4c83b64..c8378be81 100644 --- a/zabbix-appliance/ubuntu/Dockerfile +++ b/zabbix-appliance/ubuntu/Dockerfile @@ -3,9 +3,9 @@ FROM ubuntu:bionic as builder ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ @@ -38,12 +38,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ openjdk-8-jdk \ patch \ pkg-config \ - subversion \ + git \ unixodbc-dev && \ cd /tmp/ && \ - svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \ + git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ - zabbix_revision=`svn info ${ZBX_SOURCES} | grep "Last Changed Rev"|awk '{print $4;}'` && \ + zabbix_revision=`git rev-parse --short HEAD` && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \ sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \ @@ -77,10 +77,9 @@ 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 && \ + rm -f /tmp/zabbix-${ZBX_VERSION}/frontends/php/assets/fonts/DejaVuSans.ttf && \ ./locale/make_mo.sh FROM ubuntu:bionic @@ -91,9 +90,9 @@ ARG VCS_REF ARG APT_FLAGS_COMMON="-y" ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends" -ARG MAJOR_VERSION=4.0 +ARG MAJOR_VERSION=4.4 ARG ZBX_VERSION=${MAJOR_VERSION} -ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/ +ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \ MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \ @@ -191,7 +190,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ ttf-dejavu-core \ ca-certificates \ unixodbc && \ - update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \ + update-alternatives --install /usr/share/zabbix/assets/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 && \ @@ -199,6 +198,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ dpkg-reconfigure locales && \ + chown --quiet -R www-data:www-data /usr/share/zabbix && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \ mkdir -p /var/lib/php7 && \ diff --git a/zabbix-appliance/ubuntu/conf/tmp/font-config b/zabbix-appliance/ubuntu/conf/tmp/font-config index f28ef2e17..23d261a14 100644 --- a/zabbix-appliance/ubuntu/conf/tmp/font-config +++ b/zabbix-appliance/ubuntu/conf/tmp/font-config @@ -1,18 +1,18 @@ 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 @@ +@@ -66,7 +66,7 @@ define('ZBX_WIDGET_ROWS', 20); - define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) + define('ZBX_FONTPATH', realpath('assets/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_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); +@@ -111,7 +111,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');