Merge branch 'next' into andrasbacsai/livewire-model-binding

app/Livewire/Project/Resource/Create.php

@@ -81,7 +81,7 @@ public function mount()
                         'destination_id' => $destination->id,
                         'destination_type' => $destination->getMorphClass(),
                     ];
-                    if ($oneClickServiceName === 'cloudflared') {
+                    if ($oneClickServiceName === 'cloudflared' || $oneClickServiceName === 'pgadmin') {
                         data_set($service_payload, 'connect_to_docker_network', true);
                     }
                     $service = Service::create($service_payload);

public/svgs/gramps-web.svg

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg602"
+   sodipodi:version="0.34"
+   width="500pt"
+   height="500pt"
+   xml:space="preserve"
+   sodipodi:docname="logo.svg"
+   version="1.1"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><metadata
+     id="metadata90"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs604"><linearGradient
+       id="linearGradient627"><stop
+         style="stop-color:#7f7f7f;stop-opacity:1;"
+         offset="0"
+         id="stop628" /><stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop629" /></linearGradient><linearGradient
+       xlink:href="#linearGradient627"
+       id="linearGradient630" /><radialGradient
+       xlink:href="#linearGradient627"
+       id="radialGradient631"
+       cx="0.4920629"
+       cy="0.48437563"
+       r="0.7127381"
+       fx="0.4920629"
+       fy="0.48437563" /><radialGradient
+       xlink:href="#linearGradient627"
+       id="radialGradient634"
+       cx="0.5"
+       cy="0.5"
+       r="0.5"
+       fx="0.5"
+       fy="0.5" /><radialGradient
+       xlink:href="#linearGradient627"
+       id="radialGradient637"
+       cx="0.49542692"
+       cy="0.53518981"
+       r="0.55758011"
+       fx="0.49542692"
+       fy="0.53518981"
+       gradientTransform="scale(1.038947,0.962513)"
+       gradientUnits="objectBoundingBox" /></defs><sodipodi:namedview
+     id="base"
+     showgrid="false"
+     inkscape:zoom="0.73361291"
+     inkscape:cx="456.94095"
+     inkscape:cy="277.6002"
+     inkscape:window-width="1920"
+     inkscape:window-height="1003"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1176"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-paths="true"
+     inkscape:object-paths="true"
+     inkscape:document-rotation="0" /><g
+     id="g1176"
+     transform="translate(1.111852,-1.9505107)"><path
+       inkscape:connector-curvature="0"
+       id="path1087"
+       d="m 175.2367,338.27684 h 31.47905 v -153.9548 h 60.76188"
+       style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /><rect
+       ry="13.418079"
+       rx="13.418079"
+       y="298.72879"
+       x="53.249031"
+       height="77.683617"
+       width="114.48766"
+       id="rect1025"
+       style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><rect
+       ry="13.418079"
+       rx="13.418079"
+       y="145.48022"
+       x="260.97763"
+       height="77.683617"
+       width="114.48766"
+       id="rect1025-3"
+       style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><rect
+       ry="13.418079"
+       rx="13.418079"
+       y="66.233986"
+       x="496.70627"
+       height="77.683617"
+       width="114.48766"
+       id="rect1025-3-7"
+       style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><rect
+       ry="13.418079"
+       rx="13.418079"
+       y="216.99173"
+       x="496.70627"
+       height="77.683617"
+       width="114.48766"
+       id="rect1025-3-6-5"
+       style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><path
+       inkscape:connector-curvature="0"
+       id="path1087-3"
+       d="m 175.2367,338.27684 h 31.47905 v 153.9548 h 60.76188"
+       style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /><rect
+       ry="13.418079"
+       rx="13.418079"
+       y="453.3432"
+       x="260.97763"
+       height="77.683617"
+       width="114.48766"
+       id="rect1025-3-5"
+       style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><path
+       inkscape:connector-curvature="0"
+       id="path1087-6"
+       d="m 389.46529,181.9825 h 36.59813 v -76.10121 h 70.64286"
+       style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /><path
+       inkscape:connector-curvature="0"
+       id="path1087-3-2"
+       d="m 375.46529,181.9825 50.59813,0 v 76.1012 h 70.64286"
+       style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       sodipodi:nodetypes="cccc" /><rect
+       ry="13.418079"
+       rx="13.418079"
+       y="375.8923"
+       x="496.70627"
+       height="77.683617"
+       width="114.48766"
+       id="rect1025-3-7-9"
+       style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><rect
+       ry="13.418079"
+       rx="13.418079"
+       y="526.65009"
+       x="496.70627"
+       height="77.683617"
+       width="114.48766"
+       id="rect1025-3-6-5-1"
+       style="opacity:1;vector-effect:none;fill:#6D4C41;fill-opacity:1;stroke:#6D4C41;stroke-width:18;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /><path
+       inkscape:connector-curvature="0"
+       id="path1087-6-2"
+       d="m 389.46529,491.64082 h 36.59813 v -76.10121 h 70.64286"
+       style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /><path
+       inkscape:connector-curvature="0"
+       id="path1087-3-2-7"
+       d="m 375.46529,491.64082 50.59813,0 v 76.10121 h 70.64286"
+       style="fill:none;stroke:#6D4C41;stroke-width:30;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       sodipodi:nodetypes="cccc" /></g></svg>

public/svgs/rybbit.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 191.16 144.69"><path fill="#FFF" d="M127.29 118.47c.91-2.62 4.71-7.47 10.12-12.69 6.8-6.56 15.9-13.49 23.29-18.39-9.95 26.6-9.53 39.61 30.46 57.28-8.67.04-34.1 0-43.73 0-7.81-4.95-22.3-19.93-20.13-26.2Z"/><path fill="#FFF" d="M113.68 42.32c8.45 0 14.93-7.08 14.93-15.53 0-6.19-3.36-11.53-9.08-13.9-5.72-2.37-12.52-1.27-16.67 3.32-3.91 4.33-5.68 10.95-3.32 16.67 2.37 5.72 7.95 9.44 14.13 9.44Zm24.03-25.52c15.38.04 48.87 11.91 48.87 18 0 12.63-13.28 34-19.32 39.03 3.1-7.58 6.5-17.77 6.54-26.73-9.85 2.38-21.94 7.12-32.89 14.25-11.78 7.68-22.36 18-28.79 29.71-6.75 12.27-8.49 23.37-5.37 32.95 2.54 7.81 8.48 14.63 16.69 20.66H82.18c-5.46-5.46-9.15-12.24-9.03-23.63.07-7.17 1.64-16.23 6.46-25.84-25.96 27.78-20.91 44.54-30.62 46.43-9.49 1.84-25.15-13.11-31.29-19.56 2.55 6.95 12.06 17.92 20.77 22.6H3.93c-5.91-22.5-5.03-54.5 1.79-77.44 7.12 4.9 16.15 15.05 21.43 22.46 11.09-27.4 40.19-55.7 59.47-64.98C87.59 10.67 98.99-.03 113.09 0c11.29-.02 20.69 6.64 24.63 16.8Z"/><circle cx="117.09" cy="27.09" r="7.59" fill="#FFF"/></svg>

templates/compose/bluesky-pds.yaml

@@ -7,61 +7,47 @@
 
 services:
   pds:
-    image: 'ghcr.io/bluesky-social/pds:latest'
+    image: 'ghcr.io/bluesky-social/pds:0.4.182'
     volumes:
-      - ./pds-data:/pds
+      - pds-data:/pds
     environment:
       - SERVICE_URL_PDS_3000
-      - PDS_HOSTNAME=${SERVICE_URL_PDS}
+      - 'PDS_HOSTNAME=${SERVICE_FQDN_PDS_3000}'
-      - PDS_JWT_SECRET=${SERVICE_PASSWORD_JWT_SECRET}
+      - 'PDS_JWT_SECRET=${SERVICE_HEX_32_JWTSECRET}'
-      - PDS_ADMIN_PASSWORD=${SERVICE_PASSWORD_ADMIN}
+      - 'PDS_ADMIN_PASSWORD=${SERVICE_PASSWORD_ADMIN}'
-      - PDS_ADMIN_EMAIL=${SERVICE_EMAIL_ADMIN}
+      - 'PDS_ADMIN_EMAIL=${PDS_ADMIN_EMAIL}'
-      - PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX=${PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX}
+      - 'PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX=${SERVICE_HEX_32_ROTATIONKEY}'
-      - PDS_DATA_DIRECTORY=${PDS_DATA_DIRECTORY:-/pds}
+      - 'PDS_DATA_DIRECTORY=${PDS_DATA_DIRECTORY:-/pds}'
-      - PDS_BLOBSTORE_DISK_LOCATION=${PDS_DATA_DIRECTORY:-/pds}/blocks
+      - 'PDS_BLOBSTORE_DISK_LOCATION=${PDS_DATA_DIRECTORY:-/pds}/blocks'
-      - PDS_BLOB_UPLOAD_LIMIT=${PDS_BLOB_UPLOAD_LIMIT:-52428800}
+      - 'PDS_BLOB_UPLOAD_LIMIT=${PDS_BLOB_UPLOAD_LIMIT:-104857600}'
-      - PDS_DID_PLC_URL=${PDS_DID_PLC_URL:-https://plc.directory}
+      - 'PDS_DID_PLC_URL=${PDS_DID_PLC_URL:-https://plc.directory}'
-      - PDS_BSKY_APP_VIEW_URL=${PDS_BSKY_APP_VIEW_URL:-https://api.bsky.app}
+      - 'PDS_EMAIL_FROM_ADDRESS=${PDS_EMAIL_FROM_ADDRESS}'
-      - PDS_BSKY_APP_VIEW_DID=${PDS_BSKY_APP_VIEW_DID:-did:web:api.bsky.app}
+      - 'PDS_EMAIL_SMTP_URL=${PDS_EMAIL_SMTP_URL}'
-      - PDS_REPORT_SERVICE_URL=${PDS_REPORT_SERVICE_URL:-https://mod.bsky.app/xrpc/com.atproto.moderation.createReport}
+      - 'PDS_BSKY_APP_VIEW_URL=${PDS_BSKY_APP_VIEW_URL:-https://api.bsky.app}'
-      - PDS_REPORT_SERVICE_DID=${PDS_REPORT_SERVICE_DID:-did:plc:ar7c4by46qjdydhdevvrndac}
+      - 'PDS_BSKY_APP_VIEW_DID=${PDS_BSKY_APP_VIEW_DID:-did:web:api.bsky.app}'
-      - PDS_CRAWLERS=${PDS_CRAWLERS:-https://bsky.network}
+      - 'PDS_REPORT_SERVICE_URL=${PDS_REPORT_SERVICE_URL:-https://mod.bsky.app/xrpc/com.atproto.moderation.createReport}'
-      - LOG_ENABLED=${LOG_ENABLED:-true}
+      - 'PDS_REPORT_SERVICE_DID=${PDS_REPORT_SERVICE_DID:-did:plc:ar7c4by46qjdydhdevvrndac}'
-
+      - 'PDS_CRAWLERS=${PDS_CRAWLERS:-https://bsky.network}'
-    command: >
+      - 'LOG_ENABLED=${LOG_ENABLED:-true}'
+    command: |
       sh -c '
-        echo "Installing curl, bash, and pdsadmin..."
+        set -euo pipefail
-        apk add --no-cache curl bash && \
+        echo "Installing required packages and pdsadmin..."
-        curl -o /usr/local/bin/pdsadmin.sh https://raw.githubusercontent.com/bluesky-social/pds/main/pdsadmin.sh && \
+        apk add --no-cache openssl curl bash jq coreutils gnupg util-linux-misc >/dev/null
-        chmod +x /usr/local/bin/pdsadmin.sh && \
+        curl -o /usr/local/bin/pdsadmin.sh https://raw.githubusercontent.com/bluesky-social/pds/main/pdsadmin.sh
+        chmod 700 /usr/local/bin/pdsadmin.sh
         ln -sf /usr/local/bin/pdsadmin.sh /usr/local/bin/pdsadmin
-
+        echo "Creating an empty pds.env file so pdsadmin works..."
-        echo "Generating /pds/pds.env..."
+        touch ${PDS_DATA_DIRECTORY}/pds.env
-        printf "%s\n" \
+        echo "Launching PDS, enjoy!..."
-        "SERVICE_FQDN_PDS_3000=$${SERVICE_FQDN_PDS_3000}" \
-        "PDS_HOSTNAME=$${PDS_HOSTNAME}" \
-        "PDS_JWT_SECRET=$${PDS_JWT_SECRET}" \
-        "PDS_ADMIN_PASSWORD=$${PDS_ADMIN_PASSWORD}" \
-        "PDS_ADMIN_EMAIL=$${PDS_ADMIN_EMAIL}" \
-        "PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX=$${PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX}" \
-        "PDS_DATA_DIRECTORY=$${PDS_DATA_DIRECTORY}" \
-        "PDS_BLOBSTORE_DISK_LOCATION=$${PDS_DATA_DIRECTORY}/blocks" \
-        "PDS_BLOB_UPLOAD_LIMIT=$${PDS_BLOB_UPLOAD_LIMIT}" \
-        "PDS_DID_PLC_URL=$${PDS_DID_PLC_URL}" \
-        "PDS_BSKY_APP_VIEW_URL=$${PDS_BSKY_APP_VIEW_URL}" \
-        "PDS_BSKY_APP_VIEW_DID=$${PDS_BSKY_APP_VIEW_DID}" \
-        "PDS_REPORT_SERVICE_URL=$${PDS_REPORT_SERVICE_URL}" \
-        "PDS_REPORT_SERVICE_DID=$${PDS_REPORT_SERVICE_DID}" \
-        "PDS_CRAWLERS=$${PDS_CRAWLERS}" \
-        "LOG_ENABLED=$${LOG_ENABLED}" \
-        > /pds/pds.env
-
-        echo "Launching PDS..."
         exec node --enable-source-maps index.js
       '
-
     healthcheck:
-      test: ["CMD", "wget", "--spider", "http://127.0.0.1:3000/xrpc/_health"]
+      test:
-      interval: 2s
+        - CMD
+        - wget
+        - '--spider'
+        - 'http://127.0.0.1:3000/xrpc/_health'
+      interval: 5s
       timeout: 10s
       retries: 10

templates/compose/convex.yaml

@@ -1,4 +1,4 @@
-# documentation: https://docs.convex.dev/
+# documentation: https://github.com/get-convex/convex-backend/blob/main/self-hosted/README.md
 # slogan: Convex is the open-source reactive database for app developers.
 # category: backend
 # tags: database, reactive, database, ai, agents, chatbot, api, team, bot, flows
@@ -7,7 +7,7 @@
 
 services:
   backend:
-    image: ghcr.io/get-convex/convex-backend:5143fec81f146ca67495c12c6b7a15c5802c37e2
+    image: ghcr.io/get-convex/convex-backend:00bd92723422f3bff968230c94ccdeb8c1719832
     volumes:
       - data:/convex/data
     environment:
@@ -16,22 +16,42 @@ services:
       - INSTANCE_SECRET=${SERVICE_HEX_32_SECRET}
       - CONVEX_RELEASE_VERSION_DEV=${CONVEX_RELEASE_VERSION_DEV:-}
       - ACTIONS_USER_TIMEOUT_SECS=${ACTIONS_USER_TIMEOUT_SECS:-}
-      - CONVEX_CLOUD_ORIGIN=${SERVICE_URL_CONVEX_3210}
+      # URL of the Convex API as accessed by the client/frontend.
-      - CONVEX_SITE_ORIGIN=${SERVICE_URL_CONVEX_3211}
+      - CONVEX_CLOUD_ORIGIN=${SERVICE_URL_CONVEX}
+      # URL of Convex HTTP actions as accessed by the client/frontend.
+      - CONVEX_SITE_ORIGIN=${SERVICE_URL_BACKEND}
       - DATABASE_URL=${DATABASE_URL:-}
-      - DISABLE_BEACON=${DISABLE_BEACON:-}
+      - DISABLE_BEACON=${DISABLE_BEACON:?false}
-      - REDACT_LOGS_TO_CLIENT=${REDACT_LOGS_TO_CLIENT:-}
+      - REDACT_LOGS_TO_CLIENT=${REDACT_LOGS_TO_CLIENT:?false}
-      - CONVEX_SELF_HOSTED_URL=${SERVICE_URL_CONVEX_6791}
+      - DO_NOT_REQUIRE_SSL=${DO_NOT_REQUIRE_SSL:?true}
+      - POSTGRES_URL=${POSTGRES_URL:-}
+      - MYSQL_URL=${MYSQL_URL:-}
+      - RUST_LOG=${RUST_LOG:-info}
+      - RUST_BACKTRACE=${RUST_BACKTRACE:-}
+      - AWS_REGION=${AWS_REGION:-}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-}
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-}
+      - AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN:-}
+      - AWS_S3_FORCE_PATH_STYLE=${AWS_S3_FORCE_PATH_STYLE:-}
+      - AWS_S3_DISABLE_SSE=${AWS_S3_DISABLE_SSE:-}
+      - AWS_S3_DISABLE_CHECKSUMS=${AWS_S3_DISABLE_CHECKSUMS:-}
+      - S3_STORAGE_EXPORTS_BUCKET=${S3_STORAGE_EXPORTS_BUCKET:-}
+      - S3_STORAGE_SNAPSHOT_IMPORTS_BUCKET=${S3_STORAGE_SNAPSHOT_IMPORTS_BUCKET:-}
+      - S3_STORAGE_MODULES_BUCKET=${S3_STORAGE_MODULES_BUCKET:-}
+      - S3_STORAGE_FILES_BUCKET=${S3_STORAGE_FILES_BUCKET:-}
+      - S3_STORAGE_SEARCH_BUCKET=${S3_STORAGE_SEARCH_BUCKET:-}
+      - S3_ENDPOINT_URL=${S3_ENDPOINT_URL:-}
     healthcheck:
       test: curl -f http://127.0.0.1:3210/version
       interval: 5s
-      start_period: 5s
+      start_period: 10s
 
   dashboard:
-    image: ghcr.io/get-convex/convex-dashboard:5143fec81f146ca67495c12c6b7a15c5802c37e2
+    image: ghcr.io/get-convex/convex-dashboard:33cef775a8a6228cbacee4a09ac2c4073d62ed13
     environment:
       - SERVICE_URL_CONVEX_6791
-      - NEXT_PUBLIC_DEPLOYMENT_URL=$SERVICE_URL_BACKEND_3210
+      # URL of the Convex API as accessed by the dashboard (browser).
+      - NEXT_PUBLIC_DEPLOYMENT_URL=${SERVICE_URL_BACKEND}
     depends_on:
       backend:
         condition: service_healthy

templates/compose/docmost.yaml

@@ -19,6 +19,15 @@ services:
       - APP_URL=$SERVICE_URL_DOCMOST_3000
       - DATABASE_URL=postgresql://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql/docmost?schema=public
       - REDIS_URL=redis://redis:6379
+      - MAIL_DRIVER=${MAIL_DRIVER}
+      - SMTP_HOST=${SMTP_HOST}
+      - SMTP_PORT=${SMTP_PORT}
+      - SMTP_USERNAME=${SMTP_USERNAME}
+      - SMTP_PASSWORD=${SMTP_PASSWORD}
+      - SMTP_SECURE=${SMTP_SECURE}
+      - MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS}
+      - MAIL_FROM_NAME=${MAIL_FROM_NAME}
+      - POSTMARK_TOKEN=${POSTMARK_TOKEN}
     volumes:
       - "docmost:/app/data/storage"
     healthcheck:

templates/compose/documenso.yaml

@@ -7,7 +7,7 @@
 
 services:
   documenso:
-    image: documenso/documenso
+    image: documenso/documenso:v1.12.10 # Released at Oct 9, 2025
     depends_on:
       database:
         condition: service_healthy
@@ -18,6 +18,7 @@ services:
       - NEXT_PRIVATE_ENCRYPTION_KEY=${SERVICE_BASE64_ENCRYPTIONKEY}
       - NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY=${SERVICE_BASE64_SECONDARYENCRYPTIONKEY}
       - NEXT_PUBLIC_WEBAPP_URL=${SERVICE_URL_DOCUMENSO}
+      - NEXT_PRIVATE_RESEND_API_KEY=${NEXT_PRIVATE_RESEND_API_KEY}
       - NEXT_PRIVATE_SMTP_TRANSPORT=${NEXT_PRIVATE_SMTP_TRANSPORT}
       - NEXT_PRIVATE_SMTP_HOST=${NEXT_PRIVATE_SMTP_HOST}
       - NEXT_PRIVATE_SMTP_PORT=${NEXT_PRIVATE_SMTP_PORT}

templates/compose/filebrowser.yaml

@@ -29,8 +29,3 @@ services:
             "address": "0.0.0.0",
             "port": 80
           }
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:80"]
-      interval: 2s
-      timeout: 10s
-      retries: 15

