mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-12-11 09:01:25 +01:00
Migration to GIT
This commit is contained in:
commit
6c111af1cf
@ -5,7 +5,7 @@ ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=agent
|
ZBX_TYPE=agent
|
||||||
|
|
||||||
@ -17,12 +17,12 @@ RUN apk update && \
|
|||||||
openssl-dev \
|
openssl-dev \
|
||||||
openldap-dev \
|
openldap-dev \
|
||||||
pcre-dev \
|
pcre-dev \
|
||||||
subversion \
|
git \
|
||||||
coreutils && \
|
coreutils && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -50,7 +50,7 @@ ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=agent
|
ZBX_TYPE=agent
|
||||||
|
|
||||||
@ -16,12 +16,12 @@ RUN yum --quiet makecache && \
|
|||||||
make \
|
make \
|
||||||
openssl-devel \
|
openssl-devel \
|
||||||
openldap-devel \
|
openldap-devel \
|
||||||
subversion \
|
git \
|
||||||
gcc && \
|
gcc && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -49,7 +49,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
||||||
ENV TINI_VERSION v0.18.0
|
ENV TINI_VERSION v0.18.0
|
||||||
|
@ -5,7 +5,7 @@ ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
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 \
|
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}
|
ZBX_TYPE=agent ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
@ -21,12 +21,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libssl-dev \
|
libssl-dev \
|
||||||
make \
|
make \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
|
ca-certificates \
|
||||||
gcc && \
|
gcc && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -53,7 +54,7 @@ ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
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 \
|
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_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none \
|
||||||
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
@ -36,7 +36,7 @@ RUN addgroup zabbix && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
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 \
|
automake \
|
||||||
coreutils \
|
coreutils \
|
||||||
openjdk8 \
|
openjdk8 \
|
||||||
subversion \
|
|
||||||
alpine-sdk && \
|
alpine-sdk && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
@ -74,9 +73,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
|
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
|
||||||
apk del ${APK_FLAGS_COMMON} --purge \
|
apk del ${APK_FLAGS_COMMON} --purge \
|
||||||
build-dependencies && \
|
build-dependencies && \
|
||||||
rm -rf /var/cache/apk/* && \
|
rm -rf /var/cache/apk/*
|
||||||
rm -rf /root/.subversion && \
|
|
||||||
rm -rf /var/svn
|
|
||||||
|
|
||||||
EXPOSE 10052/TCP
|
EXPOSE 10052/TCP
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=java-gateway
|
ZBX_TYPE=java-gateway
|
||||||
|
|
||||||
@ -15,12 +15,12 @@ RUN yum --quiet makecache && \
|
|||||||
automake \
|
automake \
|
||||||
java-1.8.0-openjdk-devel \
|
java-1.8.0-openjdk-devel \
|
||||||
make \
|
make \
|
||||||
subversion \
|
git \
|
||||||
gcc && \
|
gcc && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
@ -45,7 +45,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
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 \
|
make \
|
||||||
openjdk-8-jdk \
|
openjdk-8-jdk \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
gcc && \
|
gcc && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
@ -89,12 +89,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
make \
|
make \
|
||||||
openjdk-8-jdk \
|
openjdk-8-jdk \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
gcc && \
|
gcc && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/*
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 10052/TCP
|
EXPOSE 10052/TCP
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ RUN addgroup zabbix && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
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 \
|
unixodbc-dev \
|
||||||
alpine-sdk && \
|
alpine-sdk && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=proxy ZBX_DB_TYPE=mysql
|
ZBX_TYPE=proxy ZBX_DB_TYPE=mysql
|
||||||
|
|
||||||
@ -23,12 +23,12 @@ RUN yum --quiet makecache && \
|
|||||||
net-snmp-devel \
|
net-snmp-devel \
|
||||||
OpenIPMI-devel \
|
OpenIPMI-devel \
|
||||||
openldap-devel \
|
openldap-devel \
|
||||||
subversion \
|
git \
|
||||||
unixODBC-devel && \
|
unixODBC-devel && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -66,7 +66,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
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 \
|
ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=proxy ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
|
ZBX_TYPE=proxy ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
|
||||||
|
@ -70,7 +70,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
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 \
|
libxml2-dev \
|
||||||
make \
|
make \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -152,11 +152,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
make \
|
make \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
rm -rf /root/.subversion && \
|
|
||||||
chmod +x /sbin/tini
|
chmod +x /sbin/tini
|
||||||
|
|
||||||
EXPOSE 10051/TCP
|
EXPOSE 10051/TCP
|
||||||
|
@ -59,7 +59,7 @@ RUN addgroup zabbix && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
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 \
|
openldap-dev \
|
||||||
pcre-dev \
|
pcre-dev \
|
||||||
sqlite-dev \
|
sqlite-dev \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
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}/ && \
|
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
|
||||||
apk del ${APK_FLAGS_COMMON} --purge \
|
apk del ${APK_FLAGS_COMMON} --purge \
|
||||||
build-dependencies && \
|
build-dependencies && \
|
||||||
rm -rf /var/cache/apk/* && \
|
rm -rf /var/cache/apk/*
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 10051/TCP
|
EXPOSE 10051/TCP
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3
|
ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3
|
||||||
|
|
||||||
@ -23,12 +23,12 @@ RUN yum --quiet makecache && \
|
|||||||
OpenIPMI-devel \
|
OpenIPMI-devel \
|
||||||
openldap-devel \
|
openldap-devel \
|
||||||
sqlite-devel \
|
sqlite-devel \
|
||||||
subversion \
|
git \
|
||||||
unixODBC-devel && \
|
unixODBC-devel && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -66,7 +66,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
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 \
|
ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 ZBX_OPT_TYPE=none
|
ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 ZBX_OPT_TYPE=none
|
||||||
|
@ -67,7 +67,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
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 \
|
libxml2-dev \
|
||||||
make \
|
make \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -146,11 +146,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
make \
|
make \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
rm -rf /root/.subversion && \
|
|
||||||
chmod +x /sbin/tini
|
chmod +x /sbin/tini
|
||||||
|
|
||||||
EXPOSE 10051/TCP
|
EXPOSE 10051/TCP
|
||||||
|
@ -63,7 +63,7 @@ RUN addgroup zabbix && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
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 \
|
openipmi-dev \
|
||||||
openldap-dev \
|
openldap-dev \
|
||||||
pcre-dev \
|
pcre-dev \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
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}/ && \
|
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
|
||||||
apk del ${APK_FLAGS_COMMON} --purge \
|
apk del ${APK_FLAGS_COMMON} --purge \
|
||||||
build-dependencies && \
|
build-dependencies && \
|
||||||
rm -rf /var/cache/apk/* && \
|
rm -rf /var/cache/apk/*
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 10051/TCP
|
EXPOSE 10051/TCP
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
|
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
|
||||||
|
|
||||||
@ -25,12 +25,12 @@ RUN yum --quiet makecache && \
|
|||||||
net-snmp-devel \
|
net-snmp-devel \
|
||||||
OpenIPMI-devel \
|
OpenIPMI-devel \
|
||||||
openldap-devel \
|
openldap-devel \
|
||||||
subversion \
|
git \
|
||||||
unixODBC-devel && \
|
unixODBC-devel && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -71,7 +71,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
|
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
|
||||||
|
@ -74,7 +74,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
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 \
|
libxml2-dev \
|
||||||
make \
|
make \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -161,7 +161,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
make \
|
make \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
|
@ -63,7 +63,7 @@ RUN addgroup zabbix && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
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 \
|
openldap-dev \
|
||||||
pcre-dev \
|
pcre-dev \
|
||||||
postgresql-dev \
|
postgresql-dev \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
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}/ && \
|
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
|
||||||
apk del ${APK_FLAGS_COMMON} --purge \
|
apk del ${APK_FLAGS_COMMON} --purge \
|
||||||
build-dependencies && \
|
build-dependencies && \
|
||||||
rm -rf /var/cache/apk/* && \
|
rm -rf /var/cache/apk/*
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 10051/TCP
|
EXPOSE 10051/TCP
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
|
ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
|
||||||
|
|
||||||
@ -25,12 +25,12 @@ RUN yum --quiet makecache && \
|
|||||||
OpenIPMI-devel \
|
OpenIPMI-devel \
|
||||||
openldap-devel \
|
openldap-devel \
|
||||||
postgresql-devel \
|
postgresql-devel \
|
||||||
subversion \
|
git \
|
||||||
unixODBC-devel && \
|
unixODBC-devel && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -71,7 +71,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
|
ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
|
||||||
|
@ -74,7 +74,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
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 \
|
libxml2-dev \
|
||||||
make \
|
make \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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 && \
|
||||||
./bootstrap.sh && \
|
./bootstrap.sh && \
|
||||||
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
|
||||||
@ -161,7 +161,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
make \
|
make \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
|
@ -20,7 +20,7 @@ LABEL org.label-schema.name="zabbix-snmptraps-alpine" \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
COPY ["snmptrapfmt_1.14+nmu1ubuntu2.tar.gz", "/tmp/"]
|
COPY ["snmptrapfmt_1.14+nmu1ubuntu2.tar.gz", "/tmp/"]
|
||||||
@ -36,7 +36,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
|
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ LABEL org.label-schema.name="zabbix-snmptraps-ubuntu" \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
|
@ -57,7 +57,7 @@ RUN addgroup zabbix && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -69,9 +69,12 @@ ADD conf/tmp/font-config /tmp/font-config
|
|||||||
|
|
||||||
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
||||||
gettext \
|
gettext \
|
||||||
subversion && \
|
git && \
|
||||||
cd /usr/share/ && \
|
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/ && \
|
cd /usr/share/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -82,8 +85,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
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/fonts/graphfont.ttf && \
|
||||||
apk del ${APK_FLAGS_COMMON} --purge \
|
apk del ${APK_FLAGS_COMMON} --purge \
|
||||||
build-dependencies && \
|
build-dependencies && \
|
||||||
rm -rf /var/cache/apk/* && \
|
rm -rf /var/cache/apk/*
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 80/TCP 443/TCP
|
EXPOSE 80/TCP 443/TCP
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
COPY ["conf/tmp/font-config", "/tmp/font-config"]
|
COPY ["conf/tmp/font-config", "/tmp/font-config"]
|
||||||
@ -14,9 +14,12 @@ RUN yum --quiet makecache && \
|
|||||||
yum ${YUM_FLAGS_DEV} install \
|
yum ${YUM_FLAGS_DEV} install \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
git && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \
|
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/ && \
|
cd /tmp/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -36,7 +39,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache
|
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -69,9 +69,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
apt-get ${APT_FLAGS_DEV} install \
|
apt-get ${APT_FLAGS_DEV} install \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
ca-certificates \
|
||||||
|
git && \
|
||||||
cd /usr/share/ && \
|
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/ && \
|
cd /usr/share/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -92,11 +96,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
apt-get ${APT_FLAGS_COMMON} purge \
|
apt-get ${APT_FLAGS_COMMON} purge \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
ca-certificates \
|
||||||
|
git && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/*
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 80/TCP 443/TCP
|
EXPOSE 80/TCP 443/TCP
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ RUN addgroup zabbix && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -68,9 +68,12 @@ COPY ["conf/tmp/font-config", "/tmp/font-config"]
|
|||||||
|
|
||||||
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
||||||
gettext \
|
gettext \
|
||||||
subversion && \
|
git && \
|
||||||
cd /usr/share/ && \
|
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/ && \
|
cd /usr/share/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -81,8 +84,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
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/fonts/graphfont.ttf && \
|
||||||
apk del ${APK_FLAGS_COMMON} --purge \
|
apk del ${APK_FLAGS_COMMON} --purge \
|
||||||
build-dependencies && \
|
build-dependencies && \
|
||||||
rm -rf /var/cache/apk/* && \
|
rm -rf /var/cache/apk/*
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 80/TCP 443/TCP
|
EXPOSE 80/TCP 443/TCP
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
COPY ["conf/tmp/font-config", "/tmp/font-config"]
|
COPY ["conf/tmp/font-config", "/tmp/font-config"]
|
||||||
@ -14,9 +14,12 @@ RUN yum --quiet makecache && \
|
|||||||
yum ${YUM_FLAGS_DEV} install \
|
yum ${YUM_FLAGS_DEV} install \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
git && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \
|
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/ && \
|
cd /tmp/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -36,7 +39,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache
|
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -69,9 +69,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
apt-get ${APT_FLAGS_DEV} install \
|
apt-get ${APT_FLAGS_DEV} install \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
ca-certificates \
|
||||||
|
git && \
|
||||||
cd /usr/share/ && \
|
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/ && \
|
cd /usr/share/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -92,11 +96,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
apt-get ${APT_FLAGS_COMMON} purge \
|
apt-get ${APT_FLAGS_COMMON} purge \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
ca-certificates \
|
||||||
|
git && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/*
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 80/TCP 443/TCP
|
EXPOSE 80/TCP 443/TCP
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ RUN addgroup zabbix && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -70,9 +70,12 @@ COPY ["conf/tmp/font-config", "/tmp/font-config"]
|
|||||||
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
||||||
coreutils \
|
coreutils \
|
||||||
gettext \
|
gettext \
|
||||||
subversion && \
|
git && \
|
||||||
cd /usr/share/ && \
|
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/ && \
|
cd /usr/share/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -83,9 +86,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
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/fonts/graphfont.ttf && \
|
||||||
apk del ${APK_FLAGS_COMMON} --purge \
|
apk del ${APK_FLAGS_COMMON} --purge \
|
||||||
build-dependencies && \
|
build-dependencies && \
|
||||||
rm -rf /var/cache/apk/* && \
|
rm -rf /var/cache/apk/*
|
||||||
rm -rf /root/.subversion && \
|
|
||||||
rm -rf /var/svn
|
|
||||||
|
|
||||||
EXPOSE 80/TCP 443/TCP
|
EXPOSE 80/TCP 443/TCP
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
|
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
|
||||||
|
|
||||||
@ -15,9 +15,12 @@ RUN yum --quiet makecache && \
|
|||||||
yum ${YUM_FLAGS_DEV} install \
|
yum ${YUM_FLAGS_DEV} install \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
git && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \
|
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/ && \
|
cd /tmp/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -37,7 +40,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
|
ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -81,9 +81,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
apt-get ${APT_FLAGS_DEV} install \
|
apt-get ${APT_FLAGS_DEV} install \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
ca-certificates \
|
||||||
|
git && \
|
||||||
cd /usr/share/ && \
|
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/ && \
|
cd /usr/share/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -104,11 +108,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
apt-get ${APT_FLAGS_COMMON} purge \
|
apt-get ${APT_FLAGS_COMMON} purge \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
ca-certificates \
|
||||||
|
git && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/*
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 80/TCP 443/TCP
|
EXPOSE 80/TCP 443/TCP
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ RUN addgroup zabbix && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -69,9 +69,12 @@ COPY ["conf/tmp/font-config", "/tmp/font-config"]
|
|||||||
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
||||||
coreutils \
|
coreutils \
|
||||||
gettext \
|
gettext \
|
||||||
subversion && \
|
git && \
|
||||||
cd /usr/share/ && \
|
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/ && \
|
cd /usr/share/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -82,9 +85,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
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/fonts/graphfont.ttf && \
|
||||||
apk del ${APK_FLAGS_COMMON} --purge \
|
apk del ${APK_FLAGS_COMMON} --purge \
|
||||||
build-dependencies && \
|
build-dependencies && \
|
||||||
rm -rf /var/cache/apk/* && \
|
rm -rf /var/cache/apk/*
|
||||||
rm -rf /root/.subversion && \
|
|
||||||
rm -rf /var/svn
|
|
||||||
|
|
||||||
EXPOSE 80/TCP 443/TCP
|
EXPOSE 80/TCP 443/TCP
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
|
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
|
||||||
|
|
||||||
@ -15,9 +15,12 @@ RUN yum --quiet makecache && \
|
|||||||
yum ${YUM_FLAGS_DEV} install \
|
yum ${YUM_FLAGS_DEV} install \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
git && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix && \
|
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/ && \
|
cd /tmp/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -37,7 +40,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
|
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
|
||||||
@ -81,9 +81,13 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
apt-get ${APT_FLAGS_DEV} install \
|
apt-get ${APT_FLAGS_DEV} install \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
ca-certificates \
|
||||||
|
git && \
|
||||||
cd /usr/share/ && \
|
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/ && \
|
cd /usr/share/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -104,11 +108,11 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
apt-get ${APT_FLAGS_COMMON} purge \
|
apt-get ${APT_FLAGS_COMMON} purge \
|
||||||
gettext \
|
gettext \
|
||||||
patch \
|
patch \
|
||||||
subversion && \
|
ca-certificates \
|
||||||
|
git && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/*
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 80/TCP 443/TCP
|
EXPOSE 80/TCP 443/TCP
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm \
|
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 \
|
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \
|
||||||
@ -33,9 +33,9 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
subversion \
|
subversion \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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" 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 && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
@ -87,7 +87,7 @@ ARG APK_FLAGS_PERSISTENT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
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 \
|
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 \
|
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \
|
||||||
|
@ -5,7 +5,7 @@ ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \
|
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
|
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 \
|
OpenIPMI-devel \
|
||||||
openldap-devel \
|
openldap-devel \
|
||||||
patch \
|
patch \
|
||||||
subversion \
|
git \
|
||||||
unixODBC-devel && \
|
unixODBC-devel && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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" 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 && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
@ -87,7 +87,7 @@ ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||||
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \
|
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \
|
||||||
|
@ -15,7 +15,7 @@ ARG MAJOR_VERSION=4.0
|
|||||||
ARG RELEASE=7
|
ARG RELEASE=7
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
|
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||||
|
|
||||||
LABEL name="zabbix/zabbix-appliance" \
|
LABEL name="zabbix/zabbix-appliance" \
|
||||||
@ -132,13 +132,13 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte
|
|||||||
OpenIPMI-devel \
|
OpenIPMI-devel \
|
||||||
openldap-devel \
|
openldap-devel \
|
||||||
patch \
|
patch \
|
||||||
subversion \
|
git \
|
||||||
unixODBC-devel" && \
|
unixODBC-devel" && \
|
||||||
yum -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
|
yum -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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" 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 && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
@ -183,7 +183,10 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte
|
|||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
|
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
|
||||||
cd /usr/share/ && \
|
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/ && \
|
cd /usr/share/zabbix/ && \
|
||||||
patch -p3 < /tmp/font-config && \
|
patch -p3 < /tmp/font-config && \
|
||||||
rm /tmp/font-config && \
|
rm /tmp/font-config && \
|
||||||
@ -198,8 +201,7 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte
|
|||||||
rm -rf /var/lib/yum/yumdb/* && \
|
rm -rf /var/lib/yum/yumdb/* && \
|
||||||
rm -rf /usr/lib/udev/hwdb.d/* && \
|
rm -rf /usr/lib/udev/hwdb.d/* && \
|
||||||
rm -rf /etc/udev/hwdb.bin && \
|
rm -rf /etc/udev/hwdb.bin && \
|
||||||
rm -rf /root/.pki && \
|
rm -rf /root/.pki
|
||||||
rm -rf /root/.subversion
|
|
||||||
|
|
||||||
EXPOSE 80/TCP 443/TCP 10051/TCP
|
EXPOSE 80/TCP 443/TCP 10051/TCP
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
|
|||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
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 \
|
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 \
|
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 \
|
openjdk-8-jdk \
|
||||||
patch \
|
patch \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
subversion \
|
git \
|
||||||
unixodbc-dev && \
|
unixodbc-dev && \
|
||||||
cd /tmp/ && \
|
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} && \
|
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" 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 && \
|
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
|
||||||
@ -91,9 +91,10 @@ ARG VCS_REF
|
|||||||
|
|
||||||
ARG APT_FLAGS_COMMON="-y"
|
ARG APT_FLAGS_COMMON="-y"
|
||||||
ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
|
ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
|
||||||
|
|
||||||
ARG MAJOR_VERSION=4.0
|
ARG MAJOR_VERSION=4.0
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
ARG ZBX_VERSION=${MAJOR_VERSION}.7
|
||||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
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 \
|
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 \
|
MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
|
||||||
|
Loading…
Reference in New Issue
Block a user