modified: setup.py

	modified:   singularity/build/google.py
	modified:   singularity/build/scripts/singularity-build-latest.sh
	modified:   singularity/package.py

Author: vsoch

setup.py

@@ -7,7 +7,7 @@
     name="singularity",
 
     # Version number:
-    version="0.48",
+    version="0.49",
 
     # Application author details:
     author="Vanessa Sochat",

singularity/build/google.py

@@ -195,13 +195,12 @@ 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 50MB padding.")
-            params['size'] = estimate_image_size(spec_file=params['spec_file'],
+            params['size'] = estimate_image_size(spec_file=os.path.abspath(params['spec_file']),
                                                  sudopw='')
 
         image = build_from_spec(spec_file=params['spec_file'], # default will package the image
                                 size=params['size'],
                                 sudopw='', # with root should not need sudo
-                                output_folder=build_dir,
                                 build_dir=build_dir)
 
         # Compress image

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

@@ -11,7 +11,7 @@ sudo pip3 install --upgrade google-api-python-client
 sudo pip3 install --upgrade google
 sudo pip3 install oauth2client==3.0.0
 sudo pip3 install gitpython
-sudo pip3 install singularity
+sudo pip3 install singularity --upgrade
 python3 -c "from singularity.build.google import run_build; run_build()" > /tmp/.shub-log 2>&1
 export command=$(echo "from singularity.build.google import finish_build; finish_build()")
 python3 -c "$command"

singularity/package.py

@@ -31,30 +31,22 @@ def estimate_image_size(spec_file,sudopw=None,padding=50):
     :param spec_file: the spec file, called "Singuarity"
     :param padding: the padding (MB) to add to the image
     '''
-    size_dir = tempfile.mkdtemp()
-    tmp_dir = tempfile.mkdtemp()
     image_folder = build_from_spec(spec_file=spec_file, # default will package the image
                                    sudopw=sudopw, # with root should not need sudo
-                                   output_folder=size_dir,
-                                   build_dir=tmp_dir,
                                    build_folder=True)
     original_size = calculate_folder_size(image_folder)    
     bot.logger.debug("Original image size calculated as %s",original_size)
     padded_size = original_size + padding
     bot.logger.debug("Size with padding will be %s",padded_size)
-    shutil.rmtree(size_dir)
-    os.system('sudo rm -rf %s' %tmp_dir)
     return padded_size
 
 
-def build_from_spec(spec_file=None,build_dir=None,size=None,sudopw=None,
-                    output_folder=None,build_folder=False):
+def build_from_spec(spec_file=None,build_dir=None,size=None,sudopw=None,build_folder=False):
     '''build_from_spec will build a "spec" file in a "build_dir" and return the directory
     :param spec_file: the spec file, called "Singuarity"
     :param sudopw: the sudopw for Singularity, root should provide ''
     :param build_dir: the directory to build in. If not defined, will use tmpdir.
     :param size: the size of the image
-    :param output_folder: where to output the image package
     :param build_folder: "build" the image into a folder instead. Default False
     '''
     if spec_file == None:
@@ -64,7 +56,11 @@ def build_from_spec(spec_file=None,build_dir=None,size=None,sudopw=None,
     bot.logger.debug("Building in directory %s",build_dir)
 
     # Copy the spec to a temporary directory
+    bot.logger.debug("Spec file set to %s",spec_file)
     spec_path = "%s/%s" %(build_dir,os.path.basename(spec_file))
+    bot.logger.debug("Spec file for build should be in %s",spec_path)
+
+    # If it's not already there
     if not os.path.exists(spec_path):
         shutil.copyfile(spec_file,spec_path)