mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-11-16 04:43:49 +01:00
Merge branch 'master' into trunk
This commit is contained in:
commit
782babee91
@ -144,6 +144,7 @@ RUN addgroup zabbix && \
|
||||
apk update && \
|
||||
apk add ${APK_FLAGS_PERSISTENT} \
|
||||
bash \
|
||||
curl \
|
||||
fping \
|
||||
iputils \
|
||||
libcurl \
|
||||
|
@ -144,6 +144,7 @@ RUN groupadd --system zabbix && \
|
||||
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 \
|
||||
curl \
|
||||
OpenIPMI-libs \
|
||||
dejavu-sans-fonts \
|
||||
java-1.8.0-openjdk-headless \
|
||||
|
@ -53,6 +53,7 @@ COPY ["licenses", "/licenses"]
|
||||
|
||||
### Add necessary Red Hat repos here
|
||||
RUN INSTALL_PKGS="OpenIPMI-libs \
|
||||
curl \
|
||||
dejavu-sans-fonts \
|
||||
fping \
|
||||
iksemel \
|
||||
|
@ -160,6 +160,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
|
||||
echo "deb http://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \
|
||||
apt-get ${APT_FLAGS_COMMON} update && \
|
||||
apt-get ${APT_FLAGS_PERSISTENT} install \
|
||||
curl \
|
||||
fping \
|
||||
libcurl4 \
|
||||
libevent-2.1 \
|
||||
|
Loading…
Reference in New Issue
Block a user