mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-11 07:15:54 +03:00
dockerTools: Do not pass compressor
to streamLayeredImage
This commit is contained in:
parent
f73a079352
commit
f4871a62d2
@ -517,7 +517,7 @@ rec {
|
||||
|
||||
buildLayeredImage = lib.makeOverridable ({ name, compressor ? "gz", ... }@args:
|
||||
let
|
||||
stream = streamLayeredImage args;
|
||||
stream = streamLayeredImage (builtins.removeAttrs args ["compressor"]);
|
||||
compress = compressorForImage compressor name;
|
||||
in
|
||||
runCommand "${baseNameOf name}.tar${compress.ext}"
|
||||
@ -1286,7 +1286,7 @@ rec {
|
||||
# Wrapper around streamNixShellImage to build an image from the result
|
||||
buildNixShellImage = { drv, compressor ? "gz", ... }@args:
|
||||
let
|
||||
stream = streamNixShellImage args;
|
||||
stream = streamNixShellImage (builtins.removeAttrs args ["compressor"]);
|
||||
compress = compressorForImage compressor drv.name;
|
||||
in
|
||||
runCommand "${drv.name}-env.tar${compress.ext}"
|
||||
|
Loading…
Reference in New Issue
Block a user