Use archived rootfs

slapos/recipe/downloader.py

@@ -28,26 +28,60 @@
 import os
 import urllib
 import hashlib
+import tempfile
+import shutil
+import subprocess
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
 BUFFER_SIZE = 1024
 
 def service(args):
+    environ = os.environ.copy()
+    environ.update(PATH=args['path'])
     if not os.path.exists(args['confirm']):
-        urllib.urlretrieve(args['url'], args['output'])
-
-        if args['md5'] is not None:
-            # XXX: Find a better way to do a md5sum
-            md5sum = hashlib.md5()
-            with open(args['output'], 'r') as output:
-                file_buffer = output.read(BUFFER_SIZE)
-                while len(file_buffer) > 0:
-                    md5sum.update(file_buffer)
+        tmpdir = tempfile.mkdtemp()
+        try:
+            # XXX: Hardcoded path
+            tmpoutput = os.path.join(tmpdir, 'downloaded')
+            urllib.urlretrieve(args['url'], tmpoutput)
+
+            if args['md5'] is not None:
+                # XXX: we need to find a better way to do a md5sum
+                md5sum = hashlib.md5()
+                with open(args['output'], 'r') as output:
                     file_buffer = output.read(BUFFER_SIZE)
+                    while len(file_buffer) > 0:
+                        md5sum.update(file_buffer)
+                        file_buffer = output.read(BUFFER_SIZE)
+
+                if args['md5'] != md5sum.hexdigest():
+                    return 127 # Not-null return code
+
+            if not args['archive']:
+                os.rename(tmpoutput, args['output'])
+            else:
+                # XXX: hardcoding path
+                extract_dir = os.path.join(tmpdir, 'extract')
+                os.mkdir(extract_dir)
+                subprocess.check_call(
+                    ['tar', '-x', '-f', tmpoutput,
+                            '-C', extract_dir,
+                    ],
+                    env=environ,
+                )
+                archive_content = os.listdir(extract_dir)
+                if len(archive_content) == 1 and \
+                   os.path.isfile(os.path.join(extract_dir,
+                                               archive_content[0])):
+                    os.rename(os.path.join(extract_dir,
+                                           archive_content[0]),
+                              args['output'])
+                else:
+                    return 127 # Not-null return code
 
-            if args['md5'] != md5sum.hexdigest():
-                return 127 # Not-null return code
+        finally:
+            shutil.rmtree(tmpdir)
 
         # Just a touch on args['confirm'] file
         open(args['confirm'], 'w').close()
@@ -65,16 +99,20 @@ class Recipe(GenericBaseRecipe):
         if len(md5sum) == 0:
             md5sum = None
 
+        keywords = {
+            'url': self.options['url'],
+            'md5': md5sum,
+            'output': self.options['downloaded-file'],
+            'confirm': self.options['downloaded-file-complete'],
+            'archive': self.optionIsTrue('archive', False),
+        }
+        if keywords['archive']:
+            keywords['path'] = self.options['path']
         path_list.append(
             self.createPythonScript(
                 self.options['binary'],
                 'slapos.recipe.downloader.service',
-                {
-                    'url': self.options['url'],
-                    'md5': md5sum,
-                    'output': self.options['downloaded-file'],
-                    'confirm': self.options['downloaded-file-complete']
-                }
+                keywords,
             )
         )
 

software/lxc/instance-lxc.cfg

@@ -53,7 +53,8 @@ md5sum = $${slap-parameter:rootfs-md5sum}
 downloaded-file = $${rootdirectory:srv}/rootfs.img
 downloaded-file-complete = $${:downloaded-file}.complete
 binary = $${basedirectory:services}/rootfsdownload
-wget-binary = ${wget:location}/bin/wget
+path = ${tar:location}/bin/:${gzip:location}/bin/:${bzip2:location}/bin/:${xz-utils:location}/bin/
+archive = true
 
 [lxc-conf]
 recipe = slapos.cookbook:template

software/lxc/software.cfg

@@ -5,10 +5,10 @@ extends =
   ../../component/lxc/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/curl/buildout.cfg
-  ../../component/wget/buildout.cfg
   ../../component/gzip/buildout.cfg
   ../../component/bzip2/buildout.cfg
   ../../component/xz-utils/buildout.cfg
+  ../../component/tar/buildout.cfg
   ../../component/shellinabox/buildout.cfg
   ../../component/pwgen/buildout.cfg
 
@@ -33,7 +33,7 @@ mode = 0644
 [template-lxc]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-lxc.cfg
-md5sum = 2d0975e08aa402a9aec325cfc03229d2
+md5sum = 93791cb9eb71236c94273167d9b7df33
 output = ${buildout:directory}/template-lxc.cfg
 mode = 0644