From d6e5003e02752785a1c5cf6f6cf766b4c15c02e0 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 5 Dec 2022 02:03:38 -0500 Subject: [PATCH] Fixed reepo names for RHEL --- Dockerfiles/agent/rhel/Dockerfile | 4 ++-- Dockerfiles/agent2/rhel/Dockerfile | 4 ++-- Dockerfiles/build-base/rhel/Dockerfile | 4 ++-- Dockerfiles/java-gateway/rhel/Dockerfile | 4 ++-- Dockerfiles/proxy-mysql/rhel/Dockerfile | 6 +++--- Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 6 +++--- Dockerfiles/server-mysql/rhel/Dockerfile | 6 +++--- Dockerfiles/snmptraps/rhel/Dockerfile | 4 ++-- Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 6 +++--- Dockerfiles/web-service/rhel/Dockerfile | 12 ++++++++++-- 10 files changed, 32 insertions(+), 24 deletions(-) diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index b3ca6cd49..181e66662 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 b94aa13e9..ec6c64a12 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 c3c826a38..311cefc9f 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 9b08aaa92..dc06f095c 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 fef4d8ee6..8997ea87b 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 2e69ab093..693205e44 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 e8845323d..83a51517f 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 ac8998ddf..129187c7a 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 66512eaab..064344f9a 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 df53c9542..5f707a49b 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" \