From 5573687ef7f59798b331cfb1fe5c91c1f6505e87 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Thu, 20 Aug 2026 10:27:12 +0100 Subject: [PATCH] Run the orchestrator from its all-in-one image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaces the jobs-service container with the orchestrator image, which carries every control plane in one process — the shape compose wants, where the per-plane images exist for Kubernetes. Appwrite drives the jobs plane exactly as before; only the container it talks to changes. Also lands job-sidecar on the service's own release: it was pinned to 0.18.0 against a 1.3.0 service. Co-Authored-By: Claude Fable 5 --- .env | 2 +- app/config/variables.php | 4 ++-- docker-compose.yml | 20 ++++++++++++++------ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.env b/.env index d6a78fc36b..dbbaba9ee8 100644 --- a/.env +++ b/.env @@ -122,7 +122,7 @@ _APP_EXECUTOR_SECRET=your-secret-key _APP_EXECUTOR_IMAGES=openruntimes/node:v5-22,openruntimes/static:v5-1 _APP_EXECUTOR_CONNECTION_STORAGE=local://localhost _APP_BUILDS_VOLUME=appwrite-builds -_APP_JOBS_HOST=http://orchestrator-jobs:8080 +_APP_JOBS_HOST=http://orchestrator:8080 _APP_JOBS_SECRET=your-secret-key _APP_JOBS_ENDPOINT=http://appwrite _APP_BROWSER_HOST=http://appwrite-browser:3000/v1 diff --git a/app/config/variables.php b/app/config/variables.php index 443dc19f66..98605e9eee 100644 --- a/app/config/variables.php +++ b/app/config/variables.php @@ -1026,9 +1026,9 @@ return [ ], [ 'name' => '_APP_JOBS_HOST', - 'description' => 'The host used by Appwrite to communicate with the open-runtimes jobs-service that builds manual-upload function deployments.', + 'description' => 'The host used by Appwrite to communicate with the open-runtimes orchestrator that builds manual-upload function deployments.', 'introduction' => '1.9.0', - 'default' => 'http://orchestrator-jobs:8080', + 'default' => 'http://orchestrator:8080', 'required' => false, 'overwrite' => true, 'question' => '', diff --git a/docker-compose.yml b/docker-compose.yml index abb56e3c21..fe93003d28 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1498,15 +1498,18 @@ services: retries: 20 start_period: 5s - orchestrator-jobs: - container_name: orchestrator-jobs - hostname: orchestrator-jobs + orchestrator: + container_name: orchestrator + hostname: orchestrator logging: driver: json-file options: max-file: "5" max-size: 10m - image: ghcr.io/open-runtimes/orchestrator/jobs-service:1.3.0 + # One image carrying every orchestrator control plane. Appwrite drives the + # jobs plane today; the per-plane images exist for Kubernetes, where each + # scales, fails and gets RBAC on its own. + image: ghcr.io/open-runtimes/orchestrator/orchestrator:1.3.0 restart: unless-stopped user: root networks: @@ -1515,9 +1518,14 @@ services: - /var/run/docker.sock:/var/run/docker.sock environment: - ORCHESTRATOR_BACKEND=docker + # The jobs plane and the serving planes read the network under different + # names; both name the network the workload containers join. - ORCHESTRATOR_NETWORK=appwrite - - ARTIFACT_ENDPOINT=http://orchestrator-jobs:8080 - - JOB_SIDECAR_IMAGE=ghcr.io/open-runtimes/orchestrator/job-sidecar:0.18.0 + - DOCKER_NETWORK=appwrite + - ARTIFACT_ENDPOINT=http://orchestrator:8080 + # Sidecars ship with the service and move with it, so they share its tag. + - JOB_SIDECAR_IMAGE=ghcr.io/open-runtimes/orchestrator/job-sidecar:1.3.0 + - WORKLOAD_SIDECAR_IMAGE=ghcr.io/open-runtimes/orchestrator/workload-sidecar:1.3.0 mariadb: image: mariadb:10.11