Merge branch 'next' into mosquitto

2024-10-14 22:32:09 +01:00
parent 268c7b4663 81db57002b
commit 5aee2a5cc2
59 changed files with 1509 additions and 436 deletions
--- a/templates/compose/azimutt.yaml
+++ b/templates/compose/azimutt.yaml
@@ -9,9 +9,9 @@ services:
  postgres:
    image: postgres:15
    environment:
-      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
-      - POSTGRES_USER=$SERVICE_USER_POSTGRES
-      - POSTGRES_DB=azimutt
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-azimutt}
    volumes:
      - azimutt-postgres-data:/var/lib/postgresql/data
    healthcheck:
@@ -80,8 +80,8 @@ services:
      - PHX_SERVER=true
      - PHX_HOST=$SERVICE_URL_AZIMUTT
      - PORT=${PORT:-4000}
-      - DATABASE_URL=ecto://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgres/azimutt
-      - SECRET_KEY_BASE=$SERVICE_BASE64_64_AZIMUTT
+      - DATABASE_URL=ecto://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres/${POSTGRES_DB:-azimutt}
+      - SECRET_KEY_BASE=${SERVICE_BASE64_64_AZIMUTT}
      - FILE_STORAGE_ADAPTER=${FILE_STORAGE_ADAPTER:-s3}
      - AUTH_PASSWORD=${AUTH_PASSWORD:-true}
      - SKIP_ONBOARDING_FUNNEL=${SKIP_ONBOARDING_FUNNEL:-true}
--- a/templates/compose/calcom.yaml
+++ b/templates/compose/calcom.yaml
@@ -0,0 +1,65 @@
+# documentation: https://cal.com/docs
+# slogan: Scheduling infrastructure for everyone.
+# tags: calcom,calendso,scheduling,open,source
+# logo: svgs/calcom.svg
+# port: 3000
+
+services:
+  calcom:
+    image: calcom.docker.scarf.sh/calcom/cal.com
+    platform: linux/amd64
+    environment:
+      # Some variables still uses Calcom previous name, Calendso
+      #
+      # Full list https://github.com/calcom/cal.com/blob/main/.env.example
+      - SERVICE_FQDN_CALCOM_3000
+      - NEXT_PUBLIC_LICENSE_CONSENT=agree
+      - NODE_ENV=production
+      - NEXT_PUBLIC_WEBAPP_URL=${SERVICE_FQDN_CALCOM}
+      - NEXT_PUBLIC_API_V2_URL=${SERVICE_FQDN_CALCOM}/api/v2
+      # https://next-auth.js.org/configuration/options#nextauth_url
+      # From https://github.com/calcom/docker?tab=readme-ov-file#important-run-time-variables, it should be ${NEXT_PUBLIC_WEBAPP_URL}/api/auth
+      - NEXTAUTH_URL=${SERVICE_FQDN_CALCOM}/api/auth
+      # It is highly recommended that the NEXTAUTH_SECRET must be overridden and very unique
+      # Use `openssl rand -base64 32` to generate a key
+      - NEXTAUTH_SECRET=${SERVICE_BASE64_CALCOMSECRET}
+      # Encryption key that will be used to encrypt CalDAV credentials, choose a random string, for example with `dd if=/dev/urandom bs=1K count=1 | md5sum`
+      - CALENDSO_ENCRYPTION_KEY=${SERVICE_BASE64_CALCOMKEY}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-calendso}
+      - DATABASE_HOST=postgresql
+      - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@${DATABASE_HOST:-postgresql}/${POSTGRES_DB:-calendso}
+      # Needed to run migrations while using a connection pooler like PgBouncer
+      # Use the same one as DATABASE_URL if you are not using a connection pooler
+      - DATABASE_DIRECT_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@${DATABASE_HOST:-postgresql}/${POSTGRES_DB:-calendso}
+      # GOOGLE_API_CREDENTIALS={}
+      # Set this to 1 if you don't want Cal to collect anonymous usage
+      - CALCOM_TELEMETRY_DISABLED=1
+      # E-mail settings
+      # Configures the global From: header whilst sending emails.
+      - EMAIL_FROM=${EMAIL_FROM}
+      - EMAIL_FROM_NAME=${EMAIL_FROM_NAME}
+      # Configure SMTP settings (@see https://nodemailer.com/smtp/).
+      - EMAIL_SERVER_HOST=${EMAIL_SERVER_HOST}
+      - EMAIL_SERVER_PORT=${EMAIL_SERVER_PORT}
+      - EMAIL_SERVER_USER=${EMAIL_SERVER_USER}
+      - EMAIL_SERVER_PASSWORD=${EMAIL_SERVER_PASSWORD}
+      - NEXT_PUBLIC_APP_NAME="Cal.com"
+      # More info on ALLOWED_HOSTNAMES https://github.com/calcom/cal.com/issues/12201
+      - ALLOWED_HOSTNAMES=["${SERVICE_FQDN_CALCOM}"]
+    depends_on:
+      - postgresql
+  postgresql:
+    image: postgres:16-alpine
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-calendso}
+    volumes:
+      - calcom-postgresql-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
--- a/templates/compose/edgedb.yaml
+++ b/templates/compose/edgedb.yaml
@@ -0,0 +1,41 @@
+# ignore: true
+# documentation: https://www.edgedb.com
+# slogan: An open-source database designed as a spiritual successor to SQL and the relational paradigm. Powered by the Postgres query engine under the hood.
+# tags: db database sql
+# logo: svgs/edgedb.svg
+# port: 5656
+
+services:
+  edgedb:
+    image: edgedb/edgedb
+    environment:
+      - SERVICE_FQDN_EDGEDB_5656
+      - EDGEDB_SERVER_ADMIN_UI=${EDGEDB_SERVER_ADMIN_UI:-enabled}
+      - EDGEDB_SERVER_BACKEND_DSN=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgresql:5432/${POSTGRES_DB:-edgedb}
+      - EDGEDB_SERVER_SECURITY=${EDGEDB_SERVER_SECURITY:-strict}
+      - EDGEDB_SERVER_PASSWORD=${SERVICE_PASSWORD_EDGEDB}
+      - POSTGRES_DB=${POSTGRES_DB:-edgedb}
+    depends_on:
+      postgresql:
+        condition: service_healthy
+    volumes:
+      - edgedb-data:/dbschema
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:5656/server/status/alive"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+
+  postgresql:
+    image: postgres:16-alpine
+    volumes:
+      - edgedb-postgresql-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-edgedb}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
--- a/templates/compose/plausible.yaml
+++ b/templates/compose/plausible.yaml
@@ -10,31 +10,60 @@ services:
    command: 'sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"'
    environment:
      - SERVICE_FQDN_PLAUSIBLE
