Merge branch 'next' into patch-1

.env.dusk.ci

@@ -0,0 +1,15 @@
+APP_ENV=production
+APP_NAME="Coolify Staging"
+APP_ID=development
+APP_KEY=
+APP_URL=http://localhost
+APP_PORT=8000
+SSH_MUX_ENABLED=true
+
+# PostgreSQL Database Configuration
+DB_DATABASE=coolify
+DB_USERNAME=coolify
+DB_PASSWORD=password
+DB_HOST=localhost
+DB_PORT=5432
+

.github/workflows/browser-tests.yml

@@ -0,0 +1,65 @@
+name: Dusk
+on:
+  push:
+    branches: [ "not-existing" ]
+jobs:
+  dusk:
+    runs-on: ubuntu-latest
+
+    services:
+      redis:
+        image: redis
+        env:
+          REDIS_HOST: localhost
+          REDIS_PORT: 6379
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up PostgreSQL
+        run: |
+          sudo systemctl start postgresql
+          sudo -u postgres psql -c "CREATE DATABASE coolify;"
+          sudo -u postgres psql -c "CREATE USER coolify WITH PASSWORD 'password';"
+          sudo -u postgres psql -c "ALTER ROLE coolify SET client_encoding TO 'utf8';"
+          sudo -u postgres psql -c "ALTER ROLE coolify SET default_transaction_isolation TO 'read committed';"
+          sudo -u postgres psql -c "ALTER ROLE coolify SET timezone TO 'UTC';"
+          sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE coolify TO coolify;"
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+      - name: Copy .env
+        run: cp .env.dusk.ci .env
+      - name: Install Dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+      - name: Generate key
+        run: php artisan key:generate
+      - name: Install Chrome binaries
+        run: php artisan dusk:chrome-driver --detect
+      - name: Start Chrome Driver
+        run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=4444 &
+      - name: Build assets
+        run: npm install && npm run build
+      - name: Run Laravel Server
+        run: php artisan serve --no-reload &
+      - name: Execute tests
+        run: php artisan dusk
+      - name: Upload Screenshots
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: screenshots
+          path: tests/Browser/screenshots
+      - name: Upload Console Logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: console
+          path: tests/Browser/console

.github/workflows/coolify-helper-next.yml

@@ -1,4 +1,4 @@
-name: Coolify Helper Image Development (v4)
+name: Coolify Helper Image Development
 
 on:
   push:
@@ -8,7 +8,8 @@ on:
       - docker/coolify-helper/Dockerfile
 
 env:
-  REGISTRY: ghcr.io
+  GITHUB_REGISTRY: ghcr.io
+  DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify-helper"
 
 jobs:
@@ -19,25 +20,36 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ghcr.io
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
         with:
-          no-cache: true
           context: .
           file: docker/coolify-helper/Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
           labels: |
             coolify.managed=true
   aarch64:
@@ -47,27 +59,39 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ghcr.io
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
         with:
-          no-cache: true
           context: .
           file: docker/coolify-helper/Dockerfile
           platforms: linux/aarch64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
           labels: |
             coolify.managed=true
+
   merge-manifest:
     runs-on: ubuntu-latest
     permissions:
@@ -75,25 +99,42 @@ jobs:
       packages: write
     needs: [ amd64, aarch64 ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to ghcr.io
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
            echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Create & publish manifest
+
+      - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
+          docker buildx imagetools create \
+          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:next
+
+      - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
+        run: |
+          docker buildx imagetools create \
+          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:next
+
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

.github/workflows/coolify-helper.yml

@@ -1,4 +1,4 @@
-name: Coolify Helper Image (v4)
+name: Coolify Helper Image
 
 on:
   push:
@@ -8,7 +8,8 @@ on:
       - docker/coolify-helper/Dockerfile
 
 env:
-  REGISTRY: ghcr.io
+  GITHUB_REGISTRY: ghcr.io
+  DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify-helper"
 
 jobs:
@@ -19,25 +20,36 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ghcr.io
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
         with:
-          no-cache: true
           context: .
           file: docker/coolify-helper/Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
           labels: |
             coolify.managed=true
   aarch64:
@@ -47,25 +59,36 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ghcr.io
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
-           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
         with:
-          no-cache: true
           context: .
           file: docker/coolify-helper/Dockerfile
           platforms: linux/aarch64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
           labels: |
             coolify.managed=true
   merge-manifest:
@@ -75,25 +98,43 @@ jobs:
       packages: write
     needs: [ amd64, aarch64 ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to ghcr.io
+      - uses: actions/checkout@v4
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
-           echo "VERSION=$(docker run  --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Create & publish manifest
+           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.helper.version' versions.json)"|xargs >> $GITHUB_OUTPUT
+
+      - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          docker buildx imagetools create \
+          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
+      - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
+        run: |
+          docker buildx imagetools create \
+          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

.github/workflows/coolify-production-build.yml

@@ -0,0 +1,143 @@
+name: Production Build (v4)
+
+on:
+  push:
+    branches: ["main"]
+    paths-ignore:
+      - .github/workflows/coolify-helper.yml
+      - .github/workflows/coolify-helper-next.yml
+      - .github/workflows/coolify-realtime.yml
+      - .github/workflows/coolify-realtime-next.yml
+      - docker/coolify-helper/Dockerfile
+      - docker/coolify-realtime/Dockerfile
+      - docker/testing-host/Dockerfile
+      - templates/service-templates.json
+
+env:
+  GITHUB_REGISTRY: ghcr.io
+  DOCKER_REGISTRY: docker.io
+  IMAGE_NAME: "coollabsio/coolify"
+
+jobs:
+  amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.GITHUB_REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Get Version
+        id: version
+        run: |
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT]
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/prod/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
+          labels: |
+            coolify.managed=true
+
+  aarch64:
+    runs-on: [self-hosted, arm64]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.GITHUB_REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Get Version
+        id: version
+        run: |
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT]
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/prod/Dockerfile
+          platforms: linux/aarch64
+          push: true
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
+          labels: |
+            coolify.managed=true
+
+  merge-manifest:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [amd64, aarch64]
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.GITHUB_REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Get Version
+        id: version
+        run: |
+          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
+
+      - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
+        run: |
+          docker buildx imagetools create \
+          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
+      - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
+        run: |
+          docker buildx imagetools create \
+          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
+      - uses: sarisia/actions-status-discord@v1
+        if: always()
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK_PROD_RELEASE_CHANNEL  }}

.github/workflows/coolify-realtime-next.yml

@@ -1,17 +1,18 @@
-name: Coolify Realtime Development (v4)
+name: Coolify Realtime Development
 
 on:
   push:
     branches: [ "next" ]
     paths:
-      - .github/workflows/coolify-realtime.yml
+      - .github/workflows/coolify-realtime-next.yml
       - docker/coolify-realtime/Dockerfile
       - docker/coolify-realtime/terminal-server.js
       - docker/coolify-realtime/package.json
       - docker/coolify-realtime/soketi-entrypoint.sh
 
 env:
-  REGISTRY: ghcr.io
+  GITHUB_REGISTRY: ghcr.io
+  DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify-realtime"
 
 jobs:
@@ -22,27 +23,39 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ghcr.io
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
         with:
-          no-cache: true
           context: .
           file: docker/coolify-realtime/Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
           labels: |
             coolify.managed=true
+
   aarch64:
     runs-on: [ self-hosted, arm64 ]
     permissions:
@@ -50,27 +63,39 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ghcr.io
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
            echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
         with:
-          no-cache: true
           context: .
           file: docker/coolify-realtime/Dockerfile
           platforms: linux/aarch64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
           labels: |
             coolify.managed=true
+
   merge-manifest:
     runs-on: ubuntu-latest
     permissions:
@@ -78,26 +103,44 @@ jobs:
       packages: write
     needs: [ amd64, aarch64 ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to ghcr.io
+      - uses: actions/checkout@v4
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
            echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Create & publish manifest
+
+      - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
+          docker buildx imagetools create \
+          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:next
+
+      - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
+        run: |
+          docker buildx imagetools create \
+          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:next
+
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_PROD_RELEASE_CHANNEL  }}
+          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}

.github/workflows/coolify-realtime.yml

@@ -1,4 +1,4 @@
-name: Coolify Realtime (v4)
+name: Coolify Realtime
 
 on:
   push:
@@ -11,7 +11,8 @@ on:
       - docker/coolify-realtime/soketi-entrypoint.sh
 
 env:
-  REGISTRY: ghcr.io
+  GITHUB_REGISTRY: ghcr.io
+  DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify-realtime"
 
 jobs:
@@ -22,27 +23,39 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ghcr.io
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
         with:
-          no-cache: true
           context: .
           file: docker/coolify-realtime/Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
           labels: |
             coolify.managed=true
+
   aarch64:
     runs-on: [ self-hosted, arm64 ]
     permissions:
@@ -50,27 +63,39 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ghcr.io
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
            echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
         with:
-          no-cache: true
           context: .
           file: docker/coolify-realtime/Dockerfile
           platforms: linux/aarch64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
           labels: |
             coolify.managed=true
+
   merge-manifest:
     runs-on: ubuntu-latest
     permissions:
@@ -78,25 +103,43 @@ jobs:
       packages: write
     needs: [ amd64, aarch64 ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to ghcr.io
+      - uses: actions/checkout@v4
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
       - name: Get Version
         id: version
         run: |
            echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app ghcr.io/jqlang/jq:latest '.coolify.realtime.version' versions.json)"|xargs >> $GITHUB_OUTPUT
-      - name: Create & publish manifest
+
+      - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          docker buildx imagetools create \
+          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
+      - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
+        run: |
+          docker buildx imagetools create \
+          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

.github/workflows/coolify-staging-build.yml

@@ -0,0 +1,129 @@
+name: Staging Build
+
+on:
+  push:
+    branches-ignore: ["main", "v3"]
+    paths-ignore:
+        - .github/workflows/coolify-helper.yml
+        - .github/workflows/coolify-helper-next.yml
+        - .github/workflows/coolify-realtime.yml
+        - .github/workflows/coolify-realtime-next.yml
+        - docker/coolify-helper/Dockerfile
+        - docker/coolify-realtime/Dockerfile
+        - docker/testing-host/Dockerfile
+        - templates/service-templates.json
+
+env:
+  GITHUB_REGISTRY: ghcr.io
+  DOCKER_REGISTRY: docker.io
+  IMAGE_NAME: "coollabsio/coolify"
+
+jobs:
+  amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.GITHUB_REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/prod/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+          labels: |
+            coolify.managed=true
+
+  aarch64:
+    runs-on: [self-hosted, arm64]
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.GITHUB_REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/prod/Dockerfile
+          platforms: linux/aarch64
+          push: true
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64
+          labels: |
+            coolify.managed=true
+
+  merge-manifest:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [amd64, aarch64]
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.GITHUB_REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
+        run: |
+         docker buildx imagetools create \
+         --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 \
+         --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+
+      - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
+        run: |
+          docker buildx imagetools create \
+          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+
+      - uses: sarisia/actions-status-discord@v1
+        if: always()
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}

.github/workflows/coolify-testing-host.yml

@@ -1,14 +1,15 @@
-name: Coolify Testing Host (v4-non-prod)
+name: Coolify Testing Host
 
 on:
   push:
-    branches: [ "main", "next" ]
+    branches: [ "next" ]
     paths:
       - .github/workflows/coolify-testing-host.yml
       - docker/testing-host/Dockerfile
 
 env:
-  REGISTRY: ghcr.io
+  GITHUB_REGISTRY: ghcr.io
+  DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify-testing-host"
 
 jobs:
@@ -19,21 +20,34 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ghcr.io
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
         with:
-          no-cache: true
           context: .
           file: docker/testing-host/Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          labels: |
+            coolify.managed=true
+
   aarch64:
     runs-on: [ self-hosted, arm64 ]
     permissions:
@@ -41,21 +55,34 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Login to ghcr.io
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v6
         with:
-          no-cache: true
           context: .
           file: docker/testing-host/Dockerfile
           platforms: linux/aarch64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64
+          labels: |
+            coolify.managed=true
+
   merge-manifest:
     runs-on: ubuntu-latest
     permissions:
@@ -63,21 +90,36 @@ jobs:
       packages: write
     needs: [ amd64, aarch64 ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to ghcr.io
+      - uses: actions/checkout@v4
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Create & publish manifest
+
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          docker buildx imagetools create \
+          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 \
+          --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
+      - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
+        run: |
+          docker buildx imagetools create \
+          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 \
+          --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

.github/workflows/development-build.yml

@@ -1,79 +0,0 @@
-name: Development Build (v4)
-
-on:
-  push:
-    branches-ignore: ["main", "v3"]
-    paths-ignore:
-      - .github/workflows/coolify-helper.yml
-      - docker/coolify-helper/Dockerfile
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: "coollabsio/coolify"
-
-jobs:
-  amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Login to ghcr.io
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: docker/prod/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
-  aarch64:
-    runs-on: [self-hosted, arm64]
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-      - name: Login to ghcr.io
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: docker/prod/Dockerfile
-          platforms: linux/aarch64
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64
-  merge-manifest:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [amd64, aarch64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to ghcr.io
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Create & publish manifest
-        run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}

.github/workflows/production-build.yml

@@ -1,89 +0,0 @@
-name: Production Build (v4)
-
-on:
-  push:
-    branches: ["main"]
-    paths-ignore:
-      - .github/workflows/coolify-helper.yml
-      - docker/coolify-helper/Dockerfile
-      - templates/service-templates.json
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: "coollabsio/coolify"
-
-jobs:
-  amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Login to ghcr.io
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Get Version
-        id: version
-        run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: docker/prod/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
-  aarch64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Login to ghcr.io
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Get Version
-        id: version
-        run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
-      - name: Build image and push to registry
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: docker/prod/Dockerfile
-          platforms: linux/aarch64
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
-  merge-manifest:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [amd64, aarch64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to ghcr.io
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Get Version
-        id: version
-        run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
-      - name: Create & publish manifest
-        run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_PROD_RELEASE_CHANNEL  }}

app/Actions/Application/GenerateConfig.php

@@ -12,6 +12,7 @@ class GenerateConfig
     public function handle(Application $application, bool $is_json = false)
     {
         ray()->clearAll();
+
         return $application->generateConfig(is_json: $is_json);
     }
 }

app/Actions/Server/DeleteServer.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Actions\Server;
+
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class DeleteServer
+{
+    use AsAction;
+
+    public function handle(Server $server)
+    {
+        StopSentinel::run($server);
+        $server->forceDelete();
+    }
+}

app/Actions/Server/InstallDocker.php

@@ -17,7 +17,7 @@ class InstallDocker
             throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/installation#manually">documentation</a>.');
         }
         ray('Installing Docker on server: '.$server->name.' ('.$server->ip.')'.' with OS type: '.$supported_os_type);
-        $dockerVersion = '24.0';
+        $dockerVersion = '26.0';
         $config = base64_encode('{
             "log-driver": "json-file",
             "log-opts": {

app/Actions/Server/StartSentinel.php

@@ -9,18 +9,48 @@ class StartSentinel
 {
     use AsAction;
 
-    public function handle(Server $server, $version = 'latest', bool $restart = false)
+    public function handle(Server $server, $version = 'next', bool $restart = false)
     {
         if ($restart) {
             StopSentinel::run($server);
         }
-        $metrics_history = $server->settings->metrics_history_days;
-        $refresh_rate = $server->settings->metrics_refresh_rate_seconds;
-        $token = $server->settings->metrics_token;
+        $metrics_history = data_get($server, 'settings.sentinel_metrics_history_days');
+        $refresh_rate = data_get($server, 'settings.sentinel_metrics_refresh_rate_seconds');
+        $push_interval = data_get($server, 'settings.sentinel_push_interval_seconds');
+        $token = data_get($server, 'settings.sentinel_token');
+        $endpoint = data_get($server, 'settings.sentinel_custom_url');
+        $mount_dir = '/data/coolify/sentinel';
+        $image = "ghcr.io/coollabsio/sentinel:$version";
+        if (! $endpoint) {
+            throw new \Exception('You should set FQDN in Instance Settings.');
+        }
+        $environments = [
+            'TOKEN' => $token,
+            'PUSH_ENDPOINT' => $endpoint,
+            'PUSH_INTERVAL_SECONDS' => $push_interval,
+            'COLLECTOR_ENABLED' => $server->isMetricsEnabled() ? 'true' : 'false',
+            'COLLECTOR_REFRESH_RATE_SECONDS' => $refresh_rate,
+            'COLLECTOR_RETENTION_PERIOD_DAYS' => $metrics_history,
+        ];
+        if (isDev()) {
+            // data_set($environments, 'DEBUG', 'true');
+            $mount_dir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/sentinel';
+            // $image = 'sentinel';
+        }
+        $docker_environments = '-e "'.implode('" -e "', array_map(fn ($key, $value) => "$key=$value", array_keys($environments), $environments)).'"';
+
+        $docker_command = "docker run -d $docker_environments --name coolify-sentinel -v /var/run/docker.sock:/var/run/docker.sock -v $mount_dir:/app/db --pid host --health-cmd \"curl --fail http://127.0.0.1:8888/api/health || exit 1\" --health-interval 10s --health-retries 3 --add-host=host.docker.internal:host-gateway $image";
+
         instant_remote_process([
-            "docker run --rm --pull always -d -e \"TOKEN={$token}\" -e \"SCHEDULER=true\" -e \"METRICS_HISTORY={$metrics_history}\" -e \"REFRESH_RATE={$refresh_rate}\" --name coolify-sentinel -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify/metrics:/app/metrics -v /data/coolify/logs:/app/logs --pid host --health-cmd \"curl --fail http://127.0.0.1:8888/api/health || exit 1\" --health-interval 10s --health-retries 3 ghcr.io/coollabsio/sentinel:$version",
-            'chown -R 9999:root /data/coolify/metrics /data/coolify/logs',
-            'chmod -R 700 /data/coolify/metrics /data/coolify/logs',
-        ], $server, true);
+            'docker rm -f coolify-sentinel || true',
+            "mkdir -p $mount_dir",
+            $docker_command,
+            "chown -R 9999:root $mount_dir",
+            "chmod -R 700 $mount_dir",
+        ], $server);
+
+        $server->settings->is_sentinel_enabled = true;
+        $server->settings->save();
+        $server->sentinelHeartbeat();
     }
 }

