shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

M #-: fix minor bug in docker_downloader (#1304)

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2021-06-17 16:03:37 +02:00 committed by GitHub
parent 8b1f66c2fe
commit bd1a7db725
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,13 +265,16 @@ if [ -n "$cmd" ] && ! [ "$cmd" == "null" ]; then
cmd=$(echo "$cmd" | jq -r '. | join(" ")')
fi
if [ -n "$entrypoint" ] && ! [ "$entrypoint" == "null" ] && ! echo "$entrypoint" | grep -Ewq '(bash|sh)'; then
if [ -n "$cmd" ] && ! [ "$cmd" == "null" ] && ! echo "$cmd" | grep -Ewq '(bash|sh)'; then
cmd_is_bash=$(echo "$cmd" | grep -E '"\/.*\w+\/(sh"|bash")$' || echo '')
entrypoint_is_bash=$(echo "$entrypoint" | grep -E '\/.*\w+\/(sh|bash)$' || echo '')
if [ -n "$entrypoint" ] && ! [ "$entrypoint" == "null" ] && [ -z "$entrypoint_is_bash" ]; then
if [ -n "$cmd" ] && ! [ "$cmd" == "null" ] && [ -z "$cmd_is_bash" ]; then
one_entrypoint="${entrypoint} ${cmd}"
else
one_entrypoint="${entrypoint}"
fi
elif [ -n "$cmd" ] && ! [ "$cmd" == "null" ] && ! echo "$cmd" | grep -Ewq '(bash|sh)'; then
elif [ -n "$cmd" ] && ! [ "$cmd" == "null" ] && [ -z "$cmd_is_bash" ]; then
one_entrypoint="${cmd}"
fi