From a646f4b45436bd16aa390b22e0548efd3c7a118f Mon Sep 17 00:00:00 2001 From: Daniel Gorin Date: Tue, 10 Mar 2020 14:33:25 +0000 Subject: [PATCH] Fix missing default-policy.json in skopeo We started having issues with `pkgs.dockerTools.pullImage`, were it would fail with: ``` FATA[0000] Error loading trust policy: open /etc/containers/policy.json: no such file or directory ``` It turns out that since `skopeo` was bumped to `0.1.40`, it was accidentally no longer being built with a default policy. This may happen again, see https://github.com/containers/skopeo/issues/787 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 957f691d2250..c065629018c9 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -33,8 +33,8 @@ buildGoPackage { buildFlagsArray = '' -ldflags= - -X github.com/containers/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile} - -X github.com/containers/skopeo/vendor/github.com/containers/image/internal/tmpdir.unixTempDirForBigFiles=/tmp + -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/signature.systemDefaultPolicyPath=${defaultPolicyFile} + -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/internal/tmpdir.unixTempDirForBigFiles=/tmp ''; preBuild = ''