Druk-3D/klipper-web-control-docker
1
0
Fork 0
mirror of https://github.com/dimalo/klipper-web-control-docker.git synced 2026-03-06 12:00:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX: python3 vs python2

Browse Source
This commit is contained in:
Dieter Schmidt
2021-09-30 11:37:53 +02:00
parent f284e947b6
commit 08031ac5f3
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/Dockerfile
View File

@@ -2,11 +2,10 @@ FROM debian as unzip
ARG FRONTEND_ZIP_URL=https://github.com/cadriel/fluidd/releases/latest/download/fluidd.zip
ARG DEBIAN_FRONTEND=noninteractive
WORKDIR /frontend
ADD ${FRONTEND_ZIP_URL} /tmp/frontend.zip
RUN apt-get update && apt-get install -y unzip
RUN DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y unzip
RUN unzip /tmp/frontend.zip -d /frontend
FROM nginx:alpine as image

2
klipper/Dockerfile
View File

@@ -41,7 +41,6 @@ FROM python:3.9-slim as image
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y \
git \
gcc \
@@ -88,6 +87,7 @@ RUN useradd --user-group --no-log-init --shell /bin/false -m -d ${HOME} ${USER}
mkdir -p /var/log/klipper && chown ${USER}:${USER} /var/log/klipper ${HOME} && \
pip install --no-cache supervisord-dependent-startup gpiod
RUN mkdir -p /usr/lib/python3 && ln -s /usr/local/lib/python3.9/site-packages /usr/lib/python3/dist-packages
USER ${USER}
WORKDIR ${HOME}

2
klipper/moonraker.ini
View File

@@ -1,7 +1,7 @@
[program:moonraker]
user=klippy
command=/home/klippy/moonraker-env/bin/python /home/klippy/moonraker/moonraker/moonraker.py -l /var/log/klipper/moonraker.log -c /home/klippy/.config/moonraker.conf
environment=USER=klippy,HOME=/home/klippy,PYTHONHOME=/home/klippy/moonraker-env
environment=USER=klippy,HOME=/home/klippy
stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes = 0
stderr_logfile=/dev/fd/2