updating script

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

Author: vsoch

singularity/build/main.py

@@ -21,6 +21,7 @@
 from singularity.analysis.apps import extract_apps
 from singularity.build.utils import (
     stop_if_result_none,
+    get_build_template_path,
     get_singularity_version,
     test_container
 )
@@ -58,7 +59,6 @@ def run_build(build_dir, params, verbose=True):
 
        The following must be included in params: 
        spec_file, repo_url, branch, commit
-
     '''
 
     # Download the repository
@@ -68,7 +68,7 @@ def run_build(build_dir, params, verbose=True):
 
     os.chdir(build_dir)
 
-    if params['branch'] != None:
+    if params['branch'] is not None:
         bot.info('Checking out branch %s' %params['branch'])
         os.system('git checkout %s' %(params['branch']))
     else:
@@ -81,7 +81,7 @@ def run_build(build_dir, params, verbose=True):
 
     # Commit
 
-    if params['commit'] not in [None,'']:
+    if params['commit'] not in [None, '']:
         bot.info('Checking out commit %s' %params['commit'])
         os.system('git checkout %s .' %(params['commit']))
 
@@ -96,7 +96,7 @@ def run_build(build_dir, params, verbose=True):
 
     # Now look for spec file
     if os.path.exists(params['spec_file']):
-        bot.info("Found spec file %s in repository" %params['spec_file'])
+        bot.info("Found spec file %s in repository" % params['spec_file'])
 
         # If the user has a symbolic link
         if os.path.islink(params['spec_file']):
@@ -107,6 +107,16 @@ def run_build(build_dir, params, verbose=True):
         start_time = datetime.now()
 
         # Secure Build
+        template = get_build_template_path("secure-build.sh")
+        if not os.path.exists(template):
+            bot.exit("Cannot find build template. Exiting.")
+
+        # Assemble the recipe
+        recipe_path = os.path.join(build_dir, params['spec_file'])
+        if not os.path.exists(recipe_path):
+            bot.exit("Cannot find build recipe %s. Exiting." % recipe_path)
+
+        result = Client._run_command(["/bin/bash", template, recipe_path, "container.sif"])
         image = Client.build(recipe=params['spec_file'],
                              build_folder=build_dir,
                              isolated=True)

singularity/build/scripts/secure-build.sh

@@ -5,7 +5,7 @@
 SINGULARITY_BUILDDEF="${1}"
 SINGULARITY_FINAL="${2}"
 
-if [ ! -f ${SINGULARITY_BUILDDEF} ]; then
+if [ ! -f "${SINGULARITY_BUILDDEF}" ]; then
     echo "${SINGULARITY_BUILDDEF} does not exist";
     exit 1;
 fi
@@ -53,7 +53,7 @@ REPO_DIR="/root/repo"
 STAGED_BUILD_IMAGE="/root/build"
 
 # Move the repo to be the REPO_DIR
-mv $BUILDDEF_DIR $REPO_DIR
+cp -R $BUILDDEF_DIR $REPO_DIR
 
 mkdir ${SINGULARITY_WORKDIR}${REPO_DIR}
 mkdir ${SINGULARITY_WORKDIR}${STAGED_BUILD_IMAGE}

singularity/build/utils.py

@@ -40,43 +40,47 @@
 import tempfile
 import zipfile
 
-######################################################################################
+################################################################################
 # Testing/Retry Functions
-######################################################################################
+################################################################################
 
 def stop_if_result_none(result):
     '''stop if result none will return True if we should not retry 
-    when result is none, False otherwise using retrying python package
+       when result is none, False otherwise using retrying python package
     '''
     do_retry = result is not None
     return do_retry
 
 
 def test_container(image_path):
     '''test_container is a simple function to send a command to a container, and 
-    return the status code and any message run for the test. This comes after
-    :param image_path: path to the container image
+       return the status code and any message run for the test. This comes after
+    
+       Parameters
+       ==========
+       image_path: path to the container image
     '''
     from singularity.utils import run_command
     bot.debug('Testing container exec with a list command.')
     testing_command = ["singularity", "exec", image_path, 'ls']
     return run_command(testing_command)
 
 
-######################################################################################
+################################################################################
 # Build Templates
-######################################################################################
+################################################################################
 
 def get_build_template(template_name,params=None,to_file=None):
     '''get_build template returns a string or file for a particular build template, which is
-    intended to build a version of a Singularity image on a cloud resource.
-    :param template_name: the name of the template to retrieve in build/scripts
-    :param params: (if needed) a dictionary of parameters to substitute in the file
-    :param to_file: if defined, will write to file. Default returns string.
+       intended to build a version of a Singularity image on a cloud resource.
+
+       Parameters
+       ==========
+        template_name: the name of the template to retrieve in build/scripts
+        params: (if needed) a dictionary of parameters to substitute in the file
+        to_file: if defined, will write to file. Default returns string.
     '''
-    base = get_installdir()
-    template_folder = "%s/build/scripts" %(base)
-    template_file = "%s/%s" %(template_folder,template_name)
+    template_file = get_build_template_path(template_name)
     if os.path.exists(template_file):
         bot.debug("Found template %s" %template_file)
 
@@ -95,7 +99,25 @@ def get_build_template(template_name,params=None,to_file=None):
 
 
     else:
-        bot.warning("Template %s not found." %template_file)
+        bot.warning("Template %s not found." % template_file)
+
+
+def get_build_template_path(template_name):
+    '''get_build template returns a string or file for a particular build template, which is
+       intended to build a version of a Singularity image on a cloud resource.
+
+       Parameters
+       ==========
+       template_name: the name of the template to retrieve in build/scripts
+    '''
+    base = get_installdir()
+    template_folder = "%s/build/scripts" % base
+    template_file = "%s/%s" %(template_folder, template_name)
+    if os.path.exists(template_file):
+        bot.debug("Found template %s" % template_file)
+        return template_file
+    else:
+        bot.warning("Template %s not found." % template_file)
 
 
 ######################################################################################

singularity/logger/message.py

@@ -232,6 +232,10 @@ def critical(self, message):
     def error(self, message):
         self.emit(ERROR, message, 'ERROR')
 
+    def exit(self, message, return_code=1):
+        self.emit(ERROR, message, 'ERROR')
+        sys.exit(return_code)
+
     def warning(self, message):
         self.emit(WARNING, message, 'WARNING')