templates/compose/gotify.yaml

@@ -0,0 +1,29 @@
+# documentation: https://gotify.net/docs/install
+# slogan: Gotify is an open-source self-hosted notification server.
+# category: productivity
+# tags: productivity,notification,collaboration
+# logo: svgs/gotify.png
+# port: 80
+
+services:
+  gotify:
+    image: gotify/server:2.7.3
+    environment:
+      - SERVICE_URL_GOTIFY_80
+      - GOTIFY_DEFAULTUSER_NAME=${GOTIFY_USERNAME:-admin}
+      - GOTIFY_DEFAULTUSER_PASS=${SERVICE_PASSWORD_GOTIFY}
+      - GOTIFY_DATABASE_DIALECT=${GOTIFY_DATABASE_DIALECT:-sqlite3}
+      - GOTIFY_DATABASE_CONNECTION=${GOTIFY_DATABASE_CONNECTION:-data/gotify.db}
+      - GOTIFY_PASSSTRENGTH=${GOTIFY_PASSSTRENGTH:-10}
+      - GOTIFY_UPLOADEDIMAGESDIR=${GOTIFY_UPLOADEDIMAGESDIR:-data/images}
+      - GOTIFY_PLUGINSDIR=${GOTIFY_PLUGINSDIR:-data/plugins}
+      - GOTIFY_SERVER_PORT=${GOTIFY_SERVER_PORT:-80}
+      - GOTIFY_REGISTRATION=${GOTIFY_REGISTRATION:-false}
+    volumes:
+      - 'gotify-data:/app/data'
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:80/health"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+    

