diff --git a/Dockerfile b/Dockerfile index 204688f..fd4fd6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,7 +61,6 @@ RUN git clone --depth 1 https://github.com/jacksonliam/mjpg-streamer \ && cd .. \ && make \ && rm -rf _build -COPY mjpg_streamer_images ./mjpg-streamer/mjpg-streamer-experimental/images ## --------- This is the runner image @@ -114,5 +113,6 @@ COPY --from=builder --chown=printer:printer /build/simulavr.elf ./simulavr.elf COPY --from=builder --chown=printer:printer /build/mjpg-streamer/mjpg-streamer-experimental ./mjpg-streamer COPY ./example-configs/ ./example-configs/ +COPY ./mjpg_streamer_images/ ./mjpg_streamer_images/ ENTRYPOINT ["/bin/start"] diff --git a/README.md b/README.md index 8578a72..6e511dd 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,9 @@ --- ### Configure a Dummy-Webcam: -1) To configure a dummy-webcam, use the following URL for the stream: \ -`http://localhost:8110/?action=stream` -2) In Mainsail pick either `MJPEG-Streamer` or `UV4L-MJPEG` as service. +To configure a dummy-webcam, use the following URLs: \ + * Stream: `http://localhost:8110/?action=stream` + * Snapshot: `http://localhost:8110/?action=snapshot` --- diff --git a/docker-compose.yml b/docker-compose.yml index 6668536..d6fc9d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,7 @@ services: - ./printer_storage/gcode_files:/home/printer/gcode_files:delegated - ./printer_storage/klipper_config:/home/printer/klipper_config:delegated - ./printer_storage/klipper_logs:/home/printer/klipper_logs:delegated + - ./printer_storage/webcam_images:/home/printer/mjpg-streamer/images:delegated ports: - "7125:7125" - "8110:8080" diff --git a/mjpg_streamer_images/image0.jpg b/mjpg_streamer_images/image0.jpg new file mode 100644 index 0000000..ba250db Binary files /dev/null and b/mjpg_streamer_images/image0.jpg differ diff --git a/mjpg_streamer_images/image1.jpg b/mjpg_streamer_images/image1.jpg new file mode 100644 index 0000000..1880749 Binary files /dev/null and b/mjpg_streamer_images/image1.jpg differ diff --git a/mjpg_streamer_images/image2.jpg b/mjpg_streamer_images/image2.jpg new file mode 100644 index 0000000..c32a38d Binary files /dev/null and b/mjpg_streamer_images/image2.jpg differ diff --git a/mjpg_streamer_images/image3.jpg b/mjpg_streamer_images/image3.jpg new file mode 100644 index 0000000..57031d6 Binary files /dev/null and b/mjpg_streamer_images/image3.jpg differ diff --git a/mjpg_streamer_images/image4.jpg b/mjpg_streamer_images/image4.jpg new file mode 100644 index 0000000..ed45507 Binary files /dev/null and b/mjpg_streamer_images/image4.jpg differ diff --git a/mjpg_streamer_images/image5.jpg b/mjpg_streamer_images/image5.jpg new file mode 100644 index 0000000..1669df8 Binary files /dev/null and b/mjpg_streamer_images/image5.jpg differ diff --git a/mjpg_streamer_images/image6.jpg b/mjpg_streamer_images/image6.jpg new file mode 100644 index 0000000..63d594c Binary files /dev/null and b/mjpg_streamer_images/image6.jpg differ diff --git a/mjpg_streamer_images/image7.jpg b/mjpg_streamer_images/image7.jpg new file mode 100644 index 0000000..c21bb93 Binary files /dev/null and b/mjpg_streamer_images/image7.jpg differ diff --git a/mjpg_streamer_images/image8.jpg b/mjpg_streamer_images/image8.jpg new file mode 100644 index 0000000..7927e49 Binary files /dev/null and b/mjpg_streamer_images/image8.jpg differ diff --git a/mjpg_streamer_images/image9.jpg b/mjpg_streamer_images/image9.jpg new file mode 100644 index 0000000..9045718 Binary files /dev/null and b/mjpg_streamer_images/image9.jpg differ diff --git a/scripts/start.sh b/scripts/start.sh index 58224b1..239a37b 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1,19 +1,27 @@ #!/bin/bash [ ! -e /bin/systemctl ] && sudo -S ln -s /bin/true /bin/systemctl -cd ~ || exit 1 +cd ~ || exit +[ ! -d ~/klipper_config ] && mkdir klipper_config [ ! -d ~/klipper_logs ] && mkdir klipper_logs [ ! -d ~/gcode_files ] && mkdir gcode_files +[ ! -d ~/webcam_images ] && mkdir webcam_images [ ! -d ~/.moonraker_database ] && mkdir .moonraker_database -if [ ! -d ~/klipper_config ] || find ~/klipper_config -type d -empty; then +if find ~/klipper_config -type d -empty; then cd ~/example-configs || exit 1 - cp -r ./* ~/klipper_config + sudo cp -r ./* ~/klipper_config +fi + +if find ~/webcam_images -type d -empty; then + cd ~/mjpg_streamer_images || exit 1 + sudo cp -r ./* ~/webcam_images fi sudo chown -R printer:printer ~/klipper_config sudo chown -R printer:printer ~/klipper_logs sudo chown -R printer:printer ~/gcode_files +sudo chown -R printer:printer ~/webcam_images sudo chown -R printer:printer ~/.moonraker_database sudo -S rm /bin/systemctl