app/Actions/Server/StopSentinel.php

@@ -12,5 +12,6 @@ class StopSentinel
     public function handle(Server $server)
     {
         instant_remote_process(['docker rm -f coolify-sentinel'], $server, false);
+        $server->sentinelHeartbeat(isReset: true);
     }
 }

app/Console/Kernel.php

@@ -12,7 +12,6 @@ use App\Jobs\PullSentinelImageJob;
 use App\Jobs\PullTemplatesFromCDN;
 use App\Jobs\ScheduledTaskJob;
 use App\Jobs\ServerCheckJob;
-use App\Jobs\ServerStorageCheckJob;
 use App\Jobs\UpdateCoolifyJob;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledTask;
@@ -20,6 +19,7 @@ use App\Models\Server;
 use App\Models\Team;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Illuminate\Support\Carbon;
 
 class Kernel extends ConsoleKernel
 {
@@ -115,7 +115,10 @@ class Kernel extends ConsoleKernel
             $servers = $this->all_servers->where('ip', '!=', '1.2.3.4');
         }
         foreach ($servers as $server) {
-            $schedule->job(new ServerCheckJob($server))->everyMinute()->onOneServer();
+            $last_sentinel_update = $server->sentinel_updated_at;
+            if (Carbon::parse($last_sentinel_update)->isBefore(now()->subMinutes(4))) {
+                $schedule->job(new ServerCheckJob($server))->everyMinute()->onOneServer();
+            }
             // $schedule->job(new ServerStorageCheckJob($server))->everyMinute()->onOneServer();
             $serverTimezone = $server->settings->server_timezone;
             if ($server->settings->force_docker_cleanup) {

app/Http/Controllers/Api/ServersController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Actions\Server\DeleteServer;
 use App\Actions\Server\ValidateServer;
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
@@ -23,7 +24,7 @@ class ServersController extends Controller
             return serializeApiResponse($settings);
         }
         $settings = $settings->makeHidden([
-            'metrics_token',
+            'sentinel_token',
         ]);
 
         return serializeApiResponse($settings);
@@ -726,6 +727,7 @@ class ServersController extends Controller
             return response()->json(['message' => 'Server has resources, so you need to delete them before.'], 400);
         }
         $server->delete();
+        DeleteServer::dispatch($server);
 
         return response()->json(['message' => 'Server deleted.']);
     }

app/Jobs/PushServerUpdateJob.php

@@ -0,0 +1,407 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Actions\Database\StartDatabaseProxy;
+use App\Actions\Database\StopDatabaseProxy;
+use App\Actions\Proxy\CheckProxy;
+use App\Actions\Proxy\StartProxy;
+use App\Actions\Server\InstallLogDrain;
+use App\Actions\Shared\ComplexStatusCheck;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use App\Models\Server;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Collection;
+
+class PushServerUpdateJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 1;
+
+    public $timeout = 30;
+
+    public Collection $containers;
+
+    public Collection $applications;
+
+    public Collection $previews;
+
+    public Collection $databases;
+
+    public Collection $services;
+
+    public Collection $allApplicationIds;
+
+    public Collection $allDatabaseUuids;
+
+    public Collection $allTcpProxyUuids;
+
+    public Collection $allServiceApplicationIds;
+
+    public Collection $allApplicationPreviewsIds;
+
+    public Collection $allServiceDatabaseIds;
+
+    public Collection $allApplicationsWithAdditionalServers;
+
+    public Collection $foundApplicationIds;
+
+    public Collection $foundDatabaseUuids;
+
+    public Collection $foundServiceApplicationIds;
+
+    public Collection $foundServiceDatabaseIds;
+
+    public Collection $foundApplicationPreviewsIds;
+
+    public bool $foundProxy = false;
+
+    public bool $foundLogDrainContainer = false;
+
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
+
+    public function __construct(public Server $server, public $data)
+    {
+        $this->containers = collect();
+        $this->foundApplicationIds = collect();
+        $this->foundDatabaseUuids = collect();
+        $this->foundServiceApplicationIds = collect();
+        $this->foundApplicationPreviewsIds = collect();
+        $this->foundServiceDatabaseIds = collect();
+        $this->allApplicationIds = collect();
+        $this->allDatabaseUuids = collect();
+        $this->allTcpProxyUuids = collect();
+        $this->allServiceApplicationIds = collect();
+        $this->allServiceDatabaseIds = collect();
+    }
+
+    public function handle()
+    {
+        try {
+            if (! $this->data) {
+                throw new \Exception('No data provided');
+            }
+            $data = collect($this->data);
+
+            $this->serverStatus();
+
+            $this->server->sentinelHeartbeat();
+
+            $this->containers = collect(data_get($data, 'containers'));
+            if ($this->containers->isEmpty()) {
+                return;
+            }
+            $this->applications = $this->server->applications();
+            $this->databases = $this->server->databases();
+            $this->previews = $this->server->previews();
+            $this->services = $this->server->services()->get();
+            $this->allApplicationIds = $this->applications->filter(function ($application) {
+                return $application->additional_servers->count() === 0;
+            })->pluck('id');
+            $this->allApplicationsWithAdditionalServers = $this->applications->filter(function ($application) {
+                return $application->additional_servers->count() > 0;
+            });
+            $this->allApplicationPreviewsIds = $this->previews->pluck('id');
+            $this->allDatabaseUuids = $this->databases->pluck('uuid');
+            $this->allTcpProxyUuids = $this->databases->where('is_public', true)->pluck('uuid');
+            $this->services->each(function ($service) {
+                $service->applications()->pluck('id')->each(function ($applicationId) {
+                    $this->allServiceApplicationIds->push($applicationId);
+                });
+                $service->databases()->pluck('id')->each(function ($databaseId) {
+                    $this->allServiceDatabaseIds->push($databaseId);
+                });
+            });
+
+            ray('allServiceApplicationIds', ['allServiceApplicationIds' => $this->allServiceApplicationIds]);
+
+            foreach ($this->containers as $container) {
+                $containerStatus = data_get($container, 'state', 'exited');
+                $containerHealth = data_get($container, 'health_status', 'unhealthy');
+                $containerStatus = "$containerStatus ($containerHealth)";
+                $labels = collect(data_get($container, 'labels'));
+                $coolify_managed = $labels->has('coolify.managed');
+                if ($coolify_managed) {
+                    $name = data_get($container, 'name');
+                    if ($name === 'coolify-log-drain' && $this->isRunning($containerStatus)) {
+                        $this->foundLogDrainContainer = true;
+                    }
+                    if ($labels->has('coolify.applicationId')) {
+                        $applicationId = $labels->get('coolify.applicationId');
+                        $pullRequestId = data_get($labels, 'coolify.pullRequestId', '0');
+                        try {
+                            if ($pullRequestId === '0') {
+                                if ($this->allApplicationIds->contains($applicationId) && $this->isRunning($containerStatus)) {
+                                    $this->foundApplicationIds->push($applicationId);
+                                }
+                                $this->updateApplicationStatus($applicationId, $containerStatus);
+                            } else {
+                                if ($this->allApplicationPreviewsIds->contains($applicationId) && $this->isRunning($containerStatus)) {
+                                    $this->foundApplicationPreviewsIds->push($applicationId);
+                                }
+                                $this->updateApplicationPreviewStatus($applicationId, $containerStatus);
+                            }
+                        } catch (\Exception $e) {
+                            ray()->error($e);
+                        }
+                    } elseif ($labels->has('coolify.serviceId')) {
+                        $serviceId = $labels->get('coolify.serviceId');
+                        $subType = $labels->get('coolify.service.subType');
+                        $subId = $labels->get('coolify.service.subId');
+                        if ($subType === 'application' && $this->isRunning($containerStatus)) {
+                            $this->foundServiceApplicationIds->push($subId);
+                            $this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus);
+                        } elseif ($subType === 'database' && $this->isRunning($containerStatus)) {
+                            $this->foundServiceDatabaseIds->push($subId);
+                            $this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus);
+                        }
+
+                    } else {
+                        $uuid = $labels->get('com.docker.compose.service');
+                        $type = $labels->get('coolify.type');
+                        if ($name === 'coolify-proxy' && $this->isRunning($containerStatus)) {
+                            $this->foundProxy = true;
+                        } elseif ($type === 'service' && $this->isRunning($containerStatus)) {
+                            ray("Service: $uuid, $containerStatus");
+                        } else {
+                            if ($this->allDatabaseUuids->contains($uuid) && $this->isRunning($containerStatus)) {
+                                $this->foundDatabaseUuids->push($uuid);
+                                if ($this->allTcpProxyUuids->contains($uuid) && $this->isRunning($containerStatus)) {
+                                    $this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: true);
+                                } else {
+                                    $this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: false);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            $this->updateProxyStatus();
+
+            $this->updateNotFoundApplicationStatus();
+            $this->updateNotFoundApplicationPreviewStatus();
+            $this->updateNotFoundDatabaseStatus();
+            $this->updateNotFoundServiceStatus();
+
+            $this->updateAdditionalServersStatus();
+
+            $this->checkLogDrainContainer();
+
+        } catch (\Exception $e) {
+            throw $e;
+        }
+
+    }
+
+    private function serverStatus()
+    {
+        if ($this->server->isFunctional() === false) {
+            throw new \Exception('Server is not ready.');
+        }
+        if ($this->server->status() === false) {
+            throw new \Exception('Server is not reachable.');
+        }
+    }
+
+    private function updateApplicationStatus(string $applicationId, string $containerStatus)
+    {
+        $application = $this->applications->where('id', $applicationId)->first();
+        if (! $application) {
+            return;
+        }
+        $application->status = $containerStatus;
+        $application->save();
+        ray('Application updated', ['application_id' => $applicationId, 'status' => $containerStatus]);
+    }
+
+    private function updateApplicationPreviewStatus(string $applicationId, string $containerStatus)
+    {
+        $application = $this->previews->where('id', $applicationId)->first();
+        if (! $application) {
+            return;
+        }
+        $application->status = $containerStatus;
+        $application->save();
+        ray('Application preview updated', ['application_id' => $applicationId, 'status' => $containerStatus]);
+    }
+
+    private function updateNotFoundApplicationStatus()
+    {
+        $notFoundApplicationIds = $this->allApplicationIds->diff($this->foundApplicationIds);
+        if ($notFoundApplicationIds->isNotEmpty()) {
+            ray('Not found application ids', ['application_ids' => $notFoundApplicationIds]);
+            $notFoundApplicationIds->each(function ($applicationId) {
+                ray('Updating application status', ['application_id' => $applicationId, 'status' => 'exited']);
+                $application = Application::find($applicationId);
+                if ($application) {
+                    $application->status = 'exited';
+                    $application->save();
+                    ray('Application status updated', ['application_id' => $applicationId, 'status' => 'exited']);
+                }
+            });
+        }
+    }
+
+    private function updateNotFoundApplicationPreviewStatus()
+    {
+        $notFoundApplicationPreviewsIds = $this->allApplicationPreviewsIds->diff($this->foundApplicationPreviewsIds);
+        if ($notFoundApplicationPreviewsIds->isNotEmpty()) {
+            ray('Not found application previews ids', ['application_previews_ids' => $notFoundApplicationPreviewsIds]);
+            $notFoundApplicationPreviewsIds->each(function ($applicationPreviewId) {
+                ray('Updating application preview status', ['application_preview_id' => $applicationPreviewId, 'status' => 'exited']);
+                $applicationPreview = ApplicationPreview::find($applicationPreviewId);
+                if ($applicationPreview) {
+                    $applicationPreview->status = 'exited';
+                    $applicationPreview->save();
+                    ray('Application preview status updated', ['application_preview_id' => $applicationPreviewId, 'status' => 'exited']);
+                }
+            });
+        }
+    }
+
+    private function updateProxyStatus()
+    {
+        // If proxy is not found, start it
+        if ($this->server->isProxyShouldRun()) {
+            if ($this->foundProxy === false) {
+                try {
+                    if (CheckProxy::run($this->server)) {
+                        StartProxy::run($this->server, false);
+                    }
+                } catch (\Throwable $e) {
+                }
+            } else {
+                $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
+                instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
+            }
+        }
+
+    }
+
+    private function updateDatabaseStatus(string $databaseUuid, string $containerStatus, bool $tcpProxy = false)
+    {
+        $database = $this->databases->where('uuid', $databaseUuid)->first();
+        if (! $database) {
+            return;
+        }
+        $database->status = $containerStatus;
+        $database->save();
+        ray('Database status updated', ['database_uuid' => $databaseUuid, 'status' => $containerStatus]);
+        if ($this->isRunning($containerStatus) && $tcpProxy) {
+            $tcpProxyContainerFound = $this->containers->filter(function ($value, $key) use ($databaseUuid) {
+                return data_get($value, 'name') === "$databaseUuid-proxy" && data_get($value, 'state') === 'running';
+            })->first();
+            if (! $tcpProxyContainerFound) {
+                ray('Starting TCP proxy for database', ['database_uuid' => $databaseUuid]);
+                StartDatabaseProxy::dispatch($database);
+            } else {
+                ray('TCP proxy for database found in containers', ['database_uuid' => $databaseUuid]);
+            }
+        }
+    }
+
+    private function updateNotFoundDatabaseStatus()
+    {
+        $notFoundDatabaseUuids = $this->allDatabaseUuids->diff($this->foundDatabaseUuids);
+        if ($notFoundDatabaseUuids->isNotEmpty()) {
+            ray('Not found database uuids', ['database_uuids' => $notFoundDatabaseUuids]);
+            $notFoundDatabaseUuids->each(function ($databaseUuid) {
+                ray('Updating database status', ['database_uuid' => $databaseUuid, 'status' => 'exited']);
+                $database = $this->databases->where('uuid', $databaseUuid)->first();
+                if ($database) {
+                    $database->status = 'exited';
+                    $database->save();
+                    ray('Database status updated', ['database_uuid' => $databaseUuid, 'status' => 'exited']);
+                    ray('Database is public', ['database_uuid' => $databaseUuid, 'is_public' => $database->is_public]);
+                    if ($database->is_public) {
+                        ray('Stopping TCP proxy for database', ['database_uuid' => $databaseUuid]);
+                        StopDatabaseProxy::dispatch($database);
+                    }
+                }
+            });
+        }
+    }
+
+    private function updateServiceSubStatus(string $serviceId, string $subType, string $subId, string $containerStatus)
+    {
+        $service = $this->services->where('id', $serviceId)->first();
+        if (! $service) {
+            return;
+        }
+        if ($subType === 'application') {
+            $application = $service->applications()->where('id', $subId)->first();
+            $application->status = $containerStatus;
+            $application->save();
+            ray('Service application updated', ['service_id' => $serviceId, 'sub_type' => $subType, 'sub_id' => $subId, 'status' => $containerStatus]);
+        } elseif ($subType === 'database') {
+            $database = $service->databases()->where('id', $subId)->first();
+            $database->status = $containerStatus;
+            $database->save();
+            ray('Service database updated', ['service_id' => $serviceId, 'sub_type' => $subType, 'sub_id' => $subId, 'status' => $containerStatus]);
+        } else {
+            ray()->warning('Unknown sub type', ['service_id' => $serviceId, 'sub_type' => $subType, 'sub_id' => $subId, 'status' => $containerStatus]);
+        }
+    }
+
+    private function updateNotFoundServiceStatus()
+    {
+        $notFoundServiceApplicationIds = $this->allServiceApplicationIds->diff($this->foundServiceApplicationIds);
+        $notFoundServiceDatabaseIds = $this->allServiceDatabaseIds->diff($this->foundServiceDatabaseIds);
+        if ($notFoundServiceApplicationIds->isNotEmpty()) {
+            ray('Not found service application ids', ['service_application_ids' => $notFoundServiceApplicationIds]);
+            $notFoundServiceApplicationIds->each(function ($serviceApplicationId) {
+                ray('Updating service application status', ['service_application_id' => $serviceApplicationId, 'status' => 'exited']);
+                $application = ServiceApplication::find($serviceApplicationId);
+                if ($application) {
+                    $application->status = 'exited';
+                    $application->save();
+                    ray('Service application status updated', ['service_application_id' => $serviceApplicationId, 'status' => 'exited']);
+                }
+            });
+        }
+        if ($notFoundServiceDatabaseIds->isNotEmpty()) {
+            ray('Not found service database ids', ['service_database_ids' => $notFoundServiceDatabaseIds]);
+            $notFoundServiceDatabaseIds->each(function ($serviceDatabaseId) {
+                ray('Updating service database status', ['service_database_id' => $serviceDatabaseId, 'status' => 'exited']);
+                $database = ServiceDatabase::find($serviceDatabaseId);
+                if ($database) {
+                    $database->status = 'exited';
+                    $database->save();
+                    ray('Service database status updated', ['service_database_id' => $serviceDatabaseId, 'status' => 'exited']);
+                }
+            });
+        }
+    }
+
+    private function updateAdditionalServersStatus()
+    {
+        $this->allApplicationsWithAdditionalServers->each(function ($application) {
+            ray('Updating additional servers status for application', ['application_id' => $application->id]);
+            ComplexStatusCheck::run($application);
+        });
+    }
+
+    private function isRunning(string $containerStatus)
+    {
+        return str($containerStatus)->contains('running');
+    }
+
+    private function checkLogDrainContainer()
+    {
+        if ($this->server->isLogDrainEnabled() && $this->foundLogDrainContainer === false) {
+            InstallLogDrain::dispatch($this->server);
+        }
+    }
+}

app/Livewire/Destination/Show.php

@@ -66,7 +66,7 @@ class Show extends Component
             return ! $alreadyAddedNetworks->contains('network', $network['Name']);
         });
         if ($this->networks->count() === 0) {
-            $this->dispatch('success', 'No new networks found.');
+            $this->dispatch('success', 'No new destinations found on this server.');
 
             return;
         }

