Added Oracle Linux 8 images instead of CentOS 8

2025-03-06 10:31:49 +01:00 · 2021-06-10 19:39:57 +05:00 · 2021-06-10 19:39:57 +05:00 · 072228643f
commit 072228643f
parent 7cadf4f03d
20 changed files with 90 additions and 83 deletions
--- a/agent/ol/Dockerfile
+++ b/agent/ol/Dockerfile
@ -35,6 +35,9 @@ RUN set -eux && \
    mkdir -p /var/lib/zabbix && \
    mkdir -p /var/lib/zabbix/enc && \
    mkdir -p /var/lib/zabbix/modules && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    INSTALL_PKGS="bash \
            tzdata \
            iputils \
@ -42,8 +45,9 @@ RUN set -eux && \
            libcurl \
            openssl-libs \
            zlib" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
    export GNUPGHOME="$(mktemp -d)" && \
@ -83,10 +87,7 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
            git \
            gcc" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs dnf dnf-plugins-core && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
+        --nodocs dnf && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /tmp/ && \
@ -117,8 +118,7 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    dnf -y history undo last && \
    dnf -y clean all && \
-    microdnf -y remove dnf dnf-plugins-core && \
-    rm -rf /etc/yum/ && \
+    microdnf -y remove dnf && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
--- a/agent2/ol/Dockerfile
+++ b/agent2/ol/Dockerfile
@ -35,14 +35,18 @@ RUN set -eux && \
    mkdir -p /var/lib/zabbix && \
    mkdir -p /var/lib/zabbix/enc && \
    mkdir -p /var/lib/zabbix/modules && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    INSTALL_PKGS="bash \
            tzdata \
            iputils \
            pcre \
            libcurl \
            openssl-libs" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
    export GNUPGHOME="$(mktemp -d)" && \
@ -84,9 +88,6 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
            gcc" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /tmp/ && \
@ -121,7 +122,6 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
    dnf -y history undo last && \
    dnf -y clean all && \
    microdnf -y remove dnf && \
-    rm -rf /etc/yum/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
--- a/java-gateway/ol/Dockerfile
+++ b/java-gateway/ol/Dockerfile
@ -21,10 +21,14 @@ RUN set -eux && \
    mkdir -p /etc/zabbix/ && \
    mkdir -p /usr/sbin/zabbix_java/ && \
    mkdir -p /usr/sbin/zabbix_java/ext_lib/ && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    INSTALL_PKGS="java-1.8.0-openjdk-headless \
            findutils" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    microdnf -y clean all && \
    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
@ -50,9 +54,6 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
            gcc" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /tmp/ && \
@ -79,7 +80,6 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
    dnf -y history undo last && \
    dnf -y clean all && \
    microdnf -y remove dnf && \
-    rm -rf /etc/yum/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \
    chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \
    chmod -R g=u /etc/zabbix/ /usr/sbin/zabbix_java/ && \
--- a/proxy-mysql/ol/Dockerfile
+++ b/proxy-mysql/ol/Dockerfile
@ -45,12 +45,15 @@ RUN set -eux && \
    mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
    mkdir -p /usr/lib/zabbix/externalscripts && \
    mkdir -p /usr/share/doc/zabbix-proxy-mysql && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    microdnf -y module enable mysql && \
    INSTALL_PKGS="libevent \
            systemd \
            libssh \
-            fping \
            file-libs \
+            fping \
            libxml2 \
            mysql \
            mysql-libs \
@ -61,8 +64,10 @@ RUN set -eux && \
            pcre \
            zlib \
            unixODBC" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        --enablerepo="ol8_developer_EPEL" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
    export GNUPGHOME="$(mktemp -d)" && \
@ -111,9 +116,6 @@ RUN set -eux && \
            unixODBC-devel" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /tmp/ && \
@ -158,7 +160,6 @@ RUN set -eux && \
    dnf -y history undo last && \
    dnf -y clean all && \
    microdnf -y remove dnf && \
-    rm -rf /etc/yum/ && \
    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

--- a/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/proxy-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
@ -3,4 +3,4 @@ name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
 baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
 gpgcheck=1
-enabled=1
+enabled=0
--- a/proxy-sqlite3/ol/Dockerfile
+++ b/proxy-sqlite3/ol/Dockerfile
@ -45,6 +45,9 @@ RUN set -eux && \
    mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
    mkdir -p /usr/lib/zabbix/externalscripts && \
    mkdir -p /usr/share/doc/zabbix-proxy-sqlite3 && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    INSTALL_PKGS="libevent \
            libssh \
            fping \
@ -58,8 +61,10 @@ RUN set -eux && \
            pcre \
            zlib \
            unixODBC" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        --enablerepo="ol8_developer_EPEL" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
    export GNUPGHOME="$(mktemp -d)" && \
