Compare commits

..

No commits in common. "2d77edd41a64042eefa3bce536ac13aceab4ee20" and "283d56ccfd6fd71bcfeba482e20a41ba7168d0e7" have entirely different histories.

2 changed files with 0 additions and 29 deletions

View File

@ -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"]

View File

@ -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