unicornpaint

commit 445de8359766b4fe04750335dbadec21312bc4c6
parent fd941a660c7758949f292a89310a4a270dc5cc63
Author: Martin Ashby <martin@martin-laptop.lan>
Date:   Sat, 19 May 2018 11:33:21 +0100

Merge branch 'master' of github.com:MFAshby/unicornpaint

Diffstat:
A
.dockerignore
 | 
1
+
M
Dockerfile
 | 
14
++++++++------
M
README.md
 | 
11
++++-------
A
Screenshot.png
 | 
0

M
docker-compose.yml
 | 
2
+-

5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+node_modules
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,8 @@
-FROM python:latest
-RUN pip install unicornhathd Flask Flask-Sockets
-RUN pip install numpy
-COPY build/ /build/
-COPY server.py /
-ENTRYPOINT python server.py
+FROM golang:alpine
+RUN apk update && apk add git
+RUN go get github.com/ecc1/spi
+RUN go get github.com/gorilla/websocket
+COPY build/ build/
+COPY Server.go Unicorn.go RealUnicorn.go ./
+RUN go build -o ./unicornpaint Server.go Unicorn.go RealUnicorn.go
+CMD ./unicornpaint
diff --git a/README.md b/README.md
@@ -1,13 +1,11 @@
 A pretty basic painting app for the Raspberry Pi Unicorn HD hat. 
 Allows multiple people to paint at once & updates in real time.
 
-To run: 
-`curl "https://raw.githubusercontent.com/MFAshby/unicornpaint/master/download_and_run.sh" | sh`
-Open your browser to http://<your raspberry IP address>:3001/
-
-Alternatively, run with docker:
+Run with docker:
 ```
 docker pull mfashby/unicornpaint
 docker run --device /dev/spidev0.0:/dev/spidev0.0 --publish 3001:3001 mfashby/unicornpaint
 ```
-Or use the example docker-compose.yml file 
-\ No newline at end of file
+Or clone the repository and use the example docker-compose.yml file to build & run
+
+![alt text](https://github.com/MFAshby/unicornpaint/raw/master/Screenshot.png "Screenshot")
diff --git a/Screenshot.png b/Screenshot.png
Binary files differ.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
         ports: 
             - "3001:3001"
         volumes:
-            - "/home/pi/docker/unicornpaint/saves/:/saves/"
+            - "/home/pi/docker/unicornpaint/saves/:/go/saves/"
         devices:
             - "/dev/spidev0.0:/dev/spidev0.0"
         restart: always