dockerTools.pullImage: fix for skopeo 1.4.x

skopeo 1.4.x doesn't accept --src-tls-verify as a flag to the *program*,
only as a flag to copy; we must pass it after the "copy" verb, or it
will fail with:

> FATA[0000] unknown flag: --src-tls-verify
This commit is contained in:
Luke Granger-Brown 2021-08-14 21:21:26 +00:00
parent 74593328f7
commit dbe9bf9848

View file

@ -111,12 +111,13 @@ rec {
destNameTag = "${finalImageName}:${finalImageTag}";
} ''
skopeo \
--src-tls-verify=${lib.boolToString tlsVerify} \
--insecure-policy \
--tmpdir=$TMPDIR \
--override-os ${os} \
--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
'';