mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-02-23 05:10:52 +01:00
Fixed trunk compilation
This commit is contained in:
parent
b011c4d16d
commit
8ebd6b050d
@ -23,6 +23,7 @@ RUN addgroup zabbix && \
|
|||||||
supervisor \
|
supervisor \
|
||||||
bash \
|
bash \
|
||||||
coreutils \
|
coreutils \
|
||||||
|
pcre \
|
||||||
libssl1.0 && \
|
libssl1.0 && \
|
||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
@ -37,6 +38,7 @@ RUN apk update && \
|
|||||||
automake \
|
automake \
|
||||||
autoconf \
|
autoconf \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
|
pcre-dev \
|
||||||
subversion && \
|
subversion && \
|
||||||
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 && \
|
||||||
|
@ -25,6 +25,7 @@ RUN DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CO
|
|||||||
apt-get ${APT_FLAGS_COMMON} update && \
|
apt-get ${APT_FLAGS_COMMON} update && \
|
||||||
apt-get ${APT_FLAGS_PERSISTANT} install \
|
apt-get ${APT_FLAGS_PERSISTANT} install \
|
||||||
supervisor \
|
supervisor \
|
||||||
|
libpcre3 \
|
||||||
libssl1.0.0 1>/dev/null && \
|
libssl1.0.0 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 && \
|
||||||
@ -43,6 +44,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libc6-dev \
|
libc6-dev \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 1>/dev/null && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
||||||
@ -75,6 +77,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libc6-dev \
|
libc6-dev \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 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 && \
|
||||||
|
@ -32,6 +32,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
automake \
|
automake \
|
||||||
autoconf \
|
autoconf \
|
||||||
openjdk8 \
|
openjdk8 \
|
||||||
|
pcre-dev \
|
||||||
subversion && \
|
subversion && \
|
||||||
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 && \
|
||||||
|
@ -40,6 +40,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libc6-dev \
|
libc6-dev \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
openjdk-7-jdk \
|
openjdk-7-jdk \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 1>/dev/null && \
|
||||||
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 && \
|
||||||
@ -68,6 +69,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libc6-dev \
|
libc6-dev \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
openjdk-7-jdk \
|
openjdk-7-jdk \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 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 && \
|
||||||
|
@ -41,6 +41,8 @@ RUN addgroup zabbix && \
|
|||||||
libldap \
|
libldap \
|
||||||
libcurl \
|
libcurl \
|
||||||
openipmi-libs \
|
openipmi-libs \
|
||||||
|
libevent \
|
||||||
|
pcre \
|
||||||
libssh2 && \
|
libssh2 && \
|
||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
@ -62,6 +64,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
openipmi-dev \
|
openipmi-dev \
|
||||||
openldap-dev \
|
openldap-dev \
|
||||||
curl-dev \
|
curl-dev \
|
||||||
|
libevent-dev \
|
||||||
|
pcre-dev \
|
||||||
subversion && \
|
subversion && \
|
||||||
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 && \
|
||||||
|
@ -46,6 +46,8 @@ RUN locale-gen $LC_ALL && \
|
|||||||
libssl1.0.0 \
|
libssl1.0.0 \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
fping \
|
fping \
|
||||||
|
libevent-2.0 \
|
||||||
|
libpcre3 \
|
||||||
libopenipmi0 1>/dev/null && \
|
libopenipmi0 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 && \
|
||||||
@ -72,6 +74,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libssh2-1-dev \
|
libssh2-1-dev \
|
||||||
unixodbc-dev \
|
unixodbc-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
libevent-dev \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 1>/dev/null && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
||||||
@ -120,6 +124,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libssh2-1-dev \
|
libssh2-1-dev \
|
||||||
unixodbc-dev \
|
unixodbc-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
libevent-dev \
|
||||||
|
libpcre3-dev \
|
||||||
gcc \
|
gcc \
|
||||||
libc6-dev \
|
libc6-dev \
|
||||||
make \
|
make \
|
||||||
|
@ -37,6 +37,8 @@ RUN addgroup zabbix && \
|
|||||||
libldap \
|
libldap \
|
||||||
libcurl \
|
libcurl \
|
||||||
openipmi-libs \
|
openipmi-libs \
|
||||||
|
libevent \
|
||||||
|
pcre \
|
||||||
libssh2 && \
|
libssh2 && \
|
||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
@ -58,6 +60,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
openipmi-dev \
|
openipmi-dev \
|
||||||
openldap-dev \
|
openldap-dev \
|
||||||
curl-dev \
|
curl-dev \
|
||||||
|
libevent-dev \
|
||||||
|
pcre-dev \
|
||||||
subversion && \
|
subversion && \
|
||||||
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 && \
|
||||||
|
@ -44,6 +44,8 @@ RUN locale-gen $LC_ALL && \
|
|||||||
libssl1.0.0 \
|
libssl1.0.0 \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
fping \
|
fping \
|
||||||
|
libevent-2.0-5 \
|
||||||
|
libpcre3 \
|
||||||
libopenipmi0 1>/dev/null && \
|
libopenipmi0 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 && \
|
||||||
@ -70,6 +72,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libssh2-1-dev \
|
libssh2-1-dev \
|
||||||
unixodbc-dev \
|
unixodbc-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
libevent-dev \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 1>/dev/null && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
||||||
@ -121,6 +125,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libssh2-1-dev \
|
libssh2-1-dev \
|
||||||
unixodbc-dev \
|
unixodbc-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
libevent-dev \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 1>/dev/null && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \
|
apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
@ -42,6 +42,8 @@ RUN addgroup zabbix && \
|
|||||||
libldap \
|
libldap \
|
||||||
libcurl \
|
libcurl \
|
||||||
openipmi-libs \
|
openipmi-libs \
|
||||||
|
libevent \
|
||||||
|
pcre \
|
||||||
libssh2 && \
|
libssh2 && \
|
||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
@ -63,6 +65,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
openipmi-dev \
|
openipmi-dev \
|
||||||
openldap-dev \
|
openldap-dev \
|
||||||
curl-dev \
|
curl-dev \
|
||||||
|
libevent-dev \
|
||||||
|
pcre-dev \
|
||||||
subversion && \
|
subversion && \
|
||||||
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 && \
|
||||||
|
@ -46,6 +46,8 @@ RUN locale-gen $LC_ALL && \
|
|||||||
libssh2-1 \
|
libssh2-1 \
|
||||||
libssl1.0.0 \
|
libssl1.0.0 \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
|
libevent-2.0 \
|
||||||
|
libpcre3 \
|
||||||
fping \
|
fping \
|
||||||
libopenipmi0 1>/dev/null && \
|
libopenipmi0 1>/dev/null && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
@ -73,6 +75,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libssh2-1-dev \
|
libssh2-1-dev \
|
||||||
unixodbc-dev \
|
unixodbc-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
libevent-dev \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 1>/dev/null && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
||||||
@ -127,6 +131,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libssh2-1-dev \
|
libssh2-1-dev \
|
||||||
unixodbc-dev \
|
unixodbc-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
libevent-dev \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 1>/dev/null && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \
|
apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
@ -42,6 +42,8 @@ RUN addgroup zabbix && \
|
|||||||
libldap \
|
libldap \
|
||||||
libcurl \
|
libcurl \
|
||||||
openipmi-libs \
|
openipmi-libs \
|
||||||
|
libevent \
|
||||||
|
pcre \
|
||||||
libssh2 && \
|
libssh2 && \
|
||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
@ -63,6 +65,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
|||||||
openipmi-dev \
|
openipmi-dev \
|
||||||
openldap-dev \
|
openldap-dev \
|
||||||
curl-dev \
|
curl-dev \
|
||||||
|
libevent-dev \
|
||||||
|
pcre-dev \
|
||||||
subversion && \
|
subversion && \
|
||||||
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 && \
|
||||||
|
@ -46,6 +46,8 @@ RUN locale-gen $LC_ALL && \
|
|||||||
libssh2-1 \
|
libssh2-1 \
|
||||||
libssl1.0.0 \
|
libssl1.0.0 \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
|
libevent-2.0 \
|
||||||
|
libpcre3 \
|
||||||
fping \
|
fping \
|
||||||
libopenipmi0 1>/dev/null && \
|
libopenipmi0 1>/dev/null && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
@ -73,6 +75,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libssh2-1-dev \
|
libssh2-1-dev \
|
||||||
unixodbc-dev \
|
unixodbc-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
libevent-dev \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 1>/dev/null && \
|
||||||
cd /tmp/ && \
|
cd /tmp/ && \
|
||||||
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
svn --quiet export ${ZBX_SOURCES} zabbix-${ZBX_VERSION} && \
|
||||||
@ -127,6 +131,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
|||||||
libssh2-1-dev \
|
libssh2-1-dev \
|
||||||
unixodbc-dev \
|
unixodbc-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
libevent-dev \
|
||||||
|
libpcre3-dev \
|
||||||
subversion 1>/dev/null && \
|
subversion 1>/dev/null && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \
|
apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
Loading…
Reference in New Issue
Block a user