Revert "Merge branch 'trunk' into master"

This reverts commit b643fe4890, reversing
changes made to 59f4e534f2.
This commit is contained in:
root 2018-02-17 16:07:56 -08:00
parent 67bacc8cc4
commit 461f869a4a
38 changed files with 117 additions and 319 deletions

View File

@ -36,13 +36,12 @@ RUN addgroup zabbix && \
bash \
iputils \
libldap \
pcre \
supervisor && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -56,8 +55,9 @@ RUN apk update && \
autoconf \
automake \
openssl-dev \
pcre-dev \
subversion && \
openldap-dev \
subversion \
coreutils && \
cd /tmp/ && \
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \
cd /tmp/zabbix-${ZBX_VERSION} && \

View File

@ -40,9 +40,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -36,15 +36,14 @@ RUN locale-gen $LC_ALL && \
chown --quiet -R zabbix:root /var/lib/zabbix && \
apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTANT} install \
libpcre3 \
supervisor 1>/dev/null && \
apt-get ${APT_FLAGS_COMMON} autoremove && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -58,7 +57,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
automake \
libc6-dev \
libldap2-dev \
libpcre3-dev \
libssl-dev \
make \
pkg-config \
@ -93,7 +91,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
autoconf \
automake \
libc6-dev \
libpcre3-dev \
libssl-dev \
make \
pkg-config \

View File

