From a249a5605953b1d45a8e8b5b4531e0b57557722d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 Sep 2021 17:25:58 -0400 Subject: [PATCH] Review RHEL repositories --- agent/rhel/Dockerfile | 8 ++++---- agent2/rhel/Dockerfile | 8 ++++---- java-gateway/rhel/Dockerfile | 8 ++++---- proxy-mysql/rhel/Dockerfile | 11 ++++++----- proxy-sqlite3/rhel/Dockerfile | 11 ++++++----- server-mysql/rhel/Dockerfile | 11 ++++++----- web-nginx-mysql/rhel/Dockerfile | 8 ++++---- 7 files changed, 34 insertions(+), 31 deletions(-) diff --git a/agent/rhel/Dockerfile b/agent/rhel/Dockerfile index ef232bc47..dc8393a03 100644 --- a/agent/rhel/Dockerfile +++ b/agent/rhel/Dockerfile @@ -44,9 +44,9 @@ RUN set -eux && INSTALL_PKGS="bash \ iputils \ pcre \ libcurl" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ - dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \ - --security --sec-severity=Important --sec-severity=Critical && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream" && \ + dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \ + --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ groupadd --system --gid 1995 zabbix && \ @@ -80,7 +80,7 @@ RUN set -eux && INSTALL_PKGS="bash \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ +RUN set -eux && REPOLIST="ubi-8-baseos,ubi-8-appstream" && \ INSTALL_PKGS="autoconf \ automake \ libcurl-devel \ diff --git a/agent2/rhel/Dockerfile b/agent2/rhel/Dockerfile index 9f10c8bf6..d16ce31ff 100644 --- a/agent2/rhel/Dockerfile +++ b/agent2/rhel/Dockerfile @@ -44,9 +44,9 @@ RUN set -eux && INSTALL_PKGS="bash \ iputils \ pcre \ libcurl" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ - dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \ - --security --sec-severity=Important --sec-severity=Critical && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream" && \ + dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \ + --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ groupadd --system --gid 1995 zabbix && \ @@ -81,7 +81,7 @@ RUN set -eux && INSTALL_PKGS="bash \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki -RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ +RUN set -eux && REPOLIST="ubi-8-baseos,ubi-8-appstream" && \ INSTALL_PKGS="autoconf \ automake \ libcurl-devel \ diff --git a/java-gateway/rhel/Dockerfile b/java-gateway/rhel/Dockerfile index 320e443b7..7c5753ffc 100644 --- a/java-gateway/rhel/Dockerfile +++ b/java-gateway/rhel/Dockerfile @@ -40,9 +40,9 @@ COPY ["licenses", "/licenses"] RUN set -eux && INSTALL_PKGS="bash \ java-1.8.0-openjdk-headless" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ - dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \ - --security --sec-severity=Important --sec-severity=Critical && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream" && \ + dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \ + --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ groupadd --system --gid 1995 zabbix && \ @@ -69,7 +69,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \ gcc \ make \ java-1.8.0-openjdk-devel" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream" && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ diff --git a/proxy-mysql/rhel/Dockerfile b/proxy-mysql/rhel/Dockerfile index cb2e6aab8..0eaf308c6 100644 --- a/proxy-mysql/rhel/Dockerfile +++ b/proxy-mysql/rhel/Dockerfile @@ -54,9 +54,9 @@ RUN set -eux && INSTALL_PKGS="bash \ OpenIPMI-libs \ pcre \ unixODBC" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \ - dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \ - --security --sec-severity=Important --sec-severity=Critical && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \ + dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \ + --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \ dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ dnf -y module enable mysql && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ @@ -109,12 +109,13 @@ RUN set -eux && INSTALL_PKGS="autoconf \ mysql-devel \ net-snmp-devel \ openldap-devel \ + OpenIPMI-devel \ pcre-devel \ git \ gcc \ make \ unixODBC-devel" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,codeready-builder-for-rhel-8-x86_64-rpms" && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ @@ -136,7 +137,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \ --with-libcurl \ --with-libxml2 \ --with-net-snmp \ -# --with-openipmi \ + --with-openipmi \ --with-openssl \ --with-ssh \ --with-unixodbc \ diff --git a/proxy-sqlite3/rhel/Dockerfile b/proxy-sqlite3/rhel/Dockerfile index bf6ce771f..4de8476b6 100644 --- a/proxy-sqlite3/rhel/Dockerfile +++ b/proxy-sqlite3/rhel/Dockerfile @@ -53,9 +53,9 @@ RUN set -eux && INSTALL_PKGS="bash \ pcre \ sqlite-libs \ unixODBC" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \ - dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \ - --security --sec-severity=Important --sec-severity=Critical && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \ + dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \ + --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \ dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ @@ -107,12 +107,13 @@ RUN set -eux && INSTALL_PKGS="autoconf \ sqlite-devel \ net-snmp-devel \ openldap-devel \ + OpenIPMI-devel \ pcre-devel \ git \ gcc \ make \ unixODBC-devel" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,codeready-builder-for-rhel-8-x86_64-rpms" && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ @@ -134,7 +135,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \ --with-libcurl \ --with-libxml2 \ --with-net-snmp \ -# --with-openipmi \ + --with-openipmi \ --with-openssl \ --with-ssh \ --with-unixodbc \ diff --git a/server-mysql/rhel/Dockerfile b/server-mysql/rhel/Dockerfile index 6d01e8662..a2bddb882 100644 --- a/server-mysql/rhel/Dockerfile +++ b/server-mysql/rhel/Dockerfile @@ -55,9 +55,9 @@ RUN set -eux && INSTALL_PKGS="bash \ OpenIPMI-libs \ pcre \ unixODBC" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \ - dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \ - --security --sec-severity=Important --sec-severity=Critical && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \ + dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \ + --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \ dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ dnf -y module enable mysql && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ @@ -111,12 +111,13 @@ RUN set -eux && INSTALL_PKGS="autoconf \ mysql-devel \ net-snmp-devel \ openldap-devel \ + OpenIPMI-devel \ pcre-devel \ git \ gcc \ make \ unixODBC-devel" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,codeready-builder-for-rhel-8-x86_64-rpms" && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ @@ -138,7 +139,7 @@ RUN set -eux && INSTALL_PKGS="autoconf \ --with-libcurl \ --with-libxml2 \ --with-net-snmp \ -# --with-openipmi \ + --with-openipmi \ --with-openssl \ --with-ssh \ --with-unixodbc \ diff --git a/web-nginx-mysql/rhel/Dockerfile b/web-nginx-mysql/rhel/Dockerfile index 7a5df343d..cbc57cb73 100644 --- a/web-nginx-mysql/rhel/Dockerfile +++ b/web-nginx-mysql/rhel/Dockerfile @@ -53,9 +53,9 @@ RUN set -eux && INSTALL_PKGS="bash \ php-mbstring \ php-mysqlnd \ php-xml" && \ - REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \ - dnf -y update-minimal --disablerepo "*" --enablerepo ubi-8-baseos --setopt=tsflags=nodocs \ - --security --sec-severity=Important --sec-severity=Critical && \ + REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms,epel" && \ + dnf -y update-minimal --disablerepo "*" --enablerepo "ubi-8-baseos" --setopt=tsflags=nodocs \ + --security --sec-severity=Important --setopt=install_weak_deps=False --sec-severity=Critical && \ dnf -y module enable mysql && \ dnf -y module enable php:7.4 nginx:1.18 && \ dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ @@ -81,7 +81,7 @@ RUN set -eux && INSTALL_PKGS="bash \ COPY ["conf/etc/", "/etc/"] -RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ +RUN set -eux && REPOLIST="ubi-8-baseos,ubi-8-appstream,rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstream-rpms" && \ INSTALL_PKGS="glibc-locale-source gettext \ git" && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \