diff options
| author | Justin Bedo <cu@cua0.org> | 2020-02-14 09:27:07 +1100 |
|---|---|---|
| committer | Justin Bedo <cu@cua0.org> | 2021-09-29 15:35:25 +1000 |
| commit | fa0cc611ff8ae49efd76e2ed7700a2cdef5707c4 (patch) | |
| tree | 21d280f73521f3c8f2af0d7d01af59e946b7f387 /pkgs/build-support/docker | |
| parent | 0319228a458f471c017c326ac39fdb6925156271 (diff) | |
| download | nixpkgs-fa0cc611ff8ae49efd76e2ed7700a2cdef5707c4.tar nixpkgs-fa0cc611ff8ae49efd76e2ed7700a2cdef5707c4.tar.gz nixpkgs-fa0cc611ff8ae49efd76e2ed7700a2cdef5707c4.tar.bz2 nixpkgs-fa0cc611ff8ae49efd76e2ed7700a2cdef5707c4.tar.lz nixpkgs-fa0cc611ff8ae49efd76e2ed7700a2cdef5707c4.tar.xz nixpkgs-fa0cc611ff8ae49efd76e2ed7700a2cdef5707c4.tar.zst nixpkgs-fa0cc611ff8ae49efd76e2ed7700a2cdef5707c4.zip | |
dockerTools: fix export
Diffstat (limited to 'pkgs/build-support/docker')
| -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 . ''; }; |