@ -1,7 +1,7 @@
version: '2'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:alpine-trunk
image: zabbix/zabbix-server-mysql:alpine-latest
ports:
- "10051:10051"
volumes:
@ -43,7 +43,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
image: zabbix/zabbix-proxy-sqlite3:alpine-latest
ports:
- "10061:10051"
volumes:
@ -83,7 +83,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:alpine-trunk
image: zabbix/zabbix-proxy-mysql:alpine-latest
ports:
- "10071:10051"
volumes:
@ -124,7 +124,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:alpine-trunk
image: zabbix/zabbix-web-apache-mysql:alpine-latest
ports:
- "80:80"
- "443:443"
@ -155,7 +155,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:alpine-trunk
image: zabbix/zabbix-web-nginx-mysql:alpine-latest
ports:
- "8081:80"
- "8443:443"
@ -186,7 +186,7 @@ services:
com.zabbix.os: "alpine"
zabbix-agent:
image: zabbix/zabbix-agent:alpine-trunk
image: zabbix/zabbix-agent:alpine-latest
ports:
- "10050:10050"
volumes:
@ -216,7 +216,7 @@ services:
com.zabbix.os: "alpine"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:alpine-trunk
image: zabbix/zabbix-java-gateway:alpine-latest
ports:
- "10052:10052"
env_file:
@ -234,7 +234,7 @@ services:
com.zabbix.os: "alpine"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-trunk
image: zabbix/zabbix-snmptraps:ubuntu-latest
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '2'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:alpine-trunk
image: zabbix/zabbix-server-pgsql:alpine-latest
ports:
- "10051:10051"
volumes:
@ -43,7 +43,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:alpine-trunk
image: zabbix/zabbix-proxy-sqlite3:alpine-latest
ports:
- "10061:10051"
volumes:
@ -83,7 +83,7 @@ services:
com.zabbix.os: "alpine"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:alpine-trunk
image: zabbix/zabbix-proxy-mysql:alpine-latest
ports:
- "10071:10051"
volumes:
@ -155,7 +155,7 @@ services:
com.zabbix.os: "alpine"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:alpine-trunk
image: zabbix/zabbix-web-nginx-pgsql:alpine-latest
ports:
- "8081:80"
- "8443:443"
@ -186,7 +186,7 @@ services:
com.zabbix.os: "alpine"
zabbix-agent:
image: zabbix/zabbix-agent:alpine-trunk
image: zabbix/zabbix-agent:alpine-latest
ports:
- "10050:10050"
volumes:
@ -216,7 +216,7 @@ services:
com.zabbix.os: "alpine"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:alpine-trunk
image: zabbix/zabbix-java-gateway:alpine-latest
ports:
- "10052:10052"
env_file:
@ -234,7 +234,7 @@ services:
com.zabbix.os: "alpine"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-trunk
image: zabbix/zabbix-snmptraps:ubuntu-latest
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '2'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:centos-trunk
image: zabbix/zabbix-server-mysql:centos-latest
ports:
- "10051:10051"
volumes:
@ -43,7 +43,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:centos-trunk
image: zabbix/zabbix-proxy-sqlite3:centos-latest
ports:
- "10061:10051"
volumes:
@ -83,7 +83,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:centos-trunk
image: zabbix/zabbix-proxy-mysql:centos-latest
ports:
- "10071:10051"
volumes:
@ -124,7 +124,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:centos-trunk
image: zabbix/zabbix-web-apache-mysql:centos-latest
ports:
- "80:80"
- "443:443"
@ -155,7 +155,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:centos-trunk
image: zabbix/zabbix-web-nginx-mysql:centos-latest
ports:
- "8081:80"
- "8443:443"
@ -186,7 +186,7 @@ services:
com.zabbix.os: "centos"
zabbix-agent:
image: zabbix/zabbix-agent:centos-trunk
image: zabbix/zabbix-agent:centos-latest
ports:
- "10050:10050"
volumes:
@ -216,7 +216,7 @@ services:
com.zabbix.os: "centos"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:centos-trunk
image: zabbix/zabbix-java-gateway:centos-latest
ports:
- "10052:10052"
env_file:
@ -234,7 +234,7 @@ services:
com.zabbix.os: "centos"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-trunk
image: zabbix/zabbix-snmptraps:ubuntu-latest
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '2'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:centos-trunk
image: zabbix/zabbix-server-pgsql:centos-latest
ports:
- "10051:10051"
volumes:
@ -43,7 +43,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:centos-trunk
image: zabbix/zabbix-proxy-sqlite3:centos-latest
ports:
- "10061:10051"
volumes:
@ -83,7 +83,7 @@ services:
com.zabbix.os: "centos"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:centos-trunk
image: zabbix/zabbix-proxy-mysql:centos-latest
ports:
- "10071:10051"
volumes:
@ -124,7 +124,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:centos-trunk
image: zabbix/zabbix-web-apache-pgsql:centos-latest
ports:
- "80:80"
- "443:443"
@ -155,7 +155,7 @@ services:
com.zabbix.os: "centos"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:centos-trunk
image: zabbix/zabbix-web-nginx-pgsql:centos-latest
ports:
- "8081:80"
- "8443:443"
@ -186,7 +186,7 @@ services:
com.zabbix.os: "centos"
zabbix-agent:
image: zabbix/zabbix-agent:centos-trunk
image: zabbix/zabbix-agent:centos-latest
ports:
- "10050:10050"
volumes:
@ -216,7 +216,7 @@ services:
com.zabbix.os: "centos"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:centos-trunk
image: zabbix/zabbix-java-gateway:centos-latest
ports:
- "10052:10052"
env_file:
@ -234,7 +234,7 @@ services:
com.zabbix.os: "centos"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-trunk
image: zabbix/zabbix-snmptraps:ubuntu-latest
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '2'
services:
zabbix-server:
image: zabbix/zabbix-server-mysql:ubuntu-trunk
image: zabbix/zabbix-server-mysql:ubuntu-latest
ports:
- "10051:10051"
volumes:
@ -44,7 +44,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk
image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest
ports:
- "10061:10051"
volumes:
@ -84,7 +84,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
image: zabbix/zabbix-proxy-mysql:ubuntu-latest
ports:
- "10071:10051"
volumes:
@ -125,7 +125,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-apache-mysql:
image: zabbix/zabbix-web-apache-mysql:ubuntu-trunk
image: zabbix/zabbix-web-apache-mysql:ubuntu-latest
ports:
- "80:80"
- "443:443"
@ -156,7 +156,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-nginx-mysql:
image: zabbix/zabbix-web-nginx-mysql:ubuntu-trunk
image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest
ports:
- "8081:80"
- "8443:443"
@ -187,7 +187,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-agent:
image: zabbix/zabbix-agent:ubuntu-trunk
image: zabbix/zabbix-agent:ubuntu-latest
ports:
- "10050:10050"
volumes:
@ -217,7 +217,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ubuntu-trunk
image: zabbix/zabbix-java-gateway:ubuntu-latest
ports:
- "10052:10052"
env_file:
@ -235,7 +235,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-trunk
image: zabbix/zabbix-snmptraps:ubuntu-latest
ports:
- "162:162/udp"
volumes:

View File

@ -1,7 +1,7 @@
version: '2'
services:
zabbix-server:
image: zabbix/zabbix-server-pgsql:ubuntu-trunk
image: zabbix/zabbix-server-pgsql:ubuntu-latest
ports:
- "10051:10051"
volumes:
@ -43,7 +43,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-sqlite3:
image: zabbix/zabbix-proxy-sqlite3:ubuntu-trunk
image: zabbix/zabbix-proxy-sqlite3:ubuntu-latest
ports:
- "10061:10051"
volumes:
@ -83,7 +83,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-proxy-mysql:
image: zabbix/zabbix-proxy-mysql:ubuntu-trunk
image: zabbix/zabbix-proxy-mysql:ubuntu-latest
ports:
- "10071:10051"
volumes:
@ -124,7 +124,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-apache-pgsql:
image: zabbix/zabbix-web-apache-pgsql:ubuntu-trunk
image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest
ports:
- "80:80"
- "443:443"
@ -155,7 +155,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-web-nginx-pgsql:
image: zabbix/zabbix-web-nginx-pgsql:ubuntu-trunk
image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest
ports:
- "8081:80"
- "8443:443"
@ -186,7 +186,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-agent:
image: zabbix/zabbix-agent:ubuntu-trunk
image: zabbix/zabbix-agent:ubuntu-latest
ports:
- "10050:10050"
volumes:
@ -216,7 +216,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-java-gateway:
image: zabbix/zabbix-java-gateway:ubuntu-trunk
image: zabbix/zabbix-java-gateway:ubuntu-latest
ports:
- "10052:10052"
env_file:
@ -234,7 +234,7 @@ services:
com.zabbix.os: "ubuntu"
zabbix-snmptraps:
image: zabbix/zabbix-snmptraps:ubuntu-trunk
image: zabbix/zabbix-snmptraps:ubuntu-latest
ports:
- "162:162/udp"
volumes:

View File

@ -34,9 +34,9 @@ RUN addgroup zabbix && \
supervisor && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -35,9 +35,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -39,9 +39,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -148,7 +148,7 @@ spec:
spec:
containers:
- name: zabbix-web
image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest
image: zabbix/zabbix-web-nginx-mysql:alpine-latest
imagePullPolicy: Always
ports:
- containerPort: 80
@ -282,7 +282,7 @@ spec:
spec:
containers:
- name: zabbix-server
image: zabbix/zabbix-server-mysql:alpine-3.4-latest
image: zabbix/zabbix-server-mysql:alpine-latest
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -331,7 +331,7 @@ spec:
mountPath: /var/lib/zabbix/snmptraps/
readOnly: true
- name: zabbix-snmptraps
image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
image: zabbix/zabbix-snmptraps:latest
imagePullPolicy: Always
ports:
- containerPort: 162
@ -364,7 +364,7 @@ spec:
spec:
containers:
- name: zabbix-proxy-sqlite3
image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
image: zabbix/zabbix-proxy-sqlite3:alpine-latest
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -396,7 +396,7 @@ spec:
spec:
containers:
- name: zabbix-proxy-mysql
image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest
image: zabbix/zabbix-proxy-mysql:alpine-latest
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -439,7 +439,7 @@ spec:
spec:
containers:
- name: zabbix-java-gateway
image: zabbix/zabbix-java-gateway:alpine-3.4-latest
image: zabbix/zabbix-java-gateway:alpine-latest
imagePullPolicy: Always
ports:
- containerPort: 10052
@ -470,7 +470,7 @@ spec:
spec:
containers:
- name: zabbix-agent
image: zabbix/zabbix-agent:alpine-3.4-latest
image: zabbix/zabbix-agent:alpine-latest
imagePullPolicy: Always
resources:
limits:

View File

@ -45,7 +45,6 @@ RUN addgroup zabbix && \
bash \
iputils \
libcurl \
libevent \
libldap \
libssh2 \
libxml2 \
@ -53,15 +52,14 @@ RUN addgroup zabbix && \
mariadb-client-libs \
net-snmp-agent-libs \
openipmi-libs \
pcre \
supervisor \
unixodbc \
fping && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -74,14 +72,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
automake \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libxml2-dev \
mysql-dev \
net-snmp-dev \
openipmi-dev \
openldap-dev \
pcre-dev \
subversion \
unixodbc-dev \
alpine-sdk && \

View File

@ -45,7 +45,6 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} install \
fping \
libcurl \
libevent \
libxml2 \
mariadb \
net-snmp-libs \
@ -58,9 +57,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -74,7 +73,6 @@ RUN yum --quiet makecache && \
automake \
gcc \
libcurl-devel \
libevent-devel \
libssh2-devel \
libxml2-devel \
make \

View File

@ -50,10 +50,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTANT} install \
fping \
libcurl3 \
libevent-2.0 \
libmysqlclient18 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libssh2-1 \
libssl1.0.0 \
@ -66,9 +64,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -83,11 +81,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libldap2-dev \
libmysqlclient-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libxml2-dev \
@ -138,11 +134,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libldap2-dev \
libmysqlclient-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libxml2-dev \

View File

@ -45,21 +45,19 @@ RUN addgroup zabbix && \
fping \
iputils \
libcurl \
libevent \
libldap \
libssh2 \
libxml2 \
net-snmp-agent-libs \
openipmi-libs \
pcre \
sqlite-libs \
supervisor \
unixodbc && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -73,13 +71,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
automake \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libxml2-dev \
net-snmp-dev \
openipmi-dev \
openldap-dev \
pcre-dev \
sqlite-dev \
subversion \
unixodbc-dev && \

View File

@ -45,7 +45,6 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} install \
fping \
libcurl \
libevent \
libxml2 \
net-snmp-libs \
OpenIPMI-libs \
@ -57,9 +56,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -73,7 +72,6 @@ RUN yum --quiet makecache && \
automake \
gcc \
libcurl-devel \
libevent-devel \
libssh2-devel \
libxml2-devel \
make \

View File

@ -49,9 +49,7 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTANT} install \
fping \
libcurl3 \
libevent-2.0 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libsqlite3-0 \
libssh2-1 \
@ -64,9 +62,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -81,10 +79,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libldap2-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libsqlite3-dev \
libssh2-1-dev \
@ -133,10 +129,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libldap2-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libsqlite3-dev \
libssh2-1-dev \

View File

@ -48,7 +48,6 @@ RUN addgroup zabbix && \
fping \
iputils \
libcurl \
libevent \
libldap \
libssh2 \
libxml2 \
@ -56,14 +55,13 @@ RUN addgroup zabbix && \
mariadb-client-libs \
net-snmp-agent-libs \
openipmi-libs \
pcre \
supervisor \
unixodbc && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -77,14 +75,12 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
automake \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libxml2-dev \
mysql-dev \
net-snmp-dev \
openipmi-dev \
openldap-dev \
pcre-dev \
subversion \
unixodbc-dev && \
cd /tmp/ && \

View File

