Merge pull request #1303 from zabbix/trunk_tzdata

Added tzdata package for most of images

Dockerfiles/agent/centos/Dockerfile

@@ -34,7 +34,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf", "/etc
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
     INSTALL_PKGS="bash \
-            tzdata \
             iputils \
             pcre2 \
             libcurl-minimal \
@@ -58,6 +57,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --setopt=keepcache=0 \
         --best \
         --nodocs ${INSTALL_PKGS} && \
+    microdnf -y reinstall \
+            --enablerepo "baseos" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --setopt=tsflags=nodocs \
+        tzdata && \
     groupadd \
             --system \
             --gid 1995 \

Dockerfiles/agent2/alpine/Dockerfile

@@ -37,8 +37,8 @@ COPY --from=builder ["/tmp/mongodb_plugin/zabbix-agent2-plugin-mongodb", "/usr/s
 COPY --from=builder ["/tmp/postgresql_plugin/zabbix-agent2-plugin-postgresql", "/usr/sbin/zabbix-agent2-plugin/zabbix-agent2-plugin-postgresql"]
 
 RUN set -eux && \
-    INSTALL_PKGS="tzdata \
+    INSTALL_PKGS="bash \
-            bash \
+            tzdata \
             pcre2 \
             coreutils \
             smartmontools \

Dockerfiles/agent2/centos/Dockerfile

@@ -39,7 +39,6 @@ COPY --from=builder ["/tmp/postgresql_plugin/zabbix-agent2-plugin-postgresql", "
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
     INSTALL_PKGS="bash \
-            tzdata \
             iputils \
             pcre2 \
             libcurl-minimal \
@@ -63,6 +62,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --setopt=keepcache=0 \
         --best \
         --nodocs ${INSTALL_PKGS} && \
+    microdnf -y reinstall \
+            --enablerepo "baseos" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --setopt=tsflags=nodocs \
+        tzdata && \
     groupadd \
             --system \
             --gid 1995 \

Dockerfiles/proxy-mysql/alpine/Dockerfile

@@ -36,6 +36,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql
 
 RUN set -eux && \
     INSTALL_PKGS="bash \
+            tzdata \
             traceroute \
             nmap \
             iputils \

Dockerfiles/proxy-mysql/centos/Dockerfile

@@ -71,6 +71,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --setopt=keepcache=0 \
         --best \
         --nodocs ${INSTALL_PKGS} && \
+    microdnf -y reinstall \
+            --enablerepo "baseos" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --setopt=tsflags=nodocs \
+        tzdata && \
     groupadd \
             --system \
             --gid 1995 \

Dockerfiles/proxy-mysql/ubuntu/Dockerfile

@@ -39,6 +39,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     set -eux && \
     echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     INSTALL_PKGS="bash \
+            tzdata \
             traceroute \
             nmap \
             ca-certificates \

Dockerfiles/proxy-sqlite3/alpine/Dockerfile

@@ -35,6 +35,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/
 
 RUN set -eux && \
     INSTALL_PKGS="bash \
+            tzdata \
             traceroute \
             nmap \
             fping \

Dockerfiles/proxy-sqlite3/centos/Dockerfile

@@ -35,7 +35,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/
 
 RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
     set -eux && \
-    INSTALL_PKGS="libevent \
+    INSTALL_PKGS="bash \
+            libevent \
             traceroute \
             nmap \
             libssh \
@@ -66,6 +67,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --setopt=keepcache=0 \
         --best \
         --nodocs ${INSTALL_PKGS} && \
+    microdnf -y reinstall \
+            --enablerepo "baseos" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --setopt=tsflags=nodocs \
+        tzdata && \
     groupadd \
             --system \
             --gid 1995 \

Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile

@@ -37,6 +37,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     set -eux && \
     echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     INSTALL_PKGS="bash \
+            tzdata \
             traceroute \
             nmap \
             ca-certificates \

Dockerfiles/server-mysql/centos/Dockerfile

@@ -40,7 +40,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             traceroute \
             nmap \
             file-libs \
-            tzdata \
             iputils \
             traceroute \
             libpsl \
@@ -78,6 +77,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --setopt=keepcache=0 \
         --best \
         --nodocs ${INSTALL_PKGS} && \
+    microdnf -y reinstall \
+            --enablerepo "baseos" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --setopt=tsflags=nodocs \
+        tzdata && \
     microdnf download libcurl && \
     rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \
     microdnf remove -y libcurl-minimal && \

Dockerfiles/server-pgsql/centos/Dockerfile

@@ -44,7 +44,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             traceroute \
             nmap \
             iputils \
-            tzdata \
             traceroute \
             libevent \
             libssh \
@@ -78,6 +77,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
         --setopt=keepcache=0 \
         --best \
         --nodocs ${INSTALL_PKGS} && \
+    microdnf -y reinstall \
+            --enablerepo "baseos" \
+            --setopt=install_weak_deps=0 \
+            --setopt=keepcache=0 \
+            --best \
+            --setopt=tsflags=nodocs \
+        tzdata && \
     microdnf download libcurl && \
     rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \
     microdnf remove -y libcurl-minimal && \

Dockerfiles/web-apache-mysql/alpine/Dockerfile

@@ -31,6 +31,7 @@ COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
     INSTALL_PKGS="bash \
+            tzdata \
             apache2 \
             curl \
             mariadb-client \

Dockerfiles/web-apache-mysql/centos/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1
+# syntax=docker/dockerfile:1c
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}

Dockerfiles/web-apache-mysql/ubuntu/Dockerfile

@@ -33,6 +33,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     set -eux && \
     echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     INSTALL_PKGS="bash \
+            tzdata \
             apache2 \
             curl \
             libapache2-mod-php \

Dockerfiles/web-apache-pgsql/alpine/Dockerfile

@@ -31,6 +31,7 @@ COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
     INSTALL_PKGS="bash \
+            tzdata \
             apache2 \
             curl \
             php83-apache2 \

Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile

@@ -33,6 +33,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     set -eux && \
     echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     INSTALL_PKGS="bash \
+            tzdata \
             apache2 \
             curl \
             libapache2-mod-php \

Dockerfiles/web-nginx-mysql/alpine/Dockerfile

@@ -31,6 +31,7 @@ COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
     INSTALL_PKGS="bash \
+            tzdata \
             curl \
             mariadb-client \
             mariadb-connector-c \

Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile

@@ -33,6 +33,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     set -eux && \
     echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     INSTALL_PKGS="bash \
+            tzdata \
             ca-certificates \
             curl \
             mysql-client \

Dockerfiles/web-nginx-pgsql/alpine/Dockerfile

@@ -31,6 +31,7 @@ COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
     INSTALL_PKGS="bash \
+            tzdata \
             curl \
             nginx \
             php83-bcmath \

Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile

@@ -33,6 +33,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     set -eux && \
     echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     INSTALL_PKGS="bash \
+            tzdata \
             ca-certificates \
             curl \
             nginx \