-      - "DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@plausible_db/plausible"
+      - DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@plausible-db:5432/${POSTGRES_DB:-plausible-db}
+      - CLICKHOUSE_DATABASE_URL=http://plausible-events-db:8123/plausible_events_db
      - BASE_URL=$SERVICE_FQDN_PLAUSIBLE
      - SECRET_KEY_BASE=$SERVICE_BASE64_64_PLAUSIBLE
      - TOTP_VAULT_KEY=$SERVICE_REALBASE64_32_TOTP
    depends_on:
-      - plausible_db
-      - plausible_events_db
-      - mail
+      plausible-db:
+        condition: service_healthy
+      plausible-events-db:
+        condition: service_healthy
+      mail:
+        condition: service_healthy
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "wget",
+          "--no-verbose",
+          "--tries=1",
+          "--spider",
+          "http://127.0.0.1:8000/ping",
+        ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 45s
+
  mail:
    image: bytemark/smtp
+    platform: linux/amd64
+    healthcheck:
+      test: ["CMD-SHELL", "bash -c ':> /dev/tcp/127.0.0.1/25' || exit 1"]
+      interval: 5s
+      timeout: 10s
+      retries: 20

-  plausible_db:
+  plausible-db:
    image: "postgres:16-alpine"
    volumes:
-      - "db-data:/var/lib/postgresql/data"
+      - plausible-postgres-data:/var/lib/postgresql/data
    environment:
-      - POSTGRES_DB=plausible
-      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=${POSTGRES_DB:-plausible-db}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10

-  plausible_events_db:
+  plausible-events-db:
    image: "clickhouse/clickhouse-server:24.3.3.102-alpine"
    volumes:
-      - type: volume
-        source: event-data
-        target: /var/lib/clickhouse
+      - plausible-events-data:/var/lib/clickhouse
      - type: bind
        source: ./clickhouse/clickhouse-config.xml
        target: /etc/clickhouse-server/config.d/logging.xml
@@ -49,3 +78,10 @@ services:
      nofile:
        soft: 262144
        hard: 262144
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "wget --no-verbose --tries=1 -O - http://127.0.0.1:8123/ping || exit 1",
+        ]
+      start_period: 30s
--- a/templates/compose/windmill.yaml
+++ b/templates/compose/windmill.yaml
@@ -32,7 +32,7 @@ services:
    volumes:
      - worker-logs:/tmp/windmill/logs
    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/api/version || exit 1"]
+      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
      interval: 30s
      timeout: 10s
      retries: 3
@@ -51,7 +51,7 @@ services:
      - worker-dependency-cache:/tmp/windmill/cache
      - worker-logs:/tmp/windmill/logs
    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/api/version || exit 1"]
+      test: ["CMD-SHELL", "exit 0"]
      interval: 30s
      timeout: 10s
      retries: 3
@@ -70,7 +70,7 @@ services:
      - worker-dependency-cache:/tmp/windmill/cache
      - worker-logs:/tmp/windmill/logs
    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/api/version || exit 1"]
+      test: ["CMD-SHELL", "exit 0"]
      interval: 30s
      timeout: 10s
      retries: 3
@@ -89,7 +89,7 @@ services:
      - worker-dependency-cache:/tmp/windmill/cache
      - worker-logs:/tmp/windmill/logs
    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/api/version || exit 1"]
+      test: ["CMD-SHELL", "exit 0"]
      interval: 30s
      timeout: 10s
      retries: 3
@@ -108,7 +108,7 @@ services:
    volumes:
      - worker-logs:/tmp/windmill/logs
    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/api/version || exit 1"]
+      test: ["CMD-SHELL", "exit 0"]
      interval: 30s
      timeout: 10s
      retries: 3