tweaks to bundle.go

Signed-off-by: Vanessa Sochat <[email protected]>

Author: vsoch

singularity/build/scripts/bundle.go

@@ -6,7 +6,6 @@
 package types
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -75,7 +74,7 @@ func NewBundle(bundleDir, bundlePrefix string) (b *Bundle, err error) {
 
 	// Bundle path must be predictable
 	b.Path = "/tmp/sbuild"
-	err = os.MkDir(b.Path)
+	err = os.Mkdir(b.Path)
 	if err != nil {
 		return nil, err
 	}

singularity/build/scripts/singularity-prepare-instance.sh

@@ -66,7 +66,8 @@ mkdir -p ${GOPATH}/src/github.com/sylabs && \
     echo "v${SINGULARITY_VERSION}" > VERSION
 
 cd ${GOPATH}/src/github.com/sylabs/singularity && \
-    wget 
+    wget https://raw.githubusercontent.com/singularityhub/singularity-python/v3.2.1/singularity/build/scripts/bundle.go && \
+    mv bundle.go pkg/build/types/ && \
     ./mconfig && \
     cd ./builddir && \
     make && \
@@ -90,7 +91,7 @@ From: ubuntu:18.04
 %post 
     export LC_LANG=C
     export VERSION=1.12.6 OS=linux ARCH=amd64
-    export SINGULARITY_VERSION=3.2.1
+    export SINGULARITY_VERSION=${SINGULARITY_VERSION}
     apt-get update -y
     apt-get -y install git build-essential libssl-dev uuid-dev pkg-config curl gcc
     apt-get -y install libgpgme11-dev libseccomp-dev squashfs-tools libc6-dev-i386