From 9ae427f4ea00f02eb8dcbe34cd0d7b11a01aa2e1 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 28 Feb 2024 18:05:16 +0900 Subject: [PATCH 1/2] Added SBOM for images --- .github/workflows/images_build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index 0453d5645..8dd05d6bc 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -511,6 +511,8 @@ jobs: file: ${{ format('{0}/{1}/{2}/Dockerfile', env.DOCKERFILES_DIRECTORY, env.BASE_BUILD_NAME, matrix.os) }} platforms: ${{ steps.platform.outputs.list }} push: true + provenance: mode=max + sbom: true tags: ${{ steps.meta.outputs.tags }} labels: | org.opencontainers.image.revision=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} @@ -761,6 +763,8 @@ jobs: file: ${{ format('{0}/{1}/{2}/Dockerfile', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }} platforms: ${{ steps.platform.outputs.list }} push: true + provenance: mode=max + sbom: true tags: ${{ steps.meta.outputs.tags }} build-args: BUILD_BASE_IMAGE=${{ steps.base_build.outputs.base_build_image }} labels: | @@ -1218,6 +1222,8 @@ jobs: file: ${{ format('{0}/{1}/{2}/Dockerfile', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }} platforms: ${{ steps.platform.outputs.list }} push: ${{ env.AUTO_PUSH_IMAGES == 'true' }} + provenance: mode=max + sbom: ${{ env.AUTO_PUSH_IMAGES == 'true' }} tags: ${{ steps.meta.outputs.tags }} build-args: BUILD_BASE_IMAGE=${{ steps.base_build.outputs.base_build_image }} labels: | From 2f4f382092518f5c9312bff215a0f686d1d90958 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 22 Mar 2024 14:53:18 +0900 Subject: [PATCH 2/2] Updated tzdata and sbom --- Dockerfiles/agent/centos/Dockerfile | 8 +++++++- Dockerfiles/agent/rhel/Dockerfile | 11 ++++++++++- Dockerfiles/agent2/alpine/Dockerfile | 4 ++-- Dockerfiles/agent2/centos/Dockerfile | 8 +++++++- Dockerfiles/agent2/rhel/Dockerfile | 11 ++++++++++- Dockerfiles/proxy-mysql/alpine/Dockerfile | 1 + Dockerfiles/proxy-mysql/centos/Dockerfile | 7 +++++++ Dockerfiles/proxy-mysql/rhel/Dockerfile | 13 ++++++++++++- Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 1 + Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 1 + Dockerfiles/proxy-sqlite3/centos/Dockerfile | 10 +++++++++- Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 1 + Dockerfiles/server-mysql/centos/Dockerfile | 8 +++++++- Dockerfiles/server-mysql/rhel/Dockerfile | 11 ++++++++++- Dockerfiles/server-pgsql/centos/Dockerfile | 8 +++++++- Dockerfiles/snmptraps/centos/Dockerfile | 8 +++++++- Dockerfiles/snmptraps/rhel/Dockerfile | 18 +++++++++++++++++- Dockerfiles/web-apache-mysql/alpine/Dockerfile | 1 + Dockerfiles/web-apache-mysql/centos/Dockerfile | 7 +++++++ Dockerfiles/web-apache-mysql/ubuntu/Dockerfile | 1 + Dockerfiles/web-apache-pgsql/alpine/Dockerfile | 1 + Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile | 1 + Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 1 + Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 13 +++++++++++-- Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile | 1 + Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 1 + Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 1 + 27 files changed, 142 insertions(+), 15 deletions(-) diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index 2e762761a..ea4044f67 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -36,7 +36,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ REPOLIST="baseos,appstream,epel" && \ INSTALL_PKGS="bash \ tini \ - tzdata \ iputils \ pcre2 \ libcurl-minimal \ @@ -51,6 +50,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=False \ --best \ ${INSTALL_PKGS} && \ + dnf -y reinstall \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --setopt=tsflags=nodocs \ + --setopt=install_weak_deps=False \ + --best \ + tzdata && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index ece8ec739..b54be8fb7 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -54,7 +54,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ tini \ - tzdata \ iputils \ shadow-utils \ pcre2 \ @@ -72,7 +71,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ + microdnf -y update \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ + --enablerepo "ubi-8-baseos-rpms" \ + --setopt=install_weak_deps=0 \ + --best \ + --setopt=tsflags=nodocs \ + tzdata && \ microdnf -y reinstall \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index 3e567c1e0..812b1c844 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -37,9 +37,9 @@ 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="tini \ + INSTALL_PKGS="bash \ + tini \ tzdata \ - bash \ pcre2 \ coreutils \ smartmontools \ diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index d1a0cf0c7..08b09fbce 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -41,7 +41,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ REPOLIST="baseos,appstream,epel" && \ INSTALL_PKGS="bash \ tini \ - tzdata \ iputils \ pcre2 \ libcurl-minimal \ @@ -56,6 +55,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=False \ --best \ ${INSTALL_PKGS} && \ + dnf -y reinstall \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --setopt=tsflags=nodocs \ + --setopt=install_weak_deps=False \ + --best \ + tzdata && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index f8eaadd01..1ce61484c 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -59,7 +59,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ tini \ - tzdata \ iputils \ shadow-utils \ pcre2 \ @@ -78,7 +77,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ + microdnf -y update \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ + --enablerepo "ubi-8-baseos-rpms" \ + --setopt=install_weak_deps=0 \ + --best \ + --setopt=tsflags=nodocs \ + tzdata && \ microdnf -y reinstall \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index 26ad87c52..b22800bb2 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -37,6 +37,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql RUN set -eux && \ INSTALL_PKGS="bash \ tini \ + tzdata \ traceroute \ nmap \ iputils \ diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index 6a8110ab0..f7e041be0 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -64,6 +64,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=False \ --best \ ${INSTALL_PKGS} && \ + dnf -y reinstall \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --setopt=tsflags=nodocs \ + --setopt=install_weak_deps=False \ + --best \ + tzdata && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index ecf37d807..b72b6ad51 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -90,12 +90,23 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ - microdnf -y reinstall \ + microdnf -y update \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ tzdata && \ + microdnf -y reinstall \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ + --enablerepo "ubi-8-baseos-rpms" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + --best \ + --setopt=tsflags=nodocs \ + tzdata && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index 9329e2ff4..f3b6bffee 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -40,6 +40,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ tini \ + tzdata \ traceroute \ nmap \ ca-certificates \ diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 9f62d6d49..f574f107f 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -36,6 +36,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/ RUN set -eux && \ INSTALL_PKGS="bash \ tini \ + tzdata \ traceroute \ nmap \ fping \ diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index 76755d8f4..7992ed101 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -36,8 +36,9 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ REPOLIST="baseos,appstream,epel" && \ - INSTALL_PKGS="libevent \ + INSTALL_PKGS="bash \ tini \ + libevent \ traceroute \ nmap \ libssh \ @@ -59,6 +60,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=False \ --best \ ${INSTALL_PKGS} && \ + dnf -y reinstall \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --setopt=tsflags=nodocs \ + --setopt=install_weak_deps=False \ + --best \ + tzdata && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 814538486..ede0a239b 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -38,6 +38,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ tini \ + tzdata \ traceroute \ nmap \ ca-certificates \ diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index 9d4339888..b86c8f8d5 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -42,7 +42,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ traceroute \ nmap \ file-libs \ - tzdata \ iputils \ traceroute \ libevent \ @@ -67,6 +66,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=False \ --best \ ${INSTALL_PKGS} && \ + dnf -y reinstall \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --setopt=tsflags=nodocs \ + --setopt=install_weak_deps=False \ + --best \ + tzdata && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index b40f5bc2b..c7961de6a 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -61,7 +61,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ nmap \ fping \ shadow-utils \ - tzdata \ iputils \ hostname \ libcurl \ @@ -92,7 +91,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ + microdnf -y update \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ + --enablerepo "ubi-8-baseos-rpms" \ + --setopt=install_weak_deps=0 \ + --best \ + --setopt=tsflags=nodocs \ + tzdata && \ microdnf -y reinstall \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index d245ce13d..f22f7af6f 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -44,7 +44,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ traceroute \ nmap \ iputils \ - tzdata \ traceroute \ libevent \ libssh \ @@ -67,6 +66,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=False \ --best \ ${INSTALL_PKGS} && \ + dnf -y reinstall \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --setopt=tsflags=nodocs \ + --setopt=install_weak_deps=False \ + --best \ + tzdata && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index b0ae85651..ba29ecefd 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -25,7 +25,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ REPOLIST="baseos,appstream" && \ INSTALL_PKGS="bash \ - tzdata \ net-snmp" && \ dnf -y install \ --disablerepo "*" \ @@ -34,6 +33,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=False \ --best \ ${INSTALL_PKGS} && \ + dnf -y reinstall \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --setopt=tsflags=nodocs \ + --setopt=install_weak_deps=False \ + --best \ + tzdata && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 66f7aa81a..b02b8d55f 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -46,7 +46,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ shadow-utils \ - tzdata \ net-snmp" && \ microdnf -y install \ --disablerepo="*" \ @@ -57,6 +56,23 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ + microdnf -y update \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ + --enablerepo "ubi-8-baseos-rpms" \ + --setopt=install_weak_deps=0 \ + --best \ + --setopt=tsflags=nodocs \ + tzdata && \ + microdnf -y reinstall \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ + --enablerepo "ubi-8-baseos-rpms" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + --best \ + --setopt=tsflags=nodocs \ + tzdata && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 0471a9722..f8899204d 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/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 \ diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index 78066fca3..a34e185cb 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -59,6 +59,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=install_weak_deps=False \ --best \ ${INSTALL_PKGS} && \ + dnf -y reinstall \ + --disablerepo "*" \ + --enablerepo "baseos" \ + --setopt=tsflags=nodocs \ + --setopt=install_weak_deps=False \ + --best \ + tzdata && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index 03f5c5b0d..40a911aca 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ b/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 \ diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index 94d0e487f..4153bca27 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -31,6 +31,7 @@ COPY ["conf/etc/", "/etc/"] RUN set -eux && \ INSTALL_PKGS="bash \ + tzdata \ apache2 \ curl \ php8-apache2 \ diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index 382e472f1..3ae84d5de 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/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 \ diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 554a0edf2..39e5abc98 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/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 \ diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index fb8c29438..1ad6e3af7 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -51,7 +51,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"] RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ - tzdata \ curl \ supervisor \ shadow-utils \ @@ -84,12 +83,22 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ - microdnf -y reinstall \ + microdnf -y update \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ + tzdata && \ + microdnf -y reinstall \ + --disableplugin=subscription-manager \ + --disablerepo "*" \ + --enablerepo "ubi-8-baseos-rpms" \ + --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ + --best \ + --setopt=tsflags=nodocs \ tzdata && \ groupadd \ --system \ diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index 380c6f748..994da030f 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/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 \ diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index de73f8cb5..9156bc10a 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -31,6 +31,7 @@ COPY ["conf/etc/", "/etc/"] RUN set -eux && \ INSTALL_PKGS="bash \ + tzdata \ curl \ nginx \ php8-bcmath \ diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index 1518189f3..82b63f3d2 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/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 \