Merge branch 'next' of github.com:coollabsio/coolify into next

app/Livewire/Project/Index.php

@@ -18,7 +18,11 @@ class Index extends Component
     public function mount()
     {
         $this->private_keys = PrivateKey::ownedByCurrentTeam()->get();
-        $this->projects = Project::ownedByCurrentTeam()->get();
+        $this->projects = Project::ownedByCurrentTeam()->get()->map(function ($project) {
+            $project->settingsRoute = route('project.edit', ['project_uuid' => $project->uuid]);
+
+            return $project;
+        });
         $this->servers = Server::ownedByCurrentTeam()->count();
     }
 

resources/views/livewire/project/index.blade.php

@@ -24,6 +24,12 @@
                             <div x-text="item.description"></div>
                         </div>
                     </div>
+                    <div class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal">
+                        <a class="mx-4 font-bold hover:underline"
+                           :href="item.settingsRoute">
+                            Settings
+                        </a>
+                    </div>
                 </div>
             </template>
         </div>

templates/compose/azimutt.yaml

@@ -9,9 +9,9 @@ services:
   postgres:
     image: postgres:15
     environment:
-      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
-      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
-      - POSTGRES_DB=azimutt
+      - 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
+      - DATABASE_URL=ecto://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres/${POSTGRES_DB:-azimutt}
-      - SECRET_KEY_BASE=$SERVICE_BASE64_64_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}

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-db:
-      - plausible_events_db
+        condition: service_healthy
-      - mail
+      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_DB=${POSTGRES_DB:-plausible-db}
-      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - 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
+      - plausible-events-data:/var/lib/clickhouse
-        source: event-data
-        target: /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

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