mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-12-11 09:01:25 +01:00
Merge branch 'master' into 3.0
This commit is contained in:
commit
f5f32c1ae7
@ -111,9 +111,8 @@ RUN groupadd --system zabbix && \
|
||||
chown --quiet -R zabbix:root /var/lib/zabbix && \
|
||||
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
|
||||
yum ${YUM_FLAGS_COMMON} makecache && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install \
|
||||
fping \
|
||||
libcurl \
|
||||
libxml2 \
|
||||
mariadb \
|
||||
|
@ -111,9 +111,8 @@ RUN groupadd --system zabbix && \
|
||||
chown --quiet -R zabbix:root /var/lib/zabbix && \
|
||||
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
|
||||
yum ${YUM_FLAGS_COMMON} makecache && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install \
|
||||
fping \
|
||||
libcurl \
|
||||
libxml2 \
|
||||
net-snmp-libs \
|
||||
|
@ -10,12 +10,12 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||
ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
|
||||
|
||||
RUN yum --quiet makecache && \
|
||||
yum ${YUM_FLAGS_DEV} install epel-release && \
|
||||
yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-devel-1.4-2.el7.centos.x86_64.rpm \
|
||||
http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \
|
||||
yum ${YUM_FLAGS_DEV} install \
|
||||
autoconf \
|
||||
automake \
|
||||
gcc \
|
||||
iksemel-devel \
|
||||
libcurl-devel \
|
||||
libssh2-devel \
|
||||
libxml2-devel \
|
||||
@ -117,10 +117,9 @@ RUN groupadd --system zabbix && \
|
||||
chown --quiet -R zabbix:root /var/lib/zabbix && \
|
||||
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
|
||||
yum ${YUM_FLAGS_COMMON} makecache && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm \
|
||||
http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install \
|
||||
fping \
|
||||
iksemel \
|
||||
libcurl \
|
||||
libxml2 \
|
||||
mariadb \
|
||||
|
@ -10,12 +10,12 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||
ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
|
||||
|
||||
RUN yum --quiet makecache && \
|
||||
yum ${YUM_FLAGS_DEV} install epel-release && \
|
||||
yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-devel-1.4-2.el7.centos.x86_64.rpm \
|
||||
http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \
|
||||
yum ${YUM_FLAGS_DEV} install \
|
||||
autoconf \
|
||||
automake \
|
||||
gcc \
|
||||
iksemel-devel \
|
||||
libcurl-devel \
|
||||
libssh2-devel \
|
||||
libxml2-devel \
|
||||
@ -117,7 +117,8 @@ RUN groupadd --system zabbix && \
|
||||
chown --quiet -R zabbix:root /var/lib/zabbix && \
|
||||
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
|
||||
yum ${YUM_FLAGS_COMMON} makecache && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm \
|
||||
http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install \
|
||||
fping \
|
||||
iksemel \
|
||||
|
@ -12,14 +12,14 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||
|
||||
COPY ["conf/tmp/font-config", "/tmp/font-config"]
|
||||
|
||||
RUN yum ${YUM_FLAGS_DEV} install epel-release && \
|
||||
RUN yum ${YUM_FLAGS_DEV} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-devel-1.4-2.el7.centos.x86_64.rpm \
|
||||
http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \
|
||||
yum --quiet makecache && \
|
||||
yum ${YUM_FLAGS_DEV} install \
|
||||
autoconf \
|
||||
automake \
|
||||
gcc \
|
||||
gettext \
|
||||
iksemel-devel \
|
||||
java-1.8.0-openjdk-devel \
|
||||
libcurl-devel \
|
||||
libssh2-devel \
|
||||
@ -139,12 +139,12 @@ RUN groupadd --system zabbix && \
|
||||
chown --quiet -R zabbix:root /var/lib/zabbix && \
|
||||
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \
|
||||
yum ${YUM_FLAGS_COMMON} makecache && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm \
|
||||
http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
|
||||
yum ${YUM_FLAGS_PERSISTENT} install \
|
||||
OpenIPMI-libs \
|
||||
dejavu-sans-fonts \
|
||||
fping \
|
||||
iksemel \
|
||||
java-1.8.0-openjdk-headless \
|
||||
libcurl \
|
||||
libxml2 \
|
||||
|
Loading…
Reference in New Issue
Block a user