templates/compose/gramps-web.yaml

@@ -0,0 +1,59 @@
+# documentation: https://www.grampsweb.org/install_setup/setup/
+# slogan: Open Source Online Genealogy System.
+# category: family
+# tags: family, genealogy, personal
+# logo: svgs/gramps-web.svg
+# port: 5000
+
+services:
+  grampsweb:
+    image: ghcr.io/gramps-project/grampsweb:25.9.0
+    environment:
+      - SERVICE_URL_GRAMPSWEB_5000
+      - GRAMPSWEB_TREE=${GRAMPSWEB_TREE:-Gramps Web} # will create a new tree if not exists
+      - GRAMPSWEB_CELERY_CONFIG__broker_url=redis://grampsweb_redis:6379/0
+      - GRAMPSWEB_CELERY_CONFIG__result_backend=redis://grampsweb_redis:6379/0
+      - GRAMPSWEB_RATELIMIT_STORAGE_URI=redis://grampsweb_redis:6379/1
+      - GUNICORN_NUM_WORKERS=${GUNICORN_NUM_WORKERS:-2}
+    depends_on:
+      - grampsweb_redis
+    volumes: &volumes
+      - gramps_users:/app/users # persist user database
+      - gramps_index:/app/indexdir # persist search index
+      - gramps_thumb_cache:/app/thumbnail_cache # persist thumbnails
+      - gramps_cache:/app/cache # persist export and report caches
+      - gramps_secret:/app/secret # persist flask secret
+      - gramps_db:/root/.gramps/grampsdb # persist Gramps database
+      - gramps_media:/app/media # persist media files
+      - gramps_tmp:/tmp
+    healthcheck:
+      test: wget -O - http://localhost:5000 > /dev/null 2>&1
+      interval: 5s
+      timeout: 10s
+      retries: 3
+
+  grampsweb_celery:
+    image: ghcr.io/gramps-project/grampsweb:25.9.0
+    environment:
+      - GRAMPSWEB_TREE=${GRAMPSWEB_TREE:-Gramps Web} # will create a new tree if not exists
+      - GRAMPSWEB_CELERY_CONFIG__broker_url=redis://grampsweb_redis:6379/0
+      - GRAMPSWEB_CELERY_CONFIG__result_backend=redis://grampsweb_redis:6379/0
+      - GRAMPSWEB_RATELIMIT_STORAGE_URI=redis://grampsweb_redis:6379/1
+    depends_on:
+      - grampsweb_redis
+    volumes:
+      <<: *volumes
+    command: celery -A gramps_webapi.celery worker --loglevel=INFO --concurrency=2
+    healthcheck:
+      test: SECRET_KEY="$(cat secret/secret)" celery -A gramps_webapi.celery status || exit 1
+      interval: 5s
+      timeout: 10s
+      retries: 3
+
+  grampsweb_redis:
+    image: docker.io/library/redis:7.2.4-alpine
+    healthcheck:
+      test: redis-cli ping | grep PONG
+      interval: 5s
+      timeout: 10s
+      retries: 3

