From b73f1be863d39fc15428f1efcb000049be5e72a2 Mon Sep 17 00:00:00 2001
From: yuvipanda <yuvipanda@gmail.com>
Date: Fri, 14 Apr 2017 11:43:27 -0700
Subject: [PATCH] Cleanup assemble script to keep workspace clean

---
 singleuser-builder/s2i/bin/assemble | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/singleuser-builder/s2i/bin/assemble b/singleuser-builder/s2i/bin/assemble
index e3761a69..f14f8200 100755
--- a/singleuser-builder/s2i/bin/assemble
+++ b/singleuser-builder/s2i/bin/assemble
@@ -13,15 +13,11 @@ fi
 
 # Restore artifacts from the previous build (if they exist).
 #
-if [ "$(ls /tmp/artifacts/ 2>/dev/null)" ]; then
-  echo "---> Restoring build artifacts..."
-  mv /tmp/artifacts/. ./
-fi
-
 echo "---> Installing application source..."
-cp -Rf /tmp/src/. ./
+mkdir -p ${APP_DIR}/src
+cp -Rf /tmp/src/. ${APP_DIR}/src
 
 echo "---> Building application from source..."
-if [ -f requirements.txt ]; then
-    ${APP_DIR}/venv/bin/pip install --no-cache-dir -r requirements.txt
+if [ -f ${APP_DIR}/src/requirements.txt ]; then
+    ${APP_DIR}/venv/bin/pip install --no-cache-dir -r ${APP_DIR}/src/requirements.txt
 fi