From ce20e4318d0302ce1cee52bde7fbff40495accd7 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 9 Jun 2021 20:18:00 -0400
Subject: [PATCH] Added Oracle Linux 8 images instead of CentOS 8

---
 agent/ol/Dockerfile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/agent/ol/Dockerfile b/agent/ol/Dockerfile
index 4699051f4..2090db7ad 100644
--- a/agent/ol/Dockerfile
+++ b/agent/ol/Dockerfile
@@ -83,9 +83,7 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \
             git \
             gcc" && \
     microdnf -y install --setopt=install_weak_deps=0 --best \
-        --nodocs dnf && \
-    mkdir -p /etc/yum/vars/ && \
-    echo "" > /etc/yum/vars/ociregion && \
+        --nodocs dnf dnf-plugins-core && \
     dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \
         --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
     cd /tmp/ && \
@@ -116,8 +114,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 && \
-    rm -rf /etc/yum/ && \
+    microdnf -y remove dnf dnf-plugins-core && \
     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/ && \