From af39a6c058f8a368b582174c1dd79a525187bf36 Mon Sep 17 00:00:00 2001 From: Martin Ashby Date: Sat, 19 May 2018 07:54:17 +0000 Subject: Fixed saves problem in docker, speed up build --- .dockerignore | 1 + Dockerfile | 14 ++++++++------ docker-compose.yml | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +node_modules diff --git a/Dockerfile b/Dockerfile index a6fed73..fdb4794 100644 --- 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/docker-compose.yml b/docker-compose.yml index ebeb531..63058c2 100644 --- 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 -- cgit v1.2.3-ZIG From ce5c33562366c1f6c0ced30c2afd48de3a2d9a76 Mon Sep 17 00:00:00 2001 From: MFAshby Date: Sat, 19 May 2018 11:28:20 +0100 Subject: Add files via upload --- Screenshot.png | Bin 0 -> 288585 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Screenshot.png diff --git a/Screenshot.png b/Screenshot.png new file mode 100644 index 0000000..5c916f9 Binary files /dev/null and b/Screenshot.png differ -- cgit v1.2.3-ZIG From 16eae485812b34fed96eeac39f082bfcb7750d7e Mon Sep 17 00:00:00 2001 From: MFAshby Date: Sat, 19 May 2018 11:32:28 +0100 Subject: Update README.md --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ee585f9..661588d 100644 --- 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://: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") -- cgit v1.2.3-ZIG