diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-01 16:28:48 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-01 16:28:48 +0200 |
| commit | f74759450bc7d30fd6578bcf0ec5d9b39caad43c (patch) | |
| tree | 91ad9c87f9ee8b3bbf502db227f1d5aad75fb4b6 /pkgs/build-support | |
| parent | ea4121d225e6b3a7bebad1f6686d952a3e5f0e13 (diff) | |
| parent | 92031d6e01bd494a6e92d7dee08e7633256657c4 (diff) | |
| download | nixlib-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar nixlib-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar.gz nixlib-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar.bz2 nixlib-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar.lz nixlib-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar.xz nixlib-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar.zst nixlib-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index b6e342cf9b5e..160c3f85977b 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -437,8 +437,8 @@ rec { echo "Unpacking base image..." tar -C image -xpf "$fromImage" # Do not import the base image configuration and manifest + chmod a+w image image/*.json rm -f image/*.json - rm -f image/manifest.json if [[ -z "$fromImageName" ]]; then fromImageName=$(jshon -k < image/repositories|head -n1) |