diff --git a/printer-daemon/Dockerfile b/printer-daemon/Dockerfile index bca3d40..84e537a 100644 --- a/printer-daemon/Dockerfile +++ b/printer-daemon/Dockerfile @@ -65,8 +65,3 @@ RUN mkdir -p /opt/printstack/data/moonraker RUN moonraker/scripts/install-moonraker.sh -d /opt/printstack/data/moonraker -z ########################## -# Daemons # -########################## -COPY entrypoint.sh /opt/printstack/entrypoint.sh -RUN chmod +x /opt/printstack/entrypoint.sh -ENTRYPOINT ["/opt/printstack/entrypoint.sh"] diff --git a/printer-daemon/entrypoint.sh b/printer-daemon/entrypoint.sh deleted file mode 100644 index 97ca34a..0000000 --- a/printer-daemon/entrypoint.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Start the processes -/opt/printstack/klippy-env/bin/python /opt/printstack/klipper/klippy/klippy.py -a /tmp/klippy_ud /opt/printstack/data/klipper/printer.cfg & -KLIPPY_PID=$! - -/opt/printstack/moonraker-env/bin/python /opt/printstack/moonraker/moonraker/moonraker.py -c /opt/printstack/data/moonraker/config/moonraker.conf & -MOONRAKER_PID=$! - -# Function to stop both processes -stop_processes() { - kill $KLIPPY_PID - kill $MOONRAKER_PID - sleep 30 - kill -0 $KLIPPY_PID 2>/dev/null && kill -9 $KLIPPY_PID - kill -0 $MOONRAKER_PID 2>/dev/null && kill -9 $MOONRAKER_PID -} - -# Catch signals -trap stop_processes SIGTERM SIGINT - -# Wait for both processes to finish -wait $KLIPPY_PID -wait $MOONRAKER_PID \ No newline at end of file