modified: singularity/build/google.py

	modified:   singularity/build/scripts/singularity-build-latest.sh

Author: vsoch

singularity/build/google.py

@@ -195,7 +195,7 @@ def run_build(build_dir=None,spec_file=None,repo_url=None,token=None,size=None,b
         # If size is None, get from image + 50 padding
         if params['size'] == None:
             bot.logger.info("Size not detected for build. Will estimate with 200MB padding.")
-            params['size'] = estimate_image_size(spec_file=os.path.abspath(params['spec_file']),
+            params['size'] = estimate_image_size(spec_file=params['spec_file'],
                                                  sudopw='')
 
         image = build_from_spec(spec_file=params['spec_file'], # default will package the image

singularity/build/scripts/singularity-build-latest.sh

@@ -4,15 +4,14 @@ sudo apt-get -y install git
 sudo apt-get install -y build-essential libtool autotools-dev automake autoconf
 sudo apt-get install -y python3-pip
 cd /tmp && git clone http://www.github.com/singularityware/singularity
-cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
+cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install && cd..
 export SINGULARITY_VERSION=$(singularity --version)
 sudo pip3 install --upgrade pip
 sudo pip3 install --upgrade google-api-python-client
 sudo pip3 install --upgrade google
 sudo pip3 install oauth2client==3.0.0
 sudo pip3 install gitpython
-cd /tmp && git clone https://github.com/singularityware/singularity-python
-cd singularity-python && python3 setup.py sdist && sudo python3 setup.py install && cd ..
+sudo pip3 install singularity
 python3 -c "from singularity.build.google import run_build; run_build()" > /tmp/.shub-log 2>&1
 command=$(echo "from singularity.build.google import finish_build; finish_build()")
 python3 -c "$command"