Add changes introduced in https://github.com/Arksine/moonraker/pull/491 to moonraker and klipper images.

fixes #40

config/moonraker.conf

@@ -3,14 +3,9 @@ host: 0.0.0.0
 port: 7125
 klippy_uds_address: /opt/run/klipper.sock
 
-[file_manager]
-config_path: /opt/cfg
-
 [machine]
 provider: systemd_cli
-
+validate_service: False
-[database]
-database_path: /opt/db
 
 [authorization]
 trusted_clients:

config/octoprint.yaml

@@ -1,8 +1,8 @@
 serial:
   additionalPorts:
-  - /opt/run/klipper.tty
+  - /opt/printer_data/run/klipper.tty
   autoconnect: true
-  port: /opt/run/klipper.tty
+  port: /opt/printer_data/run/klipper.tty
 webcam:
   snapshot: http://webcam:8080/snapshot
   stream: /webcam/stream

config/printer-simulavr.cfg

@@ -74,7 +74,7 @@ max_temp: 110
 pin: PD6
 
 [mcu]
-serial: /opt/run/simulavr.tty
+serial: /opt/printer_data/run/simulavr.tty
 
 [printer]
 kinematics: cartesian
@@ -86,7 +86,7 @@ max_z_accel: 30
 
 ## vvv Required by Moonraker/Mainsail/Fluidd vvv
 [virtual_sdcard]
-path: /opt/gcode
+path: /opt/printer_data/gcodes
 
 [display_status]
 

config/printer.cfg

@@ -12,7 +12,7 @@ max_z_velocity: 25
 max_z_accel: 30
 
 [virtual_sdcard]
-path: /opt/gcode
+path: /opt/printer_data/gcodes
 
 [display_status]
 

docker-compose.extra.simulavr.yaml

@@ -5,12 +5,12 @@ x-klipper-simulavr: &klipper-simulavr
     simulavr:
       condition: service_started
   privileged: true
-  command: -I run/klipper.tty -a run/klipper.sock cfg/printer-simulavr.cfg -l log/klippy.log
+  command: -I printer_data/run/klipper.tty -a printer_data/run/klipper.sock printer_data/config/printer-simulavr.cfg -l printer_data/logs/klippy.log
   volumes:
-    - ./config:/opt/cfg
+    - ./config:/opt/printer_data/config
-    - run:/opt/run
+    - run:/opt/printer_data/run
-    - gcode:/opt/gcode
+    - gcode:/opt/printer_data/gcodes
-    - log:/opt/log
+    - log:/opt/printer_data/logs
     - /dev:/dev
 
 services:
@@ -26,7 +26,7 @@ services:
     privileged: true
     volumes:
       - /dev:/dev
-      - run:/opt/run
+      - run:/opt/printer_data/run
   
   ## Reconfigure Klipper service for simulavr
   klipper:

docker-compose.yaml

@@ -7,7 +7,7 @@ x-klipper-svc: &klipper-svc
   depends_on:
     init:
       condition: service_completed_successfully
-  command: -I run/klipper.tty -a run/klipper.sock cfg/printer.cfg -l log/klippy.log
+  command: -I printer_data/run/klipper.tty -a printer_data/run/klipper.sock printer_data/config/printer.cfg -l printer_data/logs/klippy.log
 
 ## Service Definitions
 services:
@@ -17,10 +17,10 @@ services:
   klipper:
     <<: *klipper-svc
     volumes:
-      - ./config:/opt/cfg
+      - ./config:/opt/printer_data/config
-      - run:/opt/run
+      - run:/opt/printer_data/run
-      - gcode:/opt/gcode
+      - gcode:/opt/printer_data/gcodes
-      - log:/opt/log
+      - log:/opt/printer_data/logs
     profiles:
       - fluidd
       - mainsail
@@ -31,10 +31,10 @@ services:
     privileged: true
     volumes:
       - /dev:/dev
