Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding docker support #64

Merged
merged 22 commits into from
Jan 6, 2022
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5537a69
Upgrading to node 16.13
texx00 Dec 24, 2021
16c2a04
First docker image test. Need to change the update mechanics, version…
texx00 Dec 24, 2021
3b65d69
Adding gunicorn to docker image
texx00 Dec 26, 2021
967b81a
Added docker-compose file with watchtower. Started experimenting with…
texx00 Dec 26, 2021
35bfa34
--amend
texx00 Dec 26, 2021
762d689
Adding first version of docs for docker
texx00 Dec 26, 2021
cb3fb2a
Updating python libraries versions
texx00 Dec 26, 2021
11d175d
Fixed some libraries versions
texx00 Dec 27, 2021
15e1af0
Buildx test
texx00 Dec 28, 2021
1762a8e
Added dev volume to docker-compose to access serial device. Still nee…
texx00 Dec 28, 2021
fe25c9e
Adding hw libraries to the armv7 image and adding docker workflow for…
texx00 Dec 30, 2021
8381e89
Fixed reboot and shutdown
texx00 Dec 30, 2021
9cc585a
Updated documentation and fixed port issue with docker-compose
texx00 Dec 30, 2021
45f0fb4
Updated docs for docker buildx command
texx00 Dec 30, 2021
f903c68
Added updates controls and checks in the frontend
texx00 Jan 3, 2022
d6c629c
Fixed database volume
texx00 Jan 4, 2022
1be6839
Fixed watchtower setup for pre-update checks. Works only with the cur…
texx00 Jan 4, 2022
e91093a
Adding dockerfile and docker-compose versions check
texx00 Jan 4, 2022
c140d1d
Trying to fix a problem with the new database.db position
texx00 Jan 4, 2022
8842adf
Checked and fixed .env file for docker
texx00 Jan 6, 2022
e5d1714
Fixing i2c libraries
texx00 Jan 6, 2022
16a30e2
Updated docs
texx00 Jan 6, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing i2c libraries
  • Loading branch information
texx00 committed Jan 6, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit e5d17145eb5865027e77d0e5275103d66e33113d
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker file to run the server in a docker environment

# IMPORTANT! before building this image it is important to use "python dev_tools/update_frontend_version_hash.py"
# IMPORTANT! before building this image it is important to use "python dev_tools/update_frontend_version_hash.py". Check the build.md file

# building frontend
FROM node:16.13.0-alpine AS step1
@@ -31,7 +31,7 @@ RUN python -m venv ${VIRTUAL_ENV}

# installing GPIO libraries only on arm/v7
ARG TARGETVARIANT TARGETARCH
RUN if [ "$TARGETARCH/$TARGETVARIANT" = "arm/v7" ] ; then python -m pip install RPi.GPIO board adafruit-circuitpython-neopixel adafruit-circuitpython-tsl2591 rpi_ws281x ; fi
RUN if [ "$TARGETARCH/$TARGETVARIANT" = "arm/v7" ] ; then python -m pip install RPi.GPIO adafruit-circuitpython-neopixel adafruit-circuitpython-tsl2591 rpi_ws281x ; fi

# adding docker-compose file version here to compare at runtime if need to update the file manually on the host
# this version should always match the DOCKER_COMPOSE_FILE_VERSION in the docker-compose.yml file
@@ -56,9 +56,9 @@ COPY docker/placeholder.jpg server/static/placeholder.jpg
# copying frontend files into python image
COPY --from=step1 build frontend/build

RUN python setup.py install

COPY git_shash.json git_shash.json

RUN python setup.py install

EXPOSE 5000
ENTRYPOINT ["bash", "start_server.sh"]
3 changes: 2 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -112,7 +112,8 @@ Here is a brief list of what the software is capable of and what will be impleme
* [x] Shuffle mode to play shuffled drawings continuosly
* [x] Show the realtime gcode simulation with time estimate (ETA)
* [x] Simple lights/led control
* [ ] Update the software with a single button
* [x] Update the software automatically
* [x] Interact with physical buttons to control the table
* [ ] Create logo
* [ ] Run the server not on a production server
* [ ] Advanced lights controls: syncronization between lights and ball