From d317cc03cb528c2377d6be8d3359a37d37ab1d84 Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Sat, 26 Feb 2022 09:18:27 +0000
Subject: [PATCH] Initial release

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
---
 Dockerfile      | 30 ++++++++++++++++++++++++++++++
 Makefile        |  4 ++--
 README.md       | 18 +++++-------------
 src/startapp.sh |  4 ++++
 4 files changed, 41 insertions(+), 15 deletions(-)
 create mode 100755 src/startapp.sh

diff --git a/Dockerfile b/Dockerfile
index e69de29..6d8f5fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -0,0 +1,30 @@
+FROM jlesage/baseimage-gui:debian-10  AS BUILDER
+  RUN apt update && apt install -y curl
+
+  RUN curl -L -O https://github.com/Ultimaker/Cura/releases/download/4.13.1/Ultimaker_Cura-4.13.1.AppImage && \
+    chmod a+x Ultimaker_Cura-4.13.1.AppImage && \
+    cp Ultimaker_Cura-4.13.1.AppImage /usr/bin/Ultimaker_Cura-4.13.1.AppImage
+
+  RUN /usr/bin/Ultimaker_Cura-4.13.1.AppImage --appimage-extract && \
+    mv /tmp/squashfs-root /opt/cura && \
+    chmod +x /opt/cura/usr/bin/cura.sh
+
+FROM jlesage/baseimage-gui:debian-10
+  COPY --from=BUILDER /opt/cura /opt/cura
+
+  RUN sed-patch 's/<application type="normal">/<application type="normal" title="Ultimaker Cura">/' /etc/xdg/openbox/rc.xml && \
+    ln -s /opt/cura/usr/bin/cura /usr/bin/cura
+
+  ADD ./src/startapp.sh /startapp.sh
+
+  RUN mkdir -p /app/cura && \
+    mv /config/xdg/config/cura/4.13/cura.cfg /app/cura/ && \
+    ln -sf /app/cura /config/xdg/config/cura/4.13
+
+  VOLUME [ "/app/cura" ]
+  ENV APP_NAME="Cura"
+  ENV USER_ID=0
+  ENV GROUP_ID=0
+  ENV DISPLAY_WIDTH=2340
+  ENV DISPLAY_HEIGHT=1542
+  ENV KEEP_APP_RUNNING=1
diff --git a/Makefile b/Makefile
index e374977..f0993f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .DEFAULT_GOAL := default
 
-IMAGE ?= docker.cluster.fun/private/docker-cura:latest
+IMAGE ?= docker.cluster.fun/private/cura:latest
 
 .PHONY: test # Run all tests, linting and format checks
 test: lint check-format run-tests
@@ -78,4 +78,4 @@ help:
 	@echo "-----------------------------------"
 	@grep '^.PHONY: .* #' Makefile | sed 's/\.PHONY: \(.*\) # \(.*\)/\1	\2/' | expand -t20
 
-default: test build
+default: test docker-build
diff --git a/README.md b/README.md
index 9f1efdb..9c538ba 100644
--- a/README.md
+++ b/README.md
@@ -4,28 +4,20 @@ Docker image containing Ultimaker Cura, accessible via web UI or VNC.
 
 ## Features
 
-## Install
-
-```sh
-
-```
+* Web based GUI (Port 5800)
+* VNC based access (Port 5900)
 
 ## Building from source
 
-With Docker:
-
 ```sh
 make docker-build
 ```
 
-Standalone:
-
-```sh
-make build
-```
-
 ## Resources
 
+* [docker-baseimage-gui](https://github.com/jlesage/docker-baseimage-gui)
+* [Cura](https://github.com/Ultimaker/Cura)
+
 ## Contributing
 
 If you find a bug or have an idea for a new feature please [raise an issue](issues/new) to discuss it.
diff --git a/src/startapp.sh b/src/startapp.sh
new file mode 100755
index 0000000..14d6c6a
--- /dev/null
+++ b/src/startapp.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export HOME=/home
+exec /opt/cura/usr/bin/cura.sh