@ -108,9 +113,6 @@ RUN set -eux && \
            unixODBC-devel" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /tmp/ && \
@ -155,7 +157,6 @@ RUN set -eux && \
    dnf -y history undo last && \
    dnf -y clean all && \
    microdnf -y remove dnf && \
-    rm -rf /etc/yum/ && \
    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

--- a/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/proxy-sqlite3/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
@ -3,4 +3,4 @@ name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
 baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
 gpgcheck=1
-enabled=1
+enabled=0
--- a/server-mysql/ol/Dockerfile
+++ b/server-mysql/ol/Dockerfile
@ -47,6 +47,9 @@ RUN set -eux && \
    mkdir -p /usr/lib/zabbix/alertscripts && \
    mkdir -p /usr/lib/zabbix/externalscripts && \
    mkdir -p /usr/share/doc/zabbix-server-mysql && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    microdnf -y module enable mysql && \
    INSTALL_PKGS="fping \
            file-libs \
@ -66,8 +69,10 @@ RUN set -eux && \
            pcre \
            zlib \
            unixODBC" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        --enablerepo="ol8_developer_EPEL" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
    export GNUPGHOME="$(mktemp -d)" && \
@ -116,9 +121,6 @@ RUN set -eux && \
            unixODBC-devel" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /tmp/ && \
@ -165,7 +167,6 @@ RUN set -eux && \
    dnf -y history undo last && \
    dnf -y clean all && \
    microdnf -y remove dnf && \
-    rm -rf /etc/yum/ && \
    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

--- a/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/server-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
@ -3,4 +3,4 @@ name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
 baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
 gpgcheck=1
-enabled=1
+enabled=0
--- a/server-pgsql/ol/Dockerfile
+++ b/server-pgsql/ol/Dockerfile
@ -47,6 +47,9 @@ RUN set -eux && \
    mkdir -p /usr/lib/zabbix/alertscripts && \
    mkdir -p /usr/lib/zabbix/externalscripts && \
    mkdir -p /usr/share/doc/zabbix-server-postgresql && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    INSTALL_PKGS="fping \
            file-libs \
            iputils \
@ -64,8 +67,10 @@ RUN set -eux && \
            postgresql-libs \
            zlib \
            unixODBC" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        --enablerepo="ol8_developer_EPEL" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
    export GNUPGHOME="$(mktemp -d)" && \
@ -114,9 +119,6 @@ RUN set -eux && \
            unixODBC-devel" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /tmp/ && \
@ -164,7 +166,6 @@ RUN set -eux && \
    dnf -y history undo last && \
    dnf -y clean all && \
    microdnf -y remove dnf && \
-    rm -rf /etc/yum/ && \
    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

--- a/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/server-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
@ -3,4 +3,4 @@ name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
 baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
 gpgcheck=1
-enabled=1
+enabled=0
--- a/snmptraps/ol/Dockerfile
+++ b/snmptraps/ol/Dockerfile
@ -30,8 +30,9 @@ RUN set -eux && \
            --shell /sbin/nologin \
            --home-dir /var/lib/zabbix/ \
        zabbix && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    mkdir -p /var/lib/zabbix && \
    mkdir -p /var/lib/zabbix/snmptraps && \
    mkdir -p /var/lib/zabbix/mibs && \
--- a/web-apache-mysql/ol/Dockerfile
+++ b/web-apache-mysql/ol/Dockerfile
@ -23,10 +23,12 @@ RUN set -eux && \
    mkdir -p /etc/zabbix && \
    mkdir -p /etc/zabbix/web && \
    mkdir -p /etc/zabbix/web/certs && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    microdnf -y module enable mysql && \
    microdnf -y module enable php:7.4 && \
-    INSTALL_PKGS="dejavu-sans-fonts \
-            curl \
+    INSTALL_PKGS="curl \
            httpd \
            mysql \
            mod_ssl \
@ -40,8 +42,10 @@ RUN set -eux && \
            php-json \
            php-xml \
            supervisor" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        --enablerepo="ol8_developer_EPEL" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    rm -f "/etc/httpd/conf.d/default.conf" && \
    rm -f "/etc/httpd/conf.d/ssl.conf" && \
    rm -f /etc/php-fpm.d/www.conf && \
@ -74,9 +78,6 @@ RUN set -eux && \
            git" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /usr/share/ && \
@ -109,7 +110,6 @@ RUN set -eux && \
    dnf -y history undo last && \
    dnf -y clean all && \
    microdnf -y remove dnf && \
-    rm -rf /etc/yum/ && \
    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

--- a/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/web-apache-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
@ -3,4 +3,4 @@ name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
 baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
 gpgcheck=1
