extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-14 20:04:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4' into master

Browse Source
This commit is contained in:
Alexey Pustovalov 2018-02-19 00:10:51 +02:00 committed by GitHub
commit 49a0e5deb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 124 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/alpine/Dockerfile
View File

@ -36,11 +36,12 @@ RUN addgroup zabbix && \
bash \
iputils \
libldap \
pcre \
supervisor && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -55,9 +56,8 @@ RUN apk update && \
autoconf \
automake \
openssl-dev \
openldap-dev \
subversion \
coreutils && \
pcre-dev \
subversion && \
cd /tmp/ && \
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} 1>/dev/null && \
cd /tmp/zabbix-${ZBX_VERSION} && \

7
agent/ubuntu/Dockerfile
View File

@ -36,13 +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=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -57,6 +58,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
automake \
libc6-dev \
libldap2-dev \
libpcre3-dev \
libssl-dev \
make \
pkg-config \
@ -91,6 +93,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
autoconf \
automake \
libc6-dev \
libpcre3-dev \
libssl-dev \
make \
pkg-config \

16
docker-compose_v2_alpine_mysql_latest.yaml
View File

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

14
docker-compose_v2_alpine_pgsql_latest.yaml
View File

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

16
docker-compose_v2_ubuntu_mysql_latest.yaml
View File

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

16
docker-compose_v2_ubuntu_pgsql_latest.yaml
View File

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

4
java-gateway/alpine/Dockerfile
View File

@ -34,8 +34,8 @@ RUN addgroup zabbix && \
supervisor && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

4
java-gateway/ubuntu/Dockerfile
View File

@ -39,8 +39,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

14
kubernetes.yaml
View File

@ -148,7 +148,7 @@ spec:
spec:
containers:
- name: zabbix-web
image: zabbix/zabbix-web-nginx-mysql:alpine-latest
image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 80
@ -282,7 +282,7 @@ spec:
spec:
containers:
- name: zabbix-server
image: zabbix/zabbix-server-mysql:alpine-latest
image: zabbix/zabbix-server-mysql:alpine-3.4-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:latest
image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 162
@ -364,7 +364,7 @@ spec:
spec:
containers:
- name: zabbix-proxy-sqlite3
image: zabbix/zabbix-proxy-sqlite3:alpine-latest
image: zabbix/zabbix-proxy-sqlite3:alpine-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -396,7 +396,7 @@ spec:
spec:
containers:
- name: zabbix-proxy-mysql
image: zabbix/zabbix-proxy-mysql:alpine-latest
image: zabbix/zabbix-proxy-mysql:alpine-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 10051
@ -439,7 +439,7 @@ spec:
spec:
containers:
- name: zabbix-java-gateway
image: zabbix/zabbix-java-gateway:alpine-latest
image: zabbix/zabbix-java-gateway:alpine-3.4-latest
imagePullPolicy: Always
ports:
- containerPort: 10052
@ -470,7 +470,7 @@ spec:
spec:
containers:
- name: zabbix-agent
image: zabbix/zabbix-agent:alpine-latest
image: zabbix/zabbix-agent:alpine-3.4-latest
imagePullPolicy: Always
resources:
limits:

8
proxy-mysql/alpine/Dockerfile
View File

@ -45,6 +45,7 @@ RUN addgroup zabbix && \
bash \
iputils \
libcurl \
libevent \
libldap \
libssh2 \
libxml2 \
@ -52,13 +53,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=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
@ -72,12 +74,14 @@ 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 && \

10
proxy-mysql/ubuntu/Dockerfile
View File

@ -50,8 +50,10 @@ 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 \
@ -64,8 +66,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
@ -81,9 +83,11 @@ 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 \
@ -134,9 +138,11 @@ 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 \

8
proxy-sqlite3/alpine/Dockerfile
View File

@ -45,18 +45,20 @@ 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=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
@ -71,11 +73,13 @@ 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 && \

10
proxy-sqlite3/ubuntu/Dockerfile
View File

@ -49,7 +49,9 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTANT} install \
fping \
libcurl3 \
libevent-2.0 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libsqlite3-0 \
libssh2-1 \
@ -62,8 +64,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
@ -79,8 +81,10 @@ 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 \
@ -129,8 +133,10 @@ 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 \

8
server-mysql/alpine/Dockerfile
View File

@ -48,6 +48,7 @@ RUN addgroup zabbix && \
fping \
iputils \
libcurl \
libevent \
libldap \
libssh2 \
libxml2 \
@ -55,12 +56,13 @@ RUN addgroup zabbix && \
mariadb-client-libs \
net-snmp-agent-libs \
openipmi-libs \
pcre \
supervisor \
unixodbc && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
@ -75,12 +77,14 @@ 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/ && \

10
server-mysql/ubuntu/Dockerfile
View File

@ -52,9 +52,11 @@ 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 \
@ -67,8 +69,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
@ -84,10 +86,12 @@ 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 \
@ -141,10 +145,12 @@ 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 \

8
server-pgsql/alpine/Dockerfile
View File

@ -48,19 +48,21 @@ 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=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
@ -75,11 +77,13 @@ 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 && \

10
server-pgsql/ubuntu/Dockerfile
View File

@ -52,8 +52,10 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_PERSISTANT} install \
fping \
libcurl3 \
libevent-2.0 \
libiksemel3 \
libopenipmi0 \
libpcre3 \
libpq5 \
libsnmp30 \
libssh2-1 \
@ -67,8 +69,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
@ -84,9 +86,11 @@ 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 \
@ -141,9 +145,11 @@ 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 \

4
web-apache-mysql/alpine/Dockerfile
View File

@ -51,8 +51,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

4
web-apache-mysql/ubuntu/Dockerfile
View File

@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

4
web-apache-pgsql/alpine/Dockerfile
View File

@ -50,8 +50,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

4
web-apache-pgsql/ubuntu/Dockerfile
View File

@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

4
web-nginx-mysql/alpine/Dockerfile
View File

@ -50,8 +50,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

4
web-nginx-mysql/ubuntu/Dockerfile
View File

@ -58,8 +58,8 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/cache/nginx/* && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

4
web-nginx-pgsql/alpine/Dockerfile
View File

@ -49,8 +49,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \
rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}

4
web-nginx-pgsql/ubuntu/Dockerfile
View File

@ -59,8 +59,8 @@ RUN locale-gen $LC_ALL && \
rm -rf /var/cache/nginx/* && \
rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}
ARG MAJOR_VERSION=3.4
ARG ZBX_VERSION=${MAJOR_VERSION}.6
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}