public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #78945 from jbedo/singularity-img 

singularity-tools: fix buildImage
This commit is contained in:
worldofpeace 2020-02-03 15:19:47 -05:00 committed by GitHub
parent e0595054e3 56c22350c0
commit 8ecbde9def
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/build-support/singularity-tools/default.nix
View File

@ -59,7 +59,8 @@ rec {
mkdir disk mkdir disk
mkfs -t ext3 -b 4096 /dev/${vmTools.hd} mkfs -t ext3 -b 4096 /dev/${vmTools.hd}
mount /dev/${vmTools.hd} disk mount /dev/${vmTools.hd} disk
cd disk mkdir -p disk/img
cd disk/img
mkdir proc sys dev mkdir proc sys dev
# Run root script # Run root script
@ -84,8 +85,10 @@ rec {
done done
done done
# Create runScript # Create runScript and link shell
ln -s ${runScriptFile} singularity ln -s ${runtimeShell} bin/sh
mkdir -p .singularity.d
ln -s ${runScriptFile} .singularity.d/runscript
# Fill out .singularity.d # Fill out .singularity.d
mkdir -p .singularity.d/env mkdir -p .singularity.d/env
@ -94,7 +97,7 @@ rec {
cd .. cd ..
mkdir -p /var/singularity/mnt/{container,final,overlay,session,source} mkdir -p /var/singularity/mnt/{container,final,overlay,session,source}
echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd 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; in result;