-      - ./config:/opt/cfg
+      - ./config:/opt/printer_data/config
-      - run:/opt/run
+      - run:/opt/printer_data/run
-      - gcode:/opt/gcode
+      - gcode:/opt/printer_data/gcodes
-      - log:/opt/log
+      - log:/opt/printer_data/logs
     profiles:
       - octoprint
 
@@ -46,7 +46,6 @@ services:
     pid: host
     logging:
       driver: none
-    command: -c cfg/moonraker.cfg -l log/moonraker.log
     depends_on:
       init:
         condition: service_completed_successfully
@@ -57,11 +56,11 @@ services:
       - /dev/null:/opt/klipper/docs/null
       - /run/dbus:/run/dbus
       - /run/systemd:/run/systemd
-      - run:/opt/run
+      - run:/opt/printer_data/run
-      - gcode:/opt/gcode
+      - gcode:/opt/printer_data/gcodes
-      - log:/opt/log
+      - log:/opt/printer_data/logs
-      - moonraker-db:/opt/db
+      - moonraker-db:/opt/printer_data/database
-      - ./config:/opt/cfg
+      - ./config:/opt/printer_data/config
     profiles:
       - fluidd
       - mainsail
@@ -83,7 +82,7 @@ services:
     privileged: true
     volumes:
       - /dev:/dev
-      - run:/opt/run
+      - run:/opt/printer_data/run
       - octoprint:/octoprint
       - ./config/octoprint.yaml:/octoprint/octoprint/config.yaml
     profiles:

docker/klipper/Dockerfile

@@ -23,16 +23,16 @@ WORKDIR /opt
 COPY --from=build /opt/klipper ./klipper
 COPY --from=build /opt/venv ./venv
 
-RUN mkdir run cfg gcode log
+RUN mkdir printer_data
 RUN groupadd klipper --gid 1000 \
  && useradd klipper --uid 1000 --gid klipper \
  && usermod klipper --append --groups dialout \
  && chown -R klipper:klipper /opt/*
 
 USER klipper
-VOLUME ["/opt/run", "/opt/cfg", "/opt/gcode"]
+VOLUME ["/opt/printer_data"]
 ENTRYPOINT ["/opt/venv/bin/python", "klipper/klippy/klippy.py"]
-CMD ["-I", "run/klipper.tty", "-a", "run/klipper.sock", "cfg/printer.cfg"]
+CMD ["-I", "printer_data/run/klipper.tty", "-a", "printer_data/run/klipper.sock", "printer_data/config/printer.cfg"]
 
 ## For building MCU Code
 FROM ubuntu:18.04 as mcu
@@ -83,4 +83,4 @@ USER simulavr
 ENV PYTHONPATH=/opt/simulavr/build/pysimulavr/
 VOLUME ["/opt/run"]
 ENTRYPOINT ["klipper/scripts/avrsim.py"]
-CMD ["-p", "/opt/run/simulavr.tty", "/opt/klipper/out/klipper.elf"]
+CMD ["-p", "/opt/printer_data/run/simulavr.tty", "/opt/klipper/out/klipper.elf"]

docker/moonraker/Dockerfile

@@ -38,7 +38,7 @@ WORKDIR /opt
 COPY --from=build /opt/moonraker ./moonraker
 COPY --from=build /opt/venv ./venv
 
-RUN mkdir run cfg gcode db log
+RUN mkdir printer_data
 RUN groupadd moonraker --gid 1000 \
  && useradd moonraker --uid 1000 --gid moonraker \
  && usermod moonraker --append --groups dialout \
@@ -51,7 +51,7 @@ RUN ln -s /bin/systemctl /sbin/shutdown \
 ## Start Moonraker
 USER moonraker
 EXPOSE 7125
-VOLUME ["/opt/run", "/opt/cfg", "/opt/gcode", "/opt/db"]
+VOLUME ["/opt/printer_data"]
 ENTRYPOINT ["/opt/venv/bin/python", "moonraker/moonraker/moonraker.py"]
-CMD ["-c", "cfg/moonraker.cfg"]
+CMD ["-d", "/opt/printer_data"]