diff --git a/Dockerfile b/Dockerfile index 6ebc633..f95caa6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,9 @@ RUN git clone https://github.com/Arksine/moonraker \ && virtualenv -p python3 /build/moonraker-env \ && /build/moonraker-env/bin/pip install -r /build/moonraker/scripts/moonraker-requirements.txt +#### Moonraker Timelapse +RUN git clone https://github.com/mainsail-crew/moonraker-timelapse + #### MJPG-Streamer RUN git clone --depth 1 https://github.com/jacksonliam/mjpg-streamer \ && cd mjpg-streamer \ @@ -108,6 +111,7 @@ COPY --from=builder --chown=printer:printer /build/klippy-env ./klippy-env COPY --from=builder --chown=printer:printer /build/klipper/ ./klipper/ COPY --from=builder --chown=printer:printer /build/moonraker ./moonraker COPY --from=builder --chown=printer:printer /build/moonraker-env ./moonraker-env +COPY --from=builder --chown=printer:printer /build/moonraker-timelapse ./moonraker-timelapse COPY --from=builder --chown=printer:printer /build/simulavr ./simulavr 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 diff --git a/README.md b/README.md index 4114fd6..7dbff71 100644 --- a/README.md +++ b/README.md @@ -28,4 +28,4 @@ To configure a dummy-webcam, use the following URLs: * Rebuild image, recreate and start container : `docker-compose up -d --build` --- -Current image size: 734.45 MB +Current image size: 742.72 MB diff --git a/example-configs/moonraker.conf b/example-configs/moonraker.conf index 908b391..aa9ec6e 100644 --- a/example-configs/moonraker.conf +++ b/example-configs/moonraker.conf @@ -28,6 +28,7 @@ cors_domains: * [history] +#[timelapse] [job_queue] load_on_startup: False diff --git a/example-configs/printer.cfg b/example-configs/printer.cfg index f71c92e..16c49e3 100644 --- a/example-configs/printer.cfg +++ b/example-configs/printer.cfg @@ -28,6 +28,9 @@ [include addons/heater_bed.cfg] #[include addons/temp_sensors.cfg] +# Other addons +#[include addons/timelapse.cfg] + ############################################ ### ADDITIONAL CONFIGURATIONS ### ############################################ diff --git a/scripts/start.sh b/scripts/start.sh index ef9d27d..b0071d2 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -62,6 +62,28 @@ function copy_dummy_images() { fi } +###### +# Link moonraker-timelapse component to moonraker components +### +function link_timelapse() { + local component_source="${HOME}/moonraker-timelapse/component/timelapse.py" + local component_target="${HOME}/moonraker/moonraker/components/timelapse.py" + local macro_source="${HOME}/moonraker-timelapse/klipper_macro/timelapse.cfg" + local macro_target="${HOME}/klipper_config/addons/timelapse.cfg" + + if [[ -f ${component_source} && ! -h ${component_target} ]]; then + status_msg "Linking moonraker-timelapse component ..." + ln -sf "${component_source}" "${component_target}" + status_msg "OK!" + fi + + if [[ -f ${macro_source} && ! -h ${macro_target} ]]; then + status_msg "Linking timelapse.cfg ..." + ln -sf "${macro_source}" "${macro_target}" + status_msg "OK!" + fi +} + #===================================================# #===================================================# @@ -70,6 +92,7 @@ function copy_dummy_images() { check_folder_perms copy_example_configs copy_dummy_images +link_timelapse sudo -S rm /bin/systemctl sudo -S ln -s /bin/service_control /bin/systemctl