wip

Signed-off-by: Dominik Willner th33xitus@gmail.com

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

README.md

@@ -14,9 +14,9 @@
 ---
 
 ### Configure a Dummy-Webcam:
-1) To configure a dummy-webcam, use the following URL for the stream: \
+To configure a dummy-webcam, use the following URLs: \
-`http://localhost:8110/?action=stream`
+   * Stream: `http://localhost:8110/?action=stream`
-2) In Mainsail pick either `MJPEG-Streamer` or `UV4L-MJPEG` as service.
+   * Snapshot: `http://localhost:8110/?action=snapshot`
 
 ---
 

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"

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