adding missing build size calculation

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

Author: vsoch

singularity/build/google/instances.py

@@ -28,6 +28,7 @@
 import os
 import pickle
 import requests
+import shutil
 import tempfile
 
 # Log everything to stdout
@@ -129,7 +130,13 @@ def run_build(logfile='/tmp/.shub-log'):
                                                          # commits are no longer unique
                                                          # storage is by commit
 
-        build_files = [finished_image]
+        # The finished recipe must be called Singularity
+        recipe_upload = os.path.join(build_dir, "Singularity")
+        spec_file = os.path.join(build_dir, params['spec_file'])
+        if not os.path.exists(recipe_upload):
+            shutil.move(spec_file, recipe_upload) 
+
+        build_files = [finished_image, recipe_upload]
         bot.info("Sending image to storage:") 
         bot.info('\n'.join(build_files))
 

singularity/build/main.py

@@ -21,6 +21,7 @@
 
 from singularity.analysis.apps import extract_apps
 from singularity.build.utils import (
+    convert_size,
     stop_if_result_none,
     get_build_template_path,
     get_singularity_version,
@@ -154,6 +155,11 @@ def run_build(build_dir, params, verbose=True):
                 inspect["data"]['attributes'] = inspect['attributes']
                 del inspect['attributes']
 
+        # Singularity 3.x no longer calculates size
+        if 'org.label-schema.build-size' not in inspect['data']['attributes']['labels']:
+            image_size = convert_size(os.path.getsize(image), "MB")  # bytes to MB             
+            inspect['data']['attributes']['labels']['org.label-schema.build-size'] = "%sMB" % image_size
+
         Client.debug = params['debug']
 
         # Get information on apps

singularity/build/utils.py

@@ -156,6 +156,14 @@ def get_singularity_version(singularity_version=None):
 # Extensions and Files
 ######################################################################################
 
+def convert_size(size_bytes, to, bsize=1024):
+    '''A function to convert bytes to a human friendly string.
+    '''
+    a = {'KB': 1, 'MB': 2, 'GB': 3, 'TB': 4, 'PB': 5, 'EB': 6}
+    r = float(size_bytes)
+    for _ in range(a[to]):
+        r = r / bsize
+    return r
 
 def sniff_extension(file_path,verbose=True):
     '''sniff_extension will attempt to determine the file type based on the extension,