mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-02-27 23:30:52 +01:00
Merge pull request #1305 from zabbix/64_tzdata
Added tzdata package for most of images
This commit is contained in:
commit
b02c4e3e05
@ -35,7 +35,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
tzdata \
|
|
||||||
iputils \
|
iputils \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
libcurl-minimal \
|
libcurl-minimal \
|
||||||
@ -59,6 +58,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
--best \
|
--best \
|
||||||
--nodocs ${INSTALL_PKGS} && \
|
--nodocs ${INSTALL_PKGS} && \
|
||||||
|
microdnf -y reinstall \
|
||||||
|
--enablerepo "baseos" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--setopt=keepcache=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
groupadd \
|
groupadd \
|
||||||
--system \
|
--system \
|
||||||
--gid 1995 \
|
--gid 1995 \
|
||||||
|
@ -38,6 +38,7 @@ COPY --from=builder ["/tmp/postgresql_plugin/zabbix-agent2-plugin-postgresql", "
|
|||||||
|
|
||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
INSTALL_PKGS="tini \
|
INSTALL_PKGS="tini \
|
||||||
|
bash \
|
||||||
tzdata \
|
tzdata \
|
||||||
bash \
|
bash \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
|
@ -40,7 +40,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
tzdata \
|
|
||||||
iputils \
|
iputils \
|
||||||
pcre2 \
|
pcre2 \
|
||||||
libcurl-minimal \
|
libcurl-minimal \
|
||||||
@ -64,6 +63,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
--best \
|
--best \
|
||||||
--nodocs ${INSTALL_PKGS} && \
|
--nodocs ${INSTALL_PKGS} && \
|
||||||
|
microdnf -y reinstall \
|
||||||
|
--enablerepo "baseos" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--setopt=keepcache=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
groupadd \
|
groupadd \
|
||||||
--system \
|
--system \
|
||||||
--gid 1995 \
|
--gid 1995 \
|
||||||
|
@ -37,6 +37,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql
|
|||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
|
tzdata \
|
||||||
traceroute \
|
traceroute \
|
||||||
nmap \
|
nmap \
|
||||||
iputils \
|
iputils \
|
||||||
|
@ -72,6 +72,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
--best \
|
--best \
|
||||||
--nodocs ${INSTALL_PKGS} && \
|
--nodocs ${INSTALL_PKGS} && \
|
||||||
|
microdnf -y reinstall \
|
||||||
|
--enablerepo "baseos" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--setopt=keepcache=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
groupadd \
|
groupadd \
|
||||||
--system \
|
--system \
|
||||||
--gid 1995 \
|
--gid 1995 \
|
||||||
|
@ -40,6 +40,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
|
|||||||
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
|
tzdata \
|
||||||
traceroute \
|
traceroute \
|
||||||
nmap \
|
nmap \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
@ -36,6 +36,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/
|
|||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
|
tzdata \
|
||||||
traceroute \
|
traceroute \
|
||||||
nmap \
|
nmap \
|
||||||
fping \
|
fping \
|
||||||
|
@ -35,8 +35,9 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/
|
|||||||
|
|
||||||
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
||||||
set -eux && \
|
set -eux && \
|
||||||
INSTALL_PKGS="libevent \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
|
libevent \
|
||||||
traceroute \
|
traceroute \
|
||||||
nmap \
|
nmap \
|
||||||
libssh \
|
libssh \
|
||||||
@ -67,6 +68,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
--best \
|
--best \
|
||||||
--nodocs ${INSTALL_PKGS} && \
|
--nodocs ${INSTALL_PKGS} && \
|
||||||
|
microdnf -y reinstall \
|
||||||
|
--enablerepo "baseos" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--setopt=keepcache=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
groupadd \
|
groupadd \
|
||||||
--system \
|
--system \
|
||||||
--gid 1995 \
|
--gid 1995 \
|
||||||
|
@ -38,6 +38,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
|
|||||||
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
|
tzdata \
|
||||||
traceroute \
|
traceroute \
|
||||||
nmap \
|
nmap \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
@ -41,7 +41,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
traceroute \
|
traceroute \
|
||||||
nmap \
|
nmap \
|
||||||
file-libs \
|
file-libs \
|
||||||
tzdata \
|
|
||||||
iputils \
|
iputils \
|
||||||
traceroute \
|
traceroute \
|
||||||
libpsl \
|
libpsl \
|
||||||
@ -79,6 +78,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
--best \
|
--best \
|
||||||
--nodocs ${INSTALL_PKGS} && \
|
--nodocs ${INSTALL_PKGS} && \
|
||||||
|
microdnf -y reinstall \
|
||||||
|
--enablerepo "baseos" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--setopt=keepcache=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
microdnf download libcurl && \
|
microdnf download libcurl && \
|
||||||
rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \
|
rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \
|
||||||
microdnf remove -y libcurl-minimal && \
|
microdnf remove -y libcurl-minimal && \
|
||||||
|
@ -46,7 +46,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
traceroute \
|
traceroute \
|
||||||
nmap \
|
nmap \
|
||||||
iputils \
|
iputils \
|
||||||
tzdata \
|
|
||||||
traceroute \
|
traceroute \
|
||||||
libevent \
|
libevent \
|
||||||
libssh \
|
libssh \
|
||||||
@ -80,6 +79,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||||||
--setopt=keepcache=0 \
|
--setopt=keepcache=0 \
|
||||||
--best \
|
--best \
|
||||||
--nodocs ${INSTALL_PKGS} && \
|
--nodocs ${INSTALL_PKGS} && \
|
||||||
|
microdnf -y reinstall \
|
||||||
|
--enablerepo "baseos" \
|
||||||
|
--setopt=install_weak_deps=0 \
|
||||||
|
--setopt=keepcache=0 \
|
||||||
|
--best \
|
||||||
|
--setopt=tsflags=nodocs \
|
||||||
|
tzdata && \
|
||||||
microdnf download libcurl && \
|
microdnf download libcurl && \
|
||||||
rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \
|
rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \
|
||||||
microdnf remove -y libcurl-minimal && \
|
microdnf remove -y libcurl-minimal && \
|
||||||
|
@ -31,6 +31,7 @@ COPY ["conf/etc/", "/etc/"]
|
|||||||
|
|
||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
|
tzdata \
|
||||||
apache2 \
|
apache2 \
|
||||||
curl \
|
curl \
|
||||||
mariadb-client \
|
mariadb-client \
|
||||||
|
@ -33,6 +33,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
|
|||||||
set -eux && \
|
set -eux && \
|
||||||
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
|
tzdata \
|
||||||
apache2 \
|
apache2 \
|
||||||
curl \
|
curl \
|
||||||
libapache2-mod-php \
|
libapache2-mod-php \
|
||||||
|
@ -31,6 +31,7 @@ COPY ["conf/etc/", "/etc/"]
|
|||||||
|
|
||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
|
tzdata \
|
||||||
apache2 \
|
apache2 \
|
||||||
curl \
|
curl \
|
||||||
php81-apache2 \
|
php81-apache2 \
|
||||||
|
@ -33,6 +33,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
|
|||||||
set -eux && \
|
set -eux && \
|
||||||
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
|
tzdata \
|
||||||
apache2 \
|
apache2 \
|
||||||
curl \
|
curl \
|
||||||
libapache2-mod-php \
|
libapache2-mod-php \
|
||||||
|
@ -31,6 +31,7 @@ COPY ["conf/etc/", "/etc/"]
|
|||||||
|
|
||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
|
tzdata \
|
||||||
curl \
|
curl \
|
||||||
mariadb-client \
|
mariadb-client \
|
||||||
mariadb-connector-c \
|
mariadb-connector-c \
|
||||||
|
@ -33,6 +33,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
|
|||||||
set -eux && \
|
set -eux && \
|
||||||
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
|
tzdata \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
mysql-client \
|
mysql-client \
|
||||||
|
@ -31,6 +31,7 @@ COPY ["conf/etc/", "/etc/"]
|
|||||||
|
|
||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
|
tzdata \
|
||||||
curl \
|
curl \
|
||||||
nginx \
|
nginx \
|
||||||
php81-bcmath \
|
php81-bcmath \
|
||||||
|
@ -33,6 +33,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
|
|||||||
set -eux && \
|
set -eux && \
|
||||||
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
|
tzdata \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
nginx \
|
nginx \
|
||||||
|
Loading…
Reference in New Issue
Block a user