@ -47,7 +47,6 @@ RUN groupadd --system zabbix && \
fping \
iksemel \
libcurl \
libevent \
libxml2 \
mariadb \
net-snmp-libs \
@ -60,9 +59,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -77,7 +76,6 @@ RUN yum --quiet makecache && \
gcc \
iksemel-devel \
libcurl-devel \
libevent-devel \
libssh2-devel \
libxml2-devel \
make \

View File

@ -52,11 +52,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTANT} install \
fping \
libcurl3 \
libevent-2.0 \
libiksemel3 \
libmysqlclient18 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libssh2-1 \
libssl1.0.0 \
@ -69,9 +67,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -86,12 +84,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libiksemel-dev \
libldap2-dev \
libmysqlclient-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libxml2-dev \
@ -145,12 +141,10 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libiksemel-dev \
libldap2-dev \
libmysqlclient-dev \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libxml2-dev \

View File

@ -48,22 +48,20 @@ RUN addgroup zabbix && \
fping \
iputils \
libcurl \
libevent \
libldap \
libssh2 \
libxml2 \
net-snmp-agent-libs \
openipmi-libs \
pcre \
postgresql-client \
postgresql-libs \
supervisor \
unixodbc && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -77,13 +75,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
automake \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libxml2-dev \
net-snmp-dev \
openipmi-dev \
openldap-dev \
pcre-dev \
postgresql-dev \
subversion \
unixodbc-dev && \

View File

@ -48,7 +48,6 @@ RUN groupadd --system zabbix && \
fping \
iksemel \
libcurl \
libevent \
libxml2 \
net-snmp-libs \
OpenIPMI-libs \
@ -62,9 +61,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -79,7 +78,6 @@ RUN yum --quiet makecache && \
gcc \
iksemel-devel \
libcurl-devel \
libevent-devel \
libssh2-devel \
libxml2-devel \
make \

View File

