extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-22 15:53:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch '3.4' into master"

Browse Source 
This reverts commit 49a0e5deb7, reversing
changes made to b2bb957389.
This commit is contained in:
root 2018-02-17 10:22:18 -08:00
parent 49a0e5deb7
commit f4e4c3f70f
25 changed files with 81 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/alpine/Dockerfile
View File

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

7
agent/ubuntu/Dockerfile
View File

@ -36,14 +36,13 @@ RUN locale-gen $LC_ALL && \
chown --quiet -R zabbix:root /var/lib/zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \
apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTANT} install \ apt-get ${APT_FLAGS_PERSISTANT} install \
libpcre3 \
supervisor 1>/dev/null && \ supervisor 1>/dev/null && \
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/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
@ -58,7 +57,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
automake \ automake \
libc6-dev \ libc6-dev \
libldap2-dev \ libldap2-dev \
libpcre3-dev \
libssl-dev \ libssl-dev \
make \ make \
pkg-config \ pkg-config \
@ -93,7 +91,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
autoconf \ autoconf \
automake \ automake \
libc6-dev \ libc6-dev \
libpcre3-dev \
libssl-dev \ libssl-dev \
make \ make \
pkg-config \ pkg-config \

16
docker-compose_v2_alpine_mysql_latest.yaml
View File

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

14
docker-compose_v2_alpine_pgsql_latest.yaml
View File

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

16
docker-compose_v2_ubuntu_mysql_latest.yaml
View File

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

16
docker-compose_v2_ubuntu_pgsql_latest.yaml
View File

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

4
java-gateway/alpine/Dockerfile
View File

@ -34,8 +34,8 @@ RUN addgroup zabbix && \
supervisor && \ supervisor && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} 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 && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}

14
kubernetes.yaml
View File

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

8
proxy-mysql/alpine/Dockerfile
View File

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

10
proxy-mysql/ubuntu/Dockerfile
View File

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

8
proxy-sqlite3/alpine/Dockerfile
View File

@ -45,20 +45,18 @@ RUN addgroup zabbix && \
fping \ fping \
iputils \ iputils \
libcurl \ libcurl \
libevent \
libldap \ libldap \
libssh2 \ libssh2 \
libxml2 \ libxml2 \
net-snmp-agent-libs \ net-snmp-agent-libs \
openipmi-libs \ openipmi-libs \
pcre \
sqlite-libs \ sqlite-libs \
supervisor \ supervisor \
unixodbc && \ unixodbc && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
@ -73,13 +71,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
automake \ automake \
coreutils \ coreutils \
curl-dev \ curl-dev \
libevent-dev \
libssh2-dev \ libssh2-dev \
libxml2-dev \ libxml2-dev \
net-snmp-dev \ net-snmp-dev \
openipmi-dev \ openipmi-dev \
openldap-dev \ openldap-dev \
pcre-dev \
sqlite-dev \ sqlite-dev \
subversion \ subversion \
unixodbc-dev && \ unixodbc-dev && \

10
proxy-sqlite3/ubuntu/Dockerfile
View File

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

8
server-mysql/alpine/Dockerfile
View File

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

10
server-mysql/ubuntu/Dockerfile
View File

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

8
server-pgsql/alpine/Dockerfile
View File

@ -48,21 +48,19 @@ RUN addgroup zabbix && \
fping \ fping \
iputils \ iputils \
libcurl \ libcurl \
libevent \
libldap \ libldap \
libssh2 \ libssh2 \
libxml2 \ libxml2 \
net-snmp-agent-libs \ net-snmp-agent-libs \
openipmi-libs \ openipmi-libs \
pcre \
postgresql-client \ postgresql-client \
postgresql-libs \ postgresql-libs \
supervisor \ supervisor \
unixodbc && \ unixodbc && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
@ -77,13 +75,11 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
automake \ automake \
coreutils \ coreutils \
curl-dev \ curl-dev \
libevent-dev \
libssh2-dev \ libssh2-dev \
libxml2-dev \ libxml2-dev \
net-snmp-dev \ net-snmp-dev \
openipmi-dev \ openipmi-dev \
openldap-dev \ openldap-dev \
pcre-dev \
postgresql-dev \ postgresql-dev \
subversion \ subversion \
unixodbc-dev && \ unixodbc-dev && \

10
server-pgsql/ubuntu/Dockerfile
View File

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

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

@ -51,8 +51,8 @@ RUN addgroup zabbix && \
ttf-dejavu && \ ttf-dejavu && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} 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 && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} 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 && \ ttf-dejavu && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} 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 && \ apt-get ${APT_FLAGS_COMMON} clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} 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 && \ ttf-dejavu && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} 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/cache/nginx/* && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} 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 && \ ttf-dejavu && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} 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/cache/nginx/* && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG MAJOR_VERSION=3.4 ARG MAJOR_VERSION=master
ARG ZBX_VERSION=${MAJOR_VERSION}.6 ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}