summary refs log tree commit diff
path: root/pkgs/build-support/docker
diff options
context:
space:
mode:
authorAntoine Eiche <lewo@abesis.fr>2017-07-31 12:25:35 +0200
committerRobin Gloster <mail@glob.in>2017-07-31 13:52:35 +0200
commit9082b660965f8f57c1a2f61c0bdd4f6df7cf862b (patch)
treeecd19d0dfb08b4026d1f47f70d6a5576e275d166 /pkgs/build-support/docker
parent9de667042b7dd9badc9d0c645ca4ebc1af280369 (diff)
downloadnixlib-9082b660965f8f57c1a2f61c0bdd4f6df7cf862b.tar
nixlib-9082b660965f8f57c1a2f61c0bdd4f6df7cf862b.tar.gz
nixlib-9082b660965f8f57c1a2f61c0bdd4f6df7cf862b.tar.bz2
nixlib-9082b660965f8f57c1a2f61c0bdd4f6df7cf862b.tar.lz
nixlib-9082b660965f8f57c1a2f61c0bdd4f6df7cf862b.tar.xz
nixlib-9082b660965f8f57c1a2f61c0bdd4f6df7cf862b.tar.zst
nixlib-9082b660965f8f57c1a2f61c0bdd4f6df7cf862b.zip
dockerTools: fix permissions on base image
If the base image has been built with nixpkgs.dockerTools, the image
configuration and manifest are readonly so we first need to change
their permissions before removing them.

Fix #27632.
Diffstat (limited to 'pkgs/build-support/docker')
-rw-r--r--pkgs/build-support/docker/default.nix2
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)