From 824c9ac5c977ed67c20b9fae7e16c50d124dd55c Mon Sep 17 00:00:00 2001 From: Robin Bate Boerop Date: Mon, 3 Apr 2023 21:12:13 +0300 Subject: [PATCH] nix-prefetch-docker: handle overrides correctly Without this change, the `--os` and `--arch` switches are disregarded for operations involving `skopeo inspect` invocations. This means that, for example, one cannot fetch Linux images while on macOS. --- pkgs/build-support/docker/nix-prefetch-docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/nix-prefetch-docker b/pkgs/build-support/docker/nix-prefetch-docker index 5798ab5984f1..f551d37cda96 100755 --- a/pkgs/build-support/docker/nix-prefetch-docker +++ b/pkgs/build-support/docker/nix-prefetch-docker @@ -38,7 +38,7 @@ get_image_digest(){ imageTag="latest" fi - skopeo --insecure-policy --tmpdir=$TMPDIR inspect "docker://$imageName:$imageTag" | jq '.Digest' -r + skopeo --override-os "${os}" --override-arch "${arch}" --insecure-policy --tmpdir=$TMPDIR inspect "docker://$imageName:$imageTag" | jq '.Digest' -r } get_name() {