diff options
author | Robin Gloster <mail@glob.in> | 2017-09-28 13:24:56 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-09-28 14:09:49 +0200 |
commit | 5c6dc717a66b6555e5757f92376527da7a553fec (patch) | |
tree | be9229521c57dc8b860d4736148cd36ba11ff3c3 /pkgs/build-support/docker/default.nix | |
parent | 69344de783ee4fcf0d1c36926249818fb54b52dd (diff) | |
download | nixpkgs-5c6dc717a66b6555e5757f92376527da7a553fec.tar nixpkgs-5c6dc717a66b6555e5757f92376527da7a553fec.tar.gz nixpkgs-5c6dc717a66b6555e5757f92376527da7a553fec.tar.bz2 nixpkgs-5c6dc717a66b6555e5757f92376527da7a553fec.tar.lz nixpkgs-5c6dc717a66b6555e5757f92376527da7a553fec.tar.xz nixpkgs-5c6dc717a66b6555e5757f92376527da7a553fec.tar.zst nixpkgs-5c6dc717a66b6555e5757f92376527da7a553fec.zip |
Revert "dockerTools.pullImage: use skopeo to pull the image"
This reverts commit 01174c5f4d7df0fd0928fbf8a2a8e633a9cf54aa. See https://github.com/NixOS/nixpkgs/pull/29302#issuecomment-332809092 for more information. This broke image format compatibility and therefore amongst others mesos.
Diffstat (limited to 'pkgs/build-support/docker/default.nix')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 267a2812a2a..68b803f6e3c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -32,20 +32,7 @@ rec { inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb; }; - pullImage = - let - nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; - in - # For simplicity we only support sha256. - { imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}" - , sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }: - runCommand name { - impureEnvVars=pkgs.stdenv.lib.fetchers.proxyImpureEnvVars; - outputHashMode="flat"; - outputHashAlgo="sha256"; - outputHash=sha256; - } - "${pkgs.skopeo}/bin/skopeo copy docker://${imageId} docker-archive://$out:${imageId}"; + pullImage = callPackage ./pull.nix {}; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. |