app/Livewire/Project/Application/General.php

@@ -241,7 +241,6 @@ class General extends Component
         }
     }
 
-
     public function updatedApplicationBuildPack()
     {
         if ($this->application->build_pack !== 'nixpacks') {
@@ -314,7 +313,7 @@ class General extends Component
     public function set_redirect()
     {
         try {
-            $has_www = collect($this->application->fqdns)->filter(fn($fqdn) => str($fqdn)->contains('www.'))->count();
+            $has_www = collect($this->application->fqdns)->filter(fn ($fqdn) => str($fqdn)->contains('www.'))->count();
             if ($has_www === 0 && $this->application->redirect === 'www') {
                 $this->dispatch('error', 'You want to redirect to www, but you do not have a www domain set.<br><br>Please add www to your domain list and as an A DNS record (if applicable).');
 
@@ -335,6 +334,7 @@ class General extends Component
             $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
             $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
                 Url::fromString($domain, ['http', 'https']);
+
                 return str($domain)->trim()->lower();
             });
             $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
@@ -409,11 +409,13 @@ class General extends Component
             if ($originalFqdn !== $this->application->fqdn) {
                 $this->application->fqdn = $originalFqdn;
             }
+
             return handleError($e, $this);
         } finally {
             $this->dispatch('configurationChanged');
         }
     }
+
     public function downloadConfig()
     {
         $config = GenerateConfig::run($this->application, true);
@@ -423,7 +425,7 @@ class General extends Component
             echo $config;
         }, $fileName, [
             'Content-Type' => 'application/json',
-            'Content-Disposition' => 'attachment; filename=' . $fileName,
+            'Content-Disposition' => 'attachment; filename='.$fileName,
         ]);
     }
 }

app/Livewire/Project/DeleteEnvironment.php

@@ -7,18 +7,22 @@ use Livewire\Component;
 
 class DeleteEnvironment extends Component
 {
-    public array $parameters;
-
     public int $environment_id;
 
     public bool $disabled = false;
 
     public string $environmentName = '';
 
+    public array $parameters;
+
     public function mount()
     {
-        $this->parameters = get_route_parameters();
-        $this->environmentName = Environment::findOrFail($this->environment_id)->name;
+        try {
+            $this->environmentName = Environment::findOrFail($this->environment_id)->name;
+            $this->parameters = get_route_parameters();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function delete()
@@ -30,7 +34,7 @@ class DeleteEnvironment extends Component
         if ($environment->isEmpty()) {
             $environment->delete();
 
-            return redirect()->route('project.show', ['project_uuid' => $this->parameters['project_uuid']]);
+            return redirect()->route('project.show', parameters: ['project_uuid' => $this->parameters['project_uuid']]);
         }
 
         return $this->dispatch('error', 'Environment has defined resources, please delete them first.');

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();
     }
 

app/Livewire/Project/New/PublicGitRepository.php

@@ -317,6 +317,7 @@ class PublicGitRepository extends Component
                 //     $application->setConfig($config);
                 // }
             }
+
             return redirect()->route('project.application.configuration', [
                 'application_uuid' => $application->uuid,
                 'environment_name' => $environment->name,

app/Livewire/Project/Resource/Index.php

@@ -32,8 +32,11 @@ class Index extends Component
 
     public $services = [];
 
+    public array $parameters;
+
     public function mount()
     {
+        $this->parameters = get_route_parameters();
         $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (! $project) {
             return redirect()->route('dashboard');
@@ -44,7 +47,6 @@ class Index extends Component
         }
         $this->project = $project;
         $this->environment = $environment;
-
         $this->applications = $this->environment->applications->load(['tags']);
         $this->applications = $this->applications->map(function ($application) {
             if (data_get($application, 'environment.project.uuid')) {

app/Livewire/Project/Service/EditDomain.php

@@ -21,6 +21,7 @@ class EditDomain extends Component
     {
         $this->application = ServiceApplication::find($this->applicationId);
     }
+
     public function submit()
     {
         try {
@@ -28,6 +29,7 @@ class EditDomain extends Component
             $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
             $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
                 Url::fromString($domain, ['http', 'https']);
+
                 return str($domain)->trim()->lower();
             });
             $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
@@ -48,6 +50,7 @@ class EditDomain extends Component
             if ($originalFqdn !== $this->application->fqdn) {
                 $this->application->fqdn = $originalFqdn;
             }
+
             return handleError($e, $this);
         }
     }

app/Livewire/Project/Service/Navbar.php

@@ -39,7 +39,7 @@ class Navbar extends Component
 
         return [
             "echo-private:user.{$userId},ServiceStatusChanged" => 'serviceStarted',
-            "envsUpdated" => '$refresh',
+            'envsUpdated' => '$refresh',
         ];
     }
 

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -30,10 +30,7 @@ class ServiceApplicationView extends Component
         'application.is_stripprefix_enabled' => 'nullable|boolean',
     ];
 
-    public function updatedApplicationFqdn()
-    {
-
-    }
+    public function updatedApplicationFqdn() {}
 
     public function instantSave()
     {
@@ -82,6 +79,7 @@ class ServiceApplicationView extends Component
             $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
             $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
                 Url::fromString($domain, ['http', 'https']);
+
                 return str($domain)->trim()->lower();
             });
             $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
@@ -101,6 +99,7 @@ class ServiceApplicationView extends Component
             if ($originalFqdn !== $this->application->fqdn) {
                 $this->application->fqdn = $originalFqdn;
             }
+
             return handleError($e, $this);
         }
     }

app/Livewire/Project/Shared/Metrics.php

