diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 857052cd..697d3c51 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -40,16 +40,16 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent/conf/ ${ZABBIX_CONF_ RUN set -eux && \ INSTALL_PKGS="bash \ - tzdata \ coreutils \ - iputils \ + tzdata \ c-ares \ - pcre2 \ - libgcc \ libcurl \ - libmodbus \ + libgcc \ libldap \ - zlib" && \ + libmodbus \ + pcre2 \ + zlib \ + iputils" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index 18c3282a..2af74ebb 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -42,15 +42,15 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - iputils \ + shadow-utils \ c-ares \ - pcre2 \ libcurl-minimal \ libmodbus \ - openssl-libs \ openldap \ - shadow-utils \ - zlib" && \ + openssl-libs \ + pcre2 \ + zlib \ + iputils" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="extras-common" \ diff --git a/Dockerfiles/agent/ol/Dockerfile b/Dockerfiles/agent/ol/Dockerfile index 9360a904..741807f1 100644 --- a/Dockerfiles/agent/ol/Dockerfile +++ b/Dockerfiles/agent/ol/Dockerfile @@ -42,13 +42,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - iputils \ c-ares \ - pcre2 \ libcurl \ libmodbus \ openssl-libs \ - zlib" && \ + pcre2 \ + zlib \ + iputils" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index ba2c5bd3..1547a452 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -61,14 +61,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - iputils \ shadow-utils \ c-ares \ - pcre2 \ - libmodbus \ libcurl-minimal \ + libmodbus \ openldap \ - zlib" && \ + pcre2 \ + zlib \ + iputils" && \ curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index c13c19f2..4982761a 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -43,16 +43,16 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ set -eux && \ echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tzdata \ - iputils-ping \ ca-certificates \ + tzdata \ libcares2 \ - libssl3t64 \ libcurl4t64 \ + libldap2 \ libmodbus5 \ libpcre2-8-0 \ - libldap2 \ - zlib1g" && \ + libssl3t64 \ + zlib1g \ + iputils-ping" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index 9365cd4d..09f5ec3f 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -41,12 +41,12 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/agent2/conf/ ${ZABBIX_CONF RUN set -eux && \ INSTALL_PKGS="bash \ + coreutils \ tzdata \ pcre2 \ - coreutils \ + iputils \ smartmontools \ - sudo \ - iputils" && \ + sudo" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index 1ae02b21..aca10679 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -43,13 +43,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - iputils \ - pcre2 \ - libcurl-minimal \ - smartmontools \ shadow-utils \ - sudo \ - openssl-libs" && \ + libcurl-minimal \ + openssl-libs \ + pcre2 \ + iputils \ + smartmontools \ + sudo" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="extras-common" \ diff --git a/Dockerfiles/agent2/ol/Dockerfile b/Dockerfiles/agent2/ol/Dockerfile index 4e1dae7b..55c207d4 100644 --- a/Dockerfiles/agent2/ol/Dockerfile +++ b/Dockerfiles/agent2/ol/Dockerfile @@ -43,12 +43,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - iputils \ - pcre2 \ libcurl \ + openssl-libs \ + pcre2 \ + iputils \ smartmontools \ - sudo \ - openssl-libs" && \ + sudo" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 5179d76c..da473d11 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -62,12 +62,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - iputils \ shadow-utils \ + libcurl-minimal \ pcre2 \ + iputils \ smartmontools \ - sudo \ - libcurl-minimal" && \ + sudo" && \ microdnf -y install \ --disableplugin=subscription-manager \ --disablerepo="*" \ diff --git a/Dockerfiles/agent2/rhel/Dockerfile.cuda b/Dockerfiles/agent2/rhel/Dockerfile.cuda index 0bd95b72..331a9f90 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile.cuda +++ b/Dockerfiles/agent2/rhel/Dockerfile.cuda @@ -62,12 +62,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - iputils \ shadow-utils \ + libcurl-minimal \ pcre2 \ + iputils \ smartmontools \ - sudo \ - libcurl-minimal" && \ + sudo" && \ dnf -y install \ --disableplugin=subscription-manager \ --disablerepo="*" \ diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index 41b61688..5fb22fc1 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -45,14 +45,14 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ printf '%s\n' '#!/bin/sh' 'exit 101' > /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tzdata \ - iputils-ping \ ca-certificates \ - smartmontools \ - sudo \ - libssl3t64 \ + tzdata \ libcurl4t64 \ - libpcre2-8-0" && \ + libpcre2-8-0 \ + libssl3t64 \ + iputils-ping \ + smartmontools \ + sudo" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index cd844291..9d472489 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -30,32 +30,32 @@ RUN set -eux && \ *) openjdk_packages='openjdk21 openjdk21-jre-headless' ;; \ esac; \ INSTALL_PKGS="bash \ - autoconf \ - automake \ - c-ares-dev \ coreutils \ curl \ + autoconf \ + automake \ + make \ + g++ \ + go \ + linux-headers \ + $openjdk_packages \ + gettext \ + git \ + patch \ + c-ares-dev \ curl-dev \ libevent-dev \ - libssh-dev \ - sqlite-dev \ libmodbus-dev \ + libpq-dev \ + libssh-dev \ libxml2-dev \ - linux-headers \ mysql-dev \ net-snmp-dev \ openipmi-dev \ openldap-dev \ openssl-dev \ - patch \ pcre2-dev \ - libpq-dev \ - gettext \ - git \ - g++ \ - go \ - make \ - $openjdk_packages \ + sqlite-dev \ unixodbc-dev \ zlib-dev" && \ apk add \ diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 1b7fb5e5..69170285 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -25,31 +25,31 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ + curl \ autoconf \ automake \ + make \ + pkg-config \ binutils \ - curl \ gcc \ - libc6-dev \ + golang-1.26 \ + openjdk-21-jdk-headless \ + gettext \ + git \ + patch \ + unzip \ libc-ares-dev \ + libc6-dev \ libcurl4-openssl-dev \ libevent-dev \ - libmodbus-dev \ libldap2-dev \ + libmodbus-dev \ libmysqlclient-dev \ libopenipmi-dev \ libpcre2-dev \ + libpq-dev \ libsnmp-dev \ libsqlite3-dev \ - libpq-dev \ libssh-dev \ libxml2-dev \ - make \ - openjdk-21-jdk-headless \ - patch \ - pkg-config \ - gettext \ - git \ - golang-1.26 \ - unzip \ unixodbc-dev \ zlib1g-dev" && \ apt-get -y update && \ diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile index 944f51e5..63423b92 100644 --- a/Dockerfiles/java-gateway/centos/Dockerfile +++ b/Dockerfiles/java-gateway/centos/Dockerfile @@ -36,9 +36,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ + findutils \ shadow-utils \ - java-21-openjdk-headless \ - findutils" && \ + java-21-openjdk-headless" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="baseos" \ diff --git a/Dockerfiles/java-gateway/ol/Dockerfile b/Dockerfiles/java-gateway/ol/Dockerfile index 8cc7574a..aa1a549a 100644 --- a/Dockerfiles/java-gateway/ol/Dockerfile +++ b/Dockerfiles/java-gateway/ol/Dockerfile @@ -36,8 +36,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - java-21-openjdk-headless \ - findutils" && \ + findutils \ + java-21-openjdk-headless" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index fb296680..a6e8fc27 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -51,28 +51,28 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/mysql/ /usr RUN set -eux && \ INSTALL_PKGS="bash \ + gzip \ tzdata \ - traceroute \ - nmap \ - krb5 \ - iputils \ - openssl \ c-ares \ + krb5 \ libcap \ libcurl \ libevent \ libldap \ libssh \ libxml2 \ - mariadb-client \ mariadb-connector-c \ net-snmp-agent-libs \ openipmi-libs \ + openssl \ pcre2 \ unixodbc \ - gzip \ + zlib \ fping \ - zlib" && \ + iputils \ + nmap \ + traceroute \ + mariadb-client" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index cddc1708..968bace2 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -52,18 +52,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - libevent \ - traceroute \ - nmap \ - krb5-workstation \ - c-ares \ gzip \ - libssh \ + shadow-utils \ + c-ares \ file-libs \ - fping \ - iputils \ + libevent \ + libssh \ libxml2 \ - mysql8.4 \ mysql8.4-libs \ net-snmp-libs \ OpenIPMI-libs \ @@ -71,9 +66,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl \ openssl-libs \ pcre2 \ - shadow-utils \ + unixODBC \ zlib \ - unixODBC" && \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + mysql8.4" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="extras-common" \ diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile index 327685ea..214a4041 100644 --- a/Dockerfiles/proxy-mysql/ol/Dockerfile +++ b/Dockerfiles/proxy-mysql/ol/Dockerfile @@ -52,18 +52,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - libevent \ - traceroute \ - nmap \ - krb5-workstation \ + gzip \ c-ares \ - libssh \ file-libs \ - fping \ - iputils \ libcurl \ + libevent \ + libssh \ libxml2 \ - mysql8.4 \ mysql8.4-libs \ net-snmp-libs \ OpenIPMI-libs \ @@ -71,9 +66,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl \ openssl-libs \ pcre2 \ + unixODBC \ zlib \ - gzip \ - unixODBC" && \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + mysql8.4" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index b1bb0bfc..7d3a7a90 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -70,27 +70,27 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - traceroute \ - nmap \ - krb5-workstation \ - c-ares \ + gzip \ shadow-utils \ - fping \ - iputils \ + c-ares \ libcurl-minimal \ libevent \ - openldap \ - openssl \ libssh \ libxml2 \ - mysql8.4 \ mysql8.4-libs \ net-snmp-agent-libs \ OpenIPMI-libs \ + openldap \ + openssl \ pcre2 \ - gzip \ unixODBC \ - zlib" && \ + zlib \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + mysql8.4" && \ curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index afc3d604..b4f2b073 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -54,20 +54,15 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ printf '%s\n' '#!/bin/sh' 'exit 101' > /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tzdata \ - traceroute \ - nmap \ - iputils-ping \ - krb5-user \ ca-certificates \ - fping \ - openssl \ + gzip \ + tzdata \ libc6 \ libcares2 \ libcurl4t64 \ libevent-2.1 \ - libevent-pthreads-2.1 \ libevent-extra-2.1 \ + libevent-pthreads-2.1 \ libmysqlclient24 \ libopenipmi0t64 \ libpcre2-8-0 \ @@ -75,11 +70,16 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ libssh-4 \ libssl3t64 \ libxml2-16 \ - mysql-client \ - snmp-mibs-downloader \ - gzip \ + openssl \ unixodbc \ - zlib1g" && \ + zlib1g \ + fping \ + iputils-ping \ + krb5-user \ + nmap \ + snmp-mibs-downloader \ + traceroute \ + mysql-client" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index a496a408..4218ced3 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -49,13 +49,8 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/proxy/database/sqlite3/ /u RUN set -eux && \ INSTALL_PKGS="bash \ tzdata \ - traceroute \ - nmap \ - krb5 \ - fping \ - iputils \ - openssl \ c-ares \ + krb5 \ libcap \ libcurl \ libevent \ @@ -64,11 +59,16 @@ RUN set -eux && \ libxml2 \ net-snmp-agent-libs \ openipmi-libs \ + openssl \ pcre2 \ - sqlite \ sqlite-libs \ unixodbc \ - zlib" && \ + zlib \ + fping \ + iputils \ + nmap \ + traceroute \ + sqlite" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index 4ddb2779..f8cf11f1 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -50,15 +50,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - libevent \ - traceroute \ - nmap \ - krb5-workstation \ + gzip \ + shadow-utils \ c-ares \ - libssh \ - fping \ - iputils \ file-libs \ + libevent \ + libssh \ libxml2 \ net-snmp-libs \ OpenIPMI-libs \ @@ -66,12 +63,15 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl \ openssl-libs \ pcre2 \ - sqlite \ sqlite-libs \ - shadow-utils \ + unixODBC \ zlib \ - gzip \ - unixODBC" && \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + sqlite" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="extras-common" \ diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile index 50d0ca2d..1f2ae450 100644 --- a/Dockerfiles/proxy-sqlite3/ol/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ol/Dockerfile @@ -50,15 +50,11 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - libevent \ - traceroute \ - nmap \ - krb5-workstation \ + gzip \ c-ares \ - libssh \ - fping \ - iputils \ file-libs \ + libevent \ + libssh \ libxml2 \ net-snmp-libs \ OpenIPMI-libs \ @@ -66,11 +62,15 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl \ openssl-libs \ pcre2 \ - sqlite \ sqlite-libs \ + unixODBC \ zlib \ - gzip \ - unixODBC" && \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + sqlite" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index 22a7f592..449134b7 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -69,27 +69,27 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - traceroute \ - nmap \ - krb5-workstation \ - c-ares \ + gzip \ shadow-utils \ - fping \ - iputils \ + c-ares \ libcurl-minimal \ libevent \ - openldap \ - openssl \ libssh \ libxml2 \ net-snmp-agent-libs \ OpenIPMI-libs \ + openldap \ + openssl \ pcre2 \ - sqlite \ sqlite-libs \ unixODBC \ - gzip \ - zlib" && \ + zlib \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + sqlite" && \ curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 40eb5a5b..11d302c0 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -52,21 +52,14 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ printf '%s\n' '#!/bin/sh' 'exit 101' > /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tzdata \ - traceroute \ - nmap \ - iputils-ping \ - krb5-user \ ca-certificates \ - fping \ - openssl \ - sqlite3 \ + tzdata \ libc6 \ libcares2 \ libcurl4t64 \ libevent-2.1 \ - libevent-pthreads-2.1 \ libevent-extra-2.1 \ + libevent-pthreads-2.1 \ libopenipmi0t64 \ libpcre2-8-0 \ libsnmp40t64 \ @@ -74,9 +67,16 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ libssh-4 \ libssl3t64 \ libxml2-16 \ - snmp-mibs-downloader \ + openssl \ unixodbc \ - zlib1g" && \ + zlib1g \ + fping \ + iputils-ping \ + krb5-user \ + nmap \ + snmp-mibs-downloader \ + traceroute \ + sqlite3" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 34f9c3b3..e50c10c7 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -51,28 +51,28 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/mysql/crea RUN set -eux && \ INSTALL_PKGS="bash \ - fping \ - traceroute \ - nmap \ - krb5 \ + gzip \ tzdata \ - iputils \ - openssl \ c-ares \ + krb5 \ libcap \ libcurl \ libevent \ libldap \ libssh \ libxml2 \ - mariadb-client \ mariadb-connector-c \ net-snmp-agent-libs \ openipmi-libs \ + openssl \ pcre2 \ - gzip \ unixodbc \ - zlib" && \ + zlib \ + fping \ + iputils \ + nmap \ + traceroute \ + mariadb-client" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index d9b6c069..0a0191da 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -52,20 +52,16 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - fping \ - traceroute \ - nmap \ - krb5-workstation \ - c-ares \ + gzip \ hostname \ + shadow-utils \ + c-ares \ file-libs \ - iputils \ - libevent \ - libssh \ - libpsl \ libbrotli \ + libevent \ + libpsl \ + libssh \ libxml2 \ - mysql8.4 \ mysql8.4-libs \ net-snmp-libs \ OpenIPMI-libs \ @@ -73,10 +69,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl \ openssl-libs \ pcre2 \ - shadow-utils \ + unixODBC \ zlib \ - gzip \ - unixODBC" && \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + mysql8.4" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="extras-common" \ diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile index 9423a46e..9b8dd3f3 100644 --- a/Dockerfiles/server-mysql/ol/Dockerfile +++ b/Dockerfiles/server-mysql/ol/Dockerfile @@ -52,19 +52,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - fping \ - traceroute \ - nmap \ - krb5-workstation \ - c-ares \ + gzip \ hostname \ + c-ares \ file-libs \ - iputils \ libcurl \ libevent \ - libxml2 \ libssh \ - mysql8.4 \ + libxml2 \ mysql8.4-libs \ net-snmp-libs \ OpenIPMI-libs \ @@ -72,9 +67,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl \ openssl-libs \ pcre2 \ + unixODBC \ zlib \ - gzip \ - unixODBC" && \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + mysql8.4" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 235aec77..acae3075 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -71,29 +71,29 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - traceroute \ - nmap \ - krb5-workstation \ - c-ares \ - fping \ - shadow-utils \ - iputils \ + gzip \ hostname \ - openssl \ - libpsl \ + shadow-utils \ + c-ares \ libbrotli \ libevent \ - openldap \ + libpsl \ libssh \ libxml2 \ - mysql8.4 \ mysql8.4-libs \ net-snmp-agent-libs \ OpenIPMI-libs \ + openldap \ + openssl \ pcre2 \ - gzip \ unixODBC \ - zlib" && \ + zlib \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + mysql8.4" && \ curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 893eba9c..3e35d43a 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -54,20 +54,15 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ printf '%s\n' '#!/bin/sh' 'exit 101' > /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - traceroute \ - nmap \ - krb5-user \ - tzdata \ ca-certificates \ - iputils-ping \ - fping \ - openssl \ + gzip \ + tzdata \ libc6 \ libcares2 \ libcurl4t64 \ libevent-2.1 \ - libevent-pthreads-2.1 \ libevent-extra-2.1 \ + libevent-pthreads-2.1 \ libmysqlclient24 \ libopenipmi0t64 \ libpcre2-8-0 \ @@ -75,11 +70,16 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ libssh-4 \ libssl3t64 \ libxml2-16 \ - mysql-client \ - snmp-mibs-downloader \ - gzip \ + openssl \ unixodbc \ - zlib1g" && \ + zlib1g \ + fping \ + iputils-ping \ + krb5-user \ + nmap \ + snmp-mibs-downloader \ + traceroute \ + mysql-client" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 65019bef..9aced028 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -49,14 +49,10 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/server/database/postgresql RUN set -eux && \ INSTALL_PKGS="bash \ - traceroute \ - nmap \ - krb5 \ - fping \ + gzip \ tzdata \ - iputils \ - openssl \ c-ares \ + krb5 \ libcap \ libcurl \ libevent \ @@ -65,11 +61,15 @@ RUN set -eux && \ libxml2 \ net-snmp-agent-libs \ openipmi-libs \ + openssl \ pcre2 \ - postgresql18-client \ - gzip \ unixodbc \ - zlib" && \ + zlib \ + fping \ + iputils \ + nmap \ + traceroute \ + postgresql18-client" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index ff34f265..457a667f 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -51,18 +51,15 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - fping \ - file-libs \ - traceroute \ + gzip \ hostname \ - nmap \ - krb5-workstation \ + shadow-utils \ c-ares \ - iputils \ - libevent \ - libssh \ - libpsl \ + file-libs \ libbrotli \ + libevent \ + libpsl \ + libssh \ libxml2 \ net-snmp-libs \ OpenIPMI-libs \ @@ -70,12 +67,15 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl \ openssl-libs \ pcre2 \ - postgresql18 \ postgresql18-private-libs \ - shadow-utils \ + unixODBC \ zlib \ - gzip \ - unixODBC" && \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + postgresql18" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="extras-common" \ diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index 0bb095a0..84089b67 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -51,14 +51,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - fping \ - file-libs \ + gzip \ hostname \ - traceroute \ - nmap \ - krb5-workstation \ c-ares \ - iputils \ + file-libs \ libevent \ libssh \ libxml2 \ @@ -68,11 +64,15 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl \ openssl-libs \ pcre2 \ - postgresql18 \ postgresql18-private-libs \ + unixODBC \ zlib \ - gzip \ - unixODBC" && \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + postgresql18" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile index 68de302e..c96786ba 100644 --- a/Dockerfiles/server-pgsql/rhel/Dockerfile +++ b/Dockerfiles/server-pgsql/rhel/Dockerfile @@ -70,30 +70,29 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - traceroute \ - nmap \ - krb5-workstation \ - c-ares \ - fping \ - shadow-utils \ - iputils \ + gzip \ hostname \ - openssl \ - libssh \ - libpsl \ + shadow-utils \ + c-ares \ libbrotli \ libevent \ - openldap \ + libpsl \ libssh \ libxml2 \ net-snmp-agent-libs \ OpenIPMI-libs \ + openldap \ + openssl \ pcre2 \ - postgresql18 \ postgresql18-private-libs \ - gzip \ unixODBC \ - zlib" && \ + zlib \ + fping \ + iputils \ + krb5-workstation \ + nmap \ + traceroute \ + postgresql18" && \ curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ rm -rf /tmp/epel-release-latest-10.noarch.rpm && \ diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index bec0f87d..bb620dff 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -53,20 +53,15 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ printf '%s\n' '#!/bin/sh' 'exit 101' > /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - traceroute \ - nmap \ - krb5-user \ - tzdata \ ca-certificates \ - iputils-ping \ - fping \ - openssl \ + gzip \ + tzdata \ libc6 \ libcares2 \ libcurl4t64 \ libevent-2.1 \ - libevent-pthreads-2.1 \ libevent-extra-2.1 \ + libevent-pthreads-2.1 \ libopenipmi0t64 \ libpcre2-8-0 \ libpq5 \ @@ -74,11 +69,16 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ libssh-4 \ libssl3t64 \ libxml2-16 \ - postgresql-client \ - snmp-mibs-downloader \ - gzip \ + openssl \ unixodbc \ - zlib1g" && \ + zlib1g \ + fping \ + iputils-ping \ + krb5-user \ + nmap \ + snmp-mibs-downloader \ + traceroute \ + postgresql-client" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index 9d6e438c..e36576fb 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -33,8 +33,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=from=scripts,target=/tmp/scripts,ro \ set -eux && \ INSTALL_PKGS="bash \ - tzdata \ shadow-utils \ + tzdata \ net-snmp" && \ microdnf -y install \ --disablerepo="*" \ diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index e18008a2..6f7e43f7 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -36,8 +36,8 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ tzdata \ - snmp-mibs-downloader \ - snmptrapd" && \ + snmptrapd \ + snmp-mibs-downloader" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 760173e1..23cd7e88 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -58,30 +58,30 @@ COPY conf/etc/ /etc/ RUN set -eux && \ INSTALL_PKGS="bash \ - tzdata \ curl \ jq \ - mariadb-client \ + tzdata \ mariadb-connector-c \ apache2 \ + php85-fpm \ apache2-proxy \ php85-bcmath \ php85-ctype \ php85-curl \ - php85-fpm \ + php85-fileinfo \ php85-gd \ php85-gettext \ php85-json \ php85-ldap \ php85-mbstring \ php85-mysqli \ + php85-openssl \ php85-session \ php85-simplexml \ php85-sockets \ - php85-fileinfo \ php85-xmlreader \ php85-xmlwriter \ - php85-openssl" && \ + mariadb-client" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index 0b2fd8ab..5b1c3dfb 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -61,24 +61,24 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ curl-minimal \ + findutils \ + glibc-locale-source \ + gzip \ + jq \ + shadow-utils \ httpd \ - mysql8.4 \ - mod_ssl \ php \ - php-curl \ php-fpm \ + mod_ssl \ php-bcmath \ + php-curl \ php-gd \ + php-json \ php-ldap \ php-mbstring \ php-mysqlnd \ - php-json \ php-xml \ - findutils \ - glibc-locale-source \ - shadow-utils \ - gzip \ - jq" && \ + mysql8.4" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="baseos" \ diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile index c1b7a456..66c0498b 100644 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile @@ -61,23 +61,23 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ curl \ + findutils \ + glibc-locale-source \ gzip \ + jq \ httpd \ - mysql8.4 \ - mod_ssl \ php \ - php-curl \ php-fpm \ + mod_ssl \ php-bcmath \ + php-curl \ php-gd \ + php-json \ php-ldap \ php-mbstring \ php-mysqlnd \ - php-json \ php-xml \ - findutils \ - glibc-locale-source \ - jq" && \ + mysql8.4" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index 6f1c668b..e1e56211 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile @@ -65,22 +65,22 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ printf '%s\n' '#!/bin/sh' 'exit 101' > /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tzdata \ ca-certificates \ curl \ - mysql-client \ - apache2 \ + jq \ locales \ + tzdata \ libldap-common \ + apache2 \ + php8.5-fpm \ php8.5-bcmath \ php8.5-curl \ - php8.5-fpm \ php8.5-gd \ php8.5-ldap \ php8.5-mbstring \ php8.5-mysql \ php8.5-xml \ - jq" && \ + mysql-client" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index 84146bf4..d1ed5d21 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -57,28 +57,28 @@ COPY conf/etc/ /etc/ RUN set -eux && \ INSTALL_PKGS="bash \ - tzdata \ curl \ jq \ + tzdata \ apache2 \ + php85-fpm \ apache2-proxy \ php85-bcmath \ php85-ctype \ php85-curl \ - php85-fpm \ + php85-fileinfo \ php85-gd \ php85-gettext \ php85-json \ php85-ldap \ - php85-pgsql \ php85-mbstring \ + php85-openssl \ + php85-pgsql \ php85-session \ php85-simplexml \ php85-sockets \ - php85-fileinfo \ php85-xmlreader \ php85-xmlwriter \ - php85-openssl \ postgresql18-client" && \ apk add \ --no-cache \ diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index 97282dcd..4605bdb2 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -60,24 +60,24 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ curl-minimal \ + findutils \ + glibc-locale-source \ + gzip \ + jq \ + shadow-utils \ httpd \ - mod_ssl \ php \ - php-curl \ php-fpm \ + mod_ssl \ php-bcmath \ + php-curl \ php-gd \ + php-json \ php-ldap \ php-mbstring \ php-pgsql \ - php-json \ php-xml \ - postgresql18 \ - findutils \ - glibc-locale-source \ - shadow-utils \ - gzip \ - jq" && \ + postgresql18" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="baseos" \ diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index cc9637ed..9a3fd6df 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -60,23 +60,23 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ curl \ + findutils \ + glibc-locale-source \ gzip \ + jq \ httpd \ - mod_ssl \ php \ - php-curl \ php-fpm \ + mod_ssl \ php-bcmath \ + php-curl \ php-gd \ + php-json \ php-ldap \ php-mbstring \ php-pgsql \ - php-json \ php-xml \ - postgresql \ - findutils \ - glibc-locale-source \ - jq" && \ + postgresql" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index 84fa7c00..7828ed52 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile @@ -64,22 +64,22 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ printf '%s\n' '#!/bin/sh' 'exit 101' > /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tzdata \ ca-certificates \ curl \ - apache2 \ + jq \ locales \ + tzdata \ libldap-common \ + apache2 \ + php8.5-fpm \ php8.5-bcmath \ php8.5-curl \ - php8.5-fpm \ php8.5-gd \ php8.5-ldap \ php8.5-mbstring \ - php8.5-xml \ php8.5-pgsql \ - postgresql-client \ - jq" && \ + php8.5-xml \ + postgresql-client" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 6fd338d1..dd25ef05 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -56,29 +56,29 @@ COPY conf/etc/ /etc/ RUN set -eux && \ INSTALL_PKGS="bash \ - tzdata \ curl \ jq \ - mariadb-client \ + tzdata \ mariadb-connector-c \ nginx \ + php85-fpm \ php85-bcmath \ php85-ctype \ php85-curl \ - php85-fpm \ + php85-fileinfo \ php85-gd \ php85-gettext \ php85-json \ php85-ldap \ php85-mbstring \ php85-mysqli \ + php85-openssl \ php85-session \ php85-simplexml \ php85-sockets \ - php85-fileinfo \ php85-xmlreader \ php85-xmlwriter \ - php85-openssl" && \ + mariadb-client" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index 09635129..b7e0f678 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -59,22 +59,22 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ curl-minimal \ - mysql8.4 \ findutils \ glibc-locale-source \ + gzip \ + jq \ + shadow-utils \ nginx \ + php-fpm \ php-bcmath \ php-curl \ - php-fpm \ php-gd \ php-json \ php-ldap \ php-mbstring \ php-mysqlnd \ php-xml \ - shadow-utils \ - gzip \ - jq" && \ + mysql8.4" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="baseos" \ diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index 2c962488..dfc2cdd9 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -59,21 +59,21 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ curl \ + findutils \ + glibc-locale-source \ gzip \ - mysql8.4 \ + jq \ nginx \ + php-fpm \ php-bcmath \ php-curl \ - php-fpm \ php-gd \ + php-json \ php-ldap \ php-mbstring \ php-mysqlnd \ - php-json \ php-xml \ - findutils \ - glibc-locale-source \ - jq" && \ + mysql8.4" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index 3b4edfc9..be1bfb1b 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -78,22 +78,22 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ curl-minimal \ - jq \ - shadow-utils \ findutils \ glibc-locale-source \ gzip \ - mysql8.4 \ + jq \ + shadow-utils \ nginx \ + php-fpm \ php-bcmath \ php-curl \ - php-fpm \ php-gd \ php-json \ php-ldap \ php-mbstring \ php-mysqlnd \ - php-xml" && \ + php-xml \ + mysql8.4" && \ ARCH_SUFFIX="$(arch)"; \ microdnf -y install \ --disablerepo="*" \ diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index 5c6bcfd8..56b5b41b 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile @@ -63,22 +63,22 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ printf '%s\n' '#!/bin/sh' 'exit 101' > /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tzdata \ ca-certificates \ curl \ - mysql-client \ - nginx \ + jq \ locales \ + tzdata \ libldap-common \ + nginx \ + php8.5-fpm \ php8.5-bcmath \ php8.5-curl \ - php8.5-fpm \ php8.5-gd \ php8.5-ldap \ php8.5-mbstring \ php8.5-mysql \ php8.5-xml \ - jq" && \ + mysql-client" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 5a2b3f61..7a85035b 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -55,27 +55,27 @@ COPY conf/etc/ /etc/ RUN set -eux && \ INSTALL_PKGS="bash \ - tzdata \ curl \ jq \ + tzdata \ nginx \ + php85-fpm \ php85-bcmath \ php85-ctype \ php85-curl \ - php85-fpm \ + php85-fileinfo \ php85-gd \ php85-gettext \ php85-json \ php85-ldap \ php85-mbstring \ + php85-openssl \ php85-pgsql \ php85-session \ php85-simplexml \ php85-sockets \ - php85-fileinfo \ php85-xmlreader \ php85-xmlwriter \ - php85-openssl \ postgresql18-client" && \ apk add \ --no-cache \ diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index 02cf0788..b3c3fe63 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -60,20 +60,20 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ curl-minimal \ findutils \ glibc-locale-source \ + gzip \ + jq \ + shadow-utils \ nginx \ + php-fpm \ php-bcmath \ php-curl \ - php-fpm \ php-gd \ php-json \ php-ldap \ php-mbstring \ php-pgsql \ php-xml \ - postgresql18 \ - shadow-utils \ - gzip \ - jq" && \ + postgresql18" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="baseos" \ diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index 46fc3ad3..5088c29f 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -58,21 +58,21 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ curl \ + findutils \ + glibc-locale-source \ gzip \ + jq \ nginx \ - postgresql18 \ + php-fpm \ php-bcmath \ php-curl \ - php-fpm \ php-gd \ + php-json \ php-ldap \ php-mbstring \ php-pgsql \ - php-json \ php-xml \ - jq \ - findutils \ - glibc-locale-source" && \ + postgresql18" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol10_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index d42105de..bcae369a 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile @@ -77,22 +77,22 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ curl-minimal \ - jq \ - shadow-utils \ findutils \ glibc-locale-source \ gzip \ + jq \ + shadow-utils \ nginx \ - postgresql18 \ + php-fpm \ php-bcmath \ php-curl \ - php-fpm \ php-gd \ php-json \ php-ldap \ php-mbstring \ php-pgsql \ - php-xml" && \ + php-xml \ + postgresql18" && \ ARCH_SUFFIX="$(arch)"; \ microdnf -y install \ --disablerepo="*" \ diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index 6978a85e..bc617440 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile @@ -62,22 +62,22 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ printf '%s\n' '#!/bin/sh' 'exit 101' > /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ INSTALL_PKGS="bash \ - tzdata \ ca-certificates \ curl \ - nginx \ + jq \ locales \ + tzdata \ libldap-common \ + nginx \ + php8.5-fpm \ php8.5-bcmath \ php8.5-curl \ - php8.5-fpm \ php8.5-gd \ php8.5-ldap \ php8.5-mbstring \ - php8.5-xml \ php8.5-pgsql \ - postgresql-client \ - jq" && \ + php8.5-xml \ + postgresql-client" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index c250c96a..ba11ac2f 100644 --- a/Dockerfiles/web-service/alpine/Dockerfile +++ b/Dockerfiles/web-service/alpine/Dockerfile @@ -35,8 +35,8 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/conf/ ${ZABBIX RUN set -eux && \ INSTALL_PKGS="bash \ - chromium \ - ca-certificates" && \ + ca-certificates \ + chromium" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/web-service/centos/Dockerfile b/Dockerfiles/web-service/centos/Dockerfile index 8faa0645..45786b85 100644 --- a/Dockerfiles/web-service/centos/Dockerfile +++ b/Dockerfiles/web-service/centos/Dockerfile @@ -38,9 +38,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --mount=type=tmpfs,target=/var/cache/yum/ \ set -eux && \ INSTALL_PKGS="bash \ - chromium-headless \ ca-certificates \ - shadow-utils" && \ + shadow-utils \ + chromium-headless" && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="extras-common" \