Selaa lähdekoodia

Merge pull request #33443 from DeliangFan/fix_download_image_fails

Fix downloading image fails when build docker
Sebastiaan van Stijn 8 vuotta sitten
vanhempi
commit
555bd548ca
1 muutettua tiedostoa jossa 2 lisäystä ja 0 poistoa
  1. 2 0
      contrib/download-frozen-image-v2.sh

+ 2 - 0
contrib/download-frozen-image-v2.sh

@@ -157,6 +157,7 @@ while [ $# -gt 0 ]; do
 									echo "skipping existing ${layerId:0:12}"
 									echo "skipping existing ${layerId:0:12}"
 									continue
 									continue
 								fi
 								fi
+								token="$(curl -fsSL "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$image:pull" | jq --raw-output '.token')"
 								curl -fSL --progress \
 								curl -fSL --progress \
 									-H "Authorization: Bearer $token" \
 									-H "Authorization: Bearer $token" \
 									"https://registry-1.docker.io/v2/$image/blobs/$layerDigest" \
 									"https://registry-1.docker.io/v2/$image/blobs/$layerDigest" \
@@ -229,6 +230,7 @@ while [ $# -gt 0 ]; do
 					echo "skipping existing ${layerId:0:12}"
 					echo "skipping existing ${layerId:0:12}"
 					continue
 					continue
 				fi
 				fi
+				token="$(curl -fsSL "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$image:pull" | jq --raw-output '.token')"
 				curl -fSL --progress -H "Authorization: Bearer $token" "https://registry-1.docker.io/v2/$image/blobs/$imageLayer" -o "$dir/$layerId/layer.tar" # -C -
 				curl -fSL --progress -H "Authorization: Bearer $token" "https://registry-1.docker.io/v2/$image/blobs/$imageLayer" -o "$dir/$layerId/layer.tar" # -C -
 			done
 			done
 			;;
 			;;