@@ -31,13 +31,8 @@ class Metrics extends Component
     public function loadData()
     {
         try {
-            $metrics = $this->resource->getMetrics($this->interval);
-            $cpuMetrics = collect($metrics)->map(function ($metric) {
-                return [$metric[0], $metric[1]];
-            });
-            $memoryMetrics = collect($metrics)->map(function ($metric) {
-                return [$metric[0], $metric[2]];
-            });
+            $cpuMetrics = $this->resource->getCpuMetrics($this->interval);
+            $memoryMetrics = $this->resource->getMemoryMetrics($this->interval);
             $this->dispatch("refreshChartData-{$this->chartId}-cpu", [
                 'seriesData' => $cpuMetrics,
             ]);

app/Livewire/Project/Shared/UploadConfig.php

@@ -8,8 +8,11 @@ use Livewire\Component;
 class UploadConfig extends Component
 {
     public $config;
+
     public $applicationId;
-    public function mount() {
+
+    public function mount()
+    {
         if (isDev()) {
             $this->config = '{
     "build_pack": "nixpacks",
@@ -22,6 +25,7 @@ class UploadConfig extends Component
 }';
         }
     }
+
     public function uploadConfig()
     {
         try {
@@ -30,10 +34,12 @@ class UploadConfig extends Component
             $this->dispatch('success', 'Application settings updated');
         } catch (\Exception $e) {
             $this->dispatch('error', $e->getMessage());
+
             return;
         }
 
     }
+
     public function render()
     {
         return view('livewire.project.shared.upload-config');

app/Livewire/Server/Advanced.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Livewire\Server;
+
+use App\Jobs\DockerCleanupJob;
+use App\Models\Server;
+use Livewire\Component;
+
+class Advanced extends Component
+{
+    public Server $server;
+
+    protected $rules = [
+        'server.settings.concurrent_builds' => 'required|integer|min:1',
+        'server.settings.dynamic_timeout' => 'required|integer|min:1',
+        'server.settings.force_docker_cleanup' => 'required|boolean',
+        'server.settings.docker_cleanup_frequency' => 'required_if:server.settings.force_docker_cleanup,true|string',
+        'server.settings.docker_cleanup_threshold' => 'required_if:server.settings.force_docker_cleanup,false|integer|min:1|max:100',
+        'server.settings.delete_unused_volumes' => 'boolean',
+        'server.settings.delete_unused_networks' => 'boolean',
+    ];
+
+    protected $validationAttributes = [
+
+        'server.settings.concurrent_builds' => 'Concurrent Builds',
+        'server.settings.dynamic_timeout' => 'Dynamic Timeout',
+        'server.settings.force_docker_cleanup' => 'Force Docker Cleanup',
+        'server.settings.docker_cleanup_frequency' => 'Docker Cleanup Frequency',
+        'server.settings.docker_cleanup_threshold' => 'Docker Cleanup Threshold',
+        'server.settings.delete_unused_volumes' => 'Delete Unused Volumes',
+        'server.settings.delete_unused_networks' => 'Delete Unused Networks',
+    ];
+
+    public function instantSave()
+    {
+        try {
+            $this->validate();
+            $this->server->settings->save();
+            $this->dispatch('success', 'Server updated.');
+            $this->dispatch('refreshServerShow');
+        } catch (\Throwable $e) {
+            $this->server->settings->refresh();
+
+            return handleError($e, $this);
+        }
+    }
+
+    public function manualCleanup()
+    {
+        try {
+            DockerCleanupJob::dispatch($this->server, true);
+            $this->dispatch('success', 'Manual cleanup job started. Depending on the amount of data, this might take a while.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function submit()
+    {
+        try {
+            $frequency = $this->server->settings->docker_cleanup_frequency;
+            if (empty($frequency) || ! validate_cron_expression($frequency)) {
+                $this->server->settings->docker_cleanup_frequency = '*/10 * * * *';
+                throw new \Exception('Invalid Cron / Human expression for Docker Cleanup Frequency. Resetting to default 10 minutes.');
+            }
+            $this->server->settings->save();
+            $this->dispatch('success', 'Server updated.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function render()
+    {
+        return view('livewire.server.advanced');
+    }
+}

app/Livewire/Server/Charts.php

@@ -34,12 +34,12 @@ class Charts extends Component
         try {
             $cpuMetrics = $this->server->getCpuMetrics($this->interval);
             $memoryMetrics = $this->server->getMemoryMetrics($this->interval);
-            $cpuMetrics = collect($cpuMetrics)->map(function ($metric) {
-                return [$metric[0], $metric[1]];
-            });
-            $memoryMetrics = collect($memoryMetrics)->map(function ($metric) {
-                return [$metric[0], $metric[1]];
-            });
+            // $cpuMetrics = collect($cpuMetrics)->map(function ($metric) {
+            //     return [$metric[0], $metric[1]];
+            // });
+            // $memoryMetrics = collect($memoryMetrics)->map(function ($metric) {
+            //     return [$metric[0], $metric[1]];
+            // });
             $this->dispatch("refreshChartData-{$this->chartId}-cpu", [
                 'seriesData' => $cpuMetrics,
             ]);

app/Livewire/Server/CloudflareTunnels.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Livewire\Server;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class CloudflareTunnels extends Component
+{
+    public Server $server;
+
+    protected $rules = [
+        'server.settings.is_cloudflare_tunnel' => 'required|boolean',
+    ];
+
+    protected $validationAttributes = [
+        'server.settings.is_cloudflare_tunnel' => 'Cloudflare Tunnel',
+    ];
+
+    public function instantSave()
+    {
+        try {
+            $this->validate();
+            $this->server->settings->save();
+            $this->dispatch('success', 'Server updated.');
+            $this->dispatch('refreshServerShow');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function manualCloudflareConfig()
+    {
+        $this->server->settings->is_cloudflare_tunnel = true;
+        $this->server->settings->save();
+        $this->server->refresh();
+        $this->dispatch('success', 'Cloudflare Tunnels enabled.');
+    }
+
+    public function render()
+    {
+        return view('livewire.server.cloudflare-tunnels');
+    }
+}

app/Livewire/Server/Delete.php

@@ -2,6 +2,7 @@
 
 namespace App\Livewire\Server;
 
+use App\Actions\Server\DeleteServer;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
@@ -28,6 +29,7 @@ class Delete extends Component
                 return;
             }
             $this->server->delete();
+            DeleteServer::dispatch($this->server);
 
             return redirect()->route('server.index');
         } catch (\Throwable $e) {

app/Livewire/Server/Form.php

@@ -4,8 +4,6 @@ namespace App\Livewire\Server;
 
 use App\Actions\Server\StartSentinel;
 use App\Actions\Server\StopSentinel;
-use App\Jobs\DockerCleanupJob;
-use App\Jobs\PullSentinelImageJob;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -46,25 +44,19 @@ class Form extends Component
         'server.ip' => 'required',
         'server.user' => 'required',
         'server.port' => 'required',
-        'server.settings.is_cloudflare_tunnel' => 'required|boolean',
+        'wildcard_domain' => 'nullable|url',
         'server.settings.is_reachable' => 'required',
         'server.settings.is_swarm_manager' => 'required|boolean',
         'server.settings.is_swarm_worker' => 'required|boolean',
         'server.settings.is_build_server' => 'required|boolean',
-        'server.settings.concurrent_builds' => 'required|integer|min:1',
-        'server.settings.dynamic_timeout' => 'required|integer|min:1',
         'server.settings.is_metrics_enabled' => 'required|boolean',
-        'server.settings.metrics_token' => 'required',
-        'server.settings.metrics_refresh_rate_seconds' => 'required|integer|min:1',
-        'server.settings.metrics_history_days' => 'required|integer|min:1',
-        'wildcard_domain' => 'nullable|url',
-        'server.settings.is_server_api_enabled' => 'required|boolean',
+        'server.settings.sentinel_token' => 'required',
+        'server.settings.sentinel_metrics_refresh_rate_seconds' => 'required|integer|min:1',
+        'server.settings.sentinel_metrics_history_days' => 'required|integer|min:1',
+        'server.settings.sentinel_push_interval_seconds' => 'required|integer|min:10',
+        'server.settings.sentinel_custom_url' => 'nullable|url',
+        'server.settings.is_sentinel_enabled' => 'required|boolean',
         'server.settings.server_timezone' => 'required|string|timezone',
-        'server.settings.force_docker_cleanup' => 'required|boolean',
-        'server.settings.docker_cleanup_frequency' => 'required_if:server.settings.force_docker_cleanup,true|string',
-        'server.settings.docker_cleanup_threshold' => 'required_if:server.settings.force_docker_cleanup,false|integer|min:1|max:100',
-        'server.settings.delete_unused_volumes' => 'boolean',
-        'server.settings.delete_unused_networks' => 'boolean',
     ];
 
     protected $validationAttributes = [
@@ -73,21 +65,18 @@ class Form extends Component
         'server.ip' => 'IP address/Domain',
         'server.user' => 'User',
         'server.port' => 'Port',
-        'server.settings.is_cloudflare_tunnel' => 'Cloudflare Tunnel',
         'server.settings.is_reachable' => 'Is reachable',
         'server.settings.is_swarm_manager' => 'Swarm Manager',
         'server.settings.is_swarm_worker' => 'Swarm Worker',
         'server.settings.is_build_server' => 'Build Server',
-        'server.settings.concurrent_builds' => 'Concurrent Builds',
-        'server.settings.dynamic_timeout' => 'Dynamic Timeout',
         'server.settings.is_metrics_enabled' => 'Metrics',
-        'server.settings.metrics_token' => 'Metrics Token',
-        'server.settings.metrics_refresh_rate_seconds' => 'Metrics Interval',
-        'server.settings.metrics_history_days' => 'Metrics History',
-        'server.settings.is_server_api_enabled' => 'Server API',
+        'server.settings.sentinel_token' => 'Metrics Token',
+        'server.settings.sentinel_metrics_refresh_rate_seconds' => 'Metrics Interval',
+        'server.settings.sentinel_metrics_history_days' => 'Metrics History',
+        'server.settings.sentinel_push_interval_seconds' => 'Push Interval',
+        'server.settings.is_sentinel_enabled' => 'Server API',
+        'server.settings.sentinel_custom_url' => 'Coolify URL',
         'server.settings.server_timezone' => 'Server Timezone',
-        'server.settings.delete_unused_volumes' => 'Delete Unused Volumes',
-        'server.settings.delete_unused_networks' => 'Delete Unused Networks',
     ];
 
     public function mount(Server $server)
@@ -95,10 +84,24 @@ class Form extends Component
         $this->server = $server;
         $this->timezones = collect(timezone_identifiers_list())->sort()->values()->toArray();
         $this->wildcard_domain = $this->server->settings->wildcard_domain;
-        $this->server->settings->docker_cleanup_threshold = $this->server->settings->docker_cleanup_threshold;
-        $this->server->settings->docker_cleanup_frequency = $this->server->settings->docker_cleanup_frequency;
-        $this->server->settings->delete_unused_volumes = $server->settings->delete_unused_volumes;
-        $this->server->settings->delete_unused_networks = $server->settings->delete_unused_networks;
+    }
+
+    public function checkSyncStatus()
+    {
+        $this->server->refresh();
+        $this->server->settings->refresh();
+    }
+
+    public function regenerateSentinelToken()
+    {
+        try {
+            $this->server->settings->generateSentinelToken();
+            $this->server->settings->refresh();
+            $this->restartSentinel(notification: false);
+            $this->dispatch('success', 'Token regenerated & Sentinel restarted.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function updated($field)
@@ -131,21 +134,35 @@ class Form extends Component
         $this->dispatch('proxyStatusUpdated');
     }
 
-    public function checkPortForServerApi()
+    public function updatedServerSettingsIsSentinelEnabled($value)
     {
-        try {
-            if ($this->server->settings->is_server_api_enabled === true) {
-                $this->server->checkServerApi();
-                $this->dispatch('success', 'Server API is reachable.');
+        $this->validate();
+        $this->validate([
+            'server.settings.sentinel_custom_url' => 'required|url',
+        ]);
+        if ($value === false) {
+            StopSentinel::dispatch($this->server);
+            $this->server->settings->is_metrics_enabled = false;
+            $this->server->settings->save();
+            $this->server->sentinelHeartbeat(isReset: true);
+        } else {
+            try {
+                StartSentinel::run($this->server);
+            } catch (\Throwable $e) {
+                return handleError($e, $this);
             }
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
         }
     }
 
+    public function updatedServerSettingsIsMetricsEnabled()
+    {
+        $this->restartSentinel();
+    }
+
     public function instantSave()
     {
         try {
+            $this->validate();
             refresh_server_connection($this->server->privateKey);
             $this->validateServer(false);
 
@@ -153,33 +170,27 @@ class Form extends Component
             $this->server->save();
             $this->dispatch('success', 'Server updated.');
             $this->dispatch('refreshServerShow');
-            if ($this->server->isSentinelEnabled()) {
-                PullSentinelImageJob::dispatchSync($this->server);
-                ray('Sentinel is enabled');
-                if ($this->server->settings->isDirty('is_metrics_enabled')) {
-                    $this->dispatch('reloadWindow');
-                }
-                if ($this->server->settings->isDirty('is_server_api_enabled') && $this->server->settings->is_server_api_enabled === true) {
-                    ray('Starting sentinel');
-                }
-            } else {
-                ray('Sentinel is not enabled');
-                StopSentinel::dispatch($this->server);
-            }
             $this->server->settings->save();
-            // $this->checkPortForServerApi();
 
         } catch (\Throwable $e) {
+            $this->server->settings->refresh();
+
             return handleError($e, $this);
         }
     }
 
-    public function restartSentinel()
+    public function restartSentinel($notification = true)
     {
         try {
+            $this->validate();
+            $this->validate([
+                'server.settings.sentinel_custom_url' => 'required|url',
+            ]);
             $version = get_latest_sentinel_version();
             StartSentinel::run($this->server, $version, true);
-            $this->dispatch('success', 'Sentinel restarted.');
+            if ($notification) {
+                $this->dispatch('success', 'Sentinel started.');
+            }
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -236,11 +247,11 @@ class Form extends Component
             }
             refresh_server_connection($this->server->privateKey);
             $this->server->settings->wildcard_domain = $this->wildcard_domain;
-            if ($this->server->settings->force_docker_cleanup) {
-                $this->server->settings->docker_cleanup_frequency = $this->server->settings->docker_cleanup_frequency;
-            } else {
-                $this->server->settings->docker_cleanup_threshold = $this->server->settings->docker_cleanup_threshold;
-            }
+            // if ($this->server->settings->force_docker_cleanup) {
+            //     $this->server->settings->docker_cleanup_frequency = $this->server->settings->docker_cleanup_frequency;
+            // } else {
+            //     $this->server->settings->docker_cleanup_threshold = $this->server->settings->docker_cleanup_threshold;
+            // }
             $currentTimezone = $this->server->settings->getOriginal('server_timezone');
             $newTimezone = $this->server->settings->server_timezone;
             if ($currentTimezone !== $newTimezone || $currentTimezone === '') {
@@ -254,21 +265,4 @@ class Form extends Component
             return handleError($e, $this);
         }
     }
-    public function manualCleanup()
-    {
-        try {
-            DockerCleanupJob::dispatch($this->server, true);
-            $this->dispatch('success', 'Manual cleanup job started. Depending on the amount of data, this might take a while.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function manualCloudflareConfig()
-    {
-        $this->server->settings->is_cloudflare_tunnel = true;
-        $this->server->settings->save();
-        $this->server->refresh();
-        $this->dispatch('success', 'Cloudflare Tunnels enabled.');
-    }
 }

app/Livewire/Server/Proxy/Modal.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Livewire\Server\Proxy;
-
-use App\Models\Server;
-use Livewire\Component;
-
-class Modal extends Component
-{
-    public Server $server;
-
-    public function proxyStatusUpdated()
-    {
-        $this->dispatch('proxyStatusUpdated');
-    }
-}

app/Livewire/Server/Proxy/Show.php

@@ -22,10 +22,7 @@ class Show extends Component
     {
         $this->parameters = get_route_parameters();
         try {
-            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
-            if (is_null($this->server)) {
-                return redirect()->route('server.index');
-            }
+            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->firstOrFail();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Resources.php

@@ -15,7 +15,9 @@ class Resources extends Component
 
     public $parameters = [];
 
-    public Collection $unmanagedContainers;
+    public Collection $containers;
+
+    public $activeTab = 'managed';
 
     public function getListeners()
     {
@@ -50,14 +52,29 @@ class Resources extends Component
     public function refreshStatus()
     {
         $this->server->refresh();
-        $this->loadUnmanagedContainers();
+        if ($this->activeTab === 'managed') {
+            $this->loadManagedContainers();
+        } else {
+            $this->loadUnmanagedContainers();
+        }
         $this->dispatch('success', 'Resource statuses refreshed.');
     }
 
+    public function loadManagedContainers()
+    {
+        try {
+            $this->activeTab = 'managed';
+            $this->containers = $this->server->refresh()->definedResources();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
     public function loadUnmanagedContainers()
     {
+        $this->activeTab = 'unmanaged';
         try {
-            $this->unmanagedContainers = $this->server->loadUnmanagedContainers();
+            $this->containers = $this->server->loadUnmanagedContainers();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -65,13 +82,14 @@ class Resources extends Component
 
     public function mount()
     {
-        $this->unmanagedContainers = collect();
+        $this->containers = collect();
         $this->parameters = get_route_parameters();
         try {
             $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
             if (is_null($this->server)) {
                 return redirect()->route('server.index');
             }
+            $this->loadManagedContainers();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Show.php

@@ -10,20 +10,17 @@ class Show extends Component
 {
     use AuthorizesRequests;
 
-    public ?Server $server = null;
+    public Server $server;
 
-    public $parameters = [];
+    public array $parameters;
 
     protected $listeners = ['refreshServerShow'];
 
     public function mount()
     {
-        $this->parameters = get_route_parameters();
         try {
-            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
-            if (is_null($this->server)) {
-                return redirect()->route('server.index');
-            }
+            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->firstOrFail();
+            $this->parameters = get_route_parameters();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/ShowPrivateKey.php

@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Server;
 
-use App\Models\PrivateKey;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -14,15 +13,29 @@ class ShowPrivateKey extends Component
 
     public $parameters;
 
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+    }
+
     public function setPrivateKey($privateKeyId)
     {
+        $originalPrivateKeyId = $this->server->getOriginal('private_key_id');
         try {
-            $privateKey = PrivateKey::findOrFail($privateKeyId);
-            $this->server->update(['private_key_id' => $privateKey->id]);
-            $this->server->refresh();
-            $this->dispatch('success', 'Private key updated successfully.');
+            $this->server->update(['private_key_id' => $privateKeyId]);
+            ['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection();
+            if ($uptime) {
+                $this->dispatch('success', 'Private key updated successfully.');
+            } else {
+                throw new \Exception('Server is not reachable.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.<br><br>Error: '.$error);
+            }
         } catch (\Exception $e) {
+            $this->server->update(['private_key_id' => $originalPrivateKeyId]);
+            $this->server->validateConnection();
             $this->dispatch('error', 'Failed to update private key: '.$e->getMessage());
+        } finally {
+            $this->dispatch('refreshServerShow');
+            $this->server->refresh();
         }
     }
 
@@ -33,18 +46,15 @@ class ShowPrivateKey extends Component
             if ($uptime) {
                 $this->dispatch('success', 'Server is reachable.');
             } else {
-                ray($error);
                 $this->dispatch('error', 'Server is not reachable.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.<br><br>Error: '.$error);
 
                 return;
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);
+        } finally {
+            $this->dispatch('refreshServerShow');
+            $this->server->refresh();
         }
     }
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-    }
 }

app/Livewire/Settings/Index.php

@@ -28,6 +28,7 @@ class Index extends Component
     protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
 
     protected Server $server;
+
     public $timezones;
 
     protected $rules = [
@@ -57,7 +58,6 @@ class Index extends Component
         'settings.instance_timezone' => 'Instance Timezone',
     ];
 
-
     public function mount()
     {
         if (isInstanceAdmin()) {
@@ -171,7 +171,6 @@ class Index extends Component
         }
     }
 
-
     public function render()
     {
         return view('livewire.settings.index');

app/Livewire/Source/Github/Create.php

@@ -23,7 +23,7 @@ class Create extends Component
 
     public function mount()
     {
-        $this->name = generate_random_name();
+        $this->name = substr(generate_random_name(), 0, 34); // GitHub Apps names can only be 34 characters long
     }
 
     public function createGitHubApp()

app/Models/Application.php

@@ -1400,13 +1400,21 @@ class Application extends BaseModel
         return [];
     }
 
-    public function getMetrics(int $mins = 5)
+    public function getCpuMetrics(int $mins = 5)
     {
         $server = $this->destination->server;
         $container_name = $this->uuid;
         if ($server->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            if (isDev() && $server->id === 0) {
+                $process = Process::run("curl -H \"Authorization: Bearer {$this->settings->sentinel_token}\" http://host.docker.internal:8888/api/container/{$container_name}/cpu/history?from=$from");
+                if ($process->failed()) {
+                    throw new \Exception($process->errorOutput());
+                }
+                $metrics = $process->output();
+            } else {
+                $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->sentinel_token}\" http://localhost:8888/api/container/{$container_name}/cpu/history?from=$from'"], $server, false);
+            }
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');
@@ -1415,14 +1423,41 @@ class Application extends BaseModel
                 }
                 throw new \Exception($error);
             }
-            $metrics = str($metrics)->explode("\n")->skip(1)->all();
-            $parsedCollection = collect($metrics)->flatMap(function ($item) {
-                return collect(explode("\n", trim($item)))->map(function ($line) {
-                    [$time, $cpu_usage_percent, $memory_usage, $memory_usage_percent] = explode(',', trim($line));
-                    $cpu_usage_percent = number_format($cpu_usage_percent, 2);
+            $metrics = json_decode($metrics, true);
+            $parsedCollection = collect($metrics)->map(function ($metric) {
+                return [(int) $metric['time'], (float) $metric['percent']];
+            });
 
-                    return [(int) $time, (float) $cpu_usage_percent, (int) $memory_usage];
-                });
+            return $parsedCollection->toArray();
+        }
+    }
+
+    public function getMemoryMetrics(int $mins = 5)
+    {
+        $server = $this->destination->server;
+        $container_name = $this->uuid;
+        if ($server->isMetricsEnabled()) {
+            $from = now()->subMinutes($mins)->toIso8601ZuluString();
+            if (isDev() && $server->id === 0) {
+                $process = Process::run("curl -H \"Authorization: Bearer {$this->settings->sentinel_token}\" http://host.docker.internal:8888/api/container/{$container_name}/memory/history?from=$from");
+                if ($process->failed()) {
+                    throw new \Exception($process->errorOutput());
+                }
+                $metrics = $process->output();
+            } else {
+                $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->sentinel_token}\" http://localhost:8888/api/container/{$container_name}/memory/history?from=$from'"], $server, false);
+            }
+            if (str($metrics)->contains('error')) {
+                $error = json_decode($metrics, true);
+                $error = data_get($error, 'error', 'Something is not okay, are you okay?');
+                if ($error == 'Unauthorized') {
+                    $error = 'Unauthorized, please check your metrics token or restart Sentinel to set a new token.';
+                }
+                throw new \Exception($error);
+            }
+            $metrics = json_decode($metrics, true);
+            $parsedCollection = collect($metrics)->map(function ($metric) {
+                return [(int) $metric['time'], (float) $metric['used']];
             });
 
             return $parsedCollection->toArray();
@@ -1459,7 +1494,9 @@ class Application extends BaseModel
 
         return $config;
     }
-    public function setConfig($config) {
+
+    public function setConfig($config)
+    {
 
         $config = $config;
         $validator = Validator::make(['config' => $config], [

app/Models/InstanceSettings.php

@@ -21,6 +21,7 @@ class InstanceSettings extends Model implements SendsEmail
         'is_auto_update_enabled' => 'boolean',
         'auto_update_frequency' => 'string',
         'update_check_frequency' => 'string',
+        'sentinel_token' => 'encrypted',
     ];
 
     public function fqdn(): Attribute

app/Models/ScheduledDatabaseBackup.php

@@ -51,7 +51,6 @@ class ScheduledDatabaseBackup extends BaseModel
             }
         }
 
-
         return null;
     }
 }

app/Models/Server.php

@@ -7,6 +7,8 @@ use App\Enums\ProxyTypes;
 use App\Jobs\PullSentinelImageJob;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Process;
@@ -43,7 +45,7 @@ use Symfony\Component\Yaml\Yaml;
 
 class Server extends BaseModel
 {
-    use SchemalessAttributesTrait;
+    use SchemalessAttributesTrait,SoftDeletes;
 
     public static $batch_counter = 0;
 
@@ -95,7 +97,8 @@ class Server extends BaseModel
                 }
             }
         });
-        static::deleting(function ($server) {
+
+        static::forceDeleting(function ($server) {
             $server->destinations()->each(function ($destination) {
                 $destination->delete();
             });
@@ -525,9 +528,20 @@ $schema://$host {
         Storage::disk('ssh-mux')->delete($this->muxFilename());
     }
 
+    public function sentinelHeartbeat(bool $isReset = false)
+    {
+        $this->sentinel_updated_at = $isReset ? now()->subMinutes(6000) : now();
+        $this->save();
+    }
+
+    public function isSentinelLive()
+    {
+        return Carbon::parse($this->sentinel_updated_at)->isAfter(now()->subMinutes(4));
+    }
+
     public function isSentinelEnabled()
     {
-        return $this->isMetricsEnabled() || $this->isServerApiEnabled();
+        return ($this->isMetricsEnabled() || $this->isServerApiEnabled()) && ! $this->isBuildServer();
     }
 
     public function isMetricsEnabled()
@@ -537,7 +551,7 @@ $schema://$host {
 
     public function isServerApiEnabled()
     {
-        return $this->settings->is_server_api_enabled;
+        return $this->settings->is_sentinel_enabled;
     }
 
     public function checkServerApi()
@@ -555,7 +569,6 @@ $schema://$host {
                 ray($process->exitCode(), $process->output(), $process->errorOutput());
                 throw new \Exception("Server API is not reachable on http://{$server_ip}:12172");
             }
-
         }
     }
 
@@ -579,7 +592,15 @@ $schema://$host {
     {
         if ($this->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $cpu = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$this->settings->metrics_token}\" http://localhost:8888/api/cpu/history?from=$from'"], $this, false);
+            if (isDev() && $this->id === 0) {
+                $process = Process::run("curl -H \"Authorization: Bearer {$this->settings->sentinel_token}\" http://host.docker.internal:8888/api/cpu/history?from=$from");
+                if ($process->failed()) {
+                    throw new \Exception($process->errorOutput());
+                }
+                $cpu = $process->output();
+            } else {
+                $cpu = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$this->settings->sentinel_token}\" http://localhost:8888/api/cpu/history?from=$from'"], $this, false);
+            }
             if (str($cpu)->contains('error')) {
                 $error = json_decode($cpu, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');
@@ -588,17 +609,13 @@ $schema://$host {
                 }
                 throw new \Exception($error);
             }
-            $cpu = str($cpu)->explode("\n")->skip(1)->all();
-            $parsedCollection = collect($cpu)->flatMap(function ($item) {
-                return collect(explode("\n", trim($item)))->map(function ($line) {
-                    [$time, $cpu_usage_percent] = explode(',', trim($line));
-                    $cpu_usage_percent = number_format($cpu_usage_percent, 0);
-
-                    return [(int) $time, (float) $cpu_usage_percent];
-                });
+            $cpu = json_decode($cpu, true);
+            $parsedCollection = collect($cpu)->map(function ($metric) {
+                return [(int) $metric['time'], (float) $metric['percent']];
             });
 
-            return $parsedCollection->toArray();
+            return $parsedCollection;
+
         }
     }
 
@@ -606,7 +623,15 @@ $schema://$host {
     {
         if ($this->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $memory = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$this->settings->metrics_token}\" http://localhost:8888/api/memory/history?from=$from'"], $this, false);
+            if (isDev() && $this->id === 0) {
+                $process = Process::run("curl -H \"Authorization: Bearer {$this->settings->sentinel_token}\" http://host.docker.internal:8888/api/memory/history?from=$from");
+                if ($process->failed()) {
+                    throw new \Exception($process->errorOutput());
+                }
+                $memory = $process->output();
+            } else {
+                $memory = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$this->settings->sentinel_token}\" http://localhost:8888/api/memory/history?from=$from'"], $this, false);
+            }
             if (str($memory)->contains('error')) {
                 $error = json_decode($memory, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');
@@ -615,14 +640,9 @@ $schema://$host {
                 }
                 throw new \Exception($error);
             }
-            $memory = str($memory)->explode("\n")->skip(1)->all();
-            $parsedCollection = collect($memory)->flatMap(function ($item) {
-                return collect(explode("\n", trim($item)))->map(function ($line) {
-                    [$time, $used, $free, $usedPercent] = explode(',', trim($line));
-                    $usedPercent = number_format($usedPercent, 0);
-
-                    return [(int) $time, (float) $usedPercent];
-                });
+            $memory = json_decode($memory, true);
+            $parsedCollection = collect($memory)->map(function ($metric) {
+                return [(int) $metric['time'], (float) $metric['usedPercent']];
             });
 
             return $parsedCollection->toArray();
@@ -977,7 +997,8 @@ $schema://$host {
 
     public function isProxyShouldRun()
     {
-        if ($this->proxyType() === ProxyTypes::NONE->value || $this->settings->is_build_server) {
+        // TODO: Do we need "|| $this->proxy->force_stop" here?
+        if ($this->proxyType() === ProxyTypes::NONE->value || $this->isBuildServer()) {
             return false;
         }
 
@@ -1041,6 +1062,38 @@ $schema://$host {
         return data_get($this, 'settings.is_swarm_worker');
     }
 
+    public function status(): bool
+    {
+        ['uptime' => $uptime] = $this->validateConnection(false);
+        if ($uptime) {
+            if ($this->unreachable_notification_sent === true) {
+                $this->update(['unreachable_notification_sent' => false]);
+            }
+        } else {
+            // $this->server->team?->notify(new Unreachable($this->server));
+            foreach ($this->applications as $application) {
+                $application->update(['status' => 'exited']);
+            }
+            foreach ($this->databases as $database) {
+                $database->update(['status' => 'exited']);
+            }
+            foreach ($this->services as $service) {
+                $apps = $service->applications()->get();
+                $dbs = $service->databases()->get();
+                foreach ($apps as $app) {
+                    $app->update(['status' => 'exited']);
+                }
+                foreach ($dbs as $db) {
+                    $db->update(['status' => 'exited']);
+                }
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
     public function validateConnection($isManualCheck = true)
     {
         config()->set('constants.ssh.mux_enabled', ! $isManualCheck);

app/Models/ServerSetting.php

@@ -24,7 +24,7 @@ use OpenApi\Attributes as OA;
         'is_logdrain_newrelic_enabled' => ['type' => 'boolean'],
         'is_metrics_enabled' => ['type' => 'boolean'],
         'is_reachable' => ['type' => 'boolean'],
-        'is_server_api_enabled' => ['type' => 'boolean'],
+        'is_sentinel_enabled' => ['type' => 'boolean'],
         'is_swarm_manager' => ['type' => 'boolean'],
         'is_swarm_worker' => ['type' => 'boolean'],
         'is_usable' => ['type' => 'boolean'],
@@ -35,9 +35,9 @@ use OpenApi\Attributes as OA;
         'logdrain_highlight_project_id' => ['type' => 'string'],
         'logdrain_newrelic_base_uri' => ['type' => 'string'],
         'logdrain_newrelic_license_key' => ['type' => 'string'],
-        'metrics_history_days' => ['type' => 'integer'],
-        'metrics_refresh_rate_seconds' => ['type' => 'integer'],
-        'metrics_token' => ['type' => 'string'],
+        'sentinel_metrics_history_days' => ['type' => 'integer'],
+        'sentinel_metrics_refresh_rate_seconds' => ['type' => 'integer'],
+        'sentinel_token' => ['type' => 'string'],
         'docker_cleanup_frequency' => ['type' => 'string'],
         'docker_cleanup_threshold' => ['type' => 'integer'],
         'server_id' => ['type' => 'integer'],
@@ -53,8 +53,66 @@ class ServerSetting extends Model
     protected $casts = [
         'force_docker_cleanup' => 'boolean',
         'docker_cleanup_threshold' => 'integer',
+        'sentinel_token' => 'encrypted',
     ];
 
+    protected static function booted()
+    {
+        static::creating(function ($setting) {
+            try {
+                if (str($setting->sentinel_token)->isEmpty()) {
+                    $setting->generateSentinelToken(save: false);
+                }
+                if (str($setting->sentinel_custom_url)->isEmpty()) {
+                    $url = $setting->generateSentinelUrl(save: false);
+                    if (str($url)->isEmpty()) {
+                        $setting->is_sentinel_enabled = false;
+                    } else {
+                        $setting->is_sentinel_enabled = true;
+                    }
+                }
+            } catch (\Throwable $e) {
+                loggy('Error creating server setting: '.$e->getMessage());
+            }
+        });
+    }
+
+    public function generateSentinelToken(bool $save = true)
+    {
+        $data = [
+            'server_uuid' => $this->server->uuid,
+        ];
+        $token = json_encode($data);
+        $encrypted = encrypt($token);
+        $this->sentinel_token = $encrypted;
+        if ($save) {
+            $this->save();
+        }
+
+        return $encrypted;
+    }
+
+    public function generateSentinelUrl(bool $save = true)
+    {
+        $domain = null;
+        $settings = InstanceSettings::get();
+        if ($this->server->isLocalhost()) {
+            $domain = 'http://host.docker.internal:8000';
+        } elseif ($settings->fqdn) {
+            $domain = $settings->fqdn;
+        } elseif ($settings->ipv4) {
+            $domain = $settings->ipv4.':8000';
+        } elseif ($settings->ipv6) {
+            $domain = $settings->ipv6.':8000';
+        }
+        $this->sentinel_custom_url = $domain;
+        if ($save) {
+            $this->save();
+        }
+
+        return $domain;
+    }
+
     public function server()
     {
         return $this->belongsTo(Server::class);

app/Models/Service.php

@@ -297,7 +297,7 @@ class Service extends BaseModel
                                 'key' => 'CP_DISABLE_HTTPS',
                                 'value' => data_get($disable_https, 'value'),
                                 'rules' => 'required',
-                                'customHelper' => "If you want to use https, set this to 0. Variable name: CP_DISABLE_HTTPS",
+                                'customHelper' => 'If you want to use https, set this to 0. Variable name: CP_DISABLE_HTTPS',
                             ],
                         ]);
                     }
@@ -997,8 +997,8 @@ class Service extends BaseModel
                     break;
                 case $image->contains('mysql'):
                     $userVariables = ['SERVICE_USER_MYSQL', 'SERVICE_USER_WORDPRESS', 'MYSQL_USER'];
-                    $passwordVariables = ['SERVICE_PASSWORD_MYSQL', 'SERVICE_PASSWORD_WORDPRESS', 'MYSQL_PASSWORD','SERVICE_PASSWORD_64_MYSQL'];
-                    $rootPasswordVariables = ['SERVICE_PASSWORD_MYSQLROOT', 'SERVICE_PASSWORD_ROOT','SERVICE_PASSWORD_64_MYSQLROOT'];
+                    $passwordVariables = ['SERVICE_PASSWORD_MYSQL', 'SERVICE_PASSWORD_WORDPRESS', 'MYSQL_PASSWORD', 'SERVICE_PASSWORD_64_MYSQL'];
+                    $rootPasswordVariables = ['SERVICE_PASSWORD_MYSQLROOT', 'SERVICE_PASSWORD_ROOT', 'SERVICE_PASSWORD_64_MYSQLROOT'];
                     $dbNameVariables = ['MYSQL_DATABASE'];
                     $mysql_user = $this->environment_variables()->whereIn('key', $userVariables)->first();
                     $mysql_password = $this->environment_variables()->whereIn('key', $passwordVariables)->first();
@@ -1326,9 +1326,9 @@ class Service extends BaseModel
                         return false;
                     }
                 }
+
                 return true;
             }
         );
     }
-
 }

app/Models/StandaloneClickhouse.php

@@ -272,7 +272,7 @@ class StandaloneClickhouse extends BaseModel
         $container_name = $this->uuid;
         if ($server->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->sentinel_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');

app/Models/StandaloneDragonfly.php

@@ -272,7 +272,7 @@ class StandaloneDragonfly extends BaseModel
         $container_name = $this->uuid;
         if ($server->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->sentinel_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');

app/Models/StandaloneKeydb.php

@@ -272,7 +272,7 @@ class StandaloneKeydb extends BaseModel
         $container_name = $this->uuid;
         if ($server->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->sentinel_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');

app/Models/StandaloneMariadb.php

@@ -272,7 +272,7 @@ class StandaloneMariadb extends BaseModel
         $container_name = $this->uuid;
         if ($server->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->sentinel_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');

app/Models/StandaloneMongodb.php

@@ -292,7 +292,7 @@ class StandaloneMongodb extends BaseModel
         $container_name = $this->uuid;
         if ($server->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->sentinel_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');

app/Models/StandaloneMysql.php

@@ -273,7 +273,7 @@ class StandaloneMysql extends BaseModel
         $container_name = $this->uuid;
         if ($server->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->sentinel_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');

app/Models/StandalonePostgresql.php

@@ -274,7 +274,7 @@ class StandalonePostgresql extends BaseModel
         $container_name = $this->uuid;
         if ($server->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->sentinel_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');

app/Models/StandaloneRedis.php

@@ -268,7 +268,7 @@ class StandaloneRedis extends BaseModel
         $container_name = $this->uuid;
         if ($server->isMetricsEnabled()) {
             $from = now()->subMinutes($mins)->toIso8601ZuluString();
-            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->metrics_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
+            $metrics = instant_remote_process(["docker exec coolify-sentinel sh -c 'curl -H \"Authorization: Bearer {$server->settings->sentinel_token}\" http://localhost:8888/api/container/{$container_name}/metrics/history?from=$from'"], $server, false);
             if (str($metrics)->contains('error')) {
                 $error = json_decode($metrics, true);
                 $error = data_get($error, 'error', 'Something is not okay, are you okay?');

bootstrap/helpers/docker.php

@@ -335,10 +335,11 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
             if (preg_match('/coolify\.traefik\.middlewares=(.*)/', $item, $matches)) {
                 return explode(',', $matches[1]);
             }
+
             return null;
         })->flatten()
-        ->filter()
-        ->unique();
+            ->filter()
+            ->unique();
     }
     foreach ($domains as $loop => $domain) {
         try {
@@ -388,7 +389,7 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                 if ($path !== '/') {
                     // Middleware handling
                     $middlewares = collect([]);
-                    if ($is_stripprefix_enabled && !str($image)->contains('ghost')) {
+                    if ($is_stripprefix_enabled && ! str($image)->contains('ghost')) {
                         $labels->push("traefik.http.middlewares.{$https_label}-stripprefix.stripprefix.prefixes={$path}");
                         $middlewares->push("{$https_label}-stripprefix");
                     }
@@ -402,7 +403,7 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                         $labels = $labels->merge($redirect_to_non_www);
                         $middlewares->push($to_non_www_name);
                     }
-                    if ($redirect_direction === 'www' && !str($host)->startsWith('www.')) {
+                    if ($redirect_direction === 'www' && ! str($host)->startsWith('www.')) {
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
@@ -417,7 +418,7 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                     $middlewares = collect([]);
                     if ($is_gzip_enabled) {
                         $middlewares->push('gzip');
-                    }                   
+                    }
                     if (str($image)->contains('ghost')) {
                         $middlewares->push('redir-ghost');
                     }

bootstrap/helpers/proxy.php

@@ -241,6 +241,7 @@ function generate_default_proxy_configuration(Server $server)
                     'ports' => [
                         '80:80',
                         '443:443',
+                        '443:443/udp',
                     ],
                     'labels' => [
                         'coolify.managed=true',

bootstrap/helpers/shared.php

@@ -126,7 +126,7 @@ function refreshSession(?Team $team = null): void
 }
 function handleError(?Throwable $error = null, ?Livewire\Component $livewire = null, ?string $customErrorMessage = null)
 {
-    ray($error);
+    loggy($error);
     if ($error instanceof TooManyRequestsException) {
         if (isset($livewire)) {
             return $livewire->dispatch('error', "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.");
@@ -142,6 +142,10 @@ function handleError(?Throwable $error = null, ?Livewire\Component $livewire = n
         return 'Duplicate entry found. Please use a different name.';
     }
 
+    if ($error instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
+        abort(404);
+    }
+
     if ($error instanceof Throwable) {
         $message = $error->getMessage();
     } else {
@@ -164,10 +168,10 @@ function get_route_parameters(): array
 function get_latest_sentinel_version(): string
 {
     try {
-        $response = Http::get('https://cdn.coollabs.io/sentinel/versions.json');
+        $response = Http::get('https://cdn.coollabs.io/coolify/versions.json');
         $versions = $response->json();
 
-        return data_get($versions, 'sentinel.version');
+        return data_get($versions, 'coolify.sentinel.version');
     } catch (\Throwable $e) {
         //throw $e;
         ray($e->getMessage());
@@ -1338,13 +1342,6 @@ function isAnyDeploymentInprogress()
     exit(0);
 }
 
-function generateSentinelToken()
-{
-    $token = Str::random(64);
-
-    return $token;
-}
-
 function isBase64Encoded($strValue)
 {
     return base64_encode(base64_decode($strValue, true)) === $strValue;
@@ -3990,13 +3987,14 @@ function instanceSettings()
     return InstanceSettings::get();
 }
 
-function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id) {
+function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id)
+{
 
     $server = Server::find($server_id)->where('team_id', $team_id)->first();
-    if (!$server) {
+    if (! $server) {
         return;
     }
-    $uuid = new Cuid2();
+    $uuid = new Cuid2;
     $cloneCommand = "git clone --no-checkout -b $branch $repository .";
     $workdir = rtrim($base_directory, '/');
     $fileList = collect([".$workdir/coolify.json"]);
@@ -4014,6 +4012,21 @@ function loadConfigFromGit(string $repository, string $branch, string $base_dire
     try {
         return instant_remote_process($commands, $server);
     } catch (\Exception $e) {
-       // continue
+        // continue
     }
 }
+
+function loggy($message = null, array $context = [])
+{
+    if (! isDev()) {
+        return;
+    }
+    if (function_exists('ray') && config('app.debug')) {
+        ray($message, $context);
+    }
+    if (is_null($message)) {
+        return app('log');
+    }
+
+    return app('log')->debug($message, $context);
+}

composer.json

@@ -15,6 +15,7 @@
         "laravel/fortify": "^v1.16.0",
         "laravel/framework": "^v11",
         "laravel/horizon": "^5.29.1",
+        "laravel/pail": "^1.1",
         "laravel/prompts": "^0.1.6",
         "laravel/sanctum": "^v4.0",
         "laravel/socialite": "^v5.14.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c47adf3684eb727e22503937435c0914",
+    "content-hash": "943975ec232403b96a40d215253492d8",
     "packages": [
         {
             "name": "amphp/amp",
@@ -3144,6 +3144,83 @@
             },
             "time": "2024-10-08T18:23:02+00:00"
         },
+        {
+            "name": "laravel/pail",
+            "version": "v1.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/pail.git",
+                "reference": "b33ad8321416fe86efed7bf398f3306c47b4871b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/pail/zipball/b33ad8321416fe86efed7bf398f3306c47b4871b",
+                "reference": "b33ad8321416fe86efed7bf398f3306c47b4871b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "illuminate/console": "^10.24|^11.0",
+                "illuminate/contracts": "^10.24|^11.0",
+                "illuminate/log": "^10.24|^11.0",
+                "illuminate/process": "^10.24|^11.0",
+                "illuminate/support": "^10.24|^11.0",
+                "nunomaduro/termwind": "^1.15|^2.0",
+                "php": "^8.2",
+                "symfony/console": "^6.0|^7.0"
+            },
+            "require-dev": {
+                "laravel/pint": "^1.13",
+                "orchestra/testbench": "^8.12|^9.0",
+                "pestphp/pest": "^2.20",
+                "pestphp/pest-plugin-type-coverage": "^2.3",
+                "phpstan/phpstan": "^1.10",
+                "symfony/var-dumper": "^6.3|^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Pail\\PailServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\Pail\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                },
+                {
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
+                }
+            ],
+            "description": "Easily delve into your Laravel application's log files directly from the command line.",
+            "homepage": "https://github.com/laravel/pail",
+            "keywords": [
+                "laravel",
+                "logs",
+                "php",
+                "tail"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/pail/issues",
+                "source": "https://github.com/laravel/pail"
+            },
+            "time": "2024-10-15T20:06:24+00:00"
+        },
         {
             "name": "laravel/prompts",
             "version": "v0.1.25",

config/testing.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'dusk_test_email' => env('DUSK_TEST_EMAIL', 'test@example.com'),
+    'dusk_test_password' => env('DUSK_TEST_PASSWORD', 'password'),
+];

database/migrations/2024_06_18_105948_move_server_metrics.php

@@ -18,7 +18,7 @@ return new class extends Migration
             $table->boolean('is_metrics_enabled')->default(false);
             $table->integer('metrics_refresh_rate_seconds')->default(5);
             $table->integer('metrics_history_days')->default(30);
-            $table->string('metrics_token')->default(generateSentinelToken());
+            $table->string('metrics_token')->nullable();
         });
     }
 

database/migrations/2024_07_18_123458_add_force_cleanup_server.php

@@ -12,7 +12,7 @@ return new class extends Migration
     public function up(): void
     {
         Schema::table('server_settings', function (Blueprint $table) {
-            $table->boolean('is_force_cleanup_enabled')->default(false)->after('is_sentinel_enabled');
+            $table->boolean('is_force_cleanup_enabled')->default(false);
         });
     }
 

database/migrations/2024_10_14_090416_update_metrics_token_in_server_settings.php

@@ -0,0 +1,54 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->dropColumn('metrics_token');
+            $table->dropColumn('metrics_refresh_rate_seconds');
+            $table->dropColumn('metrics_history_days');
+            $table->dropColumn('is_server_api_enabled');
+
+            $table->boolean('is_sentinel_enabled')->default(false);
+            $table->text('sentinel_token')->nullable();
+            $table->integer('sentinel_metrics_refresh_rate_seconds')->default(10);
+            $table->integer('sentinel_metrics_history_days')->default(7);
+            $table->integer('sentinel_push_interval_seconds')->default(60);
+            $table->string('sentinel_custom_url')->nullable();
+        });
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dateTime('sentinel_updated_at')->default(now());
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->string('metrics_token')->nullable();
+            $table->integer('metrics_refresh_rate_seconds')->default(5);
+            $table->integer('metrics_history_days')->default(30);
+            $table->boolean('is_server_api_enabled')->default(false);
+
+            $table->dropColumn('is_sentinel_enabled');
+            $table->dropColumn('sentinel_token');
+            $table->dropColumn('sentinel_metrics_refresh_rate_seconds');
+            $table->dropColumn('sentinel_metrics_history_days');
+            $table->dropColumn('sentinel_push_interval_seconds');
+            $table->dropColumn('sentinel_custom_url');
+        });
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('sentinel_updated_at');
+        });
+    }
+};

database/migrations/2024_10_17_093722_add_soft_delete_to_servers.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropSoftDeletes();
+        });
+    }
+};

database/seeders/DatabaseSeeder.php

@@ -26,6 +26,7 @@ class DatabaseSeeder extends Seeder
             S3StorageSeeder::class,
             StandalonePostgresqlSeeder::class,
             OauthSettingSeeder::class,
+            SentinelSeeder::class,
         ]);
     }
 }

database/seeders/ProductionSeeder.php

@@ -186,6 +186,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
 
         $this->call(OauthSettingSeeder::class);
         $this->call(PopulateSshKeysDirectorySeeder::class);
+        $this->call(SentinelSeeder::class);
 
     }
 }

