Merge pull request #134071 from lukegb/skopeo-cli-change

dockerTools.pullImage: fix for skopeo 1.4.x
This commit is contained in:
Robert Hensing 2021-08-14 23:45:21 +02:00 committed by GitHub
commit 310dd717ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -111,12 +111,13 @@ rec {
destNameTag = "${finalImageName}:${finalImageTag}"; destNameTag = "${finalImageName}:${finalImageTag}";
} '' } ''
skopeo \ skopeo \
--src-tls-verify=${lib.boolToString tlsVerify} \
--insecure-policy \ --insecure-policy \
--tmpdir=$TMPDIR \ --tmpdir=$TMPDIR \
--override-os ${os} \ --override-os ${os} \
--override-arch ${arch} \ --override-arch ${arch} \
copy "$sourceURL" "docker-archive://$out:$destNameTag" \ copy \
--src-tls-verify=${lib.boolToString tlsVerify} \
"$sourceURL" "docker-archive://$out:$destNameTag" \
| cat # pipe through cat to force-disable progress bar | cat # pipe through cat to force-disable progress bar
''; '';