diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-03 15:19:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-03 15:19:47 -0500 |
commit | 8ecbde9defe35df4169b5f5eebed999488b0182a (patch) | |
tree | f172ee5b7d0863dfe3b9f5bbffa80f5b33c6ec92 /pkgs | |
parent | e0595054e36de889aa15a24a1518e6fdc7cbd7da (diff) | |
parent | 56c22350c09627be925bbe3a224a9e7120b67365 (diff) | |
download | nixlib-8ecbde9defe35df4169b5f5eebed999488b0182a.tar nixlib-8ecbde9defe35df4169b5f5eebed999488b0182a.tar.gz nixlib-8ecbde9defe35df4169b5f5eebed999488b0182a.tar.bz2 nixlib-8ecbde9defe35df4169b5f5eebed999488b0182a.tar.lz nixlib-8ecbde9defe35df4169b5f5eebed999488b0182a.tar.xz nixlib-8ecbde9defe35df4169b5f5eebed999488b0182a.tar.zst nixlib-8ecbde9defe35df4169b5f5eebed999488b0182a.zip |
Merge pull request #78945 from jbedo/singularity-img
singularity-tools: fix buildImage
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/singularity-tools/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index c110d327d3af..54749e416ea3 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -59,7 +59,8 @@ rec { mkdir disk mkfs -t ext3 -b 4096 /dev/${vmTools.hd} mount /dev/${vmTools.hd} disk - cd disk + mkdir -p disk/img + cd disk/img mkdir proc sys dev # Run root script @@ -84,8 +85,10 @@ rec { done done - # Create runScript - ln -s ${runScriptFile} singularity + # Create runScript and link shell + ln -s ${runtimeShell} bin/sh + mkdir -p .singularity.d + ln -s ${runScriptFile} .singularity.d/runscript # Fill out .singularity.d mkdir -p .singularity.d/env @@ -94,7 +97,7 @@ rec { cd .. mkdir -p /var/singularity/mnt/{container,final,overlay,session,source} echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd - singularity build $out ./disk + TMPDIR=$(pwd -P) singularity build $out ./img ''); in result; |