Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChrisTerBeke <c.terbeke@ultimaker.com>2018-03-01 13:52:09 +0300
committerChrisTerBeke <c.terbeke@ultimaker.com>2018-03-01 13:52:09 +0300
commita8bf44003f0fd8d362efd41b44cf873cda40b921 (patch)
treee12bd4cec7c484b481e29d8326936442560ed643 /Dockerfile
parent2b0211a45f510c81e8a9b2d47ff8c39f4c313cec (diff)
Some fixes in Dockerfile
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile13
1 files changed, 5 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile
index 3e6adc0f4c..b2b6243071 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,19 +23,16 @@ RUN make install
ENV URANIUM_BRANCH=master
WORKDIR $CURA_APP_DIR
RUN git clone -b $URANIUM_BRANCH --depth 1 https://github.com/Ultimaker/Uranium
-WORKDIR $CURA_APP_DIR/Uranium
-
-# Setup materials
-ENV MATERIALS_BRANCH=master
-WORKDIR $CURA_APP_DIR/Cura/resources
-RUN git clone -b $MATERIALS_BRANCH --depth 1 https://github.com/Ultimaker/fdm_materials materials
-WORKDIR $CURA_APP_DIR/Cura/resources/materials
# Setup Cura
ENV CURA_BRANCH=docker
WORKDIR $CURA_APP_DIR
RUN git clone -b $CURA_BRANCH --depth 1 https://github.com/Ultimaker/Cura
-WORKDIR $CURA_APP_DIR/Cura
+
+# Setup materials
+ENV MATERIALS_BRANCH=master
+WORKDIR $CURA_APP_DIR/Cura/resources
+RUN git clone -b $MATERIALS_BRANCH --depth 1 https://github.com/Ultimaker/fdm_materials materials
# Make sure Cura can find CuraEngine
RUN ln -s /usr/local/bin/CuraEngine $CURA_APP_DIR/Cura