F OpenNebula#4089: Fix docker_downloader for centos distro

christian7007 · May 21, 2020 · df8ccc8 · df8ccc8
1 parent 50fb225
commit df8ccc8
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/src/datastore_mad/remotes/docker_downloader.sh b/src/datastore_mad/remotes/docker_downloader.sh
@@ -148,16 +148,9 @@ mkdir -p $dockerdir
 mkdir -p $dockerdir/mnt
 
 # Check distro
-
 distro=`docker run --rm \
         -e "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
-        $docker_hub cat /etc/os-release | grep "ID_LIKE=" | cut -d= -f 2 || true`
-
-if [ -z $distro ]; then
-    distro=`docker run --rm \
-            -e "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
-            $docker_hub cat /etc/os-release | grep "^ID=.*\n" | cut -d= -f 2 || true`
-fi
+        $docker_hub cat /etc/os-release | grep "^ID=.*\n" | cut -d= -f 2 | xargs`
 
 if [ -z $distro ]; then
     echo "Cannot identified $docker_hub distribution" 1>&2
@@ -197,7 +190,7 @@ RUN systemctl enable haveged
 EOC
 )
     ;;
-centos|redhat)
+centos)
     terminal="/bin/bash"
     contextpkg=$dockerdir/context.rpm
     contexturl=$CONTEXT_URL/v$selected_tag/one-context-$selected_tag-1.el7.noarch.rpm