From c404c7136cbdd92d53d0688989724a9cf49e994c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20K=C3=BCffner?= <kueffner.markus@gmail.com>
Date: Thu, 10 Mar 2022 17:41:25 +0100
Subject: [PATCH] simulavr: template klipper service to achieve compatibility
 with octoprint

---
 docker-compose.simulavr.yaml | 46 ++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/docker-compose.simulavr.yaml b/docker-compose.simulavr.yaml
index b6fea0d..3171e17 100644
--- a/docker-compose.simulavr.yaml
+++ b/docker-compose.simulavr.yaml
@@ -1,3 +1,25 @@
+x-klipper-simulavr: &klipper-simulavr
+  depends_on:
+    init:
+      condition: service_completed_successfully
+    simulavr:
+      condition: service_started
+  privileged: true
+  volumes:
+    - ./config:/opt/cfg
+    - run:/opt/run
+    - gcode:/opt/gcode
+    - log:/opt/log
+    - /dev:/dev
+  command:
+    - "-I"
+    - "run/klipper.tty"
+    - "-a"
+    - "run/klipper.sock"
+    - "cfg/printer-simulavr.cfg"
+    - "-l"
+    - "log/klippy.log"
+
 services:
   ## simulavr
   simulavr:
@@ -15,23 +37,7 @@ services:
   
   ## Reconfigure Klipper service for simulavr
   klipper:
-    depends_on:
-      init:
-        condition: service_completed_successfully
-      simulavr:
-        condition: service_started
-    privileged: true
-    volumes:
-      - ./config:/opt/cfg
-      - run:/opt/run
-      - gcode:/opt/gcode
-      - log:/opt/log
-      - /dev:/dev
-    command:
-      - "-I"
-      - "run/klipper.tty"
-      - "-a"
-      - "run/klipper.sock"
-      - "cfg/printer-simulavr.cfg"
-      - "-l"
-      - "log/klippy.log"
\ No newline at end of file
+    <<: *klipper-simulavr
+
+  klipper-priv:
+    <<: *klipper-simulavr