diff options
Diffstat (limited to 'pkgs/build-support/docker/default.nix')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 4bda4d2a5c2..2d327a9426d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -280,9 +280,13 @@ rec { ''); in runCommand name { } '' - mkdir -p $out cd ${result} - cp layer.tar json VERSION $out + if [ -e json ] && [ -e VERSION ] ; then + mkdir -p $out + cp layer.tar json VERSION $out + else + cp layer.tar $out + fi ''; exportImage = { name ? fromImage.name, fromImage, fromImageName ? null, fromImageTag ? null, diskSize ? 1024 }: @@ -291,7 +295,7 @@ rec { postMount = '' echo "Packing raw image..." - tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out . + tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . ''; }; |