templates/compose/homarr.yaml

@@ -7,14 +7,14 @@
 
 services:
   homarr:
-    image: ghcr.io/ajnart/homarr:latest
+    image: ghcr.io/homarr-labs/homarr:v1.40.0
     environment:
       - SERVICE_URL_HOMARR_7575
+      - SERVICE_HEX_32_HOMARR
+      - 'SECRET_ENCRYPTION_KEY=${SERVICE_HEX_32_HOMARR}'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ./homarr/configs:/app/data/configs
+      - ./homarr/appdata:/appdata
-      - ./homarr/icons:/app/public/icons
-      - ./homarr/data:/data
     healthcheck:
       test: ["CMD", "wget", "-q", "--spider", "http://127.0.0.1:7575"]
       interval: 5s

templates/compose/lobe-chat.yaml

@@ -0,0 +1,22 @@
+# documentation: https://github.com/lobehub/lobe-chat?tab=readme-ov-file#b-deploying-with-docker
+# slogan: An open-source, modern-design AI chat framework.
+# category: ai
+# tags: ai, chat, openai, llm, chatbot
+# logo: svgs/lobe-chat.png
+# port: 3210
+
+services:
+  lobe-chat:
+    image: "lobehub/lobe-chat:1.135.5"
+    environment:
+      - SERVICE_URL_LOBECHAT_3210
+      - OPENAI_API_KEY=${OPENAI_API_KEY}
+      - OPENAI_PROXY_URL=${OPENAI_BASE_URL:-https://api.openai.com/v1}
+      - ACCESS_CODE=${SERVICE_PASSWORD_ACCESSCODE}
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - "wget -qO- http://localhost:3210/ || exit 1"
+      interval: 5s
+      timeout: 20s
+      retries: 10

templates/compose/mattermost.yaml

@@ -10,12 +10,12 @@ services:
     image: mattermost/mattermost-team-edition:release-10
     platform: linux/amd64
     volumes:
-      - 'mattermost-data-config:/mattermost/config:rw'
+      - "mattermost-data-config:/mattermost/config:rw"
-      - 'mattermost-data-data:/mattermost/data:rw'
+      - "mattermost-data-data:/mattermost/data:rw"
-      - 'mattermost-data-logs:/mattermost/logs:rw'
+      - "mattermost-data-logs:/mattermost/logs:rw"
-      - 'mattermost-data-plugins:/mattermost/plugins:rw'
+      - "mattermost-data-plugins:/mattermost/plugins:rw"
-      - 'mattermost-data-client-plugins:/mattermost/client/plugins:rw'
+      - "mattermost-data-client-plugins:/mattermost/client/plugins:rw"
-      - 'mattermost-data-bleve-indexes:/mattermost/bleve-indexes:rw'
+      - "mattermost-data-bleve-indexes:/mattermost/bleve-indexes:rw"
     environment:
       - SERVICE_URL_MATTERMOST_8065
       - MM_SERVICESETTINGS_SITEURL=${SERVICE_URL_MATTERMOST}
@@ -26,11 +26,6 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:8065"]
-      interval: 5s
-      timeout: 20s
-      retries: 10
 
   postgres:
     image: postgres:16-alpine

templates/compose/moodle.yaml

@@ -18,9 +18,18 @@ services:
       - MARIADB_COLLATE=utf8mb4_unicode_ci
     volumes:
       - mariadb-data:/var/lib/mysql
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - bash -c '</dev/tcp/localhost/3306'
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   moodle:
     image: docker.io/bitnamilegacy/moodle:4.3
+    depends_on:
+      - mariadb
     environment:
       - SERVICE_URL_MOODLE_8080
       - MOODLE_DATABASE_HOST=mariadb
@@ -36,5 +45,12 @@ services:
     volumes:
       - moodle-data:/bitnami/moodle
       - moodledata-data:/bitnami/moodledata
-    depends_on:
+    healthcheck:
-      - mariadb
+      test:
+        - CMD
+        - php
+        - -r
+        - "exit(file_exists('/opt/bitnami/moodle/config.php') ? 0 : 1);"
+      interval: 20s
+      timeout: 10s
+      retries: 5

templates/compose/newapi.yaml

@@ -0,0 +1,56 @@
+# documentation: https://docs.newapi.pro/en/getting-started/
+# slogan: The next-generation LLM gateway and AI asset management system supports multiple languages.
+# category: api
+# tags: api, openai, llm, api-gateway, api-management
+# logo: svgs/newapi.png
+# port: 3000
+
+services:
+  new-api:
+    image: calciumion/new-api:v0.9.2.0
+    depends_on:
+      postgresql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    environment:
+      - SERVICE_URL_NEW_API_3000
+      - SQL_DSN=postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@postgresql:5432/${POSTGRES_DATABASE:-newapi}?sslmode=disable&TimeZone=${TZ:-Asia/Shanghai}
+      - REDIS_CONN_STRING=redis://redis:6379
+      - TZ=${TZ:-Asia/Shanghai}
+      - SESSION_SECRET=$SERVICE_BASE64_64_SESSION_SECRET
+      - ERROR_LOG_ENABLED=${ERROR_LOG_ENABLED:-true}
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - "wget -q -O - http://localhost:3000/api/status | grep -o '\"success\":\\s*true' | awk -F: '{print $2}'"
+      interval: 30s
+      timeout: 10s
+      retries: 3
+  postgresql:
+    image: postgres:16-alpine
+    environment:
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=${POSTGRES_DATABASE:-newapi}
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB:-newapi}"
+      interval: 5s
+      timeout: 10s
+      retries: 20
+  redis:
+    image: redis:7-alpine
+    volumes:
+      - redis-data:/data
+    healthcheck:
+      test:
+        - CMD
+        - redis-cli
+        - PING
+      interval: 5s
+      timeout: 10s
+      retries: 20