@ -1,151 +0,0 @@
FROM centos:centos7
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
ARG VCS_REF
ARG YUM_FLAGS_COMMON="--quiet -y"
ARG YUM_FLAGS_PERSISTANT="${YUM_FLAGS_COMMON}"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG DB_TYPE=postgresql
ENV TERM=xterm
ENV MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
LABEL org.label-schema.name="zabbix-server-${DB_TYPE}-centos" \
org.label-schema.vendor="Zabbix LLC" \
org.label-schema.url="https://zabbix.com/" \
org.label-schema.description="Zabbix server with PostgreSQL database support" \
org.label-schema.vcs-ref="${VCS_REF}" \
org.label-schema.build-date="${BUILD_DATE}" \
org.label-schema.schema-version="1.0" \
org.label-schema.license="GPL 2.0"
STOPSIGNAL SIGTERM
RUN groupadd --system zabbix && \
adduser -r --shell /sbin/nologin \
-g zabbix -G dialout \
-d /var/lib/zabbix/ \
zabbix && \
mkdir -p /etc/zabbix && \
mkdir -p /var/lib/zabbix && \
mkdir -p /usr/lib/zabbix/alertscripts && \
mkdir -p /var/lib/zabbix/enc && \
mkdir -p /usr/lib/zabbix/externalscripts && \
mkdir -p /var/lib/zabbix/mibs && \
mkdir -p /var/lib/zabbix/modules && \
mkdir -p /var/lib/zabbix/snmptraps && \
mkdir -p /var/lib/zabbix/ssh_keys && \
mkdir -p /var/lib/zabbix/ssl && \
mkdir -p /var/lib/zabbix/ssl/certs && \
mkdir -p /var/lib/zabbix/ssl/keys && \
mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
chown --quiet -R zabbix:root /var/lib/zabbix && \
mkdir -p /usr/share/doc/zabbix-server-${DB_TYPE} && \
yum ${YUM_FLAGS_COMMON} makecache && \
yum ${YUM_FLAGS_DEV} install epel-release && \
yum ${YUM_FLAGS_PERSISTANT} install \
fping \
iksemel \
libcurl \
libxml2 \
net-snmp-libs \
OpenIPMI-libs \
openldap \
openssl-libs \
pcre \
postgresql \
postgresql-libs \
supervisor \
unixODBC && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
org.label-schema.version="${ZBX_VERSION}" \
org.label-schema.vcs-url="${ZBX_SOURCES}" \
org.label-schema.docker.cmd="docker run --name zabbix-server-${DB_TYPE} --link postgres-server:postgres -p 10051:10051 -d zabbix-server-${DB_TYPE}:centos-${ZBX_VERSION}"
RUN yum --quiet makecache && \
yum ${YUM_FLAGS_DEV} install \
autoconf \
automake \
gcc \
iksemel-devel \
libcurl-devel \
libssh2-devel \
libxml2-devel \
make \
net-snmp-devel \
OpenIPMI-devel \
openldap-devel \
postgresql-devel \
subversion \
unixODBC-devel && \
cd /tmp/ && \
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \
cd /tmp/zabbix-${ZBX_VERSION} && \
zabbix_revision=`svn info ${ZBX_SOURCES} |grep "Last Changed Rev"|awk '{print $4;}'` && \
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
./bootstrap.sh 1>/dev/null && \
export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
./configure \
--datadir=/usr/lib \
--libdir=/usr/lib/zabbix \
--prefix=/usr \
--sysconfdir=/etc/zabbix \
--enable-agent \
--enable-server \
--with-${DB_TYPE} \
--with-jabber \
--with-ldap \
--with-libcurl \
--with-libxml2 \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-unixodbc \
--enable-ipv6 \
--silent && \
make -j"$(nproc)" -s dbschema 1>/dev/null && \
make -j"$(nproc)" -s 1>/dev/null && \
cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \
chown --quiet -R zabbix:root /etc/zabbix && \
cat database/${DB_TYPE}/schema.sql > database/${DB_TYPE}/create.sql && \
cat database/${DB_TYPE}/images.sql >> database/${DB_TYPE}/create.sql && \
cat database/${DB_TYPE}/data.sql >> database/${DB_TYPE}/create.sql && \
gzip database/${DB_TYPE}/create.sql && \
cp database/${DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-server-${DB_TYPE}/ && \
cd /tmp/ && \
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
yum ${YUM_FLAGS_COMMON} history undo `yum history | sed -n 4p |column -t | cut -d' ' -f1` 1>/dev/null && \
yum ${YUM_FLAGS_COMMON} clean all && \
rm -rf /etc/udev/hwdb.bin && \
rm -rf /var/cache/yum && \
rm -rf /var/lib/yum/yumdb/* && \
rm -rf /usr/lib/udev/hwdb.d/* && \
rm -rf /root/.pki && \
rm -rf /root/.subversion
EXPOSE 10051/TCP
WORKDIR /var/lib/zabbix
VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"]
VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"]
COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["server", "postgresql"]

View File

@ -52,10 +52,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTANT} install \
fping \
libcurl3 \
libevent-2.0 \
libiksemel3 \
libopenipmi0 \
libpcre3 \
libpq5 \
libsnmp30 \
libssh2-1 \
@ -69,9 +67,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -86,11 +84,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libiksemel-dev \
libldap2-dev \
libopenipmi-dev \
libpcre3-dev \
libpq-dev \
libsnmp-dev \
libssh2-1-dev \
@ -145,11 +141,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gcc \
libc6-dev \
libcurl4-openssl-dev \
libevent-dev \
libiksemel-dev \
libldap2-dev \
libopenipmi-dev \
libpcre3-dev \
libpq-dev \
libsnmp-dev \
libssh2-1-dev \

View File

@ -51,9 +51,9 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -46,9 +46,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -48,9 +48,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -50,9 +50,9 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -46,9 +46,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -48,9 +48,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -50,9 +50,9 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -49,9 +49,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -58,9 +58,9 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/cache/nginx/* && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -49,9 +49,9 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -48,9 +48,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \

View File

@ -59,9 +59,9 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/cache/nginx/* && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=4.0
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \