extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-17 12:00:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch '3.4' into master"

Browse Source 
This reverts commit e3dd845396, reversing
changes made to 461f869a4a.
This commit is contained in:
root
2018-02-17 16:12:34 -08:00
parent e3dd845396
commit 1be4813733
35 changed files with 101 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
proxy-mysql/alpine/Dockerfile
View File

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