extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-10 00:47:51 +02: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
Download Patch File Download Diff File Expand all files Collapse all files

8
server-mysql/alpine/Dockerfile
View File

@ -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/ && \

10
server-mysql/ubuntu/Dockerfile
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,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 \