database/seeders/SentinelSeeder.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\Server;
+use Illuminate\Database\Seeder;
+
+class SentinelSeeder extends Seeder
+{
+    public function run()
+    {
+        Server::chunk(100, function ($servers) {
+            foreach ($servers as $server) {
+                try {
+                    if (str($server->settings->sentinel_token)->isEmpty()) {
+                        $server->settings->generateSentinelToken();
+                    }
+                    if (str($server->settings->sentinel_custom_url)->isEmpty()) {
+                        $url = $server->settings->generateSentinelUrl();
+                        if (str($url)->isEmpty()) {
+                            $server->settings->is_sentinel_enabled = false;
+                            $server->settings->save();
+                        }
+                    }
+                } catch (\Throwable $e) {
+                    loggy("Error: {$e->getMessage()}\n");
+                }
+            }
+        });
+    }
+}

openapi.yaml

@@ -4959,7 +4959,7 @@ components:
           type: boolean
         is_reachable:
           type: boolean
-        is_server_api_enabled:
+        is_sentinel_enabled:
           type: boolean
         is_swarm_manager:
           type: boolean
@@ -4981,11 +4981,11 @@ components:
           type: string
         logdrain_newrelic_license_key:
           type: string
-        metrics_history_days:
+        sentinel_metrics_refresh_rate_seconds:
           type: integer
