Using EPEL to install tini package on OEL based images

This commit is contained in:
Alexey Pustovalov 2021-09-12 08:39:47 +02:00
parent 498f3d02ee
commit 9a2e0c9a0d
6 changed files with 18 additions and 160 deletions

View File

@ -9,19 +9,9 @@ LABEL org.opencontainers.image.title="Zabbix agent" \
STOPSIGNAL SIGTERM
ENV TINI_VERSION=v0.19.0
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
i686) export ARCH_SUFFIX='i386' ;; \
x86_64) [ -f /lib64/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
aarch64) export ARCH_SUFFIX='arm64' ;; \
armv7l) export ARCH_SUFFIX='armhf' ;; \
ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
s390x) export ARCH_SUFFIX='s390x' ;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
groupadd --system --gid 1995 zabbix && \
useradd \
--system --comment "Zabbix monitoring system" \
@ -39,6 +29,7 @@ RUN set -eux && \
echo "" > /etc/yum/vars/ociregion && \
echo "oracle.com" > /etc/yum/vars/ocidomain && \
INSTALL_PKGS="bash \
tini \
tzdata \
iputils \
pcre \
@ -47,21 +38,8 @@ RUN set -eux && \
zlib" && \
microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.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 -rf "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
microdnf -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
@ -131,7 +109,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

View File

@ -9,19 +9,9 @@ LABEL org.opencontainers.image.title="Zabbix agent 2" \
STOPSIGNAL SIGTERM
ENV TINI_VERSION=v0.19.0
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
i686) export ARCH_SUFFIX='i386' ;; \
x86_64) [ -f /lib64/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
aarch64) export ARCH_SUFFIX='arm64' ;; \
armv7l) export ARCH_SUFFIX='armhf' ;; \
ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
s390x) export ARCH_SUFFIX='s390x' ;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
groupadd --system --gid 1995 zabbix && \
useradd \
--system --comment "Zabbix monitoring system" \
@ -40,6 +30,7 @@ RUN set -eux && \
echo "" > /etc/yum/vars/ociregion && \
echo "oracle.com" > /etc/yum/vars/ocidomain && \
INSTALL_PKGS="bash \
tini \
tzdata \
iputils \
pcre \
@ -47,21 +38,8 @@ RUN set -eux && \
openssl-libs" && \
microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.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 -rf "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
microdnf -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
@ -137,7 +115,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

View File

@ -9,21 +9,9 @@ LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
STOPSIGNAL SIGTERM
ENV TINI_VERSION=v0.19.0
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
i686) export ARCH_SUFFIX='i386' ;; \
x86_64) [ -f /lib64/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
aarch64) export ARCH_SUFFIX='arm64' ;; \
armv7l) export ARCH_SUFFIX='armhf' ;; \
ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
s390x) export ARCH_SUFFIX='s390x' ;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
groupadd --system --gid 1995 zabbix && \
useradd \
--system --comment "Zabbix monitoring system" \
@ -50,6 +38,7 @@ RUN set -eux && \
echo "oracle.com" > /etc/yum/vars/ocidomain && \
microdnf -y module enable mysql && \
INSTALL_PKGS="libevent \
tini \
systemd \
libssh \
file-libs \
@ -68,20 +57,6 @@ RUN set -eux && \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.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 -rf "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
microdnf -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 +146,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

View File

@ -14,16 +14,6 @@ ENV TINI_VERSION=v0.19.0
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
i686) export ARCH_SUFFIX='i386' ;; \
x86_64) [ -f /lib64/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
aarch64) export ARCH_SUFFIX='arm64' ;; \
armv7l) export ARCH_SUFFIX='armhf' ;; \
ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
s390x) export ARCH_SUFFIX='s390x' ;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
groupadd --system --gid 1995 zabbix && \
useradd \
--system --comment "Zabbix monitoring system" \
@ -50,6 +40,7 @@ RUN set -eux && \
echo "" > /etc/yum/vars/ociregion && \
echo "oracle.com" > /etc/yum/vars/ocidomain && \
INSTALL_PKGS="libevent \
tini \
libssh \
fping \
file-libs \
@ -66,20 +57,6 @@ RUN set -eux && \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.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 -rf "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
microdnf -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
@ -169,7 +146,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

View File

@ -9,21 +9,9 @@ LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
STOPSIGNAL SIGTERM
ENV TINI_VERSION=v0.19.0
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
i686) export ARCH_SUFFIX='i386' ;; \
x86_64) [ -f /lib64/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
aarch64) export ARCH_SUFFIX='arm64' ;; \
armv7l) export ARCH_SUFFIX='armhf' ;; \
ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
s390x) export ARCH_SUFFIX='s390x' ;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
groupadd --system --gid 1995 zabbix && \
useradd \
--system --comment "Zabbix monitoring system" \
@ -52,6 +40,7 @@ RUN set -eux && \
echo "oracle.com" > /etc/yum/vars/ocidomain && \
microdnf -y module enable mysql && \
INSTALL_PKGS="fping \
tini \
file-libs \
tzdata \
iputils \
@ -73,20 +62,6 @@ RUN set -eux && \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.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 -rf "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
microdnf -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
@ -178,7 +153,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

View File

@ -9,21 +9,9 @@ LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
STOPSIGNAL SIGTERM
ENV TINI_VERSION=v0.19.0
COPY ["conf/etc/yum.repos.d/oracle-epel-ol8.repo", "/etc/yum.repos.d/oracle-epel-ol8.repo"]
RUN set -eux && \
ARCH_SUFFIX="$(arch)"; \
case "$ARCH_SUFFIX" in \
i686) export ARCH_SUFFIX='i386' ;; \
x86_64) [ -f /lib64/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
aarch64) export ARCH_SUFFIX='arm64' ;; \
armv7l) export ARCH_SUFFIX='armhf' ;; \
ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
s390x) export ARCH_SUFFIX='s390x' ;; \
*) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
esac; \
groupadd --system --gid 1995 zabbix && \
useradd \
--system --comment "Zabbix monitoring system" \
@ -52,6 +40,7 @@ RUN set -eux && \
echo "oracle.com" > /etc/yum/vars/ocidomain && \
INSTALL_PKGS="fping \
file-libs \
tini \
iputils \
tzdata \
traceroute \
@ -71,20 +60,6 @@ RUN set -eux && \
--enablerepo="ol8_appstream" \
--enablerepo="ol8_developer_EPEL" \
install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.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 -rf "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
microdnf -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
@ -177,8 +152,8 @@ 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
CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"]