0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #40914 from cristianrz/40912-fix-curl-options

Browse source 
Fix curl progress flags
This commit is contained in:
Tianon Gravi 2020-05-19 12:10:25 -07:00 • committed by GitHub
commit 85dceee7d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/download-frozen-image-v1.sh
View file

@ -84,7 +84,7 @@ while [ $# -gt 0 ]; do
echo "skipping existing ${imageId:0:12}"
continue
fi
curl -SL --progress -H "Authorization: Token $token" "https://registry-1.docker.io/v1/images/$imageId/layer" -o "$dir/$imageId/layer.tar" # -C -
curl -SL --progress-bar -H "Authorization: Token $token" "https://registry-1.docker.io/v1/images/$imageId/layer" -o "$dir/$imageId/layer.tar" # -C -
done
echo
done

4
contrib/download-frozen-image-v2.sh
View file

@ -160,7 +160,7 @@ handle_single_manifest_v2() {
continue
fi
local token="$(curl -fsSL "$authBase/token?service=$authService&scope=repository:$image:pull" | jq --raw-output '.token')"
fetch_blob "$token" "$image" "$layerDigest" "$dir/$layerTar" --progress
fetch_blob "$token" "$image" "$layerDigest" "$dir/$layerTar" --progress-bar
;;
*)
@ -304,7 +304,7 @@ while [ $# -gt 0 ]; do
continue
fi
token="$(curl -fsSL "$authBase/token?service=$authService&scope=repository:$image:pull" | jq --raw-output '.token')"
fetch_blob "$token" "$image" "$imageLayer" "$dir/$layerId/layer.tar" --progress
fetch_blob "$token" "$image" "$imageLayer" "$dir/$layerId/layer.tar" --progress-bar
done
;;