From bb8a276aa9c428ca99e30b73d6f9ccf98a8e9445 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Mon, 7 Oct 2024 18:36:25 +0200
Subject: [PATCH] Fix: Windmill

---
 templates/compose/windmill.yaml | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/templates/compose/windmill.yaml b/templates/compose/windmill.yaml
index 366adb9c4..d9d6cceb8 100644
--- a/templates/compose/windmill.yaml
+++ b/templates/compose/windmill.yaml
@@ -1,22 +1,18 @@
 # documentation: https://www.windmill.dev/docs/
-# slogan: Windmill is a developer platform to build production-grade multi-steps automations and internal apps.\
-# info: Login as admin@windmill.dev / changeme to setup the instance & accounts and give yourself super-admin privileges.
+# slogan: Windmill is a developer platform to build production-grade multi-steps automations and internal apps.
 # tags: windmill,workflow,automation,developer,platform
 # logo: svgs/windmill.svg
 # port: 8000
 
-version: "3.7"
-
 services:
   db:
     image: postgres:16
     shm_size: 1g
-    restart: unless-stopped
     volumes:
       - db_data:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
-      POSTGRES_DB: windmill
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=${POSTGRES_DB:-windmill}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 10s
@@ -28,7 +24,7 @@ services:
     environment:
       - SERVICE_FQDN_WINDMILL_8000
       - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@db/windmill
-      - MODE=server
+      - MODE=${MODE:-server}
       - BASE_URL=$SERVICE_FQDN_WINDMILL
     depends_on:
       db:
@@ -40,8 +36,8 @@ services:
     image: ghcr.io/windmill-labs/windmill:main
     environment:
       - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@db/windmill
-      - MODE=worker
-      - WORKER_GROUP=default
+      - MODE=${MODE:-worker}
+      - WORKER_GROUP=${WORKER_GROUP:-default}
     depends_on:
       db:
         condition: service_healthy
@@ -54,8 +50,8 @@ services:
     image: ghcr.io/windmill-labs/windmill:main
     environment:
       - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@db/windmill
-      - MODE=worker
-      - WORKER_GROUP=default
+      - MODE=${MODE:-worker}
+      - WORKER_GROUP=${WORKER_GROUP:-default}
     depends_on:
       db:
         condition: service_healthy
@@ -68,8 +64,8 @@ services:
     image: ghcr.io/windmill-labs/windmill:main
     environment:
       - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@db/windmill
-      - MODE=worker
-      - WORKER_GROUP=default
+      - MODE=${MODE:-worker}
+      - WORKER_GROUP=${WORKER_GROUP:-default}
     depends_on:
       db:
         condition: service_healthy
@@ -82,10 +78,10 @@ services:
     image: ghcr.io/windmill-labs/windmill:main
     environment:
       - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@db/windmill
-      - MODE=worker
-      - WORKER_GROUP=native
-      - NUM_WORKERS=8
-      - SLEEP_QUEUE=200
+      - MODE=${MODE:-worker}
+      - WORKER_GROUP=${WORKER_GROUP:-native}
+      - NUM_WORKERS=${NUM_WORKERS:-8}
+      - SLEEP_QUEUE=${SLEEP_QUEUE:-200}
     depends_on:
       db:
         condition: service_healthy