extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-01-08 06:40:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Using EPEL to install tini package on RHEL based images

Browse Source
This commit is contained in:
Alexey Pustovalov 2021-09-12 09:16:21 -04:00
parent a249a56059
commit c4bb5eb73b
5 changed files with 15 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
agent/rhel/Dockerfile
View File

@ -7,7 +7,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.15
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
ENV TINI_VERSION=v0.19.0
LABEL name="zabbix/zabbix-agent-50" \ LABEL name="zabbix/zabbix-agent-50" \
maintainer="alexey.pustovalov@zabbix.com" \ maintainer="alexey.pustovalov@zabbix.com" \
@ -40,13 +39,15 @@ STOPSIGNAL SIGTERM
COPY ["licenses", "/licenses"] COPY ["licenses", "/licenses"]
RUN set -eux && INSTALL_PKGS="bash \ RUN set -eux && INSTALL_PKGS="bash \
tini \
tzdata \ tzdata \
iputils \ iputils \
pcre \ pcre \
libcurl" && \ 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 \ dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
--security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \ --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 \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
--setopt=tsflags=nodocs ${INSTALL_PKGS} && \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
groupadd --system --gid 1995 zabbix && \ 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 && \
mkdir -p /var/lib/zabbix/enc && \ mkdir -p /var/lib/zabbix/enc && \
mkdir -p /var/lib/zabbix/modules && \ 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 && \ dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ 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 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/"] 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 USER 1997

21
agent2/rhel/Dockerfile
View File

@ -7,7 +7,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.15
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
ENV TINI_VERSION=v0.19.0
LABEL name="zabbix/zabbix-agent2-50" \ LABEL name="zabbix/zabbix-agent2-50" \
maintainer="alexey.pustovalov@zabbix.com" \ maintainer="alexey.pustovalov@zabbix.com" \
@ -40,13 +39,15 @@ STOPSIGNAL SIGTERM
COPY ["licenses", "/licenses"] COPY ["licenses", "/licenses"]
RUN set -eux && INSTALL_PKGS="bash \ RUN set -eux && INSTALL_PKGS="bash \
tini \
tzdata \ tzdata \
iputils \ iputils \
pcre \ pcre \
libcurl" && \ 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 \ dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \
--security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \ --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 \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
--setopt=tsflags=nodocs ${INSTALL_PKGS} && \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
groupadd --system --gid 1995 zabbix && \ 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/enc && \
mkdir -p /var/lib/zabbix/modules && \ mkdir -p /var/lib/zabbix/modules && \
mkdir -p /var/lib/zabbix/buffer && \ 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 && \ dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ 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 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/"] 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 USER 1997

18
proxy-mysql/rhel/Dockerfile
View File

@ -8,7 +8,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.15
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
ENV TINI_VERSION=v0.19.0
LABEL name="zabbix/zabbix-proxy-mysql-50" \ LABEL name="zabbix/zabbix-proxy-mysql-50" \
maintainer="alexey.pustovalov@zabbix.com" \ maintainer="alexey.pustovalov@zabbix.com" \
@ -41,6 +40,7 @@ STOPSIGNAL SIGTERM
COPY ["licenses", "/licenses"] COPY ["licenses", "/licenses"]
RUN set -eux && INSTALL_PKGS="bash \ RUN set -eux && INSTALL_PKGS="bash \
tini \
fping \ fping \
iputils \ iputils \
libcurl \ libcurl \
@ -82,20 +82,6 @@ RUN set -eux && INSTALL_PKGS="bash \
mkdir -p /var/lib/zabbix/ssl/keys && \ mkdir -p /var/lib/zabbix/ssl/keys && \
mkdir -p /var/lib/zabbix/ssl/ssl_ca && \ mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
mkdir -p /usr/share/doc/zabbix-proxy-mysql && \ 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 && \ dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ 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 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/"] 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 USER 1997

18
proxy-sqlite3/rhel/Dockerfile
View File

@ -8,7 +8,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.15
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
ENV TINI_VERSION=v0.19.0
LABEL name="zabbix/zabbix-proxy-sqlite-50" \ LABEL name="zabbix/zabbix-proxy-sqlite-50" \
maintainer="alexey.pustovalov@zabbix.com" \ maintainer="alexey.pustovalov@zabbix.com" \
@ -41,6 +40,7 @@ STOPSIGNAL SIGTERM
COPY ["licenses", "/licenses"] COPY ["licenses", "/licenses"]
RUN set -eux && INSTALL_PKGS="bash \ RUN set -eux && INSTALL_PKGS="bash \
tini \
fping \ fping \
iputils \ iputils \
libcurl \ libcurl \
@ -80,20 +80,6 @@ RUN set -eux && INSTALL_PKGS="bash \
mkdir -p /var/lib/zabbix/ssl/certs && \ mkdir -p /var/lib/zabbix/ssl/certs && \
mkdir -p /var/lib/zabbix/ssl/keys && \ mkdir -p /var/lib/zabbix/ssl/keys && \
mkdir -p /var/lib/zabbix/ssl/ssl_ca && \ 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 && \ dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ 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 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/"] 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 USER 1997

18
server-mysql/rhel/Dockerfile
View File

@ -8,7 +8,6 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.15
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \ ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
ENV TINI_VERSION=v0.19.0
LABEL name="zabbix/zabbix-server-mysql-50" \ LABEL name="zabbix/zabbix-server-mysql-50" \
maintainer="alexey.pustovalov@zabbix.com" \ maintainer="alexey.pustovalov@zabbix.com" \
@ -41,6 +40,7 @@ STOPSIGNAL SIGTERM
COPY ["licenses", "/licenses"] COPY ["licenses", "/licenses"]
RUN set -eux && INSTALL_PKGS="bash \ RUN set -eux && INSTALL_PKGS="bash \
tini \
fping \ fping \
tzdata \ tzdata \
iputils \ iputils \
@ -84,20 +84,6 @@ RUN set -eux && INSTALL_PKGS="bash \
mkdir -p /var/lib/zabbix/ssl/keys && \ mkdir -p /var/lib/zabbix/ssl/keys && \
mkdir -p /var/lib/zabbix/ssl/ssl_ca && \ mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
mkdir -p /usr/share/doc/zabbix-server-mysql && \ 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 && \ dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ 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 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/"] 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 USER 1997