From 4dd01afffbc96363f18fc16773a5a37d42d1324f Mon Sep 17 00:00:00 2001
From: ChrisTerBeke <c.terbeke@ultimaker.com>
Date: Tue, 27 Feb 2018 13:31:07 +0100
Subject: [PATCH] Cleanup Dockerfile

---
 Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4aa7b4557c..e71ae35b46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,20 +5,23 @@ ENV CURA_BRANCH=master
 ENV URANIUM_BRANCH=$CURA_BRANCH
 ENV CURA_BENV_GIT_DIR=/srv/cura
 
-# Setup the repositories
 RUN mkdir $CURA_BENV_GIT_DIR
+
+# Setup Uranium
 WORKDIR $CURA_BENV_GIT_DIR
 RUN git clone https://github.com/Ultimaker/Uranium
 WORKDIR $CURA_BENV_GIT_DIR/Uranium
 RUN git fetch origin
 RUN git checkout $URANIUM_BRANCH
+RUN export PYTHOHPATH="${PYTHONPATH}:$CURA_BENV_GIT_DIR/Uranium"
+
+# Setup Cura
+WORKDIR $CURA_BENV_GIT_DIR
 RUN git clone https://github.com/Ultimaker/cura
 WORKDIR $CURA_BENV_GIT_DIR/Cura
 RUN git fetch origin
 RUN git checkout origin $CURA_BRANCH
 
-# Ensure Uranium is in the python path
-RUN export PYTHOHPATH="${PYTHONPATH}:$CURA_BENV_GIT_DIR/Uranium"
-
 # Run Cura
+WORKDIR $CURA_BENV_GIT_DIR/Cura
 CMD ["python3", "cura_app.py"]