-        metrics_refresh_rate_seconds:
+        sentinel_metrics_history_days:
           type: integer
-        metrics_token:
+        sentinel_token:
           type: string
         docker_cleanup_frequency:
           type: string

public/svgs/calcom.svg

@@ -0,0 +1,9 @@
+<svg width="101" height="22" viewBox="0 0 101 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0582 20.817C4.32115 20.817 0 16.2763 0 10.6704C0 5.04589 4.1005 0.467773 10.0582 0.467773C13.2209 0.467773 15.409 1.43945 17.1191 3.66311L14.3609 5.96151C13.2025 4.72822 11.805 4.11158 10.0582 4.11158C6.17833 4.11158 4.04533 7.08268 4.04533 10.6704C4.04533 14.2582 6.38059 17.1732 10.0582 17.1732C11.7866 17.1732 13.2577 16.5566 14.4161 15.3233L17.1375 17.7151C15.501 19.8453 13.2577 20.817 10.0582 20.817Z" fill="#fafafa"/>
+<path d="M29.0161 5.88601H32.7304V20.4612H29.0161V18.331C28.2438 19.8446 26.9566 20.8536 24.4927 20.8536C20.5577 20.8536 17.4133 17.4341 17.4133 13.2297C17.4133 9.02528 20.5577 5.60571 24.4927 5.60571C26.9383 5.60571 28.2438 6.61477 29.0161 8.12835V5.88601ZM29.1264 13.2297C29.1264 10.95 27.5634 9.06266 25.0995 9.06266C22.7274 9.06266 21.1828 10.9686 21.1828 13.2297C21.1828 15.4346 22.7274 17.3967 25.0995 17.3967C27.5451 17.3967 29.1264 15.4907 29.1264 13.2297Z" fill="#fafafa"/>
+<path d="M35.3599 0H39.0742V20.4427H35.3599V0Z" fill="#fafafa"/>
+<path d="M40.7291 18.5182C40.7291 17.3223 41.6853 16.3132 42.9908 16.3132C44.2964 16.3132 45.2158 17.3223 45.2158 18.5182C45.2158 19.7515 44.278 20.7605 42.9908 20.7605C41.7037 20.7605 40.7291 19.7515 40.7291 18.5182Z" fill="#fafafa"/>
+<path d="M59.4296 18.1068C58.0505 19.7885 55.9543 20.8536 53.4719 20.8536C49.0404 20.8536 45.7858 17.4341 45.7858 13.2297C45.7858 9.02528 49.0404 5.60571 53.4719 5.60571C55.8623 5.60571 57.9402 6.61477 59.3193 8.20309L56.4508 10.6136C55.7336 9.71667 54.7958 9.04397 53.4719 9.04397C51.0999 9.04397 49.5553 10.95 49.5553 13.211C49.5553 15.472 51.0999 17.378 53.4719 17.378C54.9062 17.378 55.8991 16.6306 56.6346 15.6215L59.4296 18.1068Z" fill="#fafafa"/>
+<path d="M59.7422 13.2297C59.7422 9.02528 62.9968 5.60571 67.4283 5.60571C71.8598 5.60571 75.1144 9.02528 75.1144 13.2297C75.1144 17.4341 71.8598 20.8536 67.4283 20.8536C62.9968 20.8349 59.7422 17.4341 59.7422 13.2297ZM71.3449 13.2297C71.3449 10.95 69.8003 9.06266 67.4283 9.06266C65.0563 9.04397 63.5117 10.95 63.5117 13.2297C63.5117 15.4907 65.0563 17.3967 67.4283 17.3967C69.8003 17.3967 71.3449 15.4907 71.3449 13.2297Z" fill="#fafafa"/>
+<path d="M100.232 11.5482V20.4428H96.518V12.4638C96.518 9.94119 95.3412 8.85739 93.576 8.85739C91.921 8.85739 90.7442 9.67958 90.7442 12.4638V20.4428H87.0299V12.4638C87.0299 9.94119 85.8346 8.85739 84.0878 8.85739C82.4329 8.85739 80.9802 9.67958 80.9802 12.4638V20.4428H77.2659V5.8676H80.9802V7.88571C81.7525 6.31607 83.15 5.53125 85.3014 5.53125C87.3425 5.53125 89.0525 6.5403 89.9903 8.24074C90.9281 6.50293 92.3072 5.53125 94.8079 5.53125C97.8603 5.54994 100.232 7.86702 100.232 11.5482Z" fill="#fafafa"/>
+<script xmlns=""/></svg>

public/svgs/edgedb.svg

@@ -0,0 +1,3 @@
+<svg width="176" height="80" viewBox="0 0 176 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.073 39.613C149.073 51.7589 144.203 53.9359 138.76 53.9359H127.187V25.2902H138.76C144.203 25.2902 149.073 27.4672 149.073 39.613V39.613ZM143.172 39.6143C143.172 31.1352 140.594 30.7342 136.87 30.7342H133.261V48.4945H136.87C140.594 48.4945 143.172 48.0935 143.172 39.6143V39.6143ZM81.8689 53.9359V25.2902H100.088V30.7329H87.9418V36.5766H97.1084V41.962H87.9418V48.4932H100.088V53.9359H81.8689ZM110 79.9998H116V0H110V79.9998ZM161.217 41.2193V48.4953H166.259C169.41 48.4953 170.212 46.4328 170.212 44.8859C170.212 43.6828 169.639 41.2193 165.342 41.2193H161.217ZM161.217 30.7342V36.1768H165.342C167.691 36.1768 169.066 35.1456 169.066 33.4269C169.066 31.7081 167.691 30.7342 165.342 30.7342H161.217ZM155.146 25.2902H166.833C172.964 25.2902 174.797 29.587 174.797 32.6808C174.797 35.5454 172.964 37.6078 171.703 38.1808C175.37 39.9568 176 43.5662 176 45.3995C176 47.8057 174.797 53.9359 166.833 53.9359H155.146V25.2902ZM46.9799 39.613C46.9799 51.7589 42.1101 53.9359 36.6674 53.9359H25.0945V25.2902H36.6674C42.1101 25.2902 46.9799 27.4672 46.9799 39.613V39.613ZM64.8538 48.725C67.9475 48.725 69.5517 47.6937 70.1246 47.0062V43.8552H65.1975V38.9281H74.9944V50.3291C74.135 51.6468 69.4371 54.2249 65.1402 54.2249C58.0934 54.2249 52.1351 51.4749 52.1351 39.3291C52.1351 27.1833 58.1507 25.0063 63.5934 25.0063C72.1298 25.0063 74.2496 29.475 74.9371 33.4281L69.8954 34.5739C69.609 32.7406 68.0048 30.449 64.3382 30.449C60.6142 30.449 58.0361 30.85 58.0361 39.3291C58.0361 47.8083 60.7288 48.725 64.8538 48.725V48.725ZM41.0781 39.6143C41.0781 31.1352 38.5 30.7342 34.7761 30.7342H31.1667V48.4945H34.7761C38.5 48.4945 41.0781 48.0935 41.0781 39.6143V39.6143ZM0 53.9359V25.2902H18.2187V30.7329H6.0729V36.5766H15.2395V41.962H6.0729V48.4932H18.2187V53.9359H0Z" fill="#0CCB93"/>
+</svg>

public/svgs/mindsdb.svg

@@ -0,0 +1,12 @@
+<svg width="264" height="151" viewBox="0 0 264 151" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_13_35)">
+<path d="M186.86 75.8418C189.798 98.8976 192.525 120.544 195.356 142.168C195.691 144.759 195.155 145.673 192.254 145.818C174.783 146.686 174.793 146.755 168.478 130.847C165.848 124.227 163.286 117.581 160.486 111.028C159.869 109.951 159.642 108.7 159.84 107.479C160.039 106.259 160.652 105.14 161.579 104.306C169.843 95.2778 177.892 86.0052 186.86 75.8418Z" fill="#00A587"/>
+<path d="M84.1747 95.1655C86.6767 107.857 89.145 119.785 91.3184 131.767C91.9891 135.476 95.0077 140.188 92.4252 142.696C90.1982 144.851 85.2546 141.802 81.4547 141.94C71.3595 142.317 66.6607 137.651 65.0207 127.854C64.0581 122.102 63.6321 118.119 68.4516 113.664C74.0774 107.825 79.3286 101.647 84.1747 95.1655V95.1655Z" fill="#00A587"/>
+<path d="M112.68 118.314C112.68 111.186 112.569 104.059 112.734 96.9342C112.797 94.136 112.006 93.1922 108.984 93.0932C88.369 92.4223 67.7583 91.6083 47.1521 90.6514C43.9156 90.5029 42.6377 91.407 41.9502 94.555C38.7707 109.134 35.1619 123.626 32.0562 138.222C31.1842 142.32 29.5945 143.831 25.2378 143.366C20.4038 142.873 15.5373 142.763 10.6853 143.036C7.02954 143.218 6.32523 141.716 6.3789 138.585C6.69416 116.694 7.16037 94.8026 6.94572 72.9181C6.90613 66.1838 9.19198 59.6359 13.4288 54.3467C24.832 38.7551 35.8159 22.8829 46.8636 7.0504C47.4595 5.96628 48.3973 5.10199 49.5357 4.58777C50.6742 4.07355 51.9516 3.93721 53.1756 4.19931C94.3679 8.53528 135.576 12.736 176.8 16.8013C179.378 17.1054 181.84 18.0315 183.967 19.4973C208.497 35.1813 232.984 50.9215 257.638 66.4142C261.327 68.724 261.428 70.044 257.883 72.1328C257.12 72.5383 256.438 73.0773 255.871 73.7233C248.77 82.7483 240.443 82.3424 230.381 78.343C218.22 73.522 205.395 70.3245 192.925 66.2261C191.738 65.7528 190.451 65.5735 189.178 65.7041C187.904 65.8347 186.682 66.2712 185.62 66.9751C174.15 73.9839 162.627 80.907 151.052 87.7442C150.009 88.2936 149.119 89.0852 148.458 90.0502C147.797 91.0151 147.385 92.1243 147.259 93.2813C144.72 108.328 141.815 123.31 139.481 138.396C138.81 142.719 137.244 144.089 132.877 143.788C127.332 143.466 121.772 143.457 116.225 143.762C112.935 143.907 112.093 142.772 112.2 139.687C112.415 132.562 112.268 125.428 112.268 118.301L112.68 118.314Z" fill="#00A587"/>
+</g>
+<defs>
+<clipPath id="clip0_13_35">
+<rect width="264" height="151" fill="white"/>
+</clipPath>
+</defs>
+</svg>

resources/views/components/forms/checkbox.blade.php

@@ -14,7 +14,10 @@
     'w-full' => $fullWidth,
 ])>
     @if (!$hideLabel)
-        <label class="flex gap-4 px-0 min-w-fit label">
+        <label  @class([
+            "flex gap-4 px-0 min-w-fit label",
+            'opacity-40' => $disabled,
+        ])>
             <span class="flex gap-2">
                 @if ($label)
                     {!! $label !!}

resources/views/components/server/navbar.blade.php

@@ -1,5 +1,14 @@
 <div class="pb-6">
-    <livewire:server.proxy.modal :server="$server" />
+    <x-modal modalId="startProxy">
+        <x-slot:modalBody>
+            <livewire:activity-monitor header="Proxy Startup Logs" />
+        </x-slot:modalBody>
+        <x-slot:modalSubmit>
+            <x-forms.button onclick="startProxy.close()" type="submit">
+                Close
+            </x-forms.button>
+        </x-slot:modalSubmit>
+    </x-modal>
     <div class="flex items-center gap-2">
         <h1>Server</h1>
         @if ($server->proxySet())
@@ -13,20 +22,9 @@
                 href="{{ route('server.show', [
                     'server_uuid' => data_get($parameters, 'server_uuid'),
                 ]) }}">
-                <button>General</button>
-            </a>
-            <a class="{{ request()->routeIs('server.private-key') ? 'dark:text-white' : '' }}"
-                href="{{ route('server.private-key', [
-                    'server_uuid' => data_get($parameters, 'server_uuid'),
-                ]) }}">
-                <button>Private Key</button>
-            </a>
-            <a class="{{ request()->routeIs('server.resources') ? 'dark:text-white' : '' }}"
-                href="{{ route('server.resources', [
-                    'server_uuid' => data_get($parameters, 'server_uuid'),
-                ]) }}">
-                <button>Resources</button>
+                <button>Configuration</button>
             </a>
+
             @if (!$server->isSwarmWorker() && !$server->settings->is_build_server)
                 <a class="{{ request()->routeIs('server.proxy') ? 'dark:text-white' : '' }}"
                     href="{{ route('server.proxy', [
@@ -34,18 +32,6 @@
                     ]) }}">
                     <button>Proxy</button>
                 </a>
-                <a class="{{ request()->routeIs('server.destinations') ? 'dark:text-white' : '' }}"
-                    href="{{ route('server.destinations', [
-                        'server_uuid' => data_get($parameters, 'server_uuid'),
-                    ]) }}">
-                    <button>Destinations</button>
-                </a>
-                <a class="{{ request()->routeIs('server.log-drains') ? 'dark:text-white' : '' }}"
-                    href="{{ route('server.log-drains', [
-                        'server_uuid' => data_get($parameters, 'server_uuid'),
-                    ]) }}">
-                    <button>Log Drains</button>
-                </a>
             @endif
         </nav>
         <div class="order-first sm:order-last">

resources/views/livewire/destination/show.blade.php

@@ -5,10 +5,10 @@
             <x-modal-input buttonTitle="+ Add" title="New Destination">
                 <livewire:destination.new.docker :server_id="$server->id" />
             </x-modal-input>
-            <x-forms.button wire:click='scan'>Scan Destinations</x-forms.button>
+            <x-forms.button wire:click='scan'>Scan for Destinations</x-forms.button>
         </div>
-        <div class="pt-2 pb-6 ">Destinations are used to segregate resources by network.</div>
-        <div class="flex gap-2 ">
+        <div>Destinations are used to segregate resources by network.</div>
+        <div class="flex gap-2 pt-6">
             Available for using:
             @forelse ($server->standaloneDockers as $docker)
                 <a href="{{ route('destination.show', ['destination_uuid' => data_get($docker, 'uuid')]) }}">

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>

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

@@ -7,15 +7,15 @@
             <h1>Resources</h1>
             @if ($environment->isEmpty())
                 <a class="button"
-                    href="{{ route('project.clone-me', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => request()->route('environment_name')]) }}">
+                    href="{{ route('project.clone-me', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($parameters, 'environment_name')]) }}">
                     Clone
                 </a>
             @else
-                <a href="{{ route('project.resource.create', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
+                <a href="{{ route('project.resource.create', ['project_uuid' => data_get($parameters, 'project_uuid'), 'environment_name' => data_get($parameters, 'environment_name')]) }}  "
                     class="button">+
                     New</a>
                 <a class="button"
-                    href="{{ route('project.clone-me', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => request()->route('environment_name')]) }}">
+                    href="{{ route('project.clone-me', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($parameters, 'environment_name')]) }}">
                     Clone
                 </a>
             @endif
@@ -25,7 +25,7 @@
             <ol class="flex items-center">
                 <li class="inline-flex items-center">
                     <a class="text-xs truncate lg:text-sm"
-                        href="{{ route('project.show', ['project_uuid' => request()->route('project_uuid')]) }}">
+                        href="{{ route('project.show', ['project_uuid' => data_get($parameters, 'project_uuid')]) }}">
                         {{ $project->name }}</a>
                 </li>
                 <li>
@@ -44,7 +44,7 @@
         </nav>
     </div>
     @if ($environment->isEmpty())
-        <a href="{{ route('project.resource.create', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }} "
+    <a href="{{ route('project.resource.create', ['project_uuid' => data_get($parameters, 'project_uuid'), 'environment_name' => data_get($parameters, 'environment_name')]) }} "
             class="items-center justify-center box">+ Add New Resource</a>
     @else
         <div x-data="searchComponent()">

resources/views/livewire/project/service/configuration.blade.php

@@ -1,4 +1,4 @@
-<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.check_status">
+<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }">
     <x-slot:title>
         {{ data_get_str($service, 'name')->limit(10) }} > Configuration | Coolify
     </x-slot>

resources/views/livewire/server/advanced.blade.php

