Merge branch 'master' into trunk

This commit is contained in:
root 2019-01-13 01:16:19 +02:00
commit 782babee91
4 changed files with 4 additions and 0 deletions

View File

@ -144,6 +144,7 @@ RUN addgroup zabbix && \
apk update && \ apk update && \
apk add ${APK_FLAGS_PERSISTENT} \ apk add ${APK_FLAGS_PERSISTENT} \
bash \ bash \
curl \
fping \ fping \
iputils \ iputils \
libcurl \ libcurl \

View File

@ -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 && \ 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 epel-release && \
yum ${YUM_FLAGS_PERSISTENT} install \ yum ${YUM_FLAGS_PERSISTENT} install \
curl \
OpenIPMI-libs \ OpenIPMI-libs \
dejavu-sans-fonts \ dejavu-sans-fonts \
java-1.8.0-openjdk-headless \ java-1.8.0-openjdk-headless \

View File

@ -53,6 +53,7 @@ COPY ["licenses", "/licenses"]
### Add necessary Red Hat repos here ### Add necessary Red Hat repos here
RUN INSTALL_PKGS="OpenIPMI-libs \ RUN INSTALL_PKGS="OpenIPMI-libs \
curl \
dejavu-sans-fonts \ dejavu-sans-fonts \
fping \ fping \
iksemel \ iksemel \

View File

@ -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 && \ 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_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \ apt-get ${APT_FLAGS_PERSISTENT} install \
curl \
fping \ fping \
libcurl4 \ libcurl4 \
libevent-2.1 \ libevent-2.1 \