-enabled=1
+enabled=0
--- a/web-apache-pgsql/ol/Dockerfile
+++ b/web-apache-pgsql/ol/Dockerfile
@ -23,9 +23,11 @@ RUN set -eux && \
    mkdir -p /etc/zabbix && \
    mkdir -p /etc/zabbix/web && \
    mkdir -p /etc/zabbix/web/certs && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    microdnf -y module enable php:7.4 && \
-    INSTALL_PKGS="dejavu-sans-fonts \
-            curl \
+    INSTALL_PKGS="curl \
            httpd \
            mod_ssl \
            php \
@ -39,8 +41,10 @@ RUN set -eux && \
            php-xml \
            postgresql \
            supervisor" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        --enablerepo="ol8_developer_EPEL" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    rm -f "/etc/httpd/conf.d/default.conf" && \
    rm -f "/etc/httpd/conf.d/ssl.conf" && \
    rm -f /etc/php-fpm.d/www.conf && \
@ -73,9 +77,6 @@ RUN set -eux && \
            git" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /usr/share/ && \
@ -108,7 +109,6 @@ RUN set -eux && \
    dnf -y history undo last && \
    dnf -y clean all && \
    microdnf -y remove dnf && \
-    rm -rf /etc/yum/ && \
    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

--- a/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/web-apache-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
@ -3,4 +3,4 @@ name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
 baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
 gpgcheck=1
-enabled=1
+enabled=0
--- a/web-nginx-mysql/ol/Dockerfile
+++ b/web-nginx-mysql/ol/Dockerfile
@ -24,6 +24,9 @@ RUN set -eux && \
    mkdir -p /etc/zabbix/web && \
    mkdir -p /etc/zabbix/web/certs && \
    mkdir -p /var/lib/php/session && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    microdnf -y module enable mysql && \
    microdnf -y module enable php:7.4 && \
    INSTALL_PKGS="curl \
@ -38,8 +41,10 @@ RUN set -eux && \
            php-json \
            php-xml \
            supervisor" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        --enablerepo="ol8_developer_EPEL" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    rm -f /etc/nginx/conf.d/*.conf  && \
    rm -f /etc/php-fpm.d/www.conf && \
    microdnf -y clean all && \
@ -66,9 +71,6 @@ RUN set -eux && \
            git" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /usr/share/ && \
@ -101,7 +103,6 @@ RUN set -eux && \
    dnf -y history undo last && \
    dnf -y clean all && \
    microdnf -y remove dnf && \
-    rm -rf /etc/yum/ && \
    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

--- a/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/web-nginx-mysql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
@ -3,4 +3,4 @@ name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
 baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
 gpgcheck=1
-enabled=1
+enabled=0
--- a/web-nginx-pgsql/ol/Dockerfile
+++ b/web-nginx-pgsql/ol/Dockerfile
@ -24,6 +24,9 @@ RUN set -eux && \
    mkdir -p /etc/zabbix/web && \
    mkdir -p /etc/zabbix/web/certs && \
    mkdir -p /var/lib/php/session && \
+    mkdir -p /etc/yum/vars/ && \
+    echo "" > /etc/yum/vars/ociregion && \
+    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    microdnf -y module enable php:7.4 && \
    INSTALL_PKGS="supervisor \
            curl \
@ -37,8 +40,10 @@ RUN set -eux && \
            php-pgsql \
            php-json \
            php-xml" && \
-    microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs ${INSTALL_PKGS} && \
+    microdnf -y --disablerepo="*" --enablerepo="ol8_baseos_latest" \
+        --enablerepo="ol8_appstream" \
+        --enablerepo="ol8_developer_EPEL" \
+        install --setopt=install_weak_deps=0 --best --nodocs ${INSTALL_PKGS} && \
    rm -f /etc/nginx/conf.d/*.conf  && \
    rm -f /etc/php-fpm.d/www.conf && \
    microdnf -y clean all && \
@ -65,9 +70,6 @@ RUN set -eux && \
            git" && \
    microdnf -y install --setopt=install_weak_deps=0 --best \
        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
-    echo "oracle.com" > /etc/yum/vars/ocidomain && \
    dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
        --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
    cd /usr/share/ && \
@ -100,7 +102,6 @@ RUN set -eux && \
    dnf -y history undo last && \
    dnf -y clean all && \
    microdnf -y remove dnf && \
-    rm -rf /etc/yum/ && \
    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

--- a/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
+++ b/web-nginx-pgsql/ol/conf/etc/yum.repos.d/oracle-epel-ol8.repo
@ -3,4 +3,4 @@ name=Oracle Linux $releasever EPEL Packages for Development ($basearch)
 baseurl=https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/developer/EPEL/$basearch/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
 gpgcheck=1
-enabled=1
+enabled=0