@@ -0,0 +1,84 @@
+<form wire:submit='submit'>
+    <div>
+        <div class="flex items-center gap-2">
+            <h2>Advanced</h2>
+            <x-forms.button type="submit">Save</x-forms.button>
+            <x-modal-confirmation title="Confirm Docker Cleanup?" buttonTitle="Trigger Manual Cleanup"
+                submitAction="manualCleanup" :actions="[
+                    'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
+                    'Permanently deletes all unused images',
+                    'Clears build cache',
+                    'Removes old versions of the Coolify helper image',
+                    'Optionally permanently deletes all unused volumes (if enabled in advanced options).',
+                    'Optionally permanently deletes all unused networks (if enabled in advanced options).',
+                ]" :confirmWithText="false" :confirmWithPassword="false"
+                step2ButtonText="Trigger Docker Cleanup" />
+        </div>
+        <div>Advanced configuration for your server.</div>
+    </div>
+    <div class="flex flex-col gap-4 pt-4">
+        <div class="flex flex-col gap-2">
+            <div class="flex items-center gap-2">
+                <h3>Docker Cleanup</h3>
+
+            </div>
+            <div class="flex flex-wrap items-center gap-4">
+                @if ($server->settings->force_docker_cleanup)
+                    <x-forms.input placeholder="*/10 * * * *" id="server.settings.docker_cleanup_frequency"
+                        label="Docker cleanup frequency" required
+                        helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
+                @else
+                    <x-forms.input id="server.settings.docker_cleanup_threshold" label="Docker cleanup threshold (%)"
+                        required
+                        helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
+                @endif
+                <div class="w-96">
+                    <x-forms.checkbox
+                        helper="Enabling Force Docker Cleanup or manually triggering a cleanup will perform the following actions:
+                        <ul class='list-disc pl-4 mt-2'>
+                            <li>Removes stopped containers manged by Coolify (as containers are none persistent, no data will be lost).</li>
+                            <li>Deletes unused images.</li>
+                            <li>Clears build cache.</li>
+                            <li>Removes old versions of the Coolify helper image.</li>
+                            <li>Optionally delete unused volumes (if enabled in advanced options).</li>
+                            <li>Optionally remove unused networks (if enabled in advanced options).</li>
+                        </ul>"
+                        instantSave id="server.settings.force_docker_cleanup" label="Force Docker Cleanup" />
+                </div>
+
+            </div>
+            <p class="text-sm text-gray-600 dark:text-gray-400 mb-2">
+                <span class="dark:text-warning font-bold">Warning: Enable these
+                    options only if you fully understand their implications and
+                    consequences!</span><br>Improper use will result in data loss and could cause
+                functional issues.
+            </p>
+            <div class="w-96">
+                <x-forms.checkbox instantSave id="server.settings.delete_unused_volumes" label="Delete Unused Volumes"
+                    helper="This option will remove all unused Docker volumes during cleanup.<br><br><strong>Warning: Data form stopped containers will be lost!</strong><br><br>Consequences include:<br>
+            <ul class='list-disc pl-4 mt-2'>
+                <li>Volumes not attached to running containers will be deleted and data will be permanently lost (stopped containers are affected).</li>
+                <li>Data from stopped containers volumes will be permanently lost.</li>
+                <li>No way to recover deleted volume data.</li>
+            </ul>" />
+                <x-forms.checkbox instantSave id="server.settings.delete_unused_networks" label="Delete Unused Networks"
+                    helper="This option will remove all unused Docker networks during cleanup.<br><br><strong>Warning: Functionality may be lost and containers may not be able to communicate with each other!</strong><br><br>Consequences include:<br>
+            <ul class='list-disc pl-4 mt-2'>
+                <li>Networks not attached to running containers will be permanently deleted (stopped containers are affected).</li>
+                <li>Custom networks for stopped containers will be permanently deleted.</li>
+                <li>Functionality may be lost and containers may not be able to communicate with each other.</li>
+            </ul>" />
+            </div>
+        </div>
+        <div class="flex flex-col">
+            <h3>Builds</h3>
+            <div>Customize the build process.</div>
+            <div class="flex flex-wrap gap-2 sm:flex-nowrap pt-4">
+                <x-forms.input id="server.settings.concurrent_builds" label="Number of concurrent builds" required
+                    helper="You can specify the number of simultaneous build processes/deployments that should run concurrently." />
+                <x-forms.input id="server.settings.dynamic_timeout" label="Deployment timeout (seconds)" required
+                    helper="You can define the maximum duration for a deployment to run before timing it out." />
+            </div>
+        </div>
+    </div>
+</form>

resources/views/livewire/server/cloudflare-tunnels.blade.php

@@ -0,0 +1,42 @@
+<div>
+    <div class="flex gap-1 items-center">
+        <h2>Cloudflare Tunnels</h2>
+        <x-helper class="inline-flex"
+            helper="If you are using Cloudflare Tunnels, enable this. It will proxy all SSH requests to your server through Cloudflare.<br> You then can close your server's SSH port in the firewall of your hosting provider.<br><span class='dark:text-warning'>If you choose manual configuration, Coolify does not install or set up Cloudflare (cloudflared) on your server.</span>" />
+    </div>
+    <div class="flex flex-col gap-2 pt-6">
+        @if ($server->settings->is_cloudflare_tunnel)
+            <div class="w-64">
+                <x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel"
+                    label="Enabled" />
+            </div>
+        @elseif (!$server->isFunctional())
+            <div
+                class="p-4 mb-4 w-full text-sm text-yellow-800 bg-yellow-100 rounded dark:bg-yellow-900 dark:text-yellow-300">
+                To <span class="font-semibold">automatically</span> configure Cloudflare Tunnels, please
+                validate your server first.</span> Then you will need a Cloudflare token and an SSH
+                domain configured.
+                <br />
+                To <span class="font-semibold">manually</span> configure Cloudflare Tunnels, please
+                click <span wire:click="manualCloudflareConfig"
+                    class="underline cursor-pointer">here</span>, then you should validate the server.
+                <br /><br />
+                For more information, please read our <a
+                    href="https://coolify.io/docs/knowledge-base/cloudflare/tunnels/" target="_blank"
+                    class="font-medium underline hover:text-yellow-600 dark:hover:text-yellow-200">documentation</a>.
+            </div>
+        @endif
+        @if (!$server->settings->is_cloudflare_tunnel && $server->isFunctional())
+            <x-modal-input buttonTitle="Automated Configuration" title="Cloudflare Tunnels"
+                class="w-full" :closeOutside="false">
+                <livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
+            </x-modal-input>
+        @endif
+        @if ($server->isFunctional() && !$server->settings->is_cloudflare_tunnel)
+            <div wire:click="manualCloudflareConfig" class="w-full underline cursor-pointer">
+                I have configured Cloudflare Tunnels manually
+            </div>
+        @endif
+
+    </div>
+</div>

resources/views/livewire/server/delete.blade.php

@@ -1,6 +1,6 @@
 <div>
     @if ($server->id !== 0)
-        <h2 class="pt-4">Danger Zone</h2>
+        <h2>Danger Zone</h2>
         <div class="">Woah. I hope you know what are you doing.</div>
         <h4 class="pt-4">Delete Server</h4>
         <div class="pb-4">This will remove this server from Coolify. Beware! There is no coming

resources/views/livewire/server/destination/show.blade.php

@@ -2,6 +2,6 @@
     <x-slot:title>
         {{ data_get_str($server, 'name')->limit(10) }} > Server Destinations | Coolify
     </x-slot>
-    <x-server.navbar :server="$server" :parameters="$parameters" />
+    {{-- <x-server.navbar :server="$server" :parameters="$parameters" /> --}}
     <livewire:destination.show :server="$server" />
 </div>

resources/views/livewire/server/form.blade.php

@@ -68,7 +68,8 @@
             </div>
             <div class="flex flex-col gap-2 w-full lg:flex-row">
                 <x-forms.input type="password" id="server.ip" label="IP Address/Domain"
-                    helper="An IP Address (127.0.0.1) or domain (example.com). Make sure there is no protocol like http(s):// so you provide a FQDN not a URL." required />
+                    helper="An IP Address (127.0.0.1) or domain (example.com). Make sure there is no protocol like http(s):// so you provide a FQDN not a URL."
+                    required />
                 <div class="flex gap-2">
                     <x-forms.input id="server.user" label="User" required />
                     <x-forms.input type="number" id="server.port" label="Port" required />
@@ -94,7 +95,8 @@
                 </div>
                 <div class="relative">
                     <div class="inline-flex relative items-center w-64">
-                        <input autocomplete="off" wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
+                        <input autocomplete="off"
+                            wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
                             wire:dirty.class="dark:focus:ring-warning dark:ring-warning" x-model="search"
                             @focus="open = true" @click.away="open = false" @input="open = true" class="w-full input"
                             :placeholder="placeholder" wire:model.debounce.300ms="server.settings.server_timezone">
@@ -117,173 +119,98 @@
                 </div>
             </div>
 
-            <div class="{{ $server->isFunctional() ? 'w-96' : 'w-full' }}">
+            <div class="w-full">
                 @if (!$server->isLocalhost())
-                    <x-forms.checkbox instantSave id="server.settings.is_build_server"
-                        label="Use it as a build server?" />
-                    <div class="flex flex-col gap-2 pt-6">
-                        <div class="flex gap-1 items-center">
-                            <h3 class="text-lg font-semibold">Cloudflare Tunnels</h3>
-                            <x-helper class="inline-flex"
-                                helper="If you are using Cloudflare Tunnels, enable this. It will proxy all SSH requests to your server through Cloudflare.<br> You then can close your server's SSH port in the firewall of your hosting provider.<br><span class='dark:text-warning'>If you choose manual configuration, Coolify does not install or set up Cloudflare (cloudflared) on your server.</span>" />
-                        </div>
-                        @if ($server->settings->is_cloudflare_tunnel)
-                            <div class="w-64">
-                                <x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel" label="Enabled" />
-                            </div>
-                        @elseif (!$server->isFunctional())
-                            <div class="p-4 mb-4 w-full text-sm text-yellow-800 bg-yellow-100 rounded dark:bg-yellow-900 dark:text-yellow-300">
-                                To <span class="font-semibold">automatically</span> configure Cloudflare Tunnels, please validate your server first.</span> Then you will need a Cloudflare token and an SSH domain configured.
-                                <br/>
-                                To <span class="font-semibold">manually</span> configure Cloudflare Tunnels, please click <span wire:click="manualCloudflareConfig" class="underline cursor-pointer">here</span>, then you should validate the server.
-                                <br/><br/>
-                                For more information, please read our <a href="https://coolify.io/docs/knowledge-base/cloudflare/tunnels/" target="_blank" class="font-medium underline hover:text-yellow-600 dark:hover:text-yellow-200">documentation</a>.
-                            </div>
-                        @endif
-                        @if (!$server->settings->is_cloudflare_tunnel && $server->isFunctional())
-                            <x-modal-input buttonTitle="Automated Configuration" title="Cloudflare Tunnels" class="w-full" :closeOutside="false">
-                                <livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
-                            </x-modal-input>
-                        @endif
-                        @if ($server->isFunctional() &&!$server->settings->is_cloudflare_tunnel)
-                            <div wire:click="manualCloudflareConfig" class="w-full underline cursor-pointer">
-                                I have configured Cloudflare Tunnels manually
-                            </div>
-                        @endif
-
+                    <div class="w-96">
+                        <x-forms.checkbox instantSave id="server.settings.is_build_server"
+                            label="Use it as a build server?" />
                     </div>
+
                     @if (!$server->isBuildServer() && !$server->settings->is_cloudflare_tunnel)
                         <h3 class="pt-6">Swarm <span class="text-xs text-neutral-500">(experimental)</span></h3>
                         <div class="pb-4">Read the docs <a class='underline dark:text-white'
                                 href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>.
                         </div>
-                        @if ($server->settings->is_swarm_worker)
-                            <x-forms.checkbox disabled instantSave type="checkbox"
-                                id="server.settings.is_swarm_manager"
-                                helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
-                                label="Is it a Swarm Manager?" />
-                        @else
-                            <x-forms.checkbox instantSave type="checkbox" id="server.settings.is_swarm_manager"
-                                helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
-                                label="Is it a Swarm Manager?" />
-                        @endif
+                        <div class="w-96">
+                            @if ($server->settings->is_swarm_worker)
+                                <x-forms.checkbox disabled instantSave type="checkbox"
+                                    id="server.settings.is_swarm_manager"
+                                    helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
+                                    label="Is it a Swarm Manager?" />
+                            @else
+                                <x-forms.checkbox instantSave type="checkbox" id="server.settings.is_swarm_manager"
+                                    helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
+                                    label="Is it a Swarm Manager?" />
+                            @endif
 
-                        @if ($server->settings->is_swarm_manager)
-                            <x-forms.checkbox disabled instantSave type="checkbox"
-                                id="server.settings.is_swarm_worker"
-                                helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
-                                label="Is it a Swarm Worker?" />
-                        @else
-                            <x-forms.checkbox instantSave type="checkbox" id="server.settings.is_swarm_worker"
-                                helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
-                                label="Is it a Swarm Worker?" />
-                        @endif
+                            @if ($server->settings->is_swarm_manager)
+                                <x-forms.checkbox disabled instantSave type="checkbox"
+                                    id="server.settings.is_swarm_worker"
+                                    helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
+                                    label="Is it a Swarm Worker?" />
+                            @else
+                                <x-forms.checkbox instantSave type="checkbox" id="server.settings.is_swarm_worker"
+                                    helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
+                                    label="Is it a Swarm Worker?" />
+                            @endif
+                        </div>
                     @endif
                 @endif
             </div>
         </div>
-
-        @if ($server->isFunctional())
-            <h3 class="pt-4">Settings</h3>
-            <div class="flex flex-col gap-4">
-                <div class="flex flex-col gap-2">
-                    <div class="flex flex-wrap items-center gap-4">
-                        <div class="w-64">
-                            <x-forms.checkbox
-                                helper="Enabling Force Docker Cleanup or manually triggering a cleanup will perform the following actions:
-                                <ul class='list-disc pl-4 mt-2'>
-                                    <li>Removes stopped containers manged by Coolify (as containers are none persistent, no data will be lost).</li>
-                                    <li>Deletes unused images.</li>
-                                    <li>Clears build cache.</li>
-                                    <li>Removes old versions of the Coolify helper image.</li>
-                                    <li>Optionally delete unused volumes (if enabled in advanced options).</li>
-                                    <li>Optionally remove unused networks (if enabled in advanced options).</li>
-                                </ul>"
-                                instantSave id="server.settings.force_docker_cleanup" label="Force Docker Cleanup" />
-                        </div>
-                        <x-modal-confirmation
-                            title="Confirm Docker Cleanup?"
-                            buttonTitle="Trigger Docker Cleanup"
-                            submitAction="manualCleanup"
-                            :actions="[
-                                'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
-                                'Permanently deletes all unused images',
-                                'Clears build cache',
-                                'Removes old versions of the Coolify helper image',
-                                'Optionally permanently deletes all unused volumes (if enabled in advanced options).',
-                                'Optionally permanently deletes all unused networks (if enabled in advanced options).'
-                            ]"
-                            :confirmWithText="false"
-                            :confirmWithPassword="false"
-                            step2ButtonText="Trigger Docker Cleanup"
-                        />
-                    </div>
-                    @if ($server->settings->force_docker_cleanup)
-                    <x-forms.input placeholder="*/10 * * * *" id="server.settings.docker_cleanup_frequency"
-                        label="Docker cleanup frequency" required
-                            helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
-                    @else
-                            <x-forms.input id="server.settings.docker_cleanup_threshold"
-                                label="Docker cleanup threshold (%)" required
-                                helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
-                    @endif
-                    <div x-data="{ open: false }" class="mt-4 max-w-md">
-                        <button @click="open = !open" type="button" class="flex items-center justify-between w-full text-left text-sm font-medium text-gray-700 dark:text-gray-300 hover:text-gray-900 dark:hover:text-gray-100">
-                            <span>Advanced Options</span>
-                            <svg :class="{'rotate-180': open}" class="w-5 h-5 transition-transform duration-200" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                                <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd" />
-                            </svg>
-                        </button>
-                        <div x-show="open" class="mt-2 space-y-2">
-                            <p class="text-sm text-gray-600 dark:text-gray-400 mb-2"><strong>Warning: Enable these options only if you fully understand their implications and consequences!</strong><br>Improper use will result in data loss and could cause functional issues.</p>
-                            <x-forms.checkbox instantSave id="server.settings.delete_unused_volumes" label="Delete Unused Volumes"
-                                helper="This option will remove all unused Docker volumes during cleanup.<br><br><strong>Warning: Data form stopped containers will be lost!</strong><br><br>Consequences include:<br>
-                                <ul class='list-disc pl-4 mt-2'>
-                                    <li>Volumes not attached to running containers will be deleted and data will be permanently lost (stopped containers are affected).</li>
-                                    <li>Data from stopped containers volumes will be permanently lost.</li>
-                                    <li>No way to recover deleted volume data.</li>
-                                </ul>"
-                            />
-                            <x-forms.checkbox instantSave id="server.settings.delete_unused_networks" label="Delete Unused Networks"
-                                helper="This option will remove all unused Docker networks during cleanup.<br><br><strong>Warning: Functionality may be lost and containers may not be able to communicate with each other!</strong><br><br>Consequences include:<br>
-                                <ul class='list-disc pl-4 mt-2'>
-                                    <li>Networks not attached to running containers will be permanently deleted (stopped containers are affected).</li>
-                                    <li>Custom networks for stopped containers will be permanently deleted.</li>
-                                    <li>Functionality may be lost and containers may not be able to communicate with each other.</li>
-                                </ul>"
-                            />
-                        </div>
-                    </div>
-                </div>
-
-                <div class="flex flex-wrap gap-4 sm:flex-nowrap">
-                    <x-forms.input id="server.settings.concurrent_builds" label="Number of concurrent builds" required
-                        helper="You can specify the number of simultaneous build processes/deployments that should run concurrently." />
-                    <x-forms.input id="server.settings.dynamic_timeout" label="Deployment timeout (seconds)" required
-                        helper="You can define the maximum duration for a deployment to run before timing it out." />
-                </div>
-            </div>
+        @if (isDev())
             <div class="flex gap-2 items-center pt-4 pb-2">
                 <h3>Sentinel</h3>
