Review RHEL repositories

2024-11-25 01:04:01 +01:00 · 2021-09-03 17:25:58 -04:00 · 2021-09-03 17:25:58 -04:00 · a249a56059
commit a249a56059
parent fd8f683ba0
7 changed files with 34 additions and 31 deletions
--- 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 \
--- 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 \
--- 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/ && \
--- 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 \
--- 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 \
--- 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 \
--- 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 \