shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-11 04:58:16 +03:00
Code Releases Wiki Activity

F #4089: Fix docker_downloader for centos distro

Browse Source
This commit is contained in:
Christian González 2020-05-21 11:04:19 +02:00
parent 50fb225cbe
commit df8ccc871b
No known key found for this signature in database
GPG Key ID: BC941A50DF6A42EA
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/datastore_mad/remotes/docker_downloader.sh
View File

@ -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