mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-12-16 19:40:46 +01:00
Using EPEL to install tini package on RHEL based images
This commit is contained in:
Alexey Pustovalov
parent
2e0ee131fc
commit
8d96c39083
@ -7,7 +7,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
ENV TINI_VERSION=v0.19.0
|
||||
|
||||
LABEL name="zabbix/zabbix-agent-trunk" \
|
||||
maintainer="alexey.pustovalov@zabbix.com" \
|
||||
@ -40,13 +39,15 @@ STOPSIGNAL SIGTERM
|
||||
COPY ["licenses", "/licenses"]
|
||||
|
||||
RUN set -eux && INSTALL_PKGS="bash \
|
||||
tini \
|
||||
tzdata \
|
||||
iputils \
|
||||
pcre \
|
||||
libcurl" && \
|
||||
REPOLIST="ubi-8-baseos,ubi-8-appstream" && \
|
||||
REPOLIST="ubi-8-baseos,ubi-8-appstream,epel" && \
|
||||
dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
|
||||
--security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \
|
||||
dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
|
||||
dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
|
||||
--setopt=tsflags=nodocs ${INSTALL_PKGS} && \
|
||||
groupadd --system --gid 1995 zabbix && \
|
||||
@ -62,20 +63,6 @@ RUN set -eux && INSTALL_PKGS="bash \
|
||||
mkdir -p /var/lib/zabbix && \
|
||||
mkdir -p /var/lib/zabbix/enc && \
|
||||
mkdir -p /var/lib/zabbix/modules && \
|
||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tmp/tini.asc && \
|
||||
export GNUPGHOME="$(mktemp -d)" && \
|
||||
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||
hkp://p80.pool.sks-keyservers.net:80 \
|
||||
ipv4.pool.sks-keyservers.net \
|
||||
keyserver.ubuntu.com \
|
||||
keyserver.pgp.com \
|
||||
pgp.mit.edu) ; do \
|
||||
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||
done && \
|
||||
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||
chmod +x /sbin/tini && \
|
||||
dnf -y clean all && \
|
||||
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
||||
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
|
||||
@ -132,7 +119,7 @@ WORKDIR /var/lib/zabbix
|
||||
|
||||
COPY ["docker-entrypoint.sh", "/usr/bin/"]
|
||||
|
||||
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
|
||||
USER 1997
|
||||
|
||||
|
||||
@ -7,7 +7,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
|
||||
ENV TINI_VERSION=v0.19.0
|
||||
|
||||
LABEL name="zabbix/zabbix-agent2-trunk" \
|
||||
maintainer="alexey.pustovalov@zabbix.com" \
|
||||
@ -40,13 +39,15 @@ STOPSIGNAL SIGTERM
|
||||
COPY ["licenses", "/licenses"]
|
||||
|
||||
RUN set -eux && INSTALL_PKGS="bash \
|
||||
tini \
|
||||
tzdata \
|
||||
iputils \
|
||||
pcre \
|
||||
libcurl" && \
|
||||
REPOLIST="ubi-8-baseos,ubi-8-appstream" && \
|
||||
REPOLIST="ubi-8-baseos,ubi-8-appstream,epel" && \
|
||||
dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
|
||||
--security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \
|
||||
dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
|
||||
dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
|
||||
--setopt=tsflags=nodocs ${INSTALL_PKGS} && \
|
||||
groupadd --system --gid 1995 zabbix && \
|
||||
@ -63,20 +64,6 @@ RUN set -eux && INSTALL_PKGS="bash \
|
||||
mkdir -p /var/lib/zabbix/enc && \
|
||||
mkdir -p /var/lib/zabbix/modules && \
|
||||
mkdir -p /var/lib/zabbix/buffer && \
|
||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tmp/tini.asc && \
|
||||
export GNUPGHOME="$(mktemp -d)" && \
|
||||
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||
hkp://p80.pool.sks-keyservers.net:80 \
|
||||
ipv4.pool.sks-keyservers.net \
|
||||
keyserver.ubuntu.com \
|
||||
keyserver.pgp.com \
|
||||
pgp.mit.edu) ; do \
|
||||
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||
done && \
|
||||
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||
chmod +x /sbin/tini && \
|
||||
dnf -y clean all && \
|
||||
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
||||
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
|
||||
@ -140,7 +127,7 @@ VOLUME ["/var/lib/zabbix/enc"]
|
||||
|
||||
COPY ["docker-entrypoint.sh", "/usr/bin/"]
|
||||
|
||||
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
|
||||
USER 1997
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||
MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
|
||||
ENV TINI_VERSION=v0.19.0
|
||||
|
||||
LABEL name="zabbix/zabbix-proxy-mysql-trunk" \
|
||||
maintainer="alexey.pustovalov@zabbix.com" \
|
||||
@ -35,12 +34,13 @@ LABEL name="zabbix/zabbix-proxy-mysql-trunk" \
|
||||
org.label-schema.version="${ZBX_VERSION}" \
|
||||
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
||||
org.label-schema.docker.cmd="docker run --name zabbix-proxy --link mysql-server:mysql-server -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-trunk:${ZBX_VERSION}"
|
||||
|
||||
|
||||
STOPSIGNAL SIGTERM
|
||||
|
||||
COPY ["licenses", "/licenses"]
|
||||
|
||||
RUN set -eux && INSTALL_PKGS="bash \
|
||||
tini \
|
||||
fping \
|
||||
iputils \
|
||||
libcurl \
|
||||
@ -82,20 +82,6 @@ RUN set -eux && INSTALL_PKGS="bash \
|
||||
mkdir -p /var/lib/zabbix/ssl/keys && \
|
||||
mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
|
||||
mkdir -p /usr/share/doc/zabbix-proxy-mysql && \
|
||||
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||
export GNUPGHOME="$(mktemp -d)" && \
|
||||
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||
hkp://p80.pool.sks-keyservers.net:80 \
|
||||
ipv4.pool.sks-keyservers.net \
|
||||
keyserver.ubuntu.com \
|
||||
keyserver.pgp.com \
|
||||
pgp.mit.edu) ; do \
|
||||
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||
done && \
|
||||
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||
chmod +x /sbin/tini && \
|
||||
dnf -y clean all && \
|
||||
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
||||
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
|
||||
@ -171,7 +157,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"]
|
||||
|
||||
COPY ["docker-entrypoint.sh", "/usr/bin/"]
|
||||
|
||||
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
|
||||
USER 1997
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||
MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
|
||||
ENV TINI_VERSION=v0.19.0
|
||||
|
||||
LABEL name="zabbix/zabbix-proxy-sqlite-trunk" \
|
||||
maintainer="alexey.pustovalov@zabbix.com" \
|
||||
@ -41,6 +40,7 @@ STOPSIGNAL SIGTERM
|
||||
COPY ["licenses", "/licenses"]
|
||||
|
||||
RUN set -eux && INSTALL_PKGS="bash \
|
||||
tini \
|
||||
fping \
|
||||
iputils \
|
||||
libcurl \
|
||||
@ -80,20 +80,6 @@ RUN set -eux && INSTALL_PKGS="bash \
|
||||
mkdir -p /var/lib/zabbix/ssl/certs && \
|
||||
mkdir -p /var/lib/zabbix/ssl/keys && \
|
||||
mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
|
||||
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||
export GNUPGHOME="$(mktemp -d)" && \
|
||||
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||
hkp://p80.pool.sks-keyservers.net:80 \
|
||||
ipv4.pool.sks-keyservers.net \
|
||||
keyserver.ubuntu.com \
|
||||
keyserver.pgp.com \
|
||||
pgp.mit.edu) ; do \
|
||||
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||
done && \
|
||||
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||
chmod +x /sbin/tini && \
|
||||
dnf -y clean all && \
|
||||
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
||||
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
|
||||
@ -166,7 +152,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"]
|
||||
|
||||
COPY ["docker-entrypoint.sh", "/usr/bin/"]
|
||||
|
||||
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
|
||||
USER 1997
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}
|
||||
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
|
||||
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
|
||||
MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
|
||||
ENV TINI_VERSION=v0.19.0
|
||||
|
||||
LABEL name="zabbix/zabbix-server-mysql-trunk" \
|
||||
maintainer="alexey.pustovalov@zabbix.com" \
|
||||
@ -41,6 +40,7 @@ STOPSIGNAL SIGTERM
|
||||
COPY ["licenses", "/licenses"]
|
||||
|
||||
RUN set -eux && INSTALL_PKGS="bash \
|
||||
tini \
|
||||
fping \
|
||||
tzdata \
|
||||
iputils \
|
||||
@ -84,20 +84,6 @@ RUN set -eux && INSTALL_PKGS="bash \
|
||||
mkdir -p /var/lib/zabbix/ssl/keys && \
|
||||
mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
|
||||
mkdir -p /usr/share/doc/zabbix-server-mysql && \
|
||||
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||
export GNUPGHOME="$(mktemp -d)" && \
|
||||
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||
hkp://p80.pool.sks-keyservers.net:80 \
|
||||
ipv4.pool.sks-keyservers.net \
|
||||
keyserver.ubuntu.com \
|
||||
keyserver.pgp.com \
|
||||
pgp.mit.edu) ; do \
|
||||
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||
done && \
|
||||
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||
chmod +x /sbin/tini && \
|
||||
dnf -y clean all && \
|
||||
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
||||
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
|
||||
@ -175,7 +161,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"]
|
||||
|
||||
COPY ["docker-entrypoint.sh", "/usr/bin/"]
|
||||
|
||||
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
|
||||
|
||||
USER 1997
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user