git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #78945 from jbedo/singularity-img

singularity-tools: fix buildImage

commit8ecbde9defe35df4169b5f5eebed999488b0182a authorworldofpeace <worldofpeace@protonmail.ch> dateMon 3 Feb 2020, 15:19 (7 years ago) parente05950556c2235
1 file changed+7−4
pkgs/build-support/singularity-tools/default.nix+7−4
pkgs/build-support/singularity-tools/default.nix+7−4
@@ -59,7 +59,8 @@ rec {
5959 mkdir disk
6060 mkfs -t ext3 -b 4096 /dev/${vmTools.hd}
6161 mount /dev/${vmTools.hd} disk
62− cd disk
62+ mkdir -p disk/img
63+ cd disk/img
6364 mkdir proc sys dev
6465
6566 # Run root script
@@ -84,8 +85,10 @@ rec {
8485 done
8586 done
8687
87− # Create runScript
88− ln -s ${runScriptFile} singularity
88+ # Create runScript and link shell
89+ ln -s ${runtimeShell} bin/sh
90+ mkdir -p .singularity.d
91+ ln -s ${runScriptFile} .singularity.d/runscript
8992
9093 # Fill out .singularity.d
9194 mkdir -p .singularity.d/env
@@ -94,7 +97,7 @@ rec {
9497 cd ..
9598 mkdir -p /var/singularity/mnt/{container,final,overlay,session,source}
9699 echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd
97− singularity build $out ./disk
100+ TMPDIR=$(pwd -P) singularity build $out ./img
98101 '');
99102
100103 in result;