-                {{-- @if ($server->isSentinelEnabled()) --}}
-                {{-- <x-forms.button wire:click='restartSentinel'>Restart</x-forms.button> --}}
-                {{-- @endif --}}
+                @if ($server->isSentinelEnabled())
+                    <div class="flex gap-2 items-center"
+                        wire:poll.{{ $server->settings->sentinel_push_interval_seconds }}s="checkSyncStatus">
+                        @if ($server->isSentinelLive())
+                            <x-status.running status="In-sync" noLoading />
+                            <x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
+                        @else
+                            <x-status.stopped status="Out-of-sync" noLoading />
+                            <x-forms.button wire:click='restartSentinel'>Sync</x-forms.button>
+                        @endif
+                    </div>
+                @endif
             </div>
-            <div>Metrics are disabled until a few bugs are fixed.</div>
-            {{-- <div class="w-64">
-                <x-forms.checkbox instantSave id="server.settings.is_metrics_enabled" label="Enable Metrics" />
-            </div>
-            <div class="pt-4">
-                <div class="flex flex-wrap gap-2 sm:flex-nowrap">
-                    <x-forms.input type="password" id="server.settings.metrics_token" label="Metrics token" required
-                    helper="Token for collector (Sentinel)." />
-                    <x-forms.input id="server.settings.metrics_refresh_rate_seconds" label="Metrics rate (seconds)"
-                    required
-                    helper="The interval for gathering metrics. Lower means more disk space will be used." />
-                    <x-forms.input id="server.settings.metrics_history_days" label="Metrics history (days)" required
-                    helper="How many days should the metrics data should be reserved." />
+            <div class="flex flex-col gap-2">
+                <div class="w-64">
+                    <x-forms.checkbox instantSave id="server.settings.is_sentinel_enabled" label="Enable Sentinel" />
+                    @if ($server->isSentinelEnabled())
+                        <x-forms.checkbox instantSave id="server.settings.is_metrics_enabled"
+                            label="Enable Metrics" />
+                    @else
+                        <x-forms.checkbox instantSave disabled id="server.settings.is_metrics_enabled"
+                            label="Enable Metrics" />
+                    @endif
                 </div>
-            </div>  --}}
+                @if ($server->isSentinelEnabled())
+                    <div class="flex flex-wrap gap-2 sm:flex-nowrap items-end">
+                        <x-forms.input type="password" id="server.settings.sentinel_token" label="Sentinel token"
+                            required helper="Token for Sentinel." />
+                        <x-forms.button wire:click="regenerateSentinelToken">Regenerate</x-forms.button>
+                    </div>
+
+                    <x-forms.input id="server.settings.sentinel_custom_url" required label="Coolify URL"
+                        helper="URL to your Coolify instance. If it is empty that means you do not have a FQDN set for your Coolify instance." />
+
+                    <div class="flex flex-col gap-2">
+                        <div class="flex flex-wrap gap-2 sm:flex-nowrap">
+                            <x-forms.input id="server.settings.sentinel_metrics_refresh_rate_seconds"
+                                label="Metrics rate (seconds)" required
+                                helper="The interval for gathering metrics. Lower means more disk space will be used." />
+                            <x-forms.input id="server.settings.sentinel_metrics_history_days"
+                                label="Metrics history (days)" required
+                                helper="How many days should the metrics data should be reserved." />
+                            <x-forms.input id="server.settings.sentinel_push_interval_seconds"
+                                label="Push interval (seconds)" required
+                                helper="How many seconds should the metrics data should be pushed to the collector." />
+                        </div>
+                    </div>
+                @endif
+            </div>
         @endif
+
     </form>
 </div>

resources/views/livewire/server/log-drains.blade.php

@@ -2,7 +2,7 @@
     <x-slot:title>
         {{ data_get_str($server, 'name')->limit(10) }} > Server LogDrains | Coolify
     </x-slot>
-    <x-server.navbar :server="$server" :parameters="$parameters" />
+    {{-- <x-server.navbar :server="$server" :parameters="$parameters" /> --}}
     @if ($server->isFunctional())
         <h2>Log Drains</h2>
         <div class="pb-4">Sends service logs to 3rd party tools.</div>

resources/views/livewire/server/private-key/show.blade.php

@@ -2,6 +2,5 @@
     <x-slot:title>
         Server Connection | Coolify
     </x-slot>
-    <x-server.navbar :server="$server" :parameters="$parameters" />
     <livewire:server.show-private-key :server="$server" :privateKeys="$privateKeys" />
 </div>

resources/views/livewire/server/proxy/modal.blade.php

@@ -1,12 +0,0 @@
-<div>
-    <x-modal submitWireAction="proxyStatusUpdated" modalId="startProxy">
-        <x-slot:modalBody>
-            <livewire:activity-monitor header="Proxy Startup Logs" />
-        </x-slot:modalBody>
-        <x-slot:modalSubmit>
-            <x-forms.button onclick="startProxy.close()" type="submit">
-                Close
-            </x-forms.button>
-        </x-slot:modalSubmit>
-    </x-modal>
-</div>

resources/views/livewire/server/resources.blade.php

@@ -2,24 +2,30 @@
     <x-slot:title>
         {{ data_get_str($server, 'name')->limit(10) }} > Server Resources | Coolify
     </x-slot>
-    <x-server.navbar :server="$server" :parameters="$parameters" />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'managed' }" class="flex flex-col h-full gap-8 md:flex-row">
-        <div class="flex flex-row gap-4 md:flex-col">
-            <a :class="activeTab === 'managed' && 'dark:text-white'"
-                @click.prevent="activeTab = 'managed'; window.location.hash = 'managed'" href="#">Managed</a>
-            <a :class="activeTab === 'unmanaged' && 'dark:text-white'"
-                @click.prevent="activeTab = 'unmanaged'; window.location.hash = 'unmanaged'" href="#">Unmanaged</a>
-        </div>
+    {{-- <x-server.navbar :server="$server" :parameters="$parameters" /> --}}
+    <div x-data="{ activeTab: 'managed' }" class="flex flex-col h-full gap-8 md:flex-row">
         <div class="w-full">
-            <div x-cloak x-show="activeTab === 'managed'" class="h-full">
-                <div class="flex flex-col">
-                    <div class="flex gap-2">
-                        <h2>Resources</h2>
-                        <x-forms.button wire:click="refreshStatus">Refresh</x-forms.button>
-                    </div>
-                    <div class="subtitle">Here you can find all resources that are managed by Coolify.</div>
+            <div class="flex flex-col">
+                <div class="flex gap-2">
+                    <h2>Resources</h2>
+                    <x-forms.button wire:click="refreshStatus">Refresh</x-forms.button>
                 </div>
-                @if ($server->definedResources()->count() > 0)
+                <div>Here you can find all resources that are managed by Coolify.</div>
+                <div class="flex flex-row gap-4  py-10">
+                    <div @class([
+                        'box-without-bg cursor-pointer bg-coolgray-100 text-white w-full text-center items-center justify-center',
+                        'bg-coollabs' => $activeTab === 'managed',
+                    ]) wire:click="loadManagedContainers">
+                        Managed</div>
+                    <div @class([
+                        'box-without-bg cursor-pointer bg-coolgray-100 text-white w-full text-center items-center justify-center',
+                        'bg-coollabs' => $activeTab === 'unmanaged',
+                    ]) wire:click="loadUnmanagedContainers">
+                        Unmanaged</div>
+                </div>
+            </div>
+            @if ($containers->count() > 0)
+                @if ($activeTab === 'managed')
                     <div class="flex flex-col">
                         <div class="flex flex-col">
                             <div class="overflow-x-auto">
@@ -78,19 +84,7 @@
                             </div>
                         </div>
                     </div>
-                @else
-                    <div>No resources found.</div>
-                @endif
-            </div>
-            <div x-cloak x-show="activeTab === 'unmanaged'" class="h-full">
-                <div class="flex flex-col" x-init="$wire.loadUnmanagedContainers()">
-                    <div class="flex gap-2">
-                        <h2>Resources</h2>
-                        <x-forms.button wire:click="refreshStatus">Refresh</x-forms.button>
-                    </div>
-                    <div class="subtitle">Here you can find all other containers running on the server.</div>
-                </div>
-                @if ($unmanagedContainers->count() > 0)
+                @elseif ($activeTab === 'unmanaged')
                     <div class="flex flex-col">
                         <div class="flex flex-col">
                             <div class="overflow-x-auto">
@@ -114,7 +108,7 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                                @forelse ($unmanagedContainers->sortBy('name',SORT_NATURAL) as $resource)
+                                                @forelse ($containers->sortBy('name',SORT_NATURAL) as $resource)
                                                     <tr>
                                                         <td class="px-5 py-4 text-sm whitespace-nowrap">
                                                             {{ data_get($resource, 'Names') }}
@@ -152,11 +146,14 @@
                                 </div>
                             </div>
                         </div>
-                    </div>
-                @else
-                    <div>No resources found.</div>
                 @endif
-            </div>
+            @else
+                @if ($activeTab === 'managed')
+                    <div>No managed resources found.</div>
+                @elseif ($activeTab === 'unmanaged')
+                    <div>No unmanaged resources found.</div>
+                @endif
+            @endif
         </div>
     </div>
 </div>

resources/views/livewire/server/show-private-key.blade.php

@@ -1,5 +1,5 @@
 <div>
-    <div class="flex items-end gap-2 pb-6 ">
+    <div class="flex items-end gap-2">
         <h2>Private Key</h2>
         <x-modal-input buttonTitle="+ Add" title="New Private Key">
             <livewire:security.private-key.create />
@@ -9,29 +9,25 @@
         </x-forms.button>
     </div>
 
-    <div class="flex flex-col gap-2 pb-6">
-        @if (data_get($server, 'privateKey.uuid'))
-            <div>
-                Currently attached Private Key:
-                <a
-                    href="{{ route('security.private-key.show', ['private_key_uuid' => data_get($server, 'privateKey.uuid')]) }}">
-                    <button class="dark:text-white btn-link">{{ data_get($server, 'privateKey.name') }}</button>
-                </a>
-            </div>
-        @else
-            <div class="">No private key attached.</div>
-        @endif
-
+    <div class="flex flex-col gap-2">
+        <div class="pb-4">Change your server's private key.</div>
     </div>
-    <h3 class="pb-4">Choose another Key</h3>
-    <div class="grid grid-cols-3 gap-2">
+    <div class="grid xl:grid-cols-2 grid-cols-1 gap-2">
         @forelse ($privateKeys as $private_key)
-            <div class="box group cursor-pointer"
-                 wire:click='setPrivateKey({{ $private_key->id }})'>
+            <div class="box-without-bg justify-between dark:bg-coolgray-100 bg-white items-center">
                 <div class="flex flex-col ">
                     <div class="box-title">{{ $private_key->name }}</div>
                     <div class="box-description">{{ $private_key->description }}</div>
                 </div>
+                @if (data_get($server, 'privateKey.uuid') !== $private_key->uuid)
+                <x-forms.button wire:click='setPrivateKey({{ $private_key->id }})'>
+                    Use this key
+                    </x-forms.button>
+                @else
+                    <x-forms.button disabled>
+                        Currently used
+                    </x-forms.button>
+                @endif
             </div>
         @empty
             <div>No private keys found. </div>

resources/views/livewire/server/show.blade.php

@@ -3,11 +3,75 @@
         {{ data_get_str($server, 'name')->limit(10) }} > Server Configurations | Coolify
     </x-slot>
     <x-server.navbar :server="$server" :parameters="$parameters" />
-    <livewire:server.form :server="$server" />
-    @if ($server->isFunctional() && $server->isMetricsEnabled())
-        <div class="pt-10">
-            <livewire:server.charts :server="$server" />
+    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">
+        <div class="flex flex-col items-start gap-2 min-w-fit">
+            <a class="menu-item" :class="activeTab === 'general' && 'menu-item-active'"
+                @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
+            @if ($server->isFunctional())
+                <a class="menu-item" :class="activeTab === 'advanced' && 'menu-item-active'"
+                    @click.prevent="activeTab = 'advanced'; window.location.hash = 'advanced'" href="#">Advanced
+                </a>
+            @endif
+            <a class="menu-item" :class="activeTab === 'private-key' && 'menu-item-active'"
+                @click.prevent="activeTab = 'private-key'; window.location.hash = 'private-key'" href="#">Private
+                Key</a>
+            @if ($server->isFunctional())
+                <a class="menu-item" :class="activeTab === 'cloudflare-tunnels' && 'menu-item-active'"
+                    @click.prevent="activeTab = 'cloudflare-tunnels'; window.location.hash = 'cloudflare-tunnels'"
+                    href="#">Cloudflare Tunnels</a>
+                <a class="menu-item" :class="activeTab === 'resources' && 'menu-item-active'"
+                    @click.prevent="activeTab = 'resources'; window.location.hash = 'resources'"
+                    href="#">Resources</a>
+                <a class="menu-item" :class="activeTab === 'destinations' && 'menu-item-active'"
+                    @click.prevent="activeTab = 'destinations'; window.location.hash = 'destinations'"
+                    href="#">Destinations</a>
+                <a class="menu-item" :class="activeTab === 'log-drains' && 'menu-item-active'"
+                    @click.prevent="activeTab = 'log-drains'; window.location.hash = 'log-drains'" href="#">Log
+                    Drains</a>
+                <a class="menu-item" :class="activeTab === 'metrics' && 'menu-item-active'"
+                    @click.prevent="activeTab = 'metrics'; window.location.hash = 'metrics'" href="#">Metrics</a>
+            @endif
+            @if (!$server->isLocalhost())
+                <a class="menu-item" :class="activeTab === 'danger' && 'menu-item-active'"
+                    @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger</a>
+            @endif
         </div>
-    @endif
-    <livewire:server.delete :server="$server" />
+        <div class="w-full">
+            <div x-cloak x-show="activeTab === 'general'" class="h-full">
+                <livewire:server.form :server="$server" />
+            </div>
+            <div x-cloak x-show="activeTab === 'advanced'" class="h-full">
+                <livewire:server.advanced :server="$server" />
+            </div>
+            <div x-cloak x-show="activeTab === 'private-key'" class="h-full">
+                <livewire:server.private-key.show :server="$server" />
+            </div>
+            <div x-cloak x-show="activeTab === 'cloudflare-tunnels'" class="h-full">
+                <livewire:server.cloudflare-tunnels :server="$server" />
+            </div>
+            <div x-cloak x-show="activeTab === 'resources'" class="h-full">
+                <livewire:server.resources :server="$server" />
+            </div>
+            <div x-cloak x-show="activeTab === 'destinations'" class="h-full">
+                <livewire:server.destination.show :server="$server" />
+            </div>
+            <div x-cloak x-show="activeTab === 'log-drains'" class="h-full">
+                <livewire:server.log-drains :server="$server" />
+            </div>
+            <div x-cloak x-show="activeTab === 'metrics'" class="h-full">
+                @if ($server->isFunctional() && $server->isMetricsEnabled())
+                    <div class="pt-10">
+                        <livewire:server.charts :server="$server" />
+                    </div>
+                @else
+                    No metrics available.
+                @endif
+            </div>
+            @if (!$server->isLocalhost())
+                <div x-cloak x-show="activeTab === 'danger'" class="h-full">
+                    <livewire:server.delete :server="$server" />
+                </div>
+            @endif
+        </div>
+    </div>
 </div>

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

@@ -95,7 +95,7 @@
             <x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
             <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
         </div>
-        <h5 class="pt-4 font-bold text-white">Update</h5>
+        <h4 class="pt-6">Update</h4>
         <div class="text-right md:w-96">
             @if (!is_null(env('AUTOUPDATE', null)))
                 <div class="text-right md:w-96">

routes/api.php

@@ -13,6 +13,8 @@ use App\Http\Controllers\Api\TeamController;
 use App\Http\Middleware\ApiAllowed;
 use App\Http\Middleware\IgnoreReadOnlyApiToken;
 use App\Http\Middleware\OnlyRootApiToken;
+use App\Jobs\PushServerUpdateJob;
+use App\Models\Server;
 use Illuminate\Support\Facades\Route;
 
 Route::get('/health', [OtherController::class, 'healthcheck']);
@@ -129,6 +131,33 @@ Route::group([
 
 });
 
+Route::group([
+    'prefix' => 'v1',
+], function () {
+    Route::post('/sentinel/push', function () {
+        $token = request()->header('Authorization');
+        if (! $token) {
+            return response()->json(['message' => 'Unauthorized'], 401);
+        }
+        $naked_token = str_replace('Bearer ', '', $token);
+        $decrypted = decrypt($naked_token);
+        $decrypted_token = json_decode($decrypted, true);
+        $server_uuid = data_get($decrypted_token, 'server_uuid');
+        $server = Server::where('uuid', $server_uuid)->first();
+        if (! $server) {
+            return response()->json(['message' => 'Server not found'], 404);
+        }
+        if ($server->settings->sentinel_token !== $naked_token) {
+            return response()->json(['message' => 'Unauthorized'], 401);
+        }
+        $data = request()->all();
+
+        PushServerUpdateJob::dispatch($server, $data);
+
+        return response()->json(['message' => 'ok'], 200);
+    });
+});
+
 Route::any('/{any}', function () {
     return response()->json(['message' => 'Not found.', 'docs' => 'https://coolify.io/docs'], 404);
 })->where('any', '.*');

scripts/install.sh

@@ -13,7 +13,7 @@ DOCKER_VERSION="26.0"
 # TODO: Ask for a user
 CURRENT_USER=$USER
 
-mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance,metrics,logs}
+mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance,sentinel}
 mkdir -p /data/coolify/ssh/{keys,mux}
 mkdir -p /data/coolify/proxy/dynamic
 

storage/pail/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

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}

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