From 1c2999551b036755e66d889c620e3a5a3d2ead86 Mon Sep 17 00:00:00 2001
From: ChrisTerBeke <c.terbeke@ultimaker.com>
Date: Wed, 28 Feb 2018 10:30:51 +0100
Subject: [PATCH] install materials, install cura engine, run headless

---
 Dockerfile | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1a0cbe0fff..30aacfdb56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,14 @@
-FROM ultimaker/cura-build-environment:3.2
+FROM ultimaker/cura-build-environment:1
 
 # Environment vars for easy configuration
 ENV CURA_BENV_BUILD_TYPE=Release
-ENV CURA_BRANCH=master
+ENV CURA_BRANCH=3.2
 ENV URANIUM_BRANCH=$CURA_BRANCH
 ENV CURA_ENGINE_BRANCH=$CURA_BRANCH
+ENV MATERIALS_BRANCH=$CURA_BRANCH
 ENV CURA_APP_DIR=/srv/cura
 
+# Ensure our sources dir exists
 RUN mkdir $CURA_APP_DIR
 
 # Setup Uranium
@@ -15,7 +17,7 @@ RUN git clone https://github.com/Ultimaker/Uranium
 WORKDIR $CURA_APP_DIR/Uranium
 RUN git fetch origin
 RUN git checkout $URANIUM_BRANCH
-RUN export PYTHONPATH="${PYTHONPATH}:$CURA_APP_DIR/Uranium"
+RUN export PYTHONPATH=${PYTHONPATH}:$CURA_APP_DIR/Uranium
 
 # Setup Cura
 WORKDIR $CURA_APP_DIR
@@ -24,6 +26,13 @@ WORKDIR $CURA_APP_DIR/Cura
 RUN git fetch origin
 RUN git checkout origin $CURA_BRANCH
 
+# Setup materials
+WORKDIR $CURA_APP_DIR/Cura/resources
+RUN git clone https://github.com/Ultimaker/fdm_materials materials
+WORKDIR $CURA_APP_DIR/Cura/resources/materials
+RUN git fetch origin
+RUN git checkout origin $MATERIALS_BRANCH
+
 # Setup CuraEngine
 WORKDIR $CURA_APP_DIR
 RUN git clone https://github.com/Ultimaker/CuraEngine
@@ -34,10 +43,13 @@ RUN mkdir build
 WORKDIR $CURA_APP_DIR/CuraEngine/build
 RUN cmake3 ..
 RUN make
+RUN make install
+
+# TODO: setup libCharon
 
 # Make sure Cura can find CuraEngine
 RUN ln -s /usr/local/bin/CuraEngine $CURA_APP_DIR/Cura
 
 # Run Cura
 WORKDIR $CURA_APP_DIR/Cura
-CMD ["python3", "cura_app.py"]
+CMD ["python3", "cura_app.py", "--headless"]