mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-02-19 11:20:51 +01:00
Fixed small issues. Preparation for Appliance
This commit is contained in:
parent
305b77fe7f
commit
7bedb58dce
@ -49,6 +49,7 @@ RUN addgroup zabbix && \
|
||||
fping \
|
||||
iputils \
|
||||
libcurl \
|
||||
libevent \
|
||||
libldap \
|
||||
libssh2 \
|
||||
libxml2 \
|
||||
@ -71,12 +72,13 @@ RUN addgroup zabbix && \
|
||||
php5-xmlreader \
|
||||
supervisor \
|
||||
ttf-dejavu \
|
||||
pcre \
|
||||
unixodbc && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG MAJOR_VERSION=4.0
|
||||
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}
|
||||
|
||||
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 \
|
||||
curl-dev \
|
||||
gettext \
|
||||
libevent-dev \
|
||||
libssh2-dev \
|
||||
libxml2-dev \
|
||||
mysql-dev \
|
||||
@ -100,6 +103,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
|
||||
openipmi-dev \
|
||||
openjdk8 \
|
||||
openldap-dev \
|
||||
pcre-dev \
|
||||
subversion \
|
||||
unixodbc-dev && \
|
||||
cd /tmp/ && \
|
||||
|
@ -51,6 +51,7 @@ RUN groupadd --system zabbix && \
|
||||
iksemel \
|
||||
java-1.8.0-openjdk-headless \
|
||||
libcurl \
|
||||
libevent \
|
||||
libxml2 \
|
||||
mariadb \
|
||||
mariadb-server \
|
||||
@ -74,9 +75,9 @@ RUN groupadd --system zabbix && \
|
||||
yum ${YUM_FLAGS_PERSISTANT} clean all && \
|
||||
rm -rf /var/cache/yum/
|
||||
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG MAJOR_VERSION=4.0
|
||||
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}
|
||||
|
||||
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 \
|
||||
java-1.8.0-openjdk-devel \
|
||||
libcurl-devel \
|
||||
libevent-devel \
|
||||
libssh2-devel \
|
||||
libxml2-devel \
|
||||
make \
|
||||
|
@ -57,9 +57,11 @@ 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 \
|
||||
@ -86,9 +88,9 @@ RUN locale-gen $LC_ALL && \
|
||||
rm -rf /var/cache/nginx/* && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG MAJOR_VERSION=master
|
||||
ARG MAJOR_VERSION=4.0
|
||||
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}
|
||||
|
||||
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 \
|
||||
libc6-dev \
|
||||
libcurl4-openssl-dev \
|
||||
libevent-dev \
|
||||
libiksemel-dev \
|
||||
libldap2-dev \
|
||||
libmysqlclient-dev \
|
||||
libopenipmi-dev \
|
||||
libpcre3-dev \
|
||||
libsnmp-dev \
|
||||
libssh2-1-dev \
|
||||
libxml2-dev \
|
||||
@ -192,10 +196,12 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
||||
gettext \
|
||||
libc6-dev \
|
||||
libcurl4-openssl-dev \
|
||||
libevent-dev \
|
||||
libiksemel-dev \
|
||||
libldap2-dev \
|
||||
libmysqlclient-dev \
|
||||
libopenipmi-dev \
|
||||
libpcre3-dev \
|
||||
libsnmp-dev \
|
||||
libssh2-1-dev \
|
||||
libxml2-dev \
|
||||
|
Loading…
Reference in New Issue
Block a user