From f571371b374303a75e85d0b9d6ad27f9c4632a32 Mon Sep 17 00:00:00 2001
From: yuvipanda <yuvipanda@gmail.com>
Date: Mon, 22 May 2017 14:41:52 -0700
Subject: [PATCH] Usability improvements for manual usage

- Name no longer needs to be specified, isn't really used anywhere
- Cleans up checkout by default
---
 builder/app.py | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/builder/app.py b/builder/app.py
index 95ca3b24..372367de 100644
--- a/builder/app.py
+++ b/builder/app.py
@@ -3,11 +3,13 @@ import json
 import os
 import time
 import logging
+import uuid
+import shutil
 from pythonjsonlogger import jsonlogger
 
 
-from traitlets.config import Application, LoggingConfigurable, Unicode, Dict, List
-from traitlets import Type
+from traitlets.config import Application, LoggingConfigurable
+from traitlets import Type, Bool, Unicode, Dict, List
 import docker
 from docker.utils import kwargs_from_env
 
@@ -23,12 +25,6 @@ class Builder(Application):
         config=True
     )
 
-    build_name = Unicode(
-        None,
-        allow_none=True,
-        config=True
-    )
-
     source_url = Unicode(
         None,
         allow_none=True,
@@ -58,12 +54,22 @@ class Builder(Application):
         config=True
     )
 
+    cleanup_checkout = Bool(
+        True,
+        config=True,
+        help="""
+        Set to True to clean up the checked out directory after building is done.
+
+        Will only clean up after a successful build - failed builds will still leave their
+        checkouts intact.
+        """
+    )
+
     aliases = Dict({
         'source': 'Builder.source_url',
         'ref': 'Builder.source_ref',
         'output': 'Builder.output_image_spec',
         'f': 'Builder.config_file',
-        'n': 'Builder.build_name'
     })
 
 
@@ -117,7 +123,8 @@ class Builder(Application):
             # image not found, proceed to build
             pass
 
-        output_path = os.path.join(self.git_workdir, self.build_name)
+
+        output_path = os.path.join(self.git_workdir, str(uuid.uuid4()))
         self.fetch(
             self.source_url,
             self.source_ref,
@@ -148,6 +155,8 @@ class Builder(Application):
                 self.log.info('Pushing image', extra=dict(progress=layers, phase='pushing'))
                 last_emit_time = time.time()
 
+        shutil.rmtree(output_path)
+
 
 if __name__ == '__main__':
     f = Builder()