diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-07-01 16:59:15 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-07-08 13:57:04 +0200 |
| commit | 83fbc0f0359f6885d5c3b22fb5331f459ade7329 (patch) | |
| tree | 2273b72938e5bc03de8961b1bf39ca7f1b92c43e /pkgs/build-support/docker/default.nix | |
| parent | dde58651401cf6ab4d63cdec043d677607af0924 (diff) | |
| download | nixpkgs-83fbc0f0359f6885d5c3b22fb5331f459ade7329.tar nixpkgs-83fbc0f0359f6885d5c3b22fb5331f459ade7329.tar.gz nixpkgs-83fbc0f0359f6885d5c3b22fb5331f459ade7329.tar.bz2 nixpkgs-83fbc0f0359f6885d5c3b22fb5331f459ade7329.tar.lz nixpkgs-83fbc0f0359f6885d5c3b22fb5331f459ade7329.tar.xz nixpkgs-83fbc0f0359f6885d5c3b22fb5331f459ade7329.tar.zst nixpkgs-83fbc0f0359f6885d5c3b22fb5331f459ade7329.zip | |
docker-tools: fixup permssions for extraCommands
Diffstat (limited to 'pkgs/build-support/docker/default.nix')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 004816a0b39..592dcd3cae7 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -252,6 +252,8 @@ rec { echo "No contents to add to layer." fi + chmod ug+w layer + if [[ -n $extraCommands ]]; then (cd layer; eval "$extraCommands") fi @@ -296,7 +298,7 @@ rec { # How much disk to allocate for the temporary virtual machine. diskSize ? 1024, # Commands (bash) to run on the layer; these do not require sudo. - extraCommands ? "", uid ? 0, gid ? 0 + extraCommands ? "" }: # Generate an executable script from the `runAsRoot` text. let runAsRootScript = shellScript "run-as-root.sh" runAsRoot; @@ -311,6 +313,8 @@ rec { echo "Adding $item..." rsync -ak --chown=0:0 $item/ layer/ done + + chmod ug+w layer ''; postMount = '' |