diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index e4f5a06b8..92ee87b01 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -63,14 +63,14 @@ RUN set -eux && \ rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos" \ + --enablerepo "ubi-8-baseos-rpms" \ --enablerepo "epel" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos" \ + --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 19a2dae17..e1faba58c 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -66,14 +66,14 @@ RUN set -eux && \ rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos" \ + --enablerepo "ubi-8-baseos-rpms" \ --enablerepo "epel" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos" \ + --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 23d5afc91..4b2e95996 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -56,8 +56,8 @@ RUN set -eux && \ microdnf -y module enable mysql && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos" \ - --enablerepo "ubi-8-appstream" \ + --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-8-appstream-rpms" \ --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ --enablerepo "rhel-8-for-x86_64-appstream-rpms" \ --enablerepo "codeready-builder-for-rhel-8-x86_64-rpms" \ diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index 4f980f46c..883ccd452 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -55,8 +55,8 @@ RUN set -eux && \ java-1.8.0-openjdk-headless" && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos" \ - --enablerepo "ubi-8-appstream" \ + --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-8-appstream-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 5176591d5..551157206 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -77,8 +77,8 @@ RUN set -eux && \ microdnf -y module enable mysql && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos" \ - --enablerepo "ubi-8-appstream" \ + --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-8-appstream-rpms" \ --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ --enablerepo "rhel-8-for-x86_64-appstream-rpms" \ --enablerepo "epel" \ @@ -87,7 +87,7 @@ RUN set -eux && \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos" \ + --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index e65e48dff..5a47a8927 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -74,8 +74,8 @@ RUN set -eux && \ rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos" \ - --enablerepo "ubi-8-appstream" \ + --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-8-appstream-rpms" \ --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ --enablerepo "epel" \ --setopt=install_weak_deps=0 \ @@ -83,7 +83,7 @@ RUN set -eux && \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos" \ + --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index f1850d079..7843ab9df 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -79,8 +79,8 @@ RUN set -eux && \ microdnf -y module enable mysql && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos" \ - --enablerepo "ubi-8-appstream" \ + --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-8-appstream-rpms" \ --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ --enablerepo "rhel-8-for-x86_64-appstream-rpms" \ --enablerepo "epel" \ @@ -89,7 +89,7 @@ RUN set -eux && \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos" \ + --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 470e8d55b..629f8d4b0 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -48,8 +48,8 @@ RUN set -eux && \ net-snmp" && \ microdnf -y install \ --disablerepo="*" \ - --enablerepo "ubi-8-baseos" \ - --enablerepo "ubi-8-appstream" \ + --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-8-appstream-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index 1ed47ec28..e7dc98bc4 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -73,8 +73,8 @@ RUN set -eux && \ microdnf -y module enable php:8.0 nginx:1.20 && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos" \ - --enablerepo "ubi-8-appstream" \ + --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-8-appstream-rpms" \ --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ --enablerepo "rhel-8-for-x86_64-appstream-rpms" \ --enablerepo "epel" \ @@ -83,7 +83,7 @@ RUN set -eux && \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos" \ + --enablerepo "ubi-8-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index 6e609ea92..e37480aec 100644 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ b/Dockerfiles/web-service/rhel/Dockerfile @@ -58,8 +58,8 @@ RUN set -eux && \ rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos" \ - --enablerepo "ubi-8-appstream" \ + --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-8-appstream-rpms" \ --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ --enablerepo "rhel-8-for-x86_64-appstream-rpms" \ --enablerepo "epel" \ @@ -67,6 +67,14 @@ RUN set -eux && \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ + microdnf -y install \ + --disablerepo "*" \ + --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-8-appstream-rpms" \ + --setopt=install_weak_deps=0 \ + --best \ + --setopt=tsflags=nodocs \ + nss nss-sysinit && \ groupadd --system --gid 1995 zabbix && \ useradd \ --system --comment "Zabbix monitoring system" \