From 3d83d580f45670858305cb0d110f44a80b6e75b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <cgonzalez@opennebula.io>
Date: Wed, 31 Mar 2021 18:01:37 +0200
Subject: [PATCH] M #: Differenciate between c7 & c8 on DH images (#1050)

---
 src/datastore_mad/remotes/docker_downloader.sh      | 13 ++++++++++---
 .../dockerhub/dockerfiles/{centos => centos7}       |  0
 .../remotes/dockerhub/dockerfiles/centos8           |  7 +++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 rename src/datastore_mad/remotes/dockerhub/dockerfiles/{centos => centos7} (100%)
 create mode 100644 src/datastore_mad/remotes/dockerhub/dockerfiles/centos8

diff --git a/src/datastore_mad/remotes/docker_downloader.sh b/src/datastore_mad/remotes/docker_downloader.sh
index 9f464884f0..e47cdb6d94 100755
--- a/src/datastore_mad/remotes/docker_downloader.sh
+++ b/src/datastore_mad/remotes/docker_downloader.sh
@@ -154,9 +154,12 @@ fi
 
 # Check distro
 if [ -z "$distro" ]; then
-    distro=$(docker run --rm --entrypoint cat \
+    os_info=$(docker run --rm --entrypoint cat \
         -e "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
-        "$docker_hub" /etc/os-release | grep "^ID=.*\n" | cut -d= -f 2 | xargs)
+        "$docker_hub" /etc/os-release)
+
+    distro=$(echo "$os_info" | grep "^ID=.*\n" | cut -d= -f 2 | xargs)
+    version=$(echo "$os_info" | grep "VERSION_ID=" | cut -d= -f 2 | xargs)
 fi
 
 if [ -z "$distro" ]; then
@@ -173,7 +176,11 @@ debian|ubuntu)
     commands=$(cat "$DOCKERFILES/debian")
     ;;
 centos)
-    commands=$(cat "$DOCKERFILES/centos")
+    if [ "$version" = "8" ]; then
+        commands=$(cat "$DOCKERFILES/centos8")
+    else
+        commands=$(cat "$DOCKERFILES/centos7")
+    fi
     ;;
 alpine)
     commands=$(cat "$DOCKERFILES/alpine")
diff --git a/src/datastore_mad/remotes/dockerhub/dockerfiles/centos b/src/datastore_mad/remotes/dockerhub/dockerfiles/centos7
similarity index 100%
rename from src/datastore_mad/remotes/dockerhub/dockerfiles/centos
rename to src/datastore_mad/remotes/dockerhub/dockerfiles/centos7
diff --git a/src/datastore_mad/remotes/dockerhub/dockerfiles/centos8 b/src/datastore_mad/remotes/dockerhub/dockerfiles/centos8
new file mode 100644
index 0000000000..82f3fac474
--- /dev/null
+++ b/src/datastore_mad/remotes/dockerhub/dockerfiles/centos8
@@ -0,0 +1,7 @@
+RUN yum update -y
+RUN yum install -y epel-release
+RUN yum install -y initscripts \
+                    e2fsprogs \
+                    haveged
+RUN yum localinstall -y `find /root/context -type f \( ! -iname "*ec2*" -iname "*el8.noarch.rpm" \)`
+RUN systemctl enable haveged