mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-11-22 15:53:35 +01:00
Revert "Merge branch '3.4' into master"
This reverts commit49a0e5deb7
, reversing changes made tob2bb957389
.
This commit is contained in:
parent
49a0e5deb7
commit
f4e4c3f70f
@ -36,12 +36,11 @@ RUN addgroup zabbix && \
|
||||
bash \
|
||||
iputils \
|
||||
libldap \
|
||||
pcre \
|
||||
supervisor && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
@ -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} && \
|
||||
|
@ -36,14 +36,13 @@ 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=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
@ -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 \
|
||||
|
@ -1,7 +1,7 @@
|
||||
version: '2'
|
||||
services:
|
||||
zabbix-server:
|
||||
image: zabbix/zabbix-server-mysql:alpine-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
image: zabbix/zabbix-snmptraps:ubuntu-latest
|
||||
ports:
|
||||
- "162:162/udp"
|
||||
volumes:
|
||||
|
@ -1,7 +1,7 @@
|
||||
version: '2'
|
||||
services:
|
||||
zabbix-server:
|
||||
image: zabbix/zabbix-server-pgsql:alpine-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
image: zabbix/zabbix-snmptraps:ubuntu-latest
|
||||
ports:
|
||||
- "162:162/udp"
|
||||
volumes:
|
||||
|
@ -1,7 +1,7 @@
|
||||
version: '2'
|
||||
services:
|
||||
zabbix-server:
|
||||
image: zabbix/zabbix-server-mysql:ubuntu-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
image: zabbix/zabbix-snmptraps:ubuntu-latest
|
||||
ports:
|
||||
- "162:162/udp"
|
||||
volumes:
|
||||
|
@ -1,7 +1,7 @@
|
||||
version: '2'
|
||||
services:
|
||||
zabbix-server:
|
||||
image: zabbix/zabbix-server-pgsql:ubuntu-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
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-3.4-latest
|
||||
image: zabbix/zabbix-snmptraps:ubuntu-latest
|
||||
ports:
|
||||
- "162:162/udp"
|
||||
volumes:
|
||||
|
@ -34,8 +34,8 @@ RUN addgroup zabbix && \
|
||||
supervisor && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
|
@ -39,8 +39,8 @@ RUN locale-gen $LC_ALL && \
|
||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
|
||||
|
@ -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:
|
||||
|
@ -45,7 +45,6 @@ RUN addgroup zabbix && \
|
||||
bash \
|
||||
iputils \
|
||||
libcurl \
|
||||
libevent \
|
||||
libldap \
|
||||
libssh2 \
|
||||
libxml2 \
|
||||
@ -53,14 +52,13 @@ RUN addgroup zabbix && \
|
||||
mariadb-client-libs \
|
||||
net-snmp-agent-libs \
|
||||
openipmi-libs \
|
||||
pcre \
|
||||
supervisor \
|
||||
unixodbc \
|
||||
fping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
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 \
|
||||
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 && \
|
||||
|
@ -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,8 +64,8 @@ RUN locale-gen $LC_ALL && \
|
||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
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 \
|
||||
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 \
|
||||
|
@ -45,20 +45,18 @@ 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=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
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 \
|
||||
coreutils \
|
||||
curl-dev \
|
||||
libevent-dev \
|
||||
libssh2-dev \
|
||||
libxml2-dev \
|
||||
net-snmp-dev \
|
||||
openipmi-dev \
|
||||
openldap-dev \
|
||||
pcre-dev \
|
||||
sqlite-dev \
|
||||
subversion \
|
||||
unixodbc-dev && \
|
||||
|
@ -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,8 +62,8 @@ RUN locale-gen $LC_ALL && \
|
||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
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 \
|
||||
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 \
|
||||
|
@ -48,7 +48,6 @@ RUN addgroup zabbix && \
|
||||
fping \
|
||||
iputils \
|
||||
libcurl \
|
||||
libevent \
|
||||
libldap \
|
||||
libssh2 \
|
||||
libxml2 \
|
||||
@ -56,13 +55,12 @@ RUN addgroup zabbix && \
|
||||
mariadb-client-libs \
|
||||
net-snmp-agent-libs \
|
||||
openipmi-libs \
|
||||
pcre \
|
||||
supervisor \
|
||||
unixodbc && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
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 \
|
||||
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/ && \
|
||||
|
@ -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,8 +67,8 @@ RUN locale-gen $LC_ALL && \
|
||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
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 \
|
||||
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 \
|
||||
|
@ -48,21 +48,19 @@ 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=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
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 \
|
||||
coreutils \
|
||||
curl-dev \
|
||||
libevent-dev \
|
||||
libssh2-dev \
|
||||
libxml2-dev \
|
||||
net-snmp-dev \
|
||||
openipmi-dev \
|
||||
openldap-dev \
|
||||
pcre-dev \
|
||||
postgresql-dev \
|
||||
subversion \
|
||||
unixodbc-dev && \
|
||||
|
@ -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,8 +67,8 @@ RUN locale-gen $LC_ALL && \
|
||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
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 \
|
||||
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 \
|
||||
|
@ -51,8 +51,8 @@ RUN addgroup zabbix && \
|
||||
ttf-dejavu && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \
|
||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -50,8 +50,8 @@ RUN addgroup zabbix && \
|
||||
ttf-dejavu && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -48,8 +48,8 @@ RUN locale-gen $LC_ALL && \
|
||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -50,8 +50,8 @@ RUN addgroup zabbix && \
|
||||
ttf-dejavu && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -58,8 +58,8 @@ RUN locale-gen $LC_ALL && \
|
||||
rm -rf /var/cache/nginx/* && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -49,8 +49,8 @@ RUN addgroup zabbix && \
|
||||
ttf-dejavu && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
@ -59,8 +59,8 @@ RUN locale-gen $LC_ALL && \
|
||||
rm -rf /var/cache/nginx/* && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=3.4
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}.6
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user