git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #105600 from edef1c/nix-prefetch-docker-stderr

nix-prefetch-docker: output informational messages to stderr

commit18db80f150c2a26ce7960b0122ca5c8aa8e75422 authoredef <edef@edef.eu> dateTue 1 Dec 2020, 18:24 (6 years ago) parent919648ade88771
1 file changed+7−7
pkgs/build-support/docker/nix-prefetch-docker+7−7
pkgs/build-support/docker/nix-prefetch-docker+7−7
@@ -127,7 +127,7 @@ trap "rm -rf \"$tmpPath\"" EXIT
127127tmpFile="$tmpPath/$(get_name $finalImageName $finalImageTag)"
128128
129129if test -z "$QUIET"; then
130− skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag"
130+ skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" >&2
131131else
132132 skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null
133133fi
@@ -139,12 +139,12 @@ imageHash=$(nix-hash --flat --type $hashType --base32 "$tmpFile")
139139finalPath=$(nix-store --add-fixed "$hashType" "$tmpFile")
140140
141141if test -z "$QUIET"; then
142− echo "-> ImageName: $imageName"
143− echo "-> ImageDigest: $imageDigest"
144− echo "-> FinalImageName: $finalImageName"
145− echo "-> FinalImageTag: $finalImageTag"
146− echo "-> ImagePath: $finalPath"
147− echo "-> ImageHash: $imageHash"
142+ echo "-> ImageName: $imageName" >&2
143+ echo "-> ImageDigest: $imageDigest" >&2
144+ echo "-> FinalImageName: $finalImageName" >&2
145+ echo "-> FinalImageTag: $finalImageTag" >&2
146+ echo "-> ImagePath: $finalPath" >&2
147+ echo "-> ImageHash: $imageHash" >&2
148148fi
149149
150150if [ "$format" == "nix" ]; then