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

Fixed small issues. Preparation for Appliance

Browse Source
This commit is contained in:
root 2018-03-30 05:37:54 -07:00
parent 305b77fe7f
commit 7bedb58dce
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zabbix-appliance/alpine/Dockerfile
View File

@ -49,6 +49,7 @@ RUN addgroup zabbix && \
fping \ fping \
iputils \ iputils \
libcurl \ libcurl \
libevent \
libldap \ libldap \
libssh2 \ libssh2 \
libxml2 \ libxml2 \
@ -71,12 +72,13 @@ RUN addgroup zabbix && \
php5-xmlreader \ php5-xmlreader \
supervisor \ supervisor \
ttf-dejavu \ ttf-dejavu \
pcre \
unixodbc && \ unixodbc && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=4.0
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -93,6 +95,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
coreutils \ coreutils \
curl-dev \ curl-dev \
gettext \ gettext \
libevent-dev \
libssh2-dev \ libssh2-dev \
libxml2-dev \ libxml2-dev \
mysql-dev \ mysql-dev \
@ -100,6 +103,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
openipmi-dev \ openipmi-dev \
openjdk8 \ openjdk8 \
openldap-dev \ openldap-dev \
pcre-dev \
subversion \ subversion \
unixodbc-dev && \ unixodbc-dev && \
cd /tmp/ && \ cd /tmp/ && \

6
zabbix-appliance/centos/Dockerfile
View File

@ -51,6 +51,7 @@ RUN groupadd --system zabbix && \
iksemel \ iksemel \
java-1.8.0-openjdk-headless \ java-1.8.0-openjdk-headless \
libcurl \ libcurl \
libevent \
libxml2 \ libxml2 \
mariadb \ mariadb \
mariadb-server \ mariadb-server \
@ -74,9 +75,9 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/ rm -rf /var/cache/yum/
ARG MAJOR_VERSION=master ARG MAJOR_VERSION=4.0
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -95,6 +96,7 @@ RUN yum --quiet makecache && \
iksemel-devel \ iksemel-devel \
java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-devel \
libcurl-devel \ libcurl-devel \
libevent-devel \
libssh2-devel \ libssh2-devel \
libxml2-devel \ libxml2-devel \
make \ make \

10
zabbix-appliance/ubuntu/Dockerfile
View File

@ -57,9 +57,11 @@ 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 \
@ -86,9 +88,9 @@ 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=master ARG MAJOR_VERSION=4.0
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
@ -106,10 +108,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gettext \ gettext \
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 \
@ -192,10 +196,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
gettext \ gettext \
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 \