refactor(compose): define the static orchestrator command once

api-proxy/compose.onchain.yml

@@ -20,31 +20,8 @@ services:
 
   orchestrator:
     extends:
-      file: ../compose.onchain.yml
+      file: ../compose.onchain.static.yml
       service: orchestrator
-    # Same flags as ../compose.onchain.yml, restated to add -liveRunnerConfig
-    # (`extends` can't append one) + mount runners.json.
-    command:
-      - -orchestrator
-      - -useLiveRunners
-      - -serviceAddr=127.0.0.1:8935
-      - -httpAddr=0.0.0.0:8935
-      - -liveRunnerAddr=https://orchestrator:8935
-      - -orchSecret=abcdef
-      - -network=${NETWORK}
-      - -ethUrl=${ETH_RPC_URL}
-      - -ethKeystorePath=/keystore
-      - -ethAcctAddr=${ORCH_ETH_ACCT}
-      - -ethPassword=${ORCH_ETH_PASSWORD}
-      - -ethOrchAddr=${ORCH_ONCHAIN_ADDR}
-      # Price comes from the app's registration; -pricePerUnit only sets the
-      # unused legacy base price, but an on-chain O won't boot without it.
-      - -pricePerUnit=0
-      - -ticketEV=10000000000
-      - -maxFaceValue=4000000000000000
-      - -liveRunnerConfig=/config/runners.json
-      - -monitor=false
-      - -v=6
     volumes:
       - ${ORCH_KEYSTORE_DIR}:/keystore:ro
       - ./runners.json:/config/runners.json:ro

api-proxy/compose.yml

@@ -10,21 +10,8 @@
 services:
   orchestrator:
     extends:
-      file: ../compose.orchestrator.yml
+      file: ../compose.orchestrator.static.yml
       service: orchestrator
-    # `extends` can't append a single flag to `command`, so the command is
-    # restated here with -liveRunnerConfig added and runners.json mounted in.
-    command:
-      - -orchestrator
-      - -useLiveRunners
-      - -serviceAddr=127.0.0.1:8935
-      - -httpAddr=0.0.0.0:8935
-      - -liveRunnerAddr=https://orchestrator:8935
-      - -orchSecret=abcdef
-      - -network=offchain
-      - -monitor=false
-      - -liveRunnerConfig=/config/runners.json
-      - -v=6
     volumes:
       - ./runners.json:/config/runners.json:ro
 

compose.onchain.static.yml

@@ -0,0 +1,29 @@
+# On-chain overlay for **static** runners.
+#
+# Same as compose.onchain.yml plus -liveRunnerConfig. Separate for the same reason:
+# `extends` replaces a command list, so the flag cannot simply be appended.
+
+services:
+  orchestrator:
+    extends:
+      file: compose.onchain.yml
+      service: orchestrator
+    command:
+      - -orchestrator
+      - -useLiveRunners
+      - -serviceAddr=127.0.0.1:8935
+      - -httpAddr=0.0.0.0:8935
+      - -liveRunnerAddr=https://orchestrator:8935
+      - -orchSecret=abcdef
+      - -network=${NETWORK}
+      - -ethUrl=${ETH_RPC_URL}
+      - -ethKeystorePath=/keystore
+      - -ethAcctAddr=${ORCH_ETH_ACCT}
+      - -ethPassword=${ORCH_ETH_PASSWORD}
+      - -ethOrchAddr=${ORCH_ONCHAIN_ADDR}
+      - -pricePerUnit=0
+      - -ticketEV=10000000000
+      - -maxFaceValue=4000000000000000
+      - -liveRunnerConfig=/config/runners.json
+      - -monitor=false
+      - -v=6

compose.orchestrator.static.yml

@@ -0,0 +1,23 @@
+# Shared orchestrator for **static** runners, offchain.
+#
+# Same as compose.orchestrator.yml plus -liveRunnerConfig, which static runners need
+# to declare themselves. It exists as its own file because `extends` replaces a
+# command list rather than appending to it, so a static example cannot extend the
+# dynamic one and add a flag. Mount your runners.json at /config/runners.json.
+
+services:
+  orchestrator:
+    extends:
+      file: compose.orchestrator.yml
+      service: orchestrator
+    command:
+      - -orchestrator
+      - -useLiveRunners
+      - -serviceAddr=127.0.0.1:8935
+      - -httpAddr=0.0.0.0:8935
+      - -liveRunnerAddr=https://orchestrator:8935
+      - -orchSecret=abcdef
+      - -network=offchain
+      - -liveRunnerConfig=/config/runners.json
+      - -monitor=false
+      - -v=6

vllm/compose.onchain.yml

@@ -19,31 +19,8 @@ services:
 
   orchestrator:
     extends:
-      file: ../compose.onchain.yml
+      file: ../compose.onchain.static.yml
       service: orchestrator
-    # Same flags as ../compose.onchain.yml, restated to add -liveRunnerConfig
-    # (`extends` can't append one) + mount runners.json.
-    command:
-      - -orchestrator
-      - -useLiveRunners
-      - -serviceAddr=127.0.0.1:8935
-      - -httpAddr=0.0.0.0:8935
-      - -liveRunnerAddr=https://orchestrator:8935
-      - -orchSecret=abcdef
-      - -network=${NETWORK}
-      - -ethUrl=${ETH_RPC_URL}
-      - -ethKeystorePath=/keystore
-      - -ethAcctAddr=${ORCH_ETH_ACCT}
-      - -ethPassword=${ORCH_ETH_PASSWORD}
-      - -ethOrchAddr=${ORCH_ONCHAIN_ADDR}
-      # Price comes from the app's registration; -pricePerUnit only sets the
-      # unused legacy base price, but an on-chain O won't boot without it.
-      - -pricePerUnit=0
-      - -ticketEV=10000000000
-      - -maxFaceValue=4000000000000000
-      - -liveRunnerConfig=/config/runners.json
-      - -monitor=false
-      - -v=6
     volumes:
       - ${ORCH_KEYSTORE_DIR}:/keystore:ro
       - ./runners.json:/config/runners.json:ro

vllm/compose.yml

@@ -8,21 +8,8 @@
 services:
   orchestrator:
     extends:
-      file: ../compose.orchestrator.yml
+      file: ../compose.orchestrator.static.yml
       service: orchestrator
-    # `extends` can't append a single flag to `command`, so the command is
-    # restated here with -liveRunnerConfig added and runners.json mounted in.
-    command:
-      - -orchestrator
-      - -useLiveRunners
-      - -serviceAddr=127.0.0.1:8935
-      - -httpAddr=0.0.0.0:8935
-      - -liveRunnerAddr=https://orchestrator:8935
-      - -orchSecret=abcdef
-      - -network=offchain
-      - -monitor=false
-      - -liveRunnerConfig=/config/runners.json
-      - -v=6
     volumes:
       - ./runners.json:/config/runners.json:ro