templates/compose/once-campfire.yaml

@@ -0,0 +1,27 @@
+# documentation: https://github.com/basecamp/once-campfire
+# slogan: Super simple group chat, without a subscription.
+# category: messaging
+# tags: campfire,chat,communication,rails,once,basecamp,37signals
+# logo: svgs/once-campfire.png
+# port: 80
+
+services:
+  campfire:
+    image: ghcr.io/basecamp/once-campfire:${TAG:-main}
+    restart: unless-stopped
+    volumes:
+      - campfire-storage:/rails/storage
+    environment:
+      - SERVICE_URL_CAMPFIRE_80
+      - SECRET_KEY_BASE=${SERVICE_BASE64_64_CAMPFIRE}    # required, set this to a secure random value
+      - VAPID_PUBLIC_KEY=${VAPID_PUBLIC_KEY}             # optional, for notifications
+      - VAPID_PRIVATE_KEY=${VAPID_PRIVATE_KEY}           # optional, for notifications
+      - DISABLE_SSL=${DISABLE_SSL:-true}                 # optional, disable SSL
+      - SSL_DOMAIN=${SSL_DOMAIN:-false}                  # optional, for SSL
+      - SKIP_TELEMETRY=${SKIP_TELEMETRY:-true}           # optional, set to disable telemetry
+      - SENTRY_DSN=${SENTRY_DSN}                         # optional, for error reporting
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost/up"]
+      interval: 10s
+      timeout: 5s
+      retries: 5

templates/compose/pgadmin.yaml

@@ -0,0 +1,21 @@
+# documentation: https://www.pgadmin.org/docs/pgadmin4/latest/container_deployment.html
+# slogan: pgAdmin is a web-based database management tool for administering your PostgreSQL databases through a user-friendly interface.
+# category: database
+# tags: database management
+# logo: svgs/postgresql.svg
+# port: 80
+
+services:
+  pgadmin:
+    image: 'dpage/pgadmin4:latest'
+    environment:
+      - SERVICE_URL_PGADMIN
+      - 'PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL:?}'
+      - 'PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD:?}'
+    volumes:
+      - pgadmin-data:/var/lib/pgadmin
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://localhost:80/login"]
+      interval: 5s
+      timeout: 10s
+      retries: 5

templates/compose/rybbit.yaml

@@ -0,0 +1,133 @@
+# documentation: https://rybbit.io/docs
+# slogan: Open-source, privacy-first web analytics.
+# tags: analytics,web,privacy,self-hosted,clickhouse,postgres
+# logo: svgs/rybbit.svg
+# port: 3002
+
+services:
+  rybbit:
+    image: 'ghcr.io/rybbit-io/rybbit-client:v1.6.1'
+    environment:
+      - SERVICE_URL_RYBBIT_3002
+      - NODE_ENV=production
+      - 'NEXT_PUBLIC_BACKEND_URL=${SERVICE_URL_RYBBIT}'
+      - 'NEXT_PUBLIC_DISABLE_SIGNUP=${DISABLE_SIGNUP:-false}'
+    depends_on:
+      - rybbit_backend
+    healthcheck:
+      test: ["CMD-SHELL", "nc -z 127.0.0.1 3002"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
+
+  rybbit_backend:
+    image: 'ghcr.io/rybbit-io/rybbit-backend:v1.6.1'
+    environment:
+      - NODE_ENV=production
+      - TRUST_PROXY=true
+      - 'BASE_URL=${SERVICE_URL_RYBBIT}'
+      # --- Coolify-Managed Secrets ---
+      - 'CLICKHOUSE_PASSWORD=${SERVICE_PASSWORD_CLICKHOUSE}'
+      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
+      - 'BETTER_AUTH_SECRET=${SERVICE_BASE64_64_BACKEND}'
+      # --- User Settings ---
+      - 'DISABLE_SIGNUP=${DISABLE_SIGNUP:-false}'
+      - 'DISABLE_TELEMETRY=${DISABLE_TELEMETRY:-true}'
+      # --- Internal Config ---
+      - 'CLICKHOUSE_HOST=http://rybbit_clickhouse:8123'
+      - 'CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}'
+      - 'CLICKHOUSE_DB=${CLICKHOUSE_DB:-analytics}'
+      - POSTGRES_HOST=rybbit_postgres
+      - POSTGRES_PORT=5432
+      - 'POSTGRES_DB=${POSTGRES_DB:-analytics}'
+      - 'POSTGRES_USER=${POSTGRES_USER:-frog}'
+    depends_on:
+      rybbit_clickhouse:
+        condition: service_healthy
+      rybbit_postgres:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3001/api/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
+
+  rybbit_postgres:
+    image: 'postgres:17.4'
+    environment:
+      - 'POSTGRES_DB=${POSTGRES_DB:-analytics}'
+      - 'POSTGRES_USER=${POSTGRES_USER:-frog}'
+      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
+    volumes:
+      - 'postgres_data:/var/lib/postgresql/data'
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  rybbit_clickhouse:
+    image: 'clickhouse/clickhouse-server:25.4.2'
+    environment:
+      - 'CLICKHOUSE_DB=${CLICKHOUSE_DB:-analytics}'
+      - 'CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}'
+      - 'CLICKHOUSE_PASSWORD=${SERVICE_PASSWORD_CLICKHOUSE}'
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8123/ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
+    volumes:
+      - 'clickhouse_data:/var/lib/clickhouse'
+      - type: bind
+        source: ./clickhouse_config/enable_json.xml
+        target: /etc/clickhouse-server/config.d/enable_json.xml
+        content: |
+          <clickhouse>
+              <settings>
+                  <enable_json_type>1</enable_json_type>
+              </settings>
+          </clickhouse>
+      - type: bind
+        source: ./clickhouse_config/logging_rules.xml
+        target: /etc/clickhouse-server/config.d/logging_rules.xml
+        content: |
+          <clickhouse>
+              <logger>
+                  <level>warning</level>
+                  <console>true</console>
+              </logger>
+              <query_thread_log remove="remove"/>
+              <query_log remove="remove"/>
+              <text_log remove="remove"/>
+              <trace_log remove="remove"/>
+              <metric_log remove="remove"/>
+              <asynchronous_metric_log remove="remove"/>
+              <session_log remove="remove"/>
+              <part_log remove="remove"/>
+              <latency_log remove="remove"/>
+              <processors_profile_log remove="remove"/>
+          </clickhouse>
+      - type: bind
+        source: ./clickhouse_config/network.xml
+        target: /etc/clickhouse-server/config.d/network.xml
+        content: |
+          <clickhouse>
+              <listen_host>0.0.0.0</listen_host>
+          </clickhouse>
+      - type: bind
+        source: ./clickhouse_config/user_logging.xml
+        target: /etc/clickhouse-server/config.d/user_logging.xml
+        content: |
+          <clickhouse>
+              <profiles>
+                  <default>
+                      <log_queries>0</log_queries>
+                      <log_query_threads>0</log_query_threads>
+                      <log_processors_profiles>0</log_processors_profiles>
+                  </default>
+              </profiles>
+          </clickhouse>

templates/compose/swetrix.yaml

@@ -0,0 +1,171 @@
+# documentation: https://docs.swetrix.com/selfhosting/how-to
+# slogan: Privacy-friendly and cookieless European web analytics alternative to Google Analytics.
+# category: analytics
+# tags: analytics,privacy,monitoring,open-source,clickhouse,redis
+# logo: svgs/swetrix.svg
+# port: 3000
+
+services:
+  swetrix:
+    image: swetrix/swetrix-fe:v4.0.5
+    depends_on:
+      - swetrix-api
+    environment:
+      - SERVICE_URL_SWETRIX_3000
+      - API_URL=$SERVICE_URL_SWETRIXAPI
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - wget --no-verbose --tries=1 --spider http://localhost:3000/ping || exit 1
+      timeout: 5s
+      retries: 10
+      interval: 30s
+      start_period: 15s
+
+  swetrix-api:
+    image: swetrix/swetrix-api:v4.0.5
+    environment:
+      # Required
+      - SECRET_KEY_BASE=$SERVICE_BASE64_64_SECRETKEYBASE
+      - SERVICE_URL_SWETRIXAPI
+
+      # Optional
+      - DISABLE_REGISTRATION=${DISABLE_REGISTRATION:-false}
+      - IP_GEOLOCATION_DB_PATH=${IP_GEOLOCATION_DB_PATH:-}
+      - DEBUG_MODE=${DEBUG_MODE:-false}
+      - CLOUDFLARE_PROXY_ENABLED=${CLOUDFLARE_PROXY_ENABLED:-false}
+
+      # SMTP (optional)
+      - SMTP_HOST=${SMTP_HOST:-}
+      - SMTP_PORT=${SMTP_PORT:-}
+      - SMTP_USER=${SMTP_USER:-}
+      - SMTP_PASSWORD=${SMTP_PASSWORD:-}
+      - FROM_EMAIL=${FROM_EMAIL:-}
+      - SMTP_MOCK=${SMTP_MOCK:-false}
+
+      # OIDC (optional)
+      - OIDC_ENABLED=${OIDC_ENABLED:-false}
+      - OIDC_ONLY_AUTH=${OIDC_ONLY_AUTH:-false}
+      - OIDC_DISCOVERY_URL=${OIDC_DISCOVERY_URL:-}
+      - OIDC_CLIENT_ID=${OIDC_CLIENT_ID:-}
+      - OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET:-}
+
+      # Required service endpoints
+      - REDIS_HOST=redis
+      - CLICKHOUSE_HOST=http://clickhouse
+      - CLICKHOUSE_PASSWORD=$SERVICE_PASSWORD_CLICKHOUSE
+      - REDIS_PASSWORD=$SERVICE_PASSWORD_REDIS
+    depends_on:
+      redis:
+        condition: service_healthy
+      clickhouse:
+        condition: service_healthy
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - wget --no-verbose --tries=1 --spider http://localhost:5005/ping || exit 1
+      timeout: 5s
+      retries: 10
+      interval: 30s
+      start_period: 15s
+
+  redis:
+    image: redis:8.2-alpine
+    environment:
+      - REDIS_PORT=${REDIS_PORT:-6379}
+      - REDIS_USER=${REDIS_USER:-default}
+      - REDIS_PASSWORD=$SERVICE_PASSWORD_REDIS
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - redis-cli ping | grep PONG
+      timeout: 5s
+      retries: 10
+      interval: 30s
+      start_period: 1m
+
+  clickhouse:
+    image: clickhouse/clickhouse-server:24.10-alpine
+    environment:
+      - CLICKHOUSE_DATABASE=${CLICKHOUSE_DATABASE:-analytics}
+      - CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}
+      - CLICKHOUSE_PORT=${CLICKHOUSE_PORT:-8123}
+      - CLICKHOUSE_PASSWORD=$SERVICE_PASSWORD_CLICKHOUSE
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - wget --no-verbose --tries=1 -O - http://127.0.0.1:8123/ping || exit 1
+      timeout: 5s
+      retries: 10
+      interval: 30s
+      start_period: 1m
+    cap_add:
+      - SYS_NICE
+    volumes:
+      # Persistent storage for ClickHouse
+      - swetrix-events-data:/var/lib/clickhouse
+
+      # Disable logging
+      - type: bind
+        source: ./disable-user-logging.xml
+        target: /etc/clickhouse-server/users.d/disable-user-logging.xml
+        read_only: true
+        content: |
+          <clickhouse>
+            <profiles>
+              <default>
+                <log_queries>0</log_queries>
+                <log_query_threads>0</log_query_threads>
+              </default>
+            </profiles>
+          </clickhouse>
+      - type: bind
+        source: ./reduce-logs.xml
+        target: /etc/clickhouse-server/config.d/reduce-logs.xml
+        read_only: true
+        content: |
+          <clickhouse>
+            <logger>
+              <level>warning</level>
+              <console>true</console>
+            </logger>
+            <query_thread_log remove="remove"/>
+            <query_log remove="remove"/>
+            <text_log remove="remove"/>
+            <trace_log remove="remove"/>
+            <metric_log remove="remove"/>
+            <asynchronous_metric_log remove="remove"/>
+            <session_log remove="remove"/>
+            <part_log remove="remove"/>
+          </clickhouse>
+
+      # Reduce RAM usage
+      - type: bind
+        source: ./preserve-ram-config.xml
+        target: /etc/clickhouse-server/config.d/preserve-ram-config.xml
+        read_only: true
+        content: |
+          <clickhouse>
+            <mark_cache_size>536870912</mark_cache_size>
+            <concurrent_threads_soft_limit_num>1</concurrent_threads_soft_limit_num>
+          </clickhouse>
+      - type: bind
+        source: ./preserve-ram-user.xml
+        target: /etc/clickhouse-server/users.d/preserve-ram-user.xml
+        read_only: true
+        content: |
+          <clickhouse>
+            <profiles>
+              <default>
+                <max_block_size>2048</max_block_size>
+                <max_download_threads>1</max_download_threads>
+                <input_format_parallel_parsing>0</input_format_parallel_parsing>
+                <output_format_parallel_formatting>0</output_format_parallel_formatting>
+              </default>
+            </profiles>
+          </clickhouse>
+
+    ulimits:
+      nofile:
+        soft: 262144
+        hard: 262144

templates/compose/traccar.yaml

@@ -30,7 +30,7 @@ services:
       postgres:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:8082/ping"]
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:8082"]
       interval: 30s
       timeout: 10s
       retries: 3

templates/service-templates-latest.json

@@ -1561,6 +1561,20 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "gotify": {
+        "documentation": "https://gotify.net/docs/install?utm_source=coolify.io",
+        "slogan": "Gotify is an open-source self-hosted notification server.",
+        "compose": "c2VydmljZXM6CiAgZ290aWZ5OgogICAgaW1hZ2U6ICdnb3RpZnkvc2VydmVyOjIuNy4zJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfR09USUZZXzgwCiAgICAgIC0gJ0dPVElGWV9ERUZBVUxUVVNFUl9OQU1FPSR7R09USUZZX1VTRVJOQU1FOi1hZG1pbn0nCiAgICAgIC0gJ0dPVElGWV9ERUZBVUxUVVNFUl9QQVNTPSR7U0VSVklDRV9QQVNTV09SRF9HT1RJRll9JwogICAgICAtICdHT1RJRllfREFUQUJBU0VfRElBTEVDVD0ke0dPVElGWV9EQVRBQkFTRV9ESUFMRUNUOi1zcWxpdGUzfScKICAgICAgLSAnR09USUZZX0RBVEFCQVNFX0NPTk5FQ1RJT049JHtHT1RJRllfREFUQUJBU0VfQ09OTkVDVElPTjotZGF0YS9nb3RpZnkuZGJ9JwogICAgICAtICdHT1RJRllfUEFTU1NUUkVOR1RIPSR7R09USUZZX1BBU1NTVFJFTkdUSDotMTB9JwogICAgICAtICdHT1RJRllfVVBMT0FERURJTUFHRVNESVI9JHtHT1RJRllfVVBMT0FERURJTUFHRVNESVI6LWRhdGEvaW1hZ2VzfScKICAgICAgLSAnR09USUZZX1BMVUdJTlNESVI9JHtHT1RJRllfUExVR0lOU0RJUjotZGF0YS9wbHVnaW5zfScKICAgICAgLSAnR09USUZZX1NFUlZFUl9QT1JUPSR7R09USUZZX1NFUlZFUl9QT1JUOi04MH0nCiAgICAgIC0gJ0dPVElGWV9SRUdJU1RSQVRJT049JHtHT1RJRllfUkVHSVNUUkFUSU9OOi1mYWxzZX0nCiAgICB2b2x1bWVzOgogICAgICAtICdnb3RpZnktZGF0YTovYXBwL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly8xMjcuMC4wLjE6ODAvaGVhbHRoJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "tags": [
+            "productivity",
+            "notification",
+            "collaboration"
+        ],
+        "category": "productivity",
+        "logo": "svgs/gotify.png",
+        "minversion": "0.0.0",
+        "port": "80"
+    },
     "gowa": {
         "documentation": "https://github.com/aldinokemal/go-whatsapp-web-multidevice?utm_source=coolify.io",
         "slogan": "Golang WhatsApp - Built with Go for efficient memory use",

templates/service-templates.json

@@ -1561,6 +1561,20 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "gotify": {
+        "documentation": "https://gotify.net/docs/install?utm_source=coolify.io",
+        "slogan": "Gotify is an open-source self-hosted notification server.",
+        "compose": "c2VydmljZXM6CiAgZ290aWZ5OgogICAgaW1hZ2U6ICdnb3RpZnkvc2VydmVyOjIuNy4zJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0dPVElGWV84MAogICAgICAtICdHT1RJRllfREVGQVVMVFVTRVJfTkFNRT0ke0dPVElGWV9VU0VSTkFNRTotYWRtaW59JwogICAgICAtICdHT1RJRllfREVGQVVMVFVTRVJfUEFTUz0ke1NFUlZJQ0VfUEFTU1dPUkRfR09USUZZfScKICAgICAgLSAnR09USUZZX0RBVEFCQVNFX0RJQUxFQ1Q9JHtHT1RJRllfREFUQUJBU0VfRElBTEVDVDotc3FsaXRlM30nCiAgICAgIC0gJ0dPVElGWV9EQVRBQkFTRV9DT05ORUNUSU9OPSR7R09USUZZX0RBVEFCQVNFX0NPTk5FQ1RJT046LWRhdGEvZ290aWZ5LmRifScKICAgICAgLSAnR09USUZZX1BBU1NTVFJFTkdUSD0ke0dPVElGWV9QQVNTU1RSRU5HVEg6LTEwfScKICAgICAgLSAnR09USUZZX1VQTE9BREVESU1BR0VTRElSPSR7R09USUZZX1VQTE9BREVESU1BR0VTRElSOi1kYXRhL2ltYWdlc30nCiAgICAgIC0gJ0dPVElGWV9QTFVHSU5TRElSPSR7R09USUZZX1BMVUdJTlNESVI6LWRhdGEvcGx1Z2luc30nCiAgICAgIC0gJ0dPVElGWV9TRVJWRVJfUE9SVD0ke0dPVElGWV9TRVJWRVJfUE9SVDotODB9JwogICAgICAtICdHT1RJRllfUkVHSVNUUkFUSU9OPSR7R09USUZZX1JFR0lTVFJBVElPTjotZmFsc2V9JwogICAgdm9sdW1lczoKICAgICAgLSAnZ290aWZ5LWRhdGE6L2FwcC9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjgwL2hlYWx0aCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "tags": [
+            "productivity",
+            "notification",
+            "collaboration"
+        ],
+        "category": "productivity",
+        "logo": "svgs/gotify.png",
+        "minversion": "0.0.0",
+        "port": "80"
+    },
     "gowa": {
         "documentation": "https://github.com/aldinokemal/go-whatsapp-web-multidevice?utm_source=coolify.io",
         "slogan": "Golang WhatsApp - Built with Go for efficient memory use",