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

M #-: fix minor bug in DockerDownloader (#1265)

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2021-06-01 12:11:14 +02:00 committed by GitHub
parent e0855a22d3
commit 25841b817b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,13 +223,18 @@ if [ $export_from == "dockerhub" ]; then
entrypoint=$(docker inspect "$docker_hub" | jq -r '.[0].Config.Entrypoint')
env=$(docker inspect "$docker_hub" | jq -r '.[0].Config.Env')
else
tmp_dockerfile_template=$dockerfile_template
tmp_dockerfile_template=${tmp_dockerfile_template/\%ONE_ENTRYPOINT\%/''}
echo "$tmp_dockerfile_template" > "$dockerfile"
# Build the image with user Dockerfile to be able to inspect it
docker build -t one"$sid" -f "$dockerfile" "$dockerdir" > /dev/null 2>&1
image_id=$(docker images -q one"$sid")
cmd=$(docker inspect "$docker_hub" | jq -r '.[0].Config.Cmd[] |= "\"" + . + "\"" | .[0].Config.Cmd')
entrypoint=$(docker inspect "$image_id" | jq -r '.[0].Config.Entrypoint |')
entrypoint=$(docker inspect "$image_id" | jq -r '.[0].Config.Entrypoint')
env=$(docker inspect "$image_id" | jq -r '.[0].Config.Env')
# Delete this image as it will need to be build after