Merge pull request #229 from m-jahn/fix_curl

fix: make curl requests failsafe against redirects, return error on fail

Author: vsoch

CHANGELOG.md

@@ -17,6 +17,7 @@ The client here will eventually be released as "spython" (and eventually to
 singularity on pypi), and the versions here will coincide with these releases.
 
 ## [master](https://github.com/singularityhub/singularity-cli/tree/master)
+ - make curl requests failsafe against redirects, improved error on fail (0.3.15)
  - add stream_type to 'run' command like in 'exec' (0.3.14)
  - do not modify user provided instance name when generating new instance (0.3.13)
  - bug with instance.run_command (0.3.12)

spython/main/parse/parsers/docker.py

@@ -332,7 +332,8 @@ def _parse_http(self, url, dest):
         """
         file_name = os.path.basename(url)
         download_path = "%s/%s" % (dest, file_name)
-        command = "curl %s -o %s" % (url, download_path)
+        curl_flags = "-L --retry 1 --fail --show-error"
+        command = "curl %s %s -o %s" % (curl_flags, url, download_path)
         self.recipe[self.active_layer].install.append(command)
 
     def _parse_archive(self, targz, dest):

spython/version.py

@@ -5,7 +5,7 @@
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-__version__ = "0.3.14"
+__version__ = "0.3.15"
 AUTHOR = "Vanessa Sochat"
 AUTHOR_EMAIL = "[email protected]"
 NAME = "spython"