fixing fromHeader bug

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)
+ - bug in Dockerfile fromHeader variable fix (0.0.29)
  - Dockerfile from "as level" removed (0.0.28)
  - fixed ENV parser to handle statements like A=B C=D
  - adding ability to stream command executed to console (0.0.25)

spython/main/parse/converters.py

@@ -207,7 +207,7 @@ def docker2singularity(self, runscript="/bin/bash", force=False):
     '''
 
     recipe = ['Bootstrap: docker']
-    recipe += [ "From: %s" %self.fromHeader[0] ]
+    recipe += [ "From: %s" %self.fromHeader ]
 
     # Sections with key value pairs
     recipe += self._create_section('files')

spython/main/parse/docker.py

@@ -68,7 +68,7 @@ def _from(self, line):
         fromHeader = self._setup('FROM', line)
 
         # Singularity does not support AS level
-        self.fromHeader = re.sub("AS .+", "", fromHeader, flags=re.I)
+        self.fromHeader = re.sub("AS .+", "", fromHeader[0], flags=re.I)
 
         if "scratch" in self.fromHeader:
             bot.warning('scratch is no longer available on Docker Hub.')

spython/version.py

@@ -18,7 +18,7 @@
 
 
 
-__version__ = "0.0.28"
+__version__ = "0.0.29"
 AUTHOR = 'Vanessa Sochat'
 AUTHOR_EMAIL = '[email protected]'
 NAME = 'spython'