updates

version++

.dockerignore

@@ -8,7 +8,6 @@ package
 .env.*
 !.env.example
 dist
-client
 apps/api/db/*.db
 local-serve
 apps/api/db/migration.db-journal

.github/ISSUE_TEMPLATE/--bug-report.yaml

@@ -2,20 +2,25 @@ name: 🐞 Bug report
 description: Create a bug report to help us improve coolify
 title: "[Bug]: "
 labels: [Bug]
-assignees:
-- andrasbacsai
-- vasani-arpit
 body:
 - type: markdown
   attributes:
     value: |
-      Thanks for taking the time to fill out this bug report! Please fill the form in English
+      Thanks for taking the time to fill out this bug report! Please fill the form in English.
 - type: checkboxes
   attributes:
     label: Is there an existing issue for this?
     options:
     - label: I have searched the existing issues
       required: true
+- type: input
+  id: repository
+  attributes:
+    label: Example public repository
+    description: "An example public git repository to reproduce the issue easily (if applicable)."
+    placeholder: "ex: https://github.com/coollabsio/coolify"
+  validations:
+    required: false
 - type: textarea
   attributes:
     label: Description

.github/ISSUE_TEMPLATE/--feature-request.yaml

@@ -2,9 +2,6 @@ name: 🛠️ Feature request
 description: Suggest an idea to improve coolify
 title: '[Feature]: '
 labels: [Enhancement]
-assignees:
-  - andrasbacsai
-  - vasani-arpit
 body:
   - type: markdown
     attributes:

.github/workflows/fluent-bit-release.yml

@@ -1,93 +0,0 @@
-name: fluent-bit-release
-
-on:
-  push:
-    paths:
-      - "others/fluentbit"
-      - ".github/workflows/fluent-bit-release.yml"
-    branches:    
-      - next
-
-jobs:
-  arm64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: others/fluentbit/
-          platforms: linux/arm64
-          push: true
-          tags: coollabsio/coolify-fluent-bit:1.0.0-arm64
-  amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: others/fluentbit/
-          platforms: linux/amd64
-          push: true
-          tags: coollabsio/coolify-fluent-bit:1.0.0-amd64
-  aarch64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: others/fluentbit/
-          platforms: linux/aarch64
-          push: true
-          tags: coollabsio/coolify-fluent-bit:1.0.0-aarch64
-  merge-manifest:
-    runs-on: ubuntu-latest
-    needs: [amd64, arm64, aarch64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Create & publish manifest
-        run: |
-          docker manifest create coollabsio/coolify-fluent-bit:1.0.0 --amend coollabsio/coolify-fluent-bit:1.0.0-amd64 --amend coollabsio/coolify-fluent-bit:1.0.0-arm64 --amend coollabsio/coolify-fluent-bit:1.0.0-aarch64
-          docker manifest push coollabsio/coolify-fluent-bit:1.0.0

.github/workflows/pocketbase-release.yml

@@ -1,93 +0,0 @@
-name: pocketbase-release
-
-on:
-  push:
-    paths:
-      - "others/pocketbase"
-      - ".github/workflows/pocketbase-release.yml"
-    branches:
-      - next
-
-jobs:
-  arm64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: others/pocketbase/
-          platforms: linux/arm64
-          push: true
-          tags: coollabsio/pocketbase:0.8.0-arm64
-  amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: others/pocketbase/
-          platforms: linux/amd64
-          push: true
-          tags: coollabsio/pocketbase:0.8.0-amd64
-  aarch64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: others/pocketbase/
-          platforms: linux/aarch64
-          push: true
-          tags: coollabsio/pocketbase:0.8.0-aarch64
-  merge-manifest:
-    runs-on: ubuntu-latest
-    needs: [amd64, arm64, aarch64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Create & publish manifest
-        run: |
-          docker manifest create coollabsio/pocketbase:0.8.0 --amend coollabsio/pocketbase:0.8.0-amd64 --amend coollabsio/pocketbase:0.8.0-arm64 --amend coollabsio/pocketbase:0.8.0-aarch64
-          docker manifest push coollabsio/pocketbase:0.8.0

.github/workflows/production-release.yml

@@ -1,91 +1,81 @@
-name: production-release
+name: Production Release to ghcr.io
 
 on:
   release:
     types: [released]
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: "coollabsio/coolify"
+
 jobs:
-  arm64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-arm64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-arm64,mode=max
   amd64:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: "v3"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
+      - name: Login to ghcr.io
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ github.actor }}
-      - name: Get current package version
+          password: ${{ secrets.GITHUB_TOKEN  }}
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
+      - name: Extract metadata
-        id: package-version
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=semver,pattern={{version}}
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
           context: .
           platforms: linux/amd64
           push: true
-          tags: coollabsio/coolify:${{steps.package-version.outputs.current-version}}-amd64
+          tags: ${{ steps.meta.outputs.tags }}
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-amd64
+          labels: ${{ steps.meta.outputs.labels }}
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-amd64,mode=max
   aarch64:
     runs-on: [self-hosted, arm64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: "v3"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
+      - name: Login to ghcr.io
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ github.actor }}
-      - name: Get current package version
+          password: ${{ secrets.GITHUB_TOKEN  }}
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
+      - name: Extract metadata
-        id: package-version
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=semver,pattern={{version}}-aarch64
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           platforms: linux/aarch64
           push: true
-          tags: coollabsio/coolify:${{steps.package-version.outputs.current-version}}-aarch64
+          tags: ${{ steps.meta.outputs.tags }}-aarch64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-aarch64
+          labels: ${{ steps.meta.outputs.labels }}
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-aarch64,mode=max
   merge-manifest:
     runs-on: ubuntu-latest
-    needs: [amd64, arm64, aarch64]
+    needs: [amd64, aarch64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -93,18 +83,22 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
+      - name: Login to ghcr.io
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ github.actor }}
-      - name: Get current package version
+          password: ${{ secrets.GITHUB_TOKEN  }}
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
+      - name: Extract metadata
-        id: package-version
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=semver,pattern={{version}}
       - name: Create & publish manifest
         run: |
-          docker manifest create coollabsio/coolify:${{steps.package-version.outputs.current-version}} --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-amd64 --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64 --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-aarch64
+          docker buildx imagetools create --append ${{ fromJSON(steps.meta.outputs.json).tags[0] }}-aarch64 --tag ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
-          docker manifest push coollabsio/coolify:${{steps.package-version.outputs.current-version}}
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

.github/workflows/release-candidate.yml

@@ -1,90 +0,0 @@
-name: release-candidate
-on:
-  release:
-    types: [prereleased]
-
-jobs:
-  arm64-making-something-cool:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: "next"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: coollabsio/coolify:${{github.event.release.name}}-arm64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-rc-arm64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-rc-arm64,mode=max
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL }}
-  amd64-making-something-cool:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: "next"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          tags: coollabsio/coolify:${{github.event.release.name}}-amd64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-rc-amd64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-rc-amd64,mode=max
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL }}
-  merge-manifest-to-be-cool:
-    runs-on: ubuntu-latest
-    needs: [arm64-making-something-cool, amd64-making-something-cool]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Create & publish manifest
-        run: |
-          docker manifest create coollabsio/coolify:${{github.event.release.name}} --amend coollabsio/coolify:${{github.event.release.name}}-amd64 --amend coollabsio/coolify:${{github.event.release.name}}-arm64
-          docker manifest push coollabsio/coolify:${{github.event.release.name}}
-          

.github/workflows/staging-release.yml

@@ -1,76 +1,76 @@
-name: staging-release
+name: Staging Release to ghcr.io
-
+concurrency:
+  group: staging_environment
+  cancel-in-progress: true
 on:
   push:
-    paths:
-      - "**"
-      - "!others/fluentbit"
-      - "!others/pocketbase"
-      - "!.github/workflows/fluent-bit-release.yml"
-      - "!.github/workflows/pocketbase-release.yml"
     branches:
-      - next
+      - "v3"
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: "coollabsio/coolify"
 
 jobs:
-  arm64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: "next"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: coollabsio/coolify:next-arm64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-arm64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-arm64,mode=max
   amd64:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          ref: "next"
+          ref: "v3"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
+      - name: Login to ghcr.io
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ github.actor }}
-      - name: Get current package version
+          password: ${{ secrets.GITHUB_TOKEN  }}
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
+      - name: Extract metadata (tags, labels)
-        id: package-version
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
           context: .
           platforms: linux/amd64
           push: true
-          tags: coollabsio/coolify:next-amd64
+          tags: ${{ steps.meta.outputs.tags }}
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-amd64
+          labels: ${{ steps.meta.outputs.labels }}
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-amd64,mode=max
+  aarch64:
+    runs-on:
+      group: aarch-runners
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: "v3"
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to ghcr.io
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Extract metadata (tags, labels)
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/aarch64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}-aarch64
+          labels: ${{ steps.meta.outputs.labels }}
   merge-manifest:
     runs-on: ubuntu-latest
-    needs: [arm64, amd64]
+    needs: [amd64, aarch64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -78,15 +78,20 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
+      - name: Login to ghcr.io
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Extract metadata (tags, labels)
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Create & publish manifest
         run: |
-          docker manifest create coollabsio/coolify:next --amend coollabsio/coolify:next-amd64 --amend coollabsio/coolify:next-arm64
+          docker buildx imagetools create --append ${{ steps.meta.outputs.tags }}-aarch64 --tag ${{ steps.meta.outputs.tags }}
-          docker manifest push coollabsio/coolify:next
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:

.gitignore

@@ -1,20 +1,25 @@
 .DS_Store
 node_modules
 .pnpm-store
-build
+/apps/ui/build
+/build
 .svelte-kit
 package
 .env
 .env.*
 !.env.example
 dist
-client
 apps/api/db/*.db
 apps/api/db/migration.db-journal
 apps/api/core*
+apps/server/build
 apps/backup/backups/*
 !apps/backup/backups/.gitkeep
-logs
+/logs
 others/certificates
 backups/*
 !backups/.gitkeep
+
+# Trpc
+apps/server/db/*.db
+apps/server/db/*.db-journal

.vscode/settings.json

@@ -18,5 +18,14 @@
 		"ts",
 		"json"
 	],
-	"i18n-ally.extract.autoDetect": true
+	"i18n-ally.extract.autoDetect": true,
+	"files.exclude": {
+		"**/.git": true,
+		"**/.svn": true,
+		"**/.hg": true,
+		"**/CVS": true,
+		"**/.DS_Store": true,
+		"**/Thumbs.db": true
+	},
+	"hide-files.files": []
 }

CONTRIBUTION.md

@@ -10,7 +10,7 @@ You'll need a set of skills to [get started](docs/contribution/GettingStarted.md
 
 ## 1) Setup your development environment
 
-- 🌟 [Container based](docs/dev_setup/Container.md) ← *Recomended*
+- 🌟 [Container based](docs/dev_setup/Container.md) ← *Recommended*
 - 📦 [DockerContainer](docs/dev_setup/DockerContiner.md) *WIP
 - 🐙 [Github Codespaces](docs/dev_setup/GithubCodespaces.md)
 - ☁️ [GitPod](docs/dev_setup/GitPod.md)
@@ -20,7 +20,7 @@ You'll need a set of skills to [get started](docs/contribution/GettingStarted.md
 
 - [Install Pnpm](https://pnpm.io/installation)
 - [Install Docker Engine](https://docs.docker.com/engine/install/)
-- [Setup Docker Compose Plugin](https://docs.docker.com/compose/install/compose-plugin/)
+- [Setup Docker Compose Plugin](https://docs.docker.com/compose/install/)
 - [Setup GIT LFS Support](https://git-lfs.github.com/)
 
 ## 3) Setup Coolify
@@ -28,12 +28,12 @@ You'll need a set of skills to [get started](docs/contribution/GettingStarted.md
 - Copy `apps/api/.env.example` to `apps/api/.env` 
 - Edit `apps/api/.env`, set the `COOLIFY_APP_ID` environment variable to something cool.
 - Run `pnpm install` to install dependencies.
-- Run `pnpm db:push` to o create a local SQlite database. This will apply all migrations at `db/dev.db`.
+- Run `pnpm db:push` to create a local SQlite database. This will apply all migrations at `db/dev.db`.
 - Run `pnpm db:seed` seed the database.
 - Run `pnpm dev` start coding.
 
 ```sh
-# Or... Copy and paste commands bellow:
+# Or... Copy and paste commands below:
 cp apps/api/.env.example apps/api/.env
 pnpm install
 pnpm db:push

Dockerfile

@@ -22,9 +22,9 @@ ARG DOCKER_VERSION=20.10.18
 # Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
 ARG DOCKER_COMPOSE_VERSION=2.6.1
 # https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=v0.27.0
+ARG PACK_VERSION=0.27.0
 
-RUN apt update && apt -y install --no-install-recommends ca-certificates git git-lfs openssh-client curl jq cmake sqlite3 openssl psmisc python3
+RUN apt update && apt -y install --no-install-recommends ca-certificates git git-lfs openssh-client curl jq cmake sqlite3 openssl psmisc python3 vim
 RUN apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/{apt,dpkg,cache,log}/
 RUN npm --no-update-notifier --no-fund --global install pnpm@${PNPM_VERSION}
 RUN npm install -g npm@${PNPM_VERSION}
@@ -38,7 +38,7 @@ RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/pack-$PACK_VERSION -o /
 RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack
 
 COPY --from=build /app/apps/api/build/ .
-COPY --from=build /app/others/fluentbit/ ./fluentbit
+# COPY --from=build /app/others/fluentbit/ ./fluentbit
 COPY --from=build /app/apps/ui/build/ ./public
 COPY --from=build /app/apps/api/prisma/ ./prisma
 COPY --from=build /app/apps/api/package.json .

Dockerfile-dev

@@ -9,7 +9,7 @@ ARG DOCKER_VERSION=20.10.18
 # Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
 ARG DOCKER_COMPOSE_VERSION=2.6.1
 # https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=v0.27.0
+ARG PACK_VERSION=0.27.0
 WORKDIR /app
 
 RUN npm --no-update-notifier --no-fund --global install pnpm@${PNPM_VERSION}

README.md

@@ -16,7 +16,7 @@ If you have a new service / build pack you would like to add, raise an idea [her
 
 ## How to install
 
-For more details goto the [docs](https://docs.coollabs.io/coolify/installation).
+For more details goto the [docs](https://docs.coollabs.io/coolify-v3/installation).
 
 Installation is automated with the following command:
 
@@ -79,9 +79,9 @@ Deploy your resource to:
 ### Services
 
 - [Appwrite](https://appwrite.io)
-- [WordPress](https://docs.coollabs.io/coolify/services/wordpress)
+- [WordPress](https://docs.coollabs.io/coolify-v3/services/wordpress)
 - [Ghost](https://ghost.org)
-- [Plausible Analytics](https://docs.coollabs.io/coolify/services/plausible-analytics)
+- [Plausible Analytics](https://docs.coollabs.io/coolify-v3/services/plausible-analytics)
 - [NocoDB](https://nocodb.com)
 - [VSCode Server](https://github.com/cdr/code-server)
 - [MinIO](https://min.io)
@@ -100,7 +100,7 @@ Deploy your resource to:
 
 - Mastodon: [@andrasbacsai@fosstodon.org](https://fosstodon.org/@andrasbacsai)
 - Telegram: [@andrasbacsai](https://t.me/andrasbacsai)
-- Twitter: [@andrasbacsai](https://twitter.com/andrasbacsai)
+- Twitter: [@andrasbacsai](https://twitter.com/heyandras)
 - Email: [andras@coollabs.io](mailto:andras@coollabs.io)
 - Discord: [Invitation](https://coollabs.io/discord)
 
@@ -119,7 +119,7 @@ Learn how to contribute to Coolify as as ...
 
 <!-- 
 &rarr; 🧑🏽‍🎨 Designer
-&rarr; 🙋‍♀️ Community Managemer
+&rarr; 🙋‍♀️ Community Manager
 &rarr; 🧙🏻‍♂️ Text Content Creator
 &rarr; 👨🏼‍🎤 Video Content Creator
 -->
@@ -130,12 +130,12 @@ Learn how to contribute to Coolify as as ...
 
 Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/coollabsio/contribute)]
 
-### Individuals
-
-<a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>
-
 ### Organizations
 
+Special thanks to our biggest sponsor, [CCCareers](https://cccareers.org/)!
+
+![CCCareers](./others/logo/ccc-logo.webp)
+
 Support this project with your organization. Your logo will show up here with a link to your website. 
 
 <a href="https://opencollective.com/coollabsio/organization/0/website"><img src="https://opencollective.com/coollabsio/organization/0/avatar.svg"></a>
@@ -148,3 +148,11 @@ Support this project with your organization. Your logo will show up here with a
 <a href="https://opencollective.com/coollabsio/organization/7/website"><img src="https://opencollective.com/coollabsio/organization/7/avatar.svg"></a>
 <a href="https://opencollective.com/coollabsio/organization/8/website"><img src="https://opencollective.com/coollabsio/organization/8/avatar.svg"></a>
 <a href="https://opencollective.com/coollabsio/organization/9/website"><img src="https://opencollective.com/coollabsio/organization/9/avatar.svg"></a> 
+
+### Individuals
+
+<a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=coollabsio/coolify&type=Date)](https://star-history.com/#coollabsio/coolify&Date)

apps/api/.gitignore

@@ -9,3 +9,5 @@ package
 dist
 dev.db
 client
+testTemplate.yaml
+testTags.json

apps/api/package.json

@@ -1,85 +1,83 @@
 {
-  "name": "api",
+	"name": "api",
-  "description": "Coolify's Fastify API",
+	"description": "Coolify's Fastify API",
-  "license": "Apache-2.0",
+	"license": "Apache-2.0",
-  "scripts": {
+	"scripts": {
-    "db:generate": "prisma generate",
+		"db:generate": "prisma generate",
-    "db:push": "prisma db push && prisma generate",
+		"db:push": "prisma db push && prisma generate",
-    "db:seed": "prisma db seed",
+		"db:seed": "prisma db seed",
-    "db:studio": "prisma studio",
+		"db:studio": "prisma studio",
-    "db:migrate": "COOLIFY_DATABASE_URL=file:../db/migration.db prisma migrate dev --skip-seed --name",
+		"db:migrate": "COOLIFY_DATABASE_URL=file:../db/migration.db prisma migrate dev --skip-seed --name",
-    "dev": "nodemon",
+		"dev": "nodemon",
-    "build": "rimraf build && esbuild `find src \\( -name '*.ts' \\)| grep -v client/` --platform=node --outdir=build --format=cjs",
+		"build": "rimraf build && esbuild `find src \\( -name '*.ts' \\)| grep -v client/` --platform=node --outdir=build --format=cjs",
-    "format": "prettier --write 'src/**/*.{js,ts,json,md}'",
+		"format": "prettier --write 'src/**/*.{js,ts,json,md}'",
-    "lint": "prettier --check 'src/**/*.{js,ts,json,md}' && eslint --ignore-path .eslintignore .",
+		"lint": "prettier --check 'src/**/*.{js,ts,json,md}' && eslint --ignore-path .eslintignore .",
-    "start": "NODE_ENV=production pnpm prisma migrate deploy && pnpm prisma generate && pnpm prisma db seed && node index.js"
+		"start": "NODE_ENV=production pnpm prisma migrate deploy && pnpm prisma generate && pnpm prisma db seed && node index.js"
-  },
+	},
-  "dependencies": {
+	"dependencies": {
-    "@breejs/ts-worker": "2.0.0",
+		"@breejs/ts-worker": "2.0.0",
-    "@fastify/autoload": "5.5.0",
+		"@fastify/autoload": "5.7.0",
-    "@fastify/cookie": "8.3.0",
+		"@fastify/cookie": "8.3.0",
-    "@fastify/cors": "8.2.0",
+		"@fastify/cors": "8.2.0",
-    "@fastify/env": "4.1.0",
+		"@fastify/env": "4.2.0",
-    "@fastify/jwt": "6.3.3",
+		"@fastify/jwt": "6.5.0",
-    "@fastify/multipart": "7.3.0",
+		"@fastify/multipart": "7.4.1",
-    "@fastify/static": "6.5.1",
+		"@fastify/static": "6.6.0",
-    "@iarna/toml": "2.2.5",
+		"@iarna/toml": "2.2.5",
-    "@ladjs/graceful": "3.0.2",
+		"@ladjs/graceful": "3.2.1",
-    "@prisma/client": "4.6.1",
+		"@prisma/client": "4.8.1",
-    "@sentry/node": "7.21.1",
+		"axe": "11.2.1",
-    "@sentry/tracing": "7.21.1",
+		"bcryptjs": "2.4.3",
-    "axe": "11.0.0",
+		"bree": "9.1.3",
-    "bcryptjs": "2.4.3",
+		"cabin": "11.1.1",
-    "bree": "9.1.2",
+		"compare-versions": "5.0.1",
-    "cabin": "11.0.1",
+		"csv-parse": "5.3.3",
-    "compare-versions": "5.0.1",
+		"csvtojson": "2.0.10",
-    "csv-parse": "5.3.2",
+		"cuid": "2.1.8",
-    "csvtojson": "2.0.10",
+		"dayjs": "1.11.7",
-    "cuid": "2.1.8",
+		"dockerode": "3.3.4",
-    "dayjs": "1.11.6",
+		"dotenv-extended": "2.9.0",
-    "dockerode": "3.3.4",
+		"execa": "6.1.0",
-    "dotenv-extended": "2.9.0",
+		"fastify": "4.11.0",
-    "execa": "6.1.0",
+		"fastify-plugin": "4.3.0",
-    "fastify": "4.10.2",
+		"fastify-socket.io": "4.0.0",
-    "fastify-plugin": "4.3.0",
+		"generate-password": "1.7.0",
-    "fastify-socket.io": "4.0.0",
+		"got": "12.5.3",
-    "generate-password": "1.7.0",
+		"is-ip": "5.0.0",
-    "got": "12.5.3",
+		"is-port-reachable": "4.0.0",
-    "is-ip": "5.0.0",
+		"js-yaml": "4.1.0",
-    "is-port-reachable": "4.0.0",
+		"jsonwebtoken": "9.0.0",
-    "js-yaml": "4.1.0",
+		"minimist": "^1.2.7",
-    "jsonwebtoken": "8.5.1",
+		"node-forge": "1.3.1",
-    "minimist": "^1.2.7",
+		"node-os-utils": "1.3.7",
-    "node-forge": "1.3.1",
+		"p-all": "4.0.0",
-    "node-os-utils": "1.3.7",
+		"p-throttle": "5.0.0",
-    "p-all": "4.0.0",
+		"prisma": "4.8.1",
-    "p-throttle": "5.0.0",
+		"public-ip": "6.0.1",
-    "prisma": "4.6.1",
+		"pump": "3.0.0",
-    "public-ip": "6.0.1",
+		"shell-quote": "^1.7.4",
-    "pump": "3.0.0",
+		"socket.io": "4.5.4",
-    "shell-quote": "^1.7.4",
+		"ssh-config": "4.2.0",
-    "socket.io": "4.5.3",
+		"strip-ansi": "7.0.1",
-    "ssh-config": "4.1.6",
+		"unique-names-generator": "4.7.1"
-    "strip-ansi": "7.0.1",
+	},
-    "unique-names-generator": "4.7.1"
+	"devDependencies": {
-  },
+		"@types/node": "18.11.18",
-  "devDependencies": {
+		"@types/node-os-utils": "1.3.0",
-    "@types/node": "18.11.9",
+		"@typescript-eslint/eslint-plugin": "5.48.1",
-    "@types/node-os-utils": "1.3.0",
+		"@typescript-eslint/parser": "5.48.1",
-    "@typescript-eslint/eslint-plugin": "5.44.0",
+		"esbuild": "0.16.16",
-    "@typescript-eslint/parser": "5.44.0",
+		"eslint": "8.31.0",
-    "esbuild": "0.15.15",
+		"eslint-config-prettier": "8.6.0",
-    "eslint": "8.28.0",
+		"eslint-plugin-prettier": "4.2.1",
-    "eslint-config-prettier": "8.5.0",
+		"nodemon": "2.0.20",
-    "eslint-plugin-prettier": "4.2.1",
+		"prettier": "2.8.2",
-    "nodemon": "2.0.20",
+		"rimraf": "3.0.2",
-    "prettier": "2.7.1",
+		"tsconfig-paths": "4.1.2",
-    "rimraf": "3.0.2",
+		"types-fastify-socket.io": "0.0.1",
-    "tsconfig-paths": "4.1.0",
+		"typescript": "4.9.4"
-    "types-fastify-socket.io": "0.0.1",
+	},
-    "typescript": "4.9.3"
+	"prisma": {
-  },
+		"seed": "node prisma/seed.js"
-  "prisma": {
+	}
-    "seed": "node prisma/seed.js"
-  }
 }

apps/api/prisma/migrations/20221221140911_git_source_custom_user/migration.sql

@@ -0,0 +1,27 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_GitSource" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "forPublic" BOOLEAN NOT NULL DEFAULT false,
+    "type" TEXT,
+    "apiUrl" TEXT,
+    "htmlUrl" TEXT,
+    "customPort" INTEGER NOT NULL DEFAULT 22,
+    "customUser" TEXT NOT NULL DEFAULT 'git',
+    "organization" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "githubAppId" TEXT,
+    "gitlabAppId" TEXT,
+    "isSystemWide" BOOLEAN NOT NULL DEFAULT false,
+    CONSTRAINT "GitSource_gitlabAppId_fkey" FOREIGN KEY ("gitlabAppId") REFERENCES "GitlabApp" ("id") ON DELETE SET NULL ON UPDATE CASCADE,
+    CONSTRAINT "GitSource_githubAppId_fkey" FOREIGN KEY ("githubAppId") REFERENCES "GithubApp" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+INSERT INTO "new_GitSource" ("apiUrl", "createdAt", "customPort", "forPublic", "githubAppId", "gitlabAppId", "htmlUrl", "id", "isSystemWide", "name", "organization", "type", "updatedAt") SELECT "apiUrl", "createdAt", "customPort", "forPublic", "githubAppId", "gitlabAppId", "htmlUrl", "id", "isSystemWide", "name", "organization", "type", "updatedAt" FROM "GitSource";
+DROP TABLE "GitSource";
+ALTER TABLE "new_GitSource" RENAME TO "GitSource";
+CREATE UNIQUE INDEX "GitSource_githubAppId_key" ON "GitSource"("githubAppId");
+CREATE UNIQUE INDEX "GitSource_gitlabAppId_key" ON "GitSource"("gitlabAppId");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/migrations/20230117092356_http2_protocol/migration.sql

@@ -0,0 +1,24 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_ApplicationSettings" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT NOT NULL,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "debug" BOOLEAN NOT NULL DEFAULT false,
+    "previews" BOOLEAN NOT NULL DEFAULT false,
+    "autodeploy" BOOLEAN NOT NULL DEFAULT true,
+    "isBot" BOOLEAN NOT NULL DEFAULT false,
+    "isPublicRepository" BOOLEAN NOT NULL DEFAULT false,
+    "isDBBranching" BOOLEAN NOT NULL DEFAULT false,
+    "isCustomSSL" BOOLEAN NOT NULL DEFAULT false,
+    "isHttp2" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ApplicationSettings_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_ApplicationSettings" ("applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "isBot", "isCustomSSL", "isDBBranching", "isPublicRepository", "previews", "updatedAt") SELECT "applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "isBot", "isCustomSSL", "isDBBranching", "isPublicRepository", "previews", "updatedAt" FROM "ApplicationSettings";
+DROP TABLE "ApplicationSettings";
+ALTER TABLE "new_ApplicationSettings" RENAME TO "ApplicationSettings";
+CREATE UNIQUE INDEX "ApplicationSettings_applicationId_key" ON "ApplicationSettings"("applicationId");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/migrations/20230307101148_add_host_volumes/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "ApplicationPersistentStorage" ADD COLUMN "hostPath" TEXT;

apps/api/prisma/migrations/20230515060951_basic_auth/migration.sql

@@ -0,0 +1,29 @@
+-- AlterTable
+ALTER TABLE "Application" ADD COLUMN "basicAuthPw" TEXT;
+ALTER TABLE "Application" ADD COLUMN "basicAuthUser" TEXT;
+
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_ApplicationSettings" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT NOT NULL,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "debug" BOOLEAN NOT NULL DEFAULT false,
+    "previews" BOOLEAN NOT NULL DEFAULT false,
+    "autodeploy" BOOLEAN NOT NULL DEFAULT true,
+    "isBot" BOOLEAN NOT NULL DEFAULT false,
+    "isPublicRepository" BOOLEAN NOT NULL DEFAULT false,
+    "isDBBranching" BOOLEAN NOT NULL DEFAULT false,
+    "isCustomSSL" BOOLEAN NOT NULL DEFAULT false,
+    "isHttp2" BOOLEAN NOT NULL DEFAULT false,
+    "basicAuth" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ApplicationSettings_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_ApplicationSettings" ("applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "isBot", "isCustomSSL", "isDBBranching", "isHttp2", "isPublicRepository", "previews", "updatedAt") SELECT "applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "isBot", "isCustomSSL", "isDBBranching", "isHttp2", "isPublicRepository", "previews", "updatedAt" FROM "ApplicationSettings";
+DROP TABLE "ApplicationSettings";
+ALTER TABLE "new_ApplicationSettings" RENAME TO "ApplicationSettings";
+CREATE UNIQUE INDEX "ApplicationSettings_applicationId_key" ON "ApplicationSettings"("applicationId");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/schema.prisma

@@ -135,6 +135,8 @@ model Application {
   dockerRegistryId           String?
   dockerRegistryImageName    String?
   simpleDockerfile           String?
+  basicAuthUser              String?
+  basicAuthPw                String?
 
   persistentStorage  ApplicationPersistentStorage[]
   secrets            Secret[]
@@ -186,6 +188,8 @@ model ApplicationSettings {
   isPublicRepository Boolean     @default(false)
   isDBBranching      Boolean     @default(false)
   isCustomSSL        Boolean     @default(false)
+  isHttp2            Boolean     @default(false)
+  basicAuth          Boolean     @default(false)
   createdAt          DateTime    @default(now())
   updatedAt          DateTime    @updatedAt
   application        Application @relation(fields: [applicationId], references: [id])
@@ -194,6 +198,7 @@ model ApplicationSettings {
 model ApplicationPersistentStorage {
   id            String      @id @default(cuid())
   applicationId String
+  hostPath      String?
   path          String
   oldPath       Boolean     @default(false)
   createdAt     DateTime    @default(now())
@@ -325,6 +330,7 @@ model GitSource {
   apiUrl       String?
   htmlUrl      String?
   customPort   Int           @default(22)
+  customUser   String        @default("git")
   organization String?
   createdAt    DateTime      @default(now())
   updatedAt    DateTime      @updatedAt

apps/api/prisma/seed.js

@@ -12,7 +12,7 @@ async function main() {
 		await prisma.setting.create({
 			data: {
 				id: '0',
-				arch: process.arch,
+				arch: process.arch
 			}
 		});
 	} else {
@@ -81,16 +81,295 @@ async function main() {
 		});
 	}
 	// Set new preview secrets
-	const secrets = await prisma.secret.findMany({ where: { isPRMRSecret: false } })
+	const secrets = await prisma.secret.findMany({ where: { isPRMRSecret: false } });
 	if (secrets.length > 0) {
 		for (const secret of secrets) {
-			const previewSecrets = await prisma.secret.findMany({ where: { applicationId: secret.applicationId, name: secret.name, isPRMRSecret: true } })
+			const previewSecrets = await prisma.secret.findMany({
+				where: { applicationId: secret.applicationId, name: secret.name, isPRMRSecret: true }
+			});
 			if (previewSecrets.length === 0) {
-				await prisma.secret.create({ data: { ...secret, id: undefined, isPRMRSecret: true } })
+				await prisma.secret.create({ data: { ...secret, id: undefined, isPRMRSecret: true } });
 			}
 		}
 	}
 }
+async function reEncryptSecrets() {
+	const { execaCommand } = await import('execa');
+	const image = await execaCommand("docker inspect coolify --format '{{ .Config.Image }}'", {
+		shell: true
+	});
+	const version = image.stdout.split(':')[1] ?? null;
+	const date = new Date().getTime();
+
+	let backupfile = `/app/db/prod.db_${date}`;
+	if (version) {
+		backupfile = `/app/db/prod.db_${version}_${date}`;
+	}
+	await execaCommand('env | grep "^COOLIFY" | sort > .env', {
+		shell: true
+	});
+	const secretOld = process.env['COOLIFY_SECRET_KEY'];
+	let secretNew = process.env['COOLIFY_SECRET_KEY_BETTER'];
+	if (!secretNew) {
+		console.log('No COOLIFY_SECRET_KEY_BETTER found... Generating new one...');
+		const { stdout: newKey } = await execaCommand(
+			'openssl rand -base64 1024 | sha256sum | base64 | head -c 32',
+			{ shell: true }
+		);
+		secretNew = newKey;
+	}
+	if (secretOld !== secretNew) {
+		console.log(`Backup database to ${backupfile}.`);
+		await execaCommand(`cp /app/db/prod.db ${backupfile}`, { shell: true });
+		console.log(
+			'Secrets (COOLIFY_SECRET_KEY & COOLIFY_SECRET_KEY_BETTER) are different, so re-encrypting everything...'
+		);
+		await execaCommand(`sed -i '/COOLIFY_SECRET_KEY=/d' .env`, { shell: true });
+		await execaCommand(`sed -i '/COOLIFY_SECRET_KEY_BETTER=/d' .env`, { shell: true });
+		await execaCommand(`echo "COOLIFY_SECRET_KEY=${secretNew}" >> .env`, { shell: true });
+		await execaCommand('echo "COOLIFY_SECRET_KEY_BETTER=' + secretNew + '" >> .env ', {
+			shell: true
+		});
+		await execaCommand(`echo "COOLIFY_SECRET_KEY_OLD_${date}=${secretOld}" >> .env`, {
+			shell: true
+		});
+		const transactions = [];
+		const secrets = await prisma.secret.findMany();
+		if (secrets.length > 0) {
+			for (const secret of secrets) {
+				try {
+					const value = decrypt(secret.value, secretOld);
+					const newValue = encrypt(value, secretNew);
+					transactions.push(
+						prisma.secret.update({
+							where: { id: secret.id },
+							data: { value: newValue }
+						})
+					);
+				} catch (e) {
+					console.log(e);
+				}
+			}
+		}
+		const serviceSecrets = await prisma.serviceSecret.findMany();
+		if (serviceSecrets.length > 0) {
+			for (const secret of serviceSecrets) {
+				try {
+					const value = decrypt(secret.value, secretOld);
+					const newValue = encrypt(value, secretNew);
+					transactions.push(
+						prisma.serviceSecret.update({
+							where: { id: secret.id },
+							data: { value: newValue }
+						})
+					);
+				} catch (e) {
+					console.log(e);
+				}
+			}
+		}
+		const gitlabApps = await prisma.gitlabApp.findMany();
+		if (gitlabApps.length > 0) {
+			for (const gitlabApp of gitlabApps) {
+				try {
+					const value = decrypt(gitlabApp.privateSshKey, secretOld);
+					const newValue = encrypt(value, secretNew);
+					const appSecret = decrypt(gitlabApp.appSecret, secretOld);
+					const newAppSecret = encrypt(appSecret, secretNew);
+					transactions.push(
+						prisma.gitlabApp.update({
+							where: { id: gitlabApp.id },
+							data: { privateSshKey: newValue, appSecret: newAppSecret }
+						})
+					);
+				} catch (e) {
+					console.log(e);
+				}
+			}
+		}
+		const githubApps = await prisma.githubApp.findMany();
+		if (githubApps.length > 0) {
+			for (const githubApp of githubApps) {
+				try {
+					const clientSecret = decrypt(githubApp.clientSecret, secretOld);
+					const newClientSecret = encrypt(clientSecret, secretNew);
+					const webhookSecret = decrypt(githubApp.webhookSecret, secretOld);
+					const newWebhookSecret = encrypt(webhookSecret, secretNew);
+					const privateKey = decrypt(githubApp.privateKey, secretOld);
+					const newPrivateKey = encrypt(privateKey, secretNew);
+
+					transactions.push(
+						prisma.githubApp.update({
+							where: { id: githubApp.id },
+							data: {
+								clientSecret: newClientSecret,
+								webhookSecret: newWebhookSecret,
+								privateKey: newPrivateKey
+							}
+						})
+					);
+				} catch (e) {
+					console.log(e);
+				}
+			}
+		}
+		const databases = await prisma.database.findMany();
+		if (databases.length > 0) {
+			for (const database of databases) {
+				try {
+					const dbUserPassword = decrypt(database.dbUserPassword, secretOld);
+					const newDbUserPassword = encrypt(dbUserPassword, secretNew);
+					const rootUserPassword = decrypt(database.rootUserPassword, secretOld);
+					const newRootUserPassword = encrypt(rootUserPassword, secretNew);
+					transactions.push(
+						prisma.database.update({
+							where: { id: database.id },
+							data: {
+								dbUserPassword: newDbUserPassword,
+								rootUserPassword: newRootUserPassword
+							}
+						})
+					);
+				} catch (e) {
+					console.log(e);
+				}
+			}
+		}
+		const databaseSecrets = await prisma.databaseSecret.findMany();
+		if (databaseSecrets.length > 0) {
+			for (const databaseSecret of databaseSecrets) {
+				try {
+					const value = decrypt(databaseSecret.value, secretOld);
+					const newValue = encrypt(value, secretNew);
+					transactions.push(
+						prisma.databaseSecret.update({
+							where: { id: databaseSecret.id },
+							data: { value: newValue }
+						})
+					);
+				} catch (e) {
+					console.log(e);
+				}
+			}
+		}
+		const wordpresses = await prisma.wordpress.findMany();
+		if (wordpresses.length > 0) {
+			for (const wordpress of wordpresses) {
+				try {
+					const value = decrypt(wordpress.ftpHostKey, secretOld);
+					const newValue = encrypt(value, secretNew);
+					const ftpHostKeyPrivate = decrypt(wordpress.ftpHostKeyPrivate, secretOld);
+					const newFtpHostKeyPrivate = encrypt(ftpHostKeyPrivate, secretNew);
+					let newFtpPassword = undefined;
+					if (wordpress.ftpPassword != null) {
+						const ftpPassword = decrypt(wordpress.ftpPassword, secretOld);
+						newFtpPassword = encrypt(ftpPassword, secretNew);
+					}
+
+					transactions.push(
+						prisma.wordpress.update({
+							where: { id: wordpress.id },
+							data: {
+								ftpHostKey: newValue,
+								ftpHostKeyPrivate: newFtpHostKeyPrivate,
+								ftpPassword: newFtpPassword
+							}
+						})
+					);
+				} catch (e) {
+					console.log(e);
+				}
+			}
+		}
+		const sshKeys = await prisma.sshKey.findMany();
+		if (sshKeys.length > 0) {
+			for (const key of sshKeys) {
+				try {
+					const value = decrypt(key.privateKey, secretOld);
+					const newValue = encrypt(value, secretNew);
+					transactions.push(
+						prisma.sshKey.update({
+							where: { id: key.id },
+							data: {
+								privateKey: newValue
+							}
+						})
+					);
+				} catch (e) {
+					console.log(e);
+				}
+			}
+		}
+		const dockerRegistries = await prisma.dockerRegistry.findMany();
+		if (dockerRegistries.length > 0) {
+			for (const registry of dockerRegistries) {
+				try {
+					const value = decrypt(registry.password, secretOld);
+					const newValue = encrypt(value, secretNew);
+					transactions.push(
+						prisma.dockerRegistry.update({
+							where: { id: registry.id },
+							data: {
+								password: newValue
+							}
+						})
+					);
+				} catch (e) {
+					console.log(e);
+				}
+			}
+		}
+		const certificates = await prisma.certificate.findMany();
+		if (certificates.length > 0) {
+			for (const certificate of certificates) {
+				try {
+					const value = decrypt(certificate.key, secretOld);
+					const newValue = encrypt(value, secretNew);
+					transactions.push(
+						prisma.certificate.update({
+							where: { id: certificate.id },
+							data: {
+								key: newValue
+							}
+						})
+					);
+				} catch (e) {
+					console.log(e);
+				}
+			}
+		}
+		await prisma.$transaction(transactions);
+	} else {
+		console.log('secrets are the same, so no need to re-encrypt');
+	}
+}
+
+const encrypt = (text, secret) => {
+	if (text && secret) {
+		const iv = crypto.randomBytes(16);
+		const cipher = crypto.createCipheriv(algorithm, secret, iv);
+		const encrypted = Buffer.concat([cipher.update(text.trim()), cipher.final()]);
+		return JSON.stringify({
+			iv: iv.toString('hex'),
+			content: encrypted.toString('hex')
+		});
+	}
+};
+const decrypt = (hashString, secret) => {
+	if (hashString && secret) {
+		const hash = JSON.parse(hashString);
+		const decipher = crypto.createDecipheriv(algorithm, secret, Buffer.from(hash.iv, 'hex'));
+		const decrpyted = Buffer.concat([
+			decipher.update(Buffer.from(hash.content, 'hex')),
+			decipher.final()
+		]);
+		if (/<2F>/.test(decrpyted.toString())) {
+			throw new Error('Invalid secret. Skipping...');
+		}
+		return decrpyted.toString();
+	}
+};
+
 main()
 	.catch((e) => {
 		console.error(e);
@@ -99,15 +378,11 @@ main()
 	.finally(async () => {
 		await prisma.$disconnect();
 	});
-
+reEncryptSecrets()
-const encrypt = (text) => {
+	.catch((e) => {
-	if (text) {
+		console.error(e);
-		const iv = crypto.randomBytes(16);
+		process.exit(1);
-		const cipher = crypto.createCipheriv(algorithm, process.env['COOLIFY_SECRET_KEY'], iv);
+	})
-		const encrypted = Buffer.concat([cipher.update(text), cipher.final()]);
+	.finally(async () => {
-		return JSON.stringify({
+		await prisma.$disconnect();
-			iv: iv.toString('hex'),
+	});
-			content: encrypted.toString('hex')
-		});
-	}
-};

apps/api/src/index.ts

@@ -1,35 +1,47 @@
-import Fastify from 'fastify';
-import cors from '@fastify/cors';
-import serve from '@fastify/static';
-import env from '@fastify/env';
-import cookie from '@fastify/cookie';
-import multipart from '@fastify/multipart';
-import path, { join } from 'path';
 import autoLoad from '@fastify/autoload';
-import socketIO from 'fastify-socket.io'
+import cookie from '@fastify/cookie';
-import socketIOServer from './realtime'
+import cors from '@fastify/cors';
+import env from '@fastify/env';
+import multipart from '@fastify/multipart';
+import serve from '@fastify/static';
+import Fastify from 'fastify';
+import socketIO from 'fastify-socket.io';
+import path, { join } from 'path';
+import socketIOServer from './realtime';
 
-import { cleanupDockerStorage, createRemoteEngineConfiguration, decrypt, executeCommand, generateDatabaseConfiguration, isDev, listSettings, prisma, sentryDSN, startTraefikProxy, startTraefikTCPProxy, version } from './lib/common';
+import Graceful from '@ladjs/graceful';
-import { scheduler } from './lib/scheduler';
 import { compareVersions } from 'compare-versions';
-import Graceful from '@ladjs/graceful'
-import yaml from 'js-yaml'
 import fs from 'fs/promises';
-import { verifyRemoteDockerEngineFn } from './routes/api/v1/destinations/handlers';
+import yaml from 'js-yaml';
-import { checkContainer } from './lib/docker';
 import { migrateApplicationPersistentStorage, migrateServicesToNewTemplate } from './lib';
+import {
+	cleanupDockerStorage,
+	createRemoteEngineConfiguration,
+	decrypt,
+	executeCommand,
+	generateDatabaseConfiguration,
+	isDev,
+	listSettings,
+	prisma,
+	startTraefikProxy,
+	startTraefikTCPProxy,
+	version
+} from './lib/common';
+import { checkContainer } from './lib/docker';
+import { scheduler } from './lib/scheduler';
+import { verifyRemoteDockerEngineFn } from './routes/api/v1/destinations/handlers';
 import { refreshTags, refreshTemplates } from './routes/api/v1/handlers';
-import * as Sentry from '@sentry/node';
 declare module 'fastify' {
 	interface FastifyInstance {
 		config: {
-			COOLIFY_APP_ID: string,
+			COOLIFY_APP_ID: string;
-			COOLIFY_SECRET_KEY: string,
+			COOLIFY_SECRET_KEY: string;
-			COOLIFY_DATABASE_URL: string,
+			COOLIFY_SECRET_KEY_BETTER: string | null;
-			COOLIFY_IS_ON: string,
+			COOLIFY_DATABASE_URL: string;
-			COOLIFY_WHITE_LABELED: string,
+			COOLIFY_IS_ON: string;
-			COOLIFY_WHITE_LABELED_ICON: string | null,
+			COOLIFY_WHITE_LABELED: string;
-			COOLIFY_AUTO_UPDATE: string,
+			COOLIFY_WHITE_LABELED_ICON: string | null;
+			COOLIFY_AUTO_UPDATE: string;
 		};
 	}
 }
@@ -38,7 +50,7 @@ const port = isDev ? 3001 : 3000;
 const host = '0.0.0.0';
 
 (async () => {
-	const settings = await prisma.setting.findFirst()
+	const settings = await prisma.setting.findFirst();
 	const fastify = Fastify({
 		logger: settings?.isAPIDebuggingEnabled || false,
 		trustProxy: true
@@ -49,10 +61,14 @@ const host = '0.0.0.0';
 		required: ['COOLIFY_SECRET_KEY', 'COOLIFY_DATABASE_URL', 'COOLIFY_IS_ON'],
 		properties: {
 			COOLIFY_APP_ID: {
-				type: 'string',
+				type: 'string'
 			},
 			COOLIFY_SECRET_KEY: {
+				type: 'string'
+			},
+			COOLIFY_SECRET_KEY_BETTER: {
 				type: 'string',
+				default: null
 			},
 			COOLIFY_DATABASE_URL: {
 				type: 'string',
@@ -73,8 +89,7 @@ const host = '0.0.0.0';
 			COOLIFY_AUTO_UPDATE: {
 				type: 'string',
 				default: 'false'
-			},
+			}
-
 		}
 	};
 	const options = {
@@ -103,13 +118,13 @@ const host = '0.0.0.0';
 	fastify.register(autoLoad, {
 		dir: join(__dirname, 'routes')
 	});
-	fastify.register(cookie)
+	fastify.register(cookie);
 	fastify.register(cors);
 	fastify.register(socketIO, {
 		cors: {
-			origin: isDev ? "*" : ''
+			origin: isDev ? '*' : ''
 		}
-	})
+	});
 	// To detect allowed origins
 	// fastify.addHook('onRequest', async (request, reply) => {
 	// 	console.log(request.headers.host)
@@ -131,10 +146,9 @@ const host = '0.0.0.0';
 	// 	}
 	// })
 
-
 	try {
-		await fastify.listen({ port, host })
+		await fastify.listen({ port, host });
-		await socketIOServer(fastify)
+		await socketIOServer(fastify);
 		console.log(`Coolify's API is listening on ${host}:${port}`);
 
 		migrateServicesToNewTemplate();
@@ -148,106 +162,125 @@ const host = '0.0.0.0';
 			if (!scheduler.workers.has('deployApplication')) {
 				scheduler.run('deployApplication');
 			}
-		}, 2000)
+		}, 2000);
 
 		// autoUpdater
 		setInterval(async () => {
-			await autoUpdater()
+			await autoUpdater();
-		}, 60000 * 15)
+		}, 60000 * 60);
 
 		// cleanupStorage
 		setInterval(async () => {
-			await cleanupStorage()
+			await cleanupStorage();
-		}, 60000 * 10)
+		}, 60000 * 15);
+
+		// Cleanup stucked containers (not defined in Coolify, but still running and managed by Coolify)
+		setInterval(async () => {
+			await cleanupStuckedContainers();
+		}, 60000);
 
 		// checkProxies, checkFluentBit & refresh templates
 		setInterval(async () => {
 			await checkProxies();
 			await checkFluentBit();
-		}, 60000)
+		}, 60000);
 
 		// Refresh and check templates
 		setInterval(async () => {
-			await refreshTemplates()
+			await refreshTemplates();
-		}, 60000)
+		}, 60000 * 10);
 
 		setInterval(async () => {
-			await refreshTags()
+			await refreshTags();
-		}, 60000)
+		}, 60000 * 10);
 
-		setInterval(async () => {
+		setInterval(
-			await migrateServicesToNewTemplate()
+			async () => {
-		}, isDev ? 10000 : 60000)
+				await migrateServicesToNewTemplate();
+			},
+			isDev ? 10000 : 60000 * 10
+		);
 
 		setInterval(async () => {
 			await copySSLCertificates();
-		}, 10000)
+		}, 10000);
 
 		await Promise.all([
 			getTagsTemplates(),
 			getArch(),
 			getIPAddress(),
 			configureRemoteDockers(),
-		])
+			refreshTemplates(),
-
+			refreshTags()
+			// cleanupStuckedContainers()
+		]);
 	} catch (error) {
 		console.error(error);
 		process.exit(1);
 	}
 })();
 
-
 async function getIPAddress() {
-	const { publicIpv4, publicIpv6 } = await import('public-ip')
+	const { publicIpv4, publicIpv6 } = await import('public-ip');
 	try {
 		const settings = await listSettings();
 		if (!settings.ipv4) {
-			const ipv4 = await publicIpv4({ timeout: 2000 })
+			const ipv4 = await publicIpv4({ timeout: 2000 });
 			console.log(`Getting public IPv4 address...`);
-			await prisma.setting.update({ where: { id: settings.id }, data: { ipv4 } })
+			await prisma.setting.update({ where: { id: settings.id }, data: { ipv4 } });
 		}
 
 		if (!settings.ipv6) {
-			const ipv6 = await publicIpv6({ timeout: 2000 })
+			const ipv6 = await publicIpv6({ timeout: 2000 });
 			console.log(`Getting public IPv6 address...`);
-			await prisma.setting.update({ where: { id: settings.id }, data: { ipv6 } })
+			await prisma.setting.update({ where: { id: settings.id }, data: { ipv6 } });
 		}
-
 	} catch (error) { }
 }
 async function getTagsTemplates() {
-	const { default: got } = await import('got')
+	const { default: got } = await import('got');
 	try {
 		if (isDev) {
-			const templates = await fs.readFile('./devTemplates.yaml', 'utf8')
+			let templates = await fs.readFile('./devTemplates.yaml', 'utf8');
-			const tags = await fs.readFile('./devTags.json', 'utf8')
+			let tags = await fs.readFile('./devTags.json', 'utf8');
-			await fs.writeFile('./templates.json', JSON.stringify(yaml.load(templates)))
+			try {
-			await fs.writeFile('./tags.json', tags)
+				if (await fs.stat('./testTemplate.yaml')) {
-			console.log('[004] Tags and templates loaded in dev mode...')
+					templates = templates + (await fs.readFile('./testTemplate.yaml', 'utf8'));
-		} else {
+				}
-			const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text()
+			} catch (error) { }
-			const response = await got.get('https://get.coollabs.io/coolify/service-templates.yaml').text()
+			try {
-			await fs.writeFile('/app/templates.json', JSON.stringify(yaml.load(response)))
+				if (await fs.stat('./testTags.json')) {
-			await fs.writeFile('/app/tags.json', tags)
+					const testTags = await fs.readFile('./testTags.json', 'utf8');
-			console.log('[004] Tags and templates loaded...')
+					if (testTags.length > 0) {
-		}
+						tags = JSON.stringify(JSON.parse(tags).concat(JSON.parse(testTags)));
+					}
+				}
+			} catch (error) { }
 
+			await fs.writeFile('./templates.json', JSON.stringify(yaml.load(templates)));
+			await fs.writeFile('./tags.json', tags);
+			console.log('[004] Tags and templates loaded in dev mode...');
+		} else {
+			const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text();
+			const response = await got
+				.get('https://get.coollabs.io/coolify/service-templates.yaml')
+				.text();
+			await fs.writeFile('/app/templates.json', JSON.stringify(yaml.load(response)));
+			await fs.writeFile('/app/tags.json', tags);
+			console.log('[004] Tags and templates loaded...');
+		}
 	} catch (error) {
-		console.log("Couldn't get latest templates.")
+		console.log("Couldn't get latest templates.");
-		console.log(error)
+		console.log(error);
 	}
 }
 async function initServer() {
 	const appId = process.env['COOLIFY_APP_ID'];
-	const settings = await prisma.setting.findUnique({ where: { id: '0' } })
+	const settings = await prisma.setting.findUnique({ where: { id: '0' } });
 	try {
 		if (settings.doNotTrack === true) {
-			console.log('[000] Telemetry disabled...')
+			console.log('[000] Telemetry disabled...');
-
 		} else {
-			if (settings.sentryDSN !== sentryDSN) {
-				await prisma.setting.update({ where: { id: '0' }, data: { sentryDSN } })
-			}
 			// Initialize Sentry
 			// Sentry.init({
 			// 	dsn: sentryDSN,
@@ -257,7 +290,7 @@ async function initServer() {
 			// console.log('[000] Sentry initialized...')
 		}
 	} catch (error) {
-		console.error(error)
+		console.error(error);
 	}
 	try {
 		console.log(`[001] Initializing server...`);
@@ -267,27 +300,73 @@ async function initServer() {
 		console.log(`[002] Cleanup stucked builds...`);
 		const isOlder = compareVersions('3.8.1', version);
 		if (isOlder === 1) {
-			await prisma.build.updateMany({ where: { status: { in: ['running', 'queued'] } }, data: { status: 'failed' } });
+			await prisma.build.updateMany({
+				where: { status: { in: ['running', 'queued'] } },
+				data: { status: 'failed' }
+			});
 		}
 	} catch (error) { }
 	try {
 		console.log('[003] Cleaning up old build sources under /tmp/build-sources/...');
-		await fs.rm('/tmp/build-sources', { recursive: true, force: true })
+		if (!isDev) await fs.rm('/tmp/build-sources', { recursive: true, force: true });
 	} catch (error) {
-		console.log(error)
+		console.log(error);
 	}
 }
 
 async function getArch() {
 	try {
-		const settings = await prisma.setting.findFirst({})
+		const settings = await prisma.setting.findFirst({});
 		if (settings && !settings.arch) {
 			console.log(`Getting architecture...`);
-			await prisma.setting.update({ where: { id: settings.id }, data: { arch: process.arch } })
+			await prisma.setting.update({ where: { id: settings.id }, data: { arch: process.arch } });
 		}
 	} catch (error) { }
 }
 
+async function cleanupStuckedContainers() {
+	try {
+		const destinationDockers = await prisma.destinationDocker.findMany();
+		let enginesDone = new Set();
+		for (const destination of destinationDockers) {
+			if (enginesDone.has(destination.engine) || enginesDone.has(destination.remoteIpAddress))
+				return;
+			if (destination.engine) {
+				enginesDone.add(destination.engine);
+			}
+			if (destination.remoteIpAddress) {
+				if (!destination.remoteVerified) continue;
+				enginesDone.add(destination.remoteIpAddress);
+			}
+			const { stdout: containers } = await executeCommand({
+				dockerId: destination.id,
+				command: `docker container ps -a --filter "label=coolify.managed=true" --format '{{ .Names}}'`
+			});
+			if (containers) {
+				const containersArray = containers.trim().split('\n');
+				if (containersArray.length > 0) {
+					for (const container of containersArray) {
+						const containerId = container.split('-')[0];
+						const application = await prisma.application.findFirst({
+							where: { id: { startsWith: containerId } }
+						});
+						const service = await prisma.service.findFirst({
+							where: { id: { startsWith: containerId } }
+						});
+						const database = await prisma.database.findFirst({
+							where: { id: { startsWith: containerId } }
+						});
+						if (!application && !service && !database) {
+							await executeCommand({ command: `docker container rm -f ${container}` });
+						}
+					}
+				}
+			}
+		}
+	} catch (error) {
+		console.log(error);
+	}
+}
 async function configureRemoteDockers() {
 	try {
 		const remoteDocker = await prisma.destinationDocker.findMany({
@@ -296,37 +375,51 @@ async function configureRemoteDockers() {
 		if (remoteDocker.length > 0) {
 			console.log(`Verifying Remote Docker Engines...`);
 			for (const docker of remoteDocker) {
-				console.log('Verifying:', docker.remoteIpAddress)
+				console.log('Verifying:', docker.remoteIpAddress);
 				await verifyRemoteDockerEngineFn(docker.id);
 			}
 		}
 	} catch (error) {
-		console.log(error)
+		console.log(error);
 	}
 }
 
 async function autoUpdater() {
 	try {
-		const { default: got } = await import('got')
+		const { default: got } = await import('got');
 		const currentVersion = version;
-		const { coolify } = await got.get('https://get.coollabs.io/versions.json', {
+		const { coolify } = await got
-			searchParams: {
+			.get('https://get.coollabs.io/versions.json', {
-				appId: process.env['COOLIFY_APP_ID'] || undefined,
+				searchParams: {
-				version: currentVersion
+					appId: process.env['COOLIFY_APP_ID'] || undefined,
-			}
+					version: currentVersion
-		}).json()
+				}
+			})
+			.json();
 		const latestVersion = coolify.main.version;
 		const isUpdateAvailable = compareVersions(latestVersion, currentVersion);
 		if (isUpdateAvailable === 1) {
-			const activeCount = 0
+			const activeCount = 0;
 			if (activeCount === 0) {
 				if (!isDev) {
 					const { isAutoUpdateEnabled } = await prisma.setting.findFirst();
 					if (isAutoUpdateEnabled) {
-						await executeCommand({ command: `docker pull coollabsio/coolify:${latestVersion}` })
+						let image = `ghcr.io/coollabsio/coolify:${latestVersion}`;
-						await executeCommand({ shell: true, command: `env | grep '^COOLIFY' > .env` })
+						try {
-						await executeCommand({ command: `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=${isAutoUpdateEnabled}' .env` })
+							await executeCommand({ command: `docker pull ${image}` });
-						await executeCommand({ shell: true, command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-fluentbit && docker rm coolify coolify-fluentbit && docker compose pull && docker compose up -d --force-recreate"` })
+						} catch (error) {
+							image = `coollabsio/coolify:${latestVersion}`;
+							await executeCommand({ command: `docker pull ${image}` });
+						}
+
+						await executeCommand({ shell: true, command: `ls .env || env | grep "^COOLIFY" | sort > .env` });
+						await executeCommand({
+							command: `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=${isAutoUpdateEnabled}' .env`
+						});
+						await executeCommand({
+							shell: true,
+							command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db ${image} /bin/sh -c "env | grep "^COOLIFY" | sort > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-fluentbit && docker rm coolify coolify-fluentbit && docker compose pull && docker compose up -d --force-recreate"`
+						});
 					}
 				} else {
 					console.log('Updating (not really in dev mode).');
@@ -334,7 +427,7 @@ async function autoUpdater() {
 			}
 		}
 	} catch (error) {
-		console.log(error)
+		console.log(error);
 	}
 }
 
@@ -345,14 +438,18 @@ async function checkFluentBit() {
 			const { id } = await prisma.destinationDocker.findFirst({
 				where: { engine, network: 'coolify' }
 			});
-			const { found } = await checkContainer({ dockerId: id, container: 'coolify-fluentbit', remove: true });
+			const { found } = await checkContainer({
+				dockerId: id,
+				container: 'coolify-fluentbit',
+				remove: true
+			});
 			if (!found) {
 				await executeCommand({ shell: true, command: `env | grep '^COOLIFY' > .env` });
 				await executeCommand({ command: `docker compose up -d fluent-bit` });
 			}
 		}
 	} catch (error) {
-		console.log(error)
+		console.log(error);
 	}
 }
 async function checkProxies() {
@@ -368,7 +465,7 @@ async function checkProxies() {
 			where: { engine, network: 'coolify', isCoolifyProxyUsed: true }
 		});
 		if (localDocker) {
-			portReachable = await isReachable(80, { host: ipv4 || ipv6 })
+			portReachable = await isReachable(80, { host: ipv4 || ipv6 });
 			if (!portReachable) {
 				await startTraefikProxy(localDocker.id);
 			}
@@ -380,13 +477,13 @@ async function checkProxies() {
 		if (remoteDocker.length > 0) {
 			for (const docker of remoteDocker) {
 				if (docker.isCoolifyProxyUsed) {
-					portReachable = await isReachable(80, { host: docker.remoteIpAddress })
+					portReachable = await isReachable(80, { host: docker.remoteIpAddress });
 					if (!portReachable) {
 						await startTraefikProxy(docker.id);
 					}
 				}
 				try {
-					await createRemoteEngineConfiguration(docker.id)
+					await createRemoteEngineConfiguration(docker.id);
 				} catch (error) { }
 			}
 		}
@@ -426,112 +523,148 @@ async function checkProxies() {
 		// 		await startTraefikTCPProxy(destinationDocker, id, publicPort, 9000);
 		// 	}
 		// }
-	} catch (error) {
+	} catch (error) { }
-
-	}
 }
 
 async function copySSLCertificates() {
 	try {
 		const pAll = await import('p-all');
-		const actions = []
+		const actions = [];
-		const certificates = await prisma.certificate.findMany({ include: { team: true } })
+		const certificates = await prisma.certificate.findMany({ include: { team: true } });
-		const teamIds = certificates.map(c => c.teamId)
+		const teamIds = certificates.map((c) => c.teamId);
-		const destinations = await prisma.destinationDocker.findMany({ where: { isCoolifyProxyUsed: true, teams: { some: { id: { in: [...teamIds] } } } } })
+		const destinations = await prisma.destinationDocker.findMany({
+			where: { isCoolifyProxyUsed: true, teams: { some: { id: { in: [...teamIds] } } } }
+		});
 		for (const certificate of certificates) {
-			const { id, key, cert } = certificate
+			const { id, key, cert } = certificate;
-			const decryptedKey = decrypt(key)
+			const decryptedKey = decrypt(key);
-			await fs.writeFile(`/tmp/${id}-key.pem`, decryptedKey)
+			await fs.writeFile(`/tmp/${id}-key.pem`, decryptedKey);
-			await fs.writeFile(`/tmp/${id}-cert.pem`, cert)
+			await fs.writeFile(`/tmp/${id}-cert.pem`, cert);
 			for (const destination of destinations) {
 				if (destination.remoteEngine) {
 					if (destination.remoteVerified) {
-						const { id: dockerId, remoteIpAddress } = destination
+						const { id: dockerId, remoteIpAddress } = destination;
-						actions.push(async () => copyRemoteCertificates(id, dockerId, remoteIpAddress))
+						actions.push(async () => copyRemoteCertificates(id, dockerId, remoteIpAddress));
 					}
 				} else {
-					actions.push(async () => copyLocalCertificates(id))
+					actions.push(async () => copyLocalCertificates(id));
 				}
 			}
 		}
-		await pAll.default(actions, { concurrency: 1 })
+		await pAll.default(actions, { concurrency: 1 });
 	} catch (error) {
-		console.log(error)
+		console.log(error);
 	} finally {
-		await executeCommand({ command: `find /tmp/ -maxdepth 1 -type f -name '*-*.pem' -delete` })
+		try {
+			await executeCommand({ command: `find /tmp/ -maxdepth 1 -type f -name '*-*.pem' -delete` });
+		} catch (e) {
+			console.log(e);
+		}
 	}
 }
 
 async function copyRemoteCertificates(id: string, dockerId: string, remoteIpAddress: string) {
 	try {
-		await executeCommand({ command: `scp /tmp/${id}-cert.pem /tmp/${id}-key.pem ${remoteIpAddress}:/tmp/` })
+		await executeCommand({
-		await executeCommand({ sshCommand: true, shell: true, dockerId, command: `docker exec coolify-proxy sh -c 'test -d /etc/traefik/acme/custom/ || mkdir -p /etc/traefik/acme/custom/'` })
+			command: `scp /tmp/${id}-cert.pem /tmp/${id}-key.pem ${remoteIpAddress}:/tmp/`
-		await executeCommand({ sshCommand: true, dockerId, command: `docker cp /tmp/${id}-key.pem coolify-proxy:/etc/traefik/acme/custom/` })
+		});
-		await executeCommand({ sshCommand: true, dockerId, command: `docker cp /tmp/${id}-cert.pem coolify-proxy:/etc/traefik/acme/custom/` })
+		await executeCommand({
+			sshCommand: true,
+			shell: true,
+			dockerId,
+			command: `docker exec coolify-proxy sh -c 'test -d /etc/traefik/acme/custom/ || mkdir -p /etc/traefik/acme/custom/'`
+		});
+		await executeCommand({
+			sshCommand: true,
+			dockerId,
+			command: `docker cp /tmp/${id}-key.pem coolify-proxy:/etc/traefik/acme/custom/`
+		});
+		await executeCommand({
+			sshCommand: true,
+			dockerId,
+			command: `docker cp /tmp/${id}-cert.pem coolify-proxy:/etc/traefik/acme/custom/`
+		});
 	} catch (error) {
-		console.log({ error })
+		console.log({ error });
 	}
 }
 async function copyLocalCertificates(id: string) {
 	try {
-		await executeCommand({ command: `docker exec coolify-proxy sh -c 'test -d /etc/traefik/acme/custom/ || mkdir -p /etc/traefik/acme/custom/'`, shell: true })
+		await executeCommand({
-		await executeCommand({ command: `docker cp /tmp/${id}-key.pem coolify-proxy:/etc/traefik/acme/custom/` })
+			command: `docker exec coolify-proxy sh -c 'test -d /etc/traefik/acme/custom/ || mkdir -p /etc/traefik/acme/custom/'`,
-		await executeCommand({ command: `docker cp /tmp/${id}-cert.pem coolify-proxy:/etc/traefik/acme/custom/` })
+			shell: true
+		});
+		await executeCommand({
+			command: `docker cp /tmp/${id}-key.pem coolify-proxy:/etc/traefik/acme/custom/`
+		});
+		await executeCommand({
+			command: `docker cp /tmp/${id}-cert.pem coolify-proxy:/etc/traefik/acme/custom/`
+		});
 	} catch (error) {
-		console.log({ error })
+		console.log({ error });
 	}
 }
 
 async function cleanupStorage() {
 	const destinationDockers = await prisma.destinationDocker.findMany();
-	let enginesDone = new Set()
+	let enginesDone = new Set();
 	for (const destination of destinationDockers) {
-		if (enginesDone.has(destination.engine) || enginesDone.has(destination.remoteIpAddress)) return
+		if (enginesDone.has(destination.engine) || enginesDone.has(destination.remoteIpAddress)) return;
-		if (destination.engine) enginesDone.add(destination.engine)
+		if (destination.engine) {
-		if (destination.remoteIpAddress) enginesDone.add(destination.remoteIpAddress)
+			enginesDone.add(destination.engine);
+		}
+		if (destination.remoteIpAddress) {
+			if (!destination.remoteVerified) continue;
+			enginesDone.add(destination.remoteIpAddress);
+		}
+		await cleanupDockerStorage(destination.id);
+		// let lowDiskSpace = false;
+		// try {
+		// 	let stdout = null;
+		// 	if (!isDev) {
+		// 		const output = await executeCommand({
+		// 			dockerId: destination.id,
+		// 			command: `CONTAINER=$(docker ps -lq | head -1) && docker exec $CONTAINER sh -c 'df -kPT /'`,
+		// 			shell: true
+		// 		});
+		// 		stdout = output.stdout;
+		// 	} else {
+		// 		const output = await executeCommand({
+		// 			command: `df -kPT /`
+		// 		});
+		// 		stdout = output.stdout;
+		// 	}
+		// 	let lines = stdout.trim().split('\n');
+		// 	let header = lines[0];
+		// 	let regex =
+		// 		/^Filesystem\s+|Type\s+|1024-blocks|\s+Used|\s+Available|\s+Capacity|\s+Mounted on\s*$/g;
+		// 	const boundaries = [];
+		// 	let match;
 
-		let lowDiskSpace = false;
+		// 	while ((match = regex.exec(header))) {
-		try {
+		// 		boundaries.push(match[0].length);
-			let stdout = null
+		// 	}
-			if (!isDev) {
-				const output = await executeCommand({ dockerId: destination.id, command: `CONTAINER=$(docker ps -lq | head -1) && docker exec $CONTAINER sh -c 'df -kPT /'`, shell: true })
-				stdout = output.stdout;
-			} else {
-				const output = await executeCommand({
-					command:
-						`df -kPT /`
-				});
-				stdout = output.stdout;
-			}
-			let lines = stdout.trim().split('\n');
-			let header = lines[0];
-			let regex =
-				/^Filesystem\s+|Type\s+|1024-blocks|\s+Used|\s+Available|\s+Capacity|\s+Mounted on\s*$/g;
-			const boundaries = [];
-			let match;
 
-			while ((match = regex.exec(header))) {
+		// 	boundaries[boundaries.length - 1] = -1;
-				boundaries.push(match[0].length);
+		// 	const data = lines.slice(1).map((line) => {
-			}
+		// 		const cl = boundaries.map((boundary) => {
-
+		// 			const column = boundary > 0 ? line.slice(0, boundary) : line;
-			boundaries[boundaries.length - 1] = -1;
+		// 			line = line.slice(boundary);
-			const data = lines.slice(1).map((line) => {
+		// 			return column.trim();
-				const cl = boundaries.map((boundary) => {
+		// 		});
-					const column = boundary > 0 ? line.slice(0, boundary) : line;
+		// 		return {
-					line = line.slice(boundary);
+		// 			capacity: Number.parseInt(cl[5], 10) / 100
-					return column.trim();
+		// 		};
-				});
+		// 	});
-				return {
+		// 	if (data.length > 0) {
-					capacity: Number.parseInt(cl[5], 10) / 100
+		// 		const { capacity } = data[0];
-				};
+		// 		if (capacity > 0.8) {
-			});
+		// 			lowDiskSpace = true;
-			if (data.length > 0) {
+		// 		}
-				const { capacity } = data[0];
+		// 	}
-				if (capacity > 0.8) {
+		// } catch (error) {}
-					lowDiskSpace = true;
+		// if (lowDiskSpace) {
-				}
+		// await cleanupDockerStorage(destination.id);
-			}
+		// }
-		} catch (error) { }
-		await cleanupDockerStorage(destination.id, lowDiskSpace, false)
 	}
 }

apps/api/src/jobs/deployApplication.ts

@@ -3,8 +3,26 @@ import crypto from 'crypto';
 import fs from 'fs/promises';
 import yaml from 'js-yaml';
 
-import { copyBaseConfigurationFiles, makeLabelForSimpleDockerfile, makeLabelForStandaloneApplication, saveBuildLog, saveDockerRegistryCredentials, setDefaultConfiguration } from '../lib/buildPacks/common';
+import {
-import { createDirectories, decrypt, defaultComposeConfiguration, getDomain, prisma, decryptApplication, isDev, pushToRegistry, executeCommand } from '../lib/common';
+	copyBaseConfigurationFiles,
+	makeLabelForSimpleDockerfile,
+	makeLabelForStandaloneApplication,
+	saveBuildLog,
+	saveDockerRegistryCredentials,
+	setDefaultConfiguration
+} from '../lib/buildPacks/common';
+import {
+	createDirectories,
+	decrypt,
+	defaultComposeConfiguration,
+	getDomain,
+	prisma,
+	decryptApplication,
+	isDev,
+	pushToRegistry,
+	executeCommand,
+	generateSecrets
+} from '../lib/common';
 import * as importers from '../lib/importers';
 import * as buildpacks from '../lib/buildPacks';
 
@@ -14,33 +32,63 @@ import * as buildpacks from '../lib/buildPacks';
 			if (message === 'error') throw new Error('oops');
 			if (message === 'cancel') {
 				parentPort.postMessage('cancelled');
-				await prisma.$disconnect()
+				await prisma.$disconnect();
 				process.exit(0);
 			}
 		});
-		const pThrottle = await import('p-throttle')
+		const pThrottle = await import('p-throttle');
 		const throttle = pThrottle.default({
 			limit: 1,
 			interval: 2000
 		});
 
-
 		const th = throttle(async () => {
 			try {
-				const queuedBuilds = await prisma.build.findMany({ where: { status: { in: ['queued', 'running'] } }, orderBy: { createdAt: 'asc' } });
+				const queuedBuilds = await prisma.build.findMany({
-				const { concurrentBuilds } = await prisma.setting.findFirst({})
+					where: { status: { in: ['queued', 'running'] } },
+					orderBy: { createdAt: 'asc' }
+				});
+				const { concurrentBuilds } = await prisma.setting.findFirst({});
 				if (queuedBuilds.length > 0) {
 					parentPort.postMessage({ deploying: true });
 					const concurrency = concurrentBuilds;
 					const pAll = await import('p-all');
-					const actions = []
+					const actions = [];
 
 					for (const queueBuild of queuedBuilds) {
 						actions.push(async () => {
-							let application = await prisma.application.findUnique({ where: { id: queueBuild.applicationId }, include: { dockerRegistry: true, destinationDocker: true, gitSource: { include: { githubApp: true, gitlabApp: true } }, persistentStorage: true, secrets: true, settings: true, teams: true } })
+							let application = await prisma.application.findUnique({
-
+								where: { id: queueBuild.applicationId },
-							let { id: buildId, type, gitSourceId, sourceBranch = null, pullmergeRequestId = null, previewApplicationId = null, forceRebuild, sourceRepository = null } = queueBuild
+								include: {
-							application = decryptApplication(application)
+									dockerRegistry: true,
+									destinationDocker: true,
+									gitSource: { include: { githubApp: true, gitlabApp: true } },
+									persistentStorage: true,
+									secrets: true,
+									settings: true,
+									teams: true
+								}
+							});
+							if (!application) {
+								await prisma.build.update({
+									where: { id: queueBuild.id },
+									data: {
+										status: 'failed'
+									}
+								});
+								throw new Error('Application not found');
+							}
+							let {
+								id: buildId,
+								type,
+								gitSourceId,
+								sourceBranch = null,
+								pullmergeRequestId = null,
+								previewApplicationId = null,
+								forceRebuild,
+								sourceRepository = null
+							} = queueBuild;
+							application = decryptApplication(application);
 
 							if (!gitSourceId && application.simpleDockerfile) {
 								const {
@@ -53,102 +101,110 @@ import * as buildpacks from '../lib/buildPacks';
 									exposePort,
 									simpleDockerfile,
 									dockerRegistry
-								} = application
+								} = application;
 								const { workdir } = await createDirectories({ repository: applicationId, buildId });
 								try {
 									if (queueBuild.status === 'running') {
-										await saveBuildLog({ line: 'Building halted, restarting...', buildId, applicationId: application.id });
+										await saveBuildLog({
+											line: 'Building halted, restarting...',
+											buildId,
+											applicationId: application.id
+										});
 									}
 									const volumes =
 										persistentStorage?.map((storage) => {
 											if (storage.oldPath) {
-												return `${applicationId}${storage.path.replace(/\//gi, '-').replace('-app', '')}:${storage.path}`;
+												return `${applicationId}${storage.path
+													.replace(/\//gi, '-')
+													.replace('-app', '')}:${storage.path}`;
+											}
+											if (storage.hostPath) {
+												return `${storage.hostPath}:${storage.path}`;
 											}
 											return `${applicationId}${storage.path.replace(/\//gi, '-')}:${storage.path}`;
 										}) || [];
 
 									if (destinationDockerId) {
-										await prisma.build.update({ where: { id: buildId }, data: { status: 'running' } });
+										await prisma.build.update({
+											where: { id: buildId },
+											data: { status: 'running' }
+										});
 										try {
 											const { stdout: containers } = await executeCommand({
 												dockerId: destinationDockerId,
 												command: `docker ps -a --filter 'label=com.docker.compose.service=${applicationId}' --format {{.ID}}`
-											})
+											});
 											if (containers) {
 												const containerArray = containers.split('\n');
 												if (containerArray.length > 0) {
 													for (const container of containerArray) {
-														await executeCommand({ dockerId: destinationDockerId, command: `docker stop -t 0 ${container}` })
+														await executeCommand({
-														await executeCommand({ dockerId: destinationDockerId, command: `docker rm --force ${container}` })
+															dockerId: destinationDockerId,
+															command: `docker stop -t 0 ${container}`
+														});
+														await executeCommand({
+															dockerId: destinationDockerId,
+															command: `docker rm --force ${container}`
+														});
 													}
 												}
 											}
 										} catch (error) {
 											//
 										}
-										const envs = [
+										let envs = [];
-											`PORT=${port}`
-										];
 										if (secrets.length > 0) {
-											secrets.forEach((secret) => {
+											envs = [
-												if (pullmergeRequestId) {
+												...envs,
-													const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
+												...generateSecrets(secrets, pullmergeRequestId, false, port)
-													if (isSecretFound.length > 0) {
+											];
-														envs.push(`${secret.name}=${isSecretFound[0].value}`);
-													} else {
-														envs.push(`${secret.name}=${secret.value}`);
-													}
-												} else {
-													if (!secret.isPRMRSecret) {
-														envs.push(`${secret.name}=${secret.value}`);
-													}
-												}
-											});
 										}
-										await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
-
-										let envFound = false;
-										try {
-											envFound = !!(await fs.stat(`${workdir}/.env`));
-										} catch (error) {
-											//
-										}
-
 										await fs.writeFile(`${workdir}/Dockerfile`, simpleDockerfile);
 										if (dockerRegistry) {
-											const { url, username, password } = dockerRegistry
+											const { url, username, password } = dockerRegistry;
-											await saveDockerRegistryCredentials({ url, username, password, workdir })
+											await saveDockerRegistryCredentials({ url, username, password, workdir });
 										}
 
 										const labels = makeLabelForSimpleDockerfile({
 											applicationId,
 											type,
-											port: exposePort ? `${exposePort}:${port}` : port,
+											port: exposePort ? `${exposePort}:${port}` : port
 										});
 										try {
-											const composeVolumes = volumes.map((volume) => {
+											const composeVolumes = volumes
-												return {
+												.filter((v) => {
-													[`${volume.split(':')[0]}`]: {
+													if (
-														name: volume.split(':')[0]
+														!v.startsWith('.') &&
+														!v.startsWith('..') &&
+														!v.startsWith('/') &&
+														!v.startsWith('~')
+													) {
+														return v;
 													}
-												};
+												})
-											});
+												.map((volume) => {
+													return {
+														[`${volume.split(':')[0]}`]: {
+															name: volume.split(':')[0]
+														}
+													};
+												});
 											const composeFile = {
 												version: '3.8',
 												services: {
 													[applicationId]: {
 														build: {
-															context: workdir,
+															context: workdir
 														},
 														image: `${applicationId}:${buildId}`,
 														container_name: applicationId,
 														volumes,
 														labels,
-														env_file: envFound ? [`${workdir}/.env`] : [],
+														environment: envs,
 														depends_on: [],
 														expose: [port],
 														...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
-														...defaultComposeConfiguration(destinationDocker.network),
+														...defaultComposeConfiguration(destinationDocker.network)
 													}
 												},
 												networks: {
@@ -159,11 +215,15 @@ import * as buildpacks from '../lib/buildPacks';
 												volumes: Object.assign({}, ...composeVolumes)
 											};
 											await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(composeFile));
-											await executeCommand({ debug: true, dockerId: destinationDocker.id, command: `docker compose --project-directory ${workdir} up -d` })
+											await executeCommand({
+												debug: true,
+												dockerId: destinationDocker.id,
+												command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
+											});
 											await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
 										} catch (error) {
 											await saveBuildLog({ line: error, buildId, applicationId });
-											const foundBuild = await prisma.build.findUnique({ where: { id: buildId } })
+											const foundBuild = await prisma.build.findUnique({ where: { id: buildId } });
 											if (foundBuild) {
 												await prisma.build.update({
 													where: { id: buildId },
@@ -174,10 +234,9 @@ import * as buildpacks from '../lib/buildPacks';
 											}
 											throw new Error(error);
 										}
-
 									}
 								} catch (error) {
-									const foundBuild = await prisma.build.findUnique({ where: { id: buildId } })
+									const foundBuild = await prisma.build.findUnique({ where: { id: buildId } });
 									if (foundBuild) {
 										await prisma.build.update({
 											where: { id: buildId },
@@ -190,18 +249,26 @@ import * as buildpacks from '../lib/buildPacks';
 										await saveBuildLog({ line: error, buildId, applicationId: application.id });
 									}
 									if (error instanceof Error) {
-										await saveBuildLog({ line: error.message, buildId, applicationId: application.id });
+										await saveBuildLog({
+											line: error.message,
+											buildId,
+											applicationId: application.id
+										});
 									}
-									await fs.rm(workdir, { recursive: true, force: true });
+									if (!isDev) await fs.rm(workdir, { recursive: true, force: true });
 									return;
 								}
 								try {
 									if (application.dockerRegistryImageName) {
 										const customTag = application.dockerRegistryImageName.split(':')[1] || buildId;
 										const imageName = application.dockerRegistryImageName.split(':')[0];
-										await saveBuildLog({ line: `Pushing ${imageName}:${customTag} to Docker Registry... It could take a while...`, buildId, applicationId: application.id });
+										await saveBuildLog({
-										await pushToRegistry(application, workdir, buildId, imageName, customTag)
+											line: `Pushing ${imageName}:${customTag} to Docker Registry... It could take a while...`,
-										await saveBuildLog({ line: "Success", buildId, applicationId: application.id });
+											buildId,
+											applicationId: application.id
+										});
+										await pushToRegistry(application, workdir, buildId, imageName, customTag);
+										await saveBuildLog({ line: 'Success', buildId, applicationId: application.id });
 									}
 								} catch (error) {
 									if (error.stdout) {
@@ -211,13 +278,16 @@ import * as buildpacks from '../lib/buildPacks';
 										await saveBuildLog({ line: error.stderr, buildId, applicationId });
 									}
 								} finally {
-									await fs.rm(workdir, { recursive: true, force: true });
+									if (!isDev) await fs.rm(workdir, { recursive: true, force: true });
-									await prisma.build.update({ where: { id: buildId }, data: { status: 'success' } });
+									await prisma.build.update({
+										where: { id: buildId },
+										data: { status: 'success' }
+									});
 								}
 								return;
 							}
 
-							const originalApplicationId = application.id
+							const originalApplicationId = application.id;
 							const {
 								id: applicationId,
 								name,
@@ -241,7 +311,7 @@ import * as buildpacks from '../lib/buildPacks';
 								deploymentType,
 								gitCommitHash,
 								dockerRegistry
-							} = application
+							} = application;
 
 							let {
 								branch,
@@ -257,7 +327,7 @@ import * as buildpacks from '../lib/buildPacks';
 								dockerComposeFileLocation,
 								dockerComposeConfiguration,
 								denoMainFile
-							} = application
+							} = application;
 
 							let imageId = applicationId;
 							let domain = getDomain(fqdn);
@@ -272,9 +342,11 @@ import * as buildpacks from '../lib/buildPacks';
 							let imageFoundRemotely = false;
 
 							if (pullmergeRequestId) {
-								const previewApplications = await prisma.previewApplication.findMany({ where: { applicationId: originalApplicationId, pullmergeRequestId } })
+								const previewApplications = await prisma.previewApplication.findMany({
+									where: { applicationId: originalApplicationId, pullmergeRequestId }
+								});
 								if (previewApplications.length > 0) {
-									previewApplicationId = previewApplications[0].id
+									previewApplicationId = previewApplications[0].id;
 								}
 								// Previews, we need to get the source branch and set subdomain
 								branch = sourceBranch;
@@ -285,7 +357,11 @@ import * as buildpacks from '../lib/buildPacks';
 							const { workdir, repodir } = await createDirectories({ repository, buildId });
 							try {
 								if (queueBuild.status === 'running') {
-									await saveBuildLog({ line: 'Building halted, restarting...', buildId, applicationId: application.id });
+									await saveBuildLog({
+										line: 'Building halted, restarting...',
+										buildId,
+										applicationId: application.id
+									});
 								}
 
 								const currentHash = crypto
@@ -323,15 +399,19 @@ import * as buildpacks from '../lib/buildPacks';
 								const volumes =
 									persistentStorage?.map((storage) => {
 										if (storage.oldPath) {
-											return `${applicationId}${storage.path.replace(/\//gi, '-').replace('-app', '')}:${storage.path}`;
+											return `${applicationId}${storage.path
+												.replace(/\//gi, '-')
+												.replace('-app', '')}:${storage.path}`;
+										}
+										if (storage.hostPath) {
+											return `${storage.hostPath}:${storage.path}`;
 										}
 										return `${applicationId}${storage.path.replace(/\//gi, '-')}:${storage.path}`;
 									}) || [];
 
-
 								try {
-									dockerComposeConfiguration = JSON.parse(dockerComposeConfiguration)
+									dockerComposeConfiguration = JSON.parse(dockerComposeConfiguration);
-								} catch (error) { }
+								} catch (error) {}
 								let deployNeeded = true;
 								let destinationType;
 
@@ -339,7 +419,10 @@ import * as buildpacks from '../lib/buildPacks';
 									destinationType = 'docker';
 								}
 								if (destinationType === 'docker') {
-									await prisma.build.update({ where: { id: buildId }, data: { status: 'running' } });
+									await prisma.build.update({
+										where: { id: buildId },
+										data: { status: 'running' }
+									});
 
 									const configuration = await setDefaultConfiguration(application);
 
@@ -348,7 +431,7 @@ import * as buildpacks from '../lib/buildPacks';
 									installCommand = configuration.installCommand;
 									startCommand = configuration.startCommand;
 									buildCommand = configuration.buildCommand;
-									publishDirectory = configuration.publishDirectory;
+									publishDirectory = configuration.publishDirectory || '';
 									baseDirectory = configuration.baseDirectory || '';
 									dockerFileLocation = configuration.dockerFileLocation;
 									dockerComposeFileLocation = configuration.dockerComposeFileLocation;
@@ -361,6 +444,7 @@ import * as buildpacks from '../lib/buildPacks';
 										githubAppId: gitSource.githubApp?.id,
 										gitlabAppId: gitSource.gitlabApp?.id,
 										customPort: gitSource.customPort,
+										customUser: gitSource.customUser,
 										gitCommitHash,
 										configuration,
 										repository,
@@ -381,10 +465,10 @@ import * as buildpacks from '../lib/buildPacks';
 										tag = `${commit.slice(0, 7)}-${pullmergeRequestId}`;
 									}
 									if (application.dockerRegistryImageName) {
-										imageName = application.dockerRegistryImageName.split(':')[0]
+										imageName = application.dockerRegistryImageName.split(':')[0];
-										customTag = application.dockerRegistryImageName.split(':')[1] || tag
+										customTag = application.dockerRegistryImageName.split(':')[1] || tag;
 									} else {
-										customTag = tag
+										customTag = tag;
 										imageName = applicationId;
 									}
 
@@ -394,13 +478,17 @@ import * as buildpacks from '../lib/buildPacks';
 
 									try {
 										await prisma.build.update({ where: { id: buildId }, data: { commit } });
-									} catch (err) { }
+									} catch (err) {}
 
 									if (!pullmergeRequestId) {
 										if (configHash !== currentHash) {
 											deployNeeded = true;
 											if (configHash) {
-												await saveBuildLog({ line: 'Configuration changed', buildId, applicationId });
+												await saveBuildLog({
+													line: 'Configuration changed',
+													buildId,
+													applicationId
+												});
 											}
 										} else {
 											deployNeeded = false;
@@ -413,30 +501,43 @@ import * as buildpacks from '../lib/buildPacks';
 										await executeCommand({
 											dockerId: destinationDocker.id,
 											command: `docker image inspect ${applicationId}:${tag}`
-										})
+										});
 										imageFoundLocally = true;
 									} catch (error) {
 										//
 									}
 									if (dockerRegistry) {
-										const { url, username, password } = dockerRegistry
+										const { url, username, password } = dockerRegistry;
-										location = await saveDockerRegistryCredentials({ url, username, password, workdir })
+										location = await saveDockerRegistryCredentials({
+											url,
+											username,
+											password,
+											workdir
+										});
 									}
 
 									try {
 										await executeCommand({
 											dockerId: destinationDocker.id,
-											command: `docker ${location ? `--config ${location}` : ''} pull ${imageName}:${customTag}`
+											command: `docker ${
-										})
+												location ? `--config ${location}` : ''
+											} pull ${imageName}:${customTag}`
+										});
 										imageFoundRemotely = true;
 									} catch (error) {
 										//
 									}
-									let imageFound = `${applicationId}:${tag}`
+									let imageFound = `${applicationId}:${tag}`;
 									if (imageFoundRemotely) {
-										imageFound = `${imageName}:${customTag}`
+										imageFound = `${imageName}:${customTag}`;
 									}
-									await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
+									await copyBaseConfigurationFiles(
+										buildPack,
+										workdir,
+										buildId,
+										applicationId,
+										baseImage
+									);
 									const labels = makeLabelForStandaloneApplication({
 										applicationId,
 										fqdn,
@@ -455,7 +556,7 @@ import * as buildpacks from '../lib/buildPacks';
 										baseDirectory,
 										publishDirectory
 									});
-									if (forceRebuild) deployNeeded = true
+									if (forceRebuild) deployNeeded = true;
 									if ((!imageFoundLocally && !imageFoundRemotely) || deployNeeded) {
 										if (buildpacks[buildPack])
 											await buildpacks[buildPack]({
@@ -496,33 +597,53 @@ import * as buildpacks from '../lib/buildPacks';
 												baseImage,
 												baseBuildImage,
 												deploymentType,
+												forceRebuild
 											});
 										else {
-											await saveBuildLog({ line: `Build pack ${buildPack} not found`, buildId, applicationId });
+											await saveBuildLog({
+												line: `Build pack ${buildPack} not found`,
+												buildId,
+												applicationId
+											});
 											throw new Error(`Build pack ${buildPack} not found.`);
 										}
 									} else {
 										if (imageFoundRemotely || deployNeeded) {
-											await saveBuildLog({ line: `Container image ${imageFound} found in Docker Registry - reuising it`, buildId, applicationId });
+											await saveBuildLog({
+												line: `Container image ${imageFound} found in Docker Registry - reuising it`,
+												buildId,
+												applicationId
+											});
 										} else {
 											if (imageFoundLocally || deployNeeded) {
-												await saveBuildLog({ line: `Container image ${imageFound} found locally - reuising it`, buildId, applicationId });
+												await saveBuildLog({
+													line: `Container image ${imageFound} found locally - reuising it`,
+													buildId,
+													applicationId
+												});
 											}
 										}
 									}
 
 									if (buildPack === 'compose') {
+										const fileYaml = `${workdir}${baseDirectory}${dockerComposeFileLocation}`;
 										try {
 											const { stdout: containers } = await executeCommand({
 												dockerId: destinationDockerId,
 												command: `docker ps -a --filter 'label=coolify.applicationId=${applicationId}' --format {{.ID}}`
-											})
+											});
 											if (containers) {
 												const containerArray = containers.split('\n');
 												if (containerArray.length > 0) {
 													for (const container of containerArray) {
-														await executeCommand({ dockerId: destinationDockerId, command: `docker stop -t 0 ${container}` })
+														await executeCommand({
-														await executeCommand({ dockerId: destinationDockerId, command: `docker rm --force ${container}` })
+															dockerId: destinationDockerId,
+															command: `docker stop -t 0 ${container}`
+														});
+														await executeCommand({
+															dockerId: destinationDockerId,
+															command: `docker rm --force ${container}`
+														});
 													}
 												}
 											}
@@ -530,17 +651,25 @@ import * as buildpacks from '../lib/buildPacks';
 											//
 										}
 										try {
-											console.log({ debug })
+											await executeCommand({
-											await executeCommand({ debug, buildId, applicationId, dockerId: destinationDocker.id, command: `docker compose --project-directory ${workdir} up -d` })
+												debug,
+												buildId,
+												applicationId,
+												dockerId: destinationDocker.id,
+												command: `docker compose --project-directory ${workdir} -f ${fileYaml} up -d`
+											});
 											await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
-											await prisma.build.update({ where: { id: buildId }, data: { status: 'success' } });
+											await prisma.build.update({
+												where: { id: buildId },
+												data: { status: 'success' }
+											});
 											await prisma.application.update({
 												where: { id: applicationId },
 												data: { configHash: currentHash }
 											});
 										} catch (error) {
 											await saveBuildLog({ line: error, buildId, applicationId });
-											const foundBuild = await prisma.build.findUnique({ where: { id: buildId } })
+											const foundBuild = await prisma.build.findUnique({ where: { id: buildId } });
 											if (foundBuild) {
 												await prisma.build.update({
 													where: { id: buildId },
@@ -551,64 +680,62 @@ import * as buildpacks from '../lib/buildPacks';
 											}
 											throw new Error(error);
 										}
-
 									} else {
 										try {
 											const { stdout: containers } = await executeCommand({
 												dockerId: destinationDockerId,
-												command: `docker ps -a --filter 'label=com.docker.compose.service=${pullmergeRequestId ? imageId : applicationId}' --format {{.ID}}`
+												command: `docker ps -a --filter 'label=com.docker.compose.service=${
-											})
+													pullmergeRequestId ? imageId : applicationId
+												}' --format {{.ID}}`
+											});
 											if (containers) {
 												const containerArray = containers.split('\n');
 												if (containerArray.length > 0) {
 													for (const container of containerArray) {
-														await executeCommand({ dockerId: destinationDockerId, command: `docker stop -t 0 ${container}` })
+														await executeCommand({
-														await executeCommand({ dockerId: destinationDockerId, command: `docker rm --force ${container}` })
+															dockerId: destinationDockerId,
+															command: `docker stop -t 0 ${container}`
+														});
+														await executeCommand({
+															dockerId: destinationDockerId,
+															command: `docker rm --force ${container}`
+														});
 													}
 												}
 											}
 										} catch (error) {
 											//
 										}
-										const envs = [
+										let envs = [];
-											`PORT=${port}`
-										];
 										if (secrets.length > 0) {
-											secrets.forEach((secret) => {
+											envs = [
-												if (pullmergeRequestId) {
+												...envs,
-													const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
+												...generateSecrets(secrets, pullmergeRequestId, false, port)
-													if (isSecretFound.length > 0) {
+											];
-														envs.push(`${secret.name}=${isSecretFound[0].value}`);
-													} else {
-														envs.push(`${secret.name}=${secret.value}`);
-													}
-												} else {
-													if (!secret.isPRMRSecret) {
-														envs.push(`${secret.name}=${secret.value}`);
-													}
-												}
-											});
 										}
-										await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
 										if (dockerRegistry) {
-											const { url, username, password } = dockerRegistry
+											const { url, username, password } = dockerRegistry;
-											await saveDockerRegistryCredentials({ url, username, password, workdir })
+											await saveDockerRegistryCredentials({ url, username, password, workdir });
-										}
-
-										let envFound = false;
-										try {
-											envFound = !!(await fs.stat(`${workdir}/.env`));
-										} catch (error) {
-											//
 										}
 										try {
-											const composeVolumes = volumes.map((volume) => {
+											const composeVolumes = volumes
-												return {
+												.filter((v) => {
-													[`${volume.split(':')[0]}`]: {
+													if (
-														name: volume.split(':')[0]
+														!v.startsWith('.') &&
+														!v.startsWith('..') &&
+														!v.startsWith('/') &&
+														!v.startsWith('~')
+													) {
+														return v;
 													}
-												};
+												})
-											});
+												.map((volume) => {
+													return {
+														[`${volume.split(':')[0]}`]: {
+															name: volume.split(':')[0]
+														}
+													};
+												});
 											const composeFile = {
 												version: '3.8',
 												services: {
@@ -616,12 +743,12 @@ import * as buildpacks from '../lib/buildPacks';
 														image: imageFound,
 														container_name: imageId,
 														volumes,
-														env_file: envFound ? [`${workdir}/.env`] : [],
+														environment: envs,
 														labels,
 														depends_on: [],
 														expose: [port],
 														...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
-														...defaultComposeConfiguration(destinationDocker.network),
+														...defaultComposeConfiguration(destinationDocker.network)
 													}
 												},
 												networks: {
@@ -632,11 +759,15 @@ import * as buildpacks from '../lib/buildPacks';
 												volumes: Object.assign({}, ...composeVolumes)
 											};
 											await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(composeFile));
-											await executeCommand({ debug, dockerId: destinationDocker.id, command: `docker compose --project-directory ${workdir} up -d` })
+											await executeCommand({
+												debug,
+												dockerId: destinationDocker.id,
+												command: `docker compose --project-directory ${workdir} -f ${workdir}/docker-compose.yml up -d`
+											});
 											await saveBuildLog({ line: 'Deployed 🎉', buildId, applicationId });
 										} catch (error) {
 											await saveBuildLog({ line: error, buildId, applicationId });
-											const foundBuild = await prisma.build.findUnique({ where: { id: buildId } })
+											const foundBuild = await prisma.build.findUnique({ where: { id: buildId } });
 											if (foundBuild) {
 												await prisma.build.update({
 													where: { id: buildId },
@@ -648,14 +779,15 @@ import * as buildpacks from '../lib/buildPacks';
 											throw new Error(error);
 										}
 
-										if (!pullmergeRequestId) await prisma.application.update({
+										if (!pullmergeRequestId)
-											where: { id: applicationId },
+											await prisma.application.update({
-											data: { configHash: currentHash }
+												where: { id: applicationId },
-										});
+												data: { configHash: currentHash }
+											});
 									}
 								}
 							} catch (error) {
-								const foundBuild = await prisma.build.findUnique({ where: { id: buildId } })
+								const foundBuild = await prisma.build.findUnique({ where: { id: buildId } });
 								if (foundBuild) {
 									await prisma.build.update({
 										where: { id: buildId },
@@ -668,16 +800,24 @@ import * as buildpacks from '../lib/buildPacks';
 									await saveBuildLog({ line: error, buildId, applicationId: application.id });
 								}
 								if (error instanceof Error) {
-									await saveBuildLog({ line: error.message, buildId, applicationId: application.id });
+									await saveBuildLog({
+										line: error.message,
+										buildId,
+										applicationId: application.id
+									});
 								}
-								await fs.rm(workdir, { recursive: true, force: true });
+								if (!isDev) await fs.rm(workdir, { recursive: true, force: true });
 								return;
 							}
 							try {
 								if (application.dockerRegistryImageName && (!imageFoundRemotely || forceRebuild)) {
-									await saveBuildLog({ line: `Pushing ${imageName}:${customTag} to Docker Registry... It could take a while...`, buildId, applicationId: application.id });
+									await saveBuildLog({
-									await pushToRegistry(application, workdir, tag, imageName, customTag)
+										line: `Pushing ${imageName}:${customTag} to Docker Registry... It could take a while...`,
-									await saveBuildLog({ line: "Success", buildId, applicationId: application.id });
+										buildId,
+										applicationId: application.id
+									});
+									await pushToRegistry(application, workdir, tag, imageName, customTag);
+									await saveBuildLog({ line: 'Success', buildId, applicationId: application.id });
 								}
 							} catch (error) {
 								if (error.stdout) {
@@ -686,21 +826,20 @@ import * as buildpacks from '../lib/buildPacks';
 								if (error.stderr) {
 									await saveBuildLog({ line: error.stderr, buildId, applicationId });
 								}
-
 							} finally {
-								await fs.rm(workdir, { recursive: true, force: true });
+								if (!isDev) await fs.rm(workdir, { recursive: true, force: true });
 								await prisma.build.update({ where: { id: buildId }, data: { status: 'success' } });
 							}
 						});
 					}
-					await pAll.default(actions, { concurrency })
+					await pAll.default(actions, { concurrency });
 				}
 			} catch (error) {
-				console.log(error)
+				console.log(error);
 			}
-		})
+		});
 		while (true) {
-			await th()
+			await th();
 		}
 	} else process.exit(0);
 })();

apps/api/src/lib.ts

@@ -86,19 +86,20 @@ export async function migrateServicesToNewTemplate() {
                     if (template.variables) {
                         if (template.variables.length > 0) {
                             for (const variable of template.variables) {
-                                const { defaultValue } = variable;
+                                let { defaultValue } = variable;
+                                defaultValue = defaultValue.toString();
                                 const regex = /^\$\$.*\((\d+)\)$/g;
                                 const length = Number(regex.exec(defaultValue)?.[1]) || undefined
-                                if (variable.defaultValue.startsWith('$$generate_password')) {
+                                if (defaultValue.startsWith('$$generate_password')) {
                                     variable.value = generatePassword({ length });
-                                } else if (variable.defaultValue.startsWith('$$generate_hex')) {
+                                } else if (defaultValue.startsWith('$$generate_hex')) {
                                     variable.value = generatePassword({ length, isHex: true });
-                                } else if (variable.defaultValue.startsWith('$$generate_username')) {
+                                } else if (defaultValue.startsWith('$$generate_username')) {
                                     variable.value = cuid();
-                                } else if (variable.defaultValue.startsWith('$$generate_token')) {
+                                } else if (defaultValue.startsWith('$$generate_token')) {
                                     variable.value = generateToken()
                                 } else {
-                                    variable.value = variable.defaultValue || '';
+                                    variable.value = defaultValue || '';
                                 }
                             }
                         }

apps/api/src/lib/buildPacks/common.ts

@@ -1,6 +1,18 @@
-import { base64Encode, decrypt, encrypt, executeCommand, generateTimestamp, getDomain, isARM, isDev, prisma, version } from "../common";
+import {
+	base64Encode,
+	decrypt,
+	encrypt,
+	executeCommand,
+	generateSecrets,
+	generateTimestamp,
+	getDomain,
+	isARM,
+	isDev,
+	prisma,
+	version
+} from '../common';
 import { promises as fs } from 'fs';
-import { day } from "../dayjs";
+import { day } from '../dayjs';
 
 const staticApps = ['static', 'react', 'vuejs', 'svelte', 'gatsby', 'astro', 'eleventy'];
 const nodeBased = [
@@ -17,7 +29,10 @@ const nodeBased = [
 	'nextjs'
 ];
 
-export function setDefaultBaseImage(buildPack: string | null, deploymentType: string | null = null) {
+export function setDefaultBaseImage(
+	buildPack: string | null,
+	deploymentType: string | null = null
+) {
 	const nodeVersions = [
 		{
 			value: 'node:lts',
@@ -316,8 +331,8 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 		{
 			value: 'heroku/builder-classic:22',
 			label: 'heroku/builder-classic:22'
-		},
+		}
-	]
+	];
 	let payload: any = {
 		baseImage: null,
 		baseBuildImage: null,
@@ -326,8 +341,10 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 	};
 	if (nodeBased.includes(buildPack)) {
 		if (deploymentType === 'static') {
-			payload.baseImage = isARM(process.arch) ? 'nginx:alpine' : 'webdevops/nginx:alpine';
+			payload.baseImage = isARM() ? 'nginx:alpine' : 'webdevops/nginx:alpine';
-			payload.baseImages = isARM(process.arch) ? staticVersions.filter((version) => !version.value.includes('webdevops')) : staticVersions;
+			payload.baseImages = isARM()
+				? staticVersions.filter((version) => !version.value.includes('webdevops'))
+				: staticVersions;
 			payload.baseBuildImage = 'node:lts';
 			payload.baseBuildImages = nodeVersions;
 		} else {
@@ -338,8 +355,10 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 		}
 	}
 	if (staticApps.includes(buildPack)) {
-		payload.baseImage = isARM(process.arch) ? 'nginx:alpine' : 'webdevops/nginx:alpine';
+		payload.baseImage = isARM() ? 'nginx:alpine' : 'webdevops/nginx:alpine';
-		payload.baseImages = isARM(process.arch) ? staticVersions.filter((version) => !version.value.includes('webdevops')) : staticVersions;
+		payload.baseImages = isARM()
+			? staticVersions.filter((version) => !version.value.includes('webdevops'))
+			: staticVersions;
 		payload.baseBuildImage = 'node:lts';
 		payload.baseBuildImages = nodeVersions;
 	}
@@ -357,12 +376,20 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 		payload.baseImage = 'denoland/deno:latest';
 	}
 	if (buildPack === 'php') {
-		payload.baseImage = isARM(process.arch) ? 'php:8.1-fpm-alpine' : 'webdevops/php-apache:8.2-alpine';
+		payload.baseImage = isARM()
-		payload.baseImages = isARM(process.arch) ? phpVersions.filter((version) => !version.value.includes('webdevops')) : phpVersions
+			? 'php:8.1-fpm-alpine'
+			: 'webdevops/php-apache:8.2-alpine';
+		payload.baseImages = isARM()
+			? phpVersions.filter((version) => !version.value.includes('webdevops'))
+			: phpVersions;
 	}
 	if (buildPack === 'laravel') {
-		payload.baseImage = isARM(process.arch) ? 'php:8.1-fpm-alpine' : 'webdevops/php-apache:8.2-alpine';
+		payload.baseImage = isARM()
-		payload.baseImages = isARM(process.arch) ? phpVersions.filter((version) => !version.value.includes('webdevops')) : phpVersions
+			? 'php:8.1-fpm-alpine'
+			: 'webdevops/php-apache:8.2-alpine';
+		payload.baseImages = isARM()
+			? phpVersions.filter((version) => !version.value.includes('webdevops'))
+			: phpVersions;
 		payload.baseBuildImage = 'node:18';
 		payload.baseBuildImages = nodeVersions;
 	}
@@ -402,10 +429,16 @@ export const setDefaultConfiguration = async (data: any) => {
 		startCommand = template?.startCommand || 'yarn start';
 	if (!buildCommand && buildPack !== 'static' && buildPack !== 'laravel')
 		buildCommand = template?.buildCommand || null;
-	if (!publishDirectory) publishDirectory = template?.publishDirectory || null;
+	if (!publishDirectory) {
+		publishDirectory = template?.publishDirectory || null;
+	} else {
+		if (!publishDirectory.startsWith('/')) publishDirectory = `/${publishDirectory}`;
+		if (publishDirectory.endsWith('/')) publishDirectory = publishDirectory.slice(0, -1);
+	}
 	if (baseDirectory) {
 		if (!baseDirectory.startsWith('/')) baseDirectory = `/${baseDirectory}`;
-		if (baseDirectory.endsWith('/') && baseDirectory !== '/') baseDirectory = baseDirectory.slice(0, -1);
+		if (baseDirectory.endsWith('/') && baseDirectory !== '/')
+			baseDirectory = baseDirectory.slice(0, -1);
 	}
 	if (dockerFileLocation) {
 		if (!dockerFileLocation.startsWith('/')) dockerFileLocation = `/${dockerFileLocation}`;
@@ -414,8 +447,10 @@ export const setDefaultConfiguration = async (data: any) => {
 		dockerFileLocation = '/Dockerfile';
 	}
 	if (dockerComposeFileLocation) {
-		if (!dockerComposeFileLocation.startsWith('/')) dockerComposeFileLocation = `/${dockerComposeFileLocation}`;
+		if (!dockerComposeFileLocation.startsWith('/'))
-		if (dockerComposeFileLocation.endsWith('/')) dockerComposeFileLocation = dockerComposeFileLocation.slice(0, -1);
+			dockerComposeFileLocation = `/${dockerComposeFileLocation}`;
+		if (dockerComposeFileLocation.endsWith('/'))
+			dockerComposeFileLocation = dockerComposeFileLocation.slice(0, -1);
 	} else {
 		dockerComposeFileLocation = '/Dockerfile';
 	}
@@ -479,7 +514,6 @@ export const scanningTemplates = {
 	}
 };
 
-
 export const saveBuildLog = async ({
 	line,
 	buildId,
@@ -491,7 +525,7 @@ export const saveBuildLog = async ({
 }): Promise<any> => {
 	if (buildId === 'undefined' || buildId === 'null' || !buildId) return;
 	if (applicationId === 'undefined' || applicationId === 'null' || !applicationId) return;
-	const { default: got } = await import('got')
+	const { default: got } = await import('got');
 	if (typeof line === 'object' && line) {
 		if (line.shortMessage) {
 			line = line.shortMessage + '\n' + line.stderr;
@@ -504,7 +538,11 @@ export const saveBuildLog = async ({
 		line = line.replace(regex, '<SENSITIVE_DATA_DELETED>@');
 	}
 	const addTimestamp = `[${generateTimestamp()}] ${line}`;
-	const fluentBitUrl = isDev ? process.env.COOLIFY_CONTAINER_DEV === 'true' ? 'http://coolify-fluentbit:24224' : 'http://localhost:24224' : 'http://coolify-fluentbit:24224';
+	const fluentBitUrl = isDev
+		? process.env.COOLIFY_CONTAINER_DEV === 'true'
+			? 'http://coolify-fluentbit:24224'
+			: 'http://localhost:24224'
+		: 'http://coolify-fluentbit:24224';
 
 	if (isDev && !process.env.COOLIFY_CONTAINER_DEV) {
 		console.debug(`[${applicationId}] ${addTimestamp}`);
@@ -514,15 +552,17 @@ export const saveBuildLog = async ({
 			json: {
 				line: encrypt(line)
 			}
-		})
+		});
 	} catch (error) {
 		return await prisma.buildLog.create({
 			data: {
-				line: addTimestamp, buildId, time: Number(day().valueOf()), applicationId
+				line: addTimestamp,
+				buildId,
+				time: Number(day().valueOf()),
+				applicationId
 			}
 		});
 	}
-
 };
 
 export async function copyBaseConfigurationFiles(
@@ -610,7 +650,7 @@ export function checkPnpm(installCommand = null, buildCommand = null, startComma
 
 export async function saveDockerRegistryCredentials({ url, username, password, workdir }) {
 	if (!username || !password) {
-		return null
+		return null;
 	}
 
 	let decryptedPassword = decrypt(password);
@@ -619,17 +659,17 @@ export async function saveDockerRegistryCredentials({ url, username, password, w
 	try {
 		await fs.mkdir(`${workdir}/.docker`);
 	} catch (error) {
-		console.log(error);
+		// console.log(error);
 	}
 	const payload = JSON.stringify({
-		"auths": {
+		auths: {
 			[url]: {
-				"auth": Buffer.from(`${username}:${decryptedPassword}`).toString('base64')
+				auth: Buffer.from(`${username}:${decryptedPassword}`).toString('base64')
 			}
 		}
-	})
+	});
-	await fs.writeFile(`${location}/config.json`, payload)
+	await fs.writeFile(`${location}/config.json`, payload);
-	return location
+	return location;
 }
 export async function buildImage({
 	applicationId,
@@ -640,29 +680,40 @@ export async function buildImage({
 	isCache = false,
 	debug = false,
 	dockerFileLocation = '/Dockerfile',
-	commit
+	commit,
+	forceRebuild = false
 }) {
 	if (isCache) {
 		await saveBuildLog({ line: `Building cache image...`, buildId, applicationId });
 	} else {
 		await saveBuildLog({ line: `Building production image...`, buildId, applicationId });
 	}
-	const dockerFile = isCache ? `${dockerFileLocation}-cache` : `${dockerFileLocation}`
+	const dockerFile = isCache ? `${dockerFileLocation}-cache` : `${dockerFileLocation}`;
-	const cache = `${applicationId}:${tag}${isCache ? '-cache' : ''}`
+	const cache = `${applicationId}:${tag}${isCache ? '-cache' : ''}`;
+	let location = null;
 
-	let location = null
+	const { dockerRegistry } = await prisma.application.findUnique({
-
+		where: { id: applicationId },
-	const { dockerRegistry } = await prisma.application.findUnique({ where: { id: applicationId }, select: { dockerRegistry: true } })
+		select: { dockerRegistry: true }
+	});
 	if (dockerRegistry) {
-		const { url, username, password } = dockerRegistry
+		const { url, username, password } = dockerRegistry;
-		location = await saveDockerRegistryCredentials({ url, username, password, workdir })
+		location = await saveDockerRegistryCredentials({ url, username, password, workdir });
 	}
 
-	await executeCommand({ stream: true, debug, buildId, applicationId, dockerId, command: `docker ${location ? `--config ${location}` : ''} build --progress plain -f ${workdir}/${dockerFile} -t ${cache} --build-arg SOURCE_COMMIT=${commit} ${workdir}` })
+	await executeCommand({
+		stream: true,
+		debug,
+		buildId,
+		applicationId,
+		dockerId,
+		command: `docker ${location ? `--config ${location}` : ''} build ${forceRebuild ? '--no-cache' : ''
+			} --progress plain -f ${workdir}/${dockerFile} -t ${cache} --build-arg SOURCE_COMMIT=${commit} ${workdir}`
+	});
 
-	const { status } = await prisma.build.findUnique({ where: { id: buildId } })
+	const { status } = await prisma.build.findUnique({ where: { id: buildId } });
 	if (status === 'canceled') {
-		throw new Error('Canceled.')
+		throw new Error('Canceled.');
 	}
 }
 export function makeLabelForSimpleDockerfile({ applicationId, port, type }) {
@@ -741,21 +792,8 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
-			if (secret.isBuildSecret) {
+			Dockerfile.push(env);
-				if (pullmergeRequestId) {
-					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
-					if (isSecretFound.length > 0) {
-						Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`);
-					} else {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				} else {
-					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				}
-			}
 		});
 	}
 	if (isPnpm) {
@@ -765,50 +803,33 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 	if (installCommand) {
 		Dockerfile.push(`RUN ${installCommand}`);
 	}
-	// Dockerfile.push(`ARG CACHEBUST=1`);
 	Dockerfile.push(`RUN ${buildCommand}`);
+	Dockerfile.push('RUN rm -fr .git');
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
 	await buildImage({ ...data, isCache: true });
 }
 
 export async function buildCacheImageForLaravel(data, imageForBuild) {
 	const { workdir, buildId, secrets, pullmergeRequestId } = data;
-
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${imageForBuild}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
-			if (secret.isBuildSecret) {
+			Dockerfile.push(env);
-				if (pullmergeRequestId) {
-					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
-					if (isSecretFound.length > 0) {
-						Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`);
-					} else {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				} else {
-					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				}
-			}
 		});
 	}
 	Dockerfile.push(`COPY *.json *.mix.js /app/`);
 	Dockerfile.push(`COPY resources /app/resources`);
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`RUN yarn install && yarn production`);
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
 	await buildImage({ ...data, isCache: true });
 }
 
 export async function buildCacheImageWithCargo(data, imageForBuild) {
-	const {
+	const { applicationId, workdir, buildId } = data;
-		applicationId,
-		workdir,
-		buildId,
-	} = data;
 
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${imageForBuild} as planner-${applicationId}`);
@@ -823,6 +844,7 @@ export async function buildCacheImageWithCargo(data, imageForBuild) {
 	Dockerfile.push('RUN cargo install cargo-chef');
 	Dockerfile.push(`COPY --from=planner-${applicationId} /app/recipe.json recipe.json`);
 	Dockerfile.push('RUN cargo chef cook --release --recipe-path recipe.json');
+	Dockerfile.push('RUN rm -fr .git');
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
 	await buildImage({ ...data, isCache: true });
 }

apps/api/src/lib/buildPacks/compose.ts

@@ -1,5 +1,5 @@
 import { promises as fs } from 'fs';
-import { defaultComposeConfiguration, executeCommand } from '../common';
+import { defaultComposeConfiguration, executeCommand, generateSecrets } from '../common';
 import { saveBuildLog } from './common';
 import yaml from 'js-yaml';
 
@@ -19,65 +19,128 @@ export default async function (data) {
 		dockerComposeConfiguration,
 		dockerComposeFileLocation
 	} = data;
-	const fileYaml = `${workdir}${baseDirectory}${dockerComposeFileLocation}`;
+	const baseDir = `${workdir}${baseDirectory}`;
+	const envFile = `${baseDir}/.env`;
+	const fileYaml = `${baseDir}${dockerComposeFileLocation}`;
 	const dockerComposeRaw = await fs.readFile(fileYaml, 'utf8');
 	const dockerComposeYaml = yaml.load(dockerComposeRaw);
 	if (!dockerComposeYaml.services) {
 		throw 'No Services found in docker-compose file.';
 	}
-	const envs = [];
+	let envs = [];
+	let buildEnvs = [];
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		envs = [...envs, ...generateSecrets(secrets, pullmergeRequestId, false, null)];
-			if (pullmergeRequestId) {
+		buildEnvs = [...buildEnvs, ...generateSecrets(secrets, pullmergeRequestId, true, null, true)];
-				const isSecretFound = secrets.filter((s) => s.name === secret.name && s.isPRMRSecret);
-				if (isSecretFound.length > 0) {
-					envs.push(`${secret.name}=${isSecretFound[0].value}`);
-				} else {
-					envs.push(`${secret.name}=${secret.value}`);
-				}
-			} else {
-				if (!secret.isPRMRSecret) {
-					envs.push(`${secret.name}=${secret.value}`);
-				}
-			}
-		});
-	}
-	await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
-	let envFound = false;
-	try {
-		envFound = !!(await fs.stat(`${workdir}/.env`));
-	} catch (error) {
-		//
 	}
+	await fs.writeFile(envFile, envs.join('\n'));
 	const composeVolumes = [];
 	if (volumes.length > 0) {
 		for (const volume of volumes) {
 			let [v, path] = volume.split(':');
-			composeVolumes[v] = {
+			if (!v.startsWith('.') && !v.startsWith('..') && !v.startsWith('/') && !v.startsWith('~')) {
-				name: v
+				composeVolumes[v] = {
-			};
+					name: v
+				};
+			}
 		}
 	}
-
 	let networks = {};
 	for (let [key, value] of Object.entries(dockerComposeYaml.services)) {
 		value['container_name'] = `${applicationId}-${key}`;
-		value['env_file'] = envFound ? [`${workdir}/.env`] : [];
+
+		if (value['env_file']) {
+			delete value['env_file'];
+		}
+		value['env_file'] = [envFile];
+
+		// let environment = typeof value['environment'] === 'undefined' ? [] : value['environment'];
+		// let finalEnvs = [...envs];
+		// if (Object.keys(environment).length > 0) {
+		// 	for (const arg of Object.keys(environment)) {
+		// 		const [key, _] = arg.split('=');
+		// 		if (finalEnvs.filter((env) => env.startsWith(key)).length === 0) {
+		// 			finalEnvs.push(arg);
+		// 		}
+		// 	}
+		// }
+		// value['environment'] = [...finalEnvs];
+
+		let build = typeof value['build'] === 'undefined' ? [] : value['build'];
+		if (typeof build === 'string') {
+			build = { context: build };
+		}
+		const buildArgs = typeof build['args'] === 'undefined' ? [] : build['args'];
+		let finalBuildArgs = [...buildEnvs];
+		if (Object.keys(buildArgs).length > 0) {
+			for (const arg of Object.keys(buildArgs)) {
+				const [key, _] = arg.split('=');
+				if (finalBuildArgs.filter((env) => env.startsWith(key)).length === 0) {
+					finalBuildArgs.push(arg);
+				}
+			}
+		}
+		if (build.length > 0 || buildArgs.length > 0) {
+			value['build'] = {
+				...build,
+				args: finalBuildArgs
+			};
+		}
+
 		value['labels'] = labels;
 		// TODO: If we support separated volume for each service, we need to add it here
 		if (value['volumes']?.length > 0) {
 			value['volumes'] = value['volumes'].map((volume) => {
-				let [v, path, permission] = volume.split(':');
+				if (typeof volume === 'string') {
-				if (!path) {
+					let [v, path, permission] = volume.split(':');
-					path = v;
+					if (
-					v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`;
+						v.startsWith('.') ||
-				} else {
+						v.startsWith('..') ||
-					v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`;
+						v.startsWith('/') ||
+						v.startsWith('~') ||
+						v.startsWith('$PWD')
+					) {
+						v = v
+							.replace(/^\./, `~`)
+							.replace(/^\.\./, '~')
+							.replace(/^\$PWD/, '~');
+					} else {
+						if (!path) {
+							path = v;
+							v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`;
+						} else {
+							v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`;
+						}
+						composeVolumes[v] = {
+							name: v
+						};
+					}
+					return `${v}:${path}${permission ? ':' + permission : ''}`;
+				}
+				if (typeof volume === 'object') {
+					let { source, target, mode } = volume;
+					if (
+						source.startsWith('.') ||
+						source.startsWith('..') ||
+						source.startsWith('/') ||
+						source.startsWith('~') ||
+						source.startsWith('$PWD')
+					) {
+						source = source
+							.replace(/^\./, `~`)
+							.replace(/^\.\./, '~')
+							.replace(/^\$PWD/, '~');
+					} else {
+						if (!target) {
+							target = source;
+							source = `${applicationId}${source.replace(/\//gi, '-').replace(/\./gi, '')}`;
+						} else {
+							source = `${applicationId}${source.replace(/\//gi, '-').replace(/\./gi, '')}`;
+						}
+					}
+
+					return `${source}:${target}${mode ? ':' + mode : ''}`;
 				}
-				composeVolumes[v] = {
-					name: v
-				};
-				return `${v}:${path}${permission ? ':' + permission : ''}`;
 			});
 		}
 		if (volumes.length > 0) {
@@ -85,17 +148,24 @@ export default async function (data) {
 				value['volumes'].push(volume);
 			}
 		}
-		if (dockerComposeConfiguration[key].port) {
+		if (dockerComposeConfiguration[key]?.port) {
 			value['expose'] = [dockerComposeConfiguration[key].port];
 		}
-		if (value['networks']?.length > 0) {
+		value['networks'] = [network];
-			value['networks'].forEach((network) => {
+		if (value['build']?.network) {
-				networks[network] = {
+			delete value['build']['network'];
-					name: network
-				};
-			});
 		}
-		value['networks'] = [...(value['networks'] || ''), network];
+		// if (value['networks']?.length > 0) {
+		// 	value['networks'].forEach((network) => {
+		// 		networks[network] = {
+		// 			name: network
+		// 		};
+		// 	});
+		// 	value['networks'] = [...(value['networks'] || ''), network];
+		// } else {
+		// 	value['networks'] = [network];
+		// }
+
 		dockerComposeYaml.services[key] = {
 			...dockerComposeYaml.services[key],
 			restart: defaultComposeConfiguration(network).restart,
@@ -106,13 +176,14 @@ export default async function (data) {
 		dockerComposeYaml['volumes'] = { ...composeVolumes };
 	}
 	dockerComposeYaml['networks'] = Object.assign({ ...networks }, { [network]: { external: true } });
+
 	await fs.writeFile(fileYaml, yaml.dump(dockerComposeYaml));
 	await executeCommand({
 		debug,
 		buildId,
 		applicationId,
 		dockerId,
-		command: `docker compose --project-directory ${workdir} pull`
+		command: `docker compose --project-directory ${workdir} -f ${fileYaml} pull`
 	});
 	await saveBuildLog({ line: 'Pulling images from Compose file...', buildId, applicationId });
 	await executeCommand({
@@ -120,7 +191,7 @@ export default async function (data) {
 		buildId,
 		applicationId,
 		dockerId,
-		command: `docker compose --project-directory ${workdir} build --progress plain`
+		command: `docker compose --project-directory ${workdir} -f ${fileYaml} build --progress plain`
 	});
 	await saveBuildLog({ line: 'Building images from Compose file...', buildId, applicationId });
 }

apps/api/src/lib/buildPacks/deno.ts

@@ -1,4 +1,5 @@
 import { promises as fs } from 'fs';
+import { generateSecrets } from '../common';
 import { buildImage } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
@@ -24,21 +25,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
-			if (secret.isBuildSecret) {
+			Dockerfile.push(env);
-				if (pullmergeRequestId) {
-					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
-					if (isSecretFound.length > 0) {
-						Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`);
-					} else {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				} else {
-					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				}
-			}
 		});
 	}
 	if (depsFound) {
@@ -48,6 +36,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN deno cache ${denoMainFile}`);
 	Dockerfile.push(`ENV NO_COLOR true`);
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`EXPOSE ${port}`);
 	Dockerfile.push(`CMD deno run ${denoOptions || ''} ${denoMainFile}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));

apps/api/src/lib/buildPacks/docker.ts

@@ -1,47 +1,27 @@
 import { promises as fs } from 'fs';
+import { generateSecrets } from '../common';
 import { buildImage } from './common';
 
 export default async function (data) {
-	let {
+	let { workdir, buildId, baseDirectory, secrets, pullmergeRequestId, dockerFileLocation } = data;
-		applicationId,
-		debug,
-		tag,
-		workdir,
-		buildId,
-		baseDirectory,
-		secrets,
-		pullmergeRequestId,
-		dockerFileLocation
-	} = data
 	const file = `${workdir}${baseDirectory}${dockerFileLocation}`;
 	data.workdir = `${workdir}${baseDirectory}`;
-	const DockerfileRaw = await fs.readFile(`${file}`, 'utf8')
+	const DockerfileRaw = await fs.readFile(`${file}`, 'utf8');
-	const Dockerfile: Array<string> = DockerfileRaw
+	const Dockerfile: Array<string> = DockerfileRaw.toString().trim().split('\n');
-		.toString()
-		.trim()
-		.split('\n');
 	Dockerfile.forEach((line, index) => {
 		if (line.startsWith('FROM')) {
 			Dockerfile.splice(index + 1, 0, `LABEL coolify.buildId=${buildId}`);
 		}
 	});
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
-			if (secret.isBuildSecret) {
+			Dockerfile.forEach((line, index) => {
-				if (
+				if (line.startsWith('FROM')) {
-					(pullmergeRequestId && secret.isPRMRSecret) ||
+					Dockerfile.splice(index + 1, 0, env);
-					(!pullmergeRequestId && !secret.isPRMRSecret)
-				) {
-					Dockerfile.forEach((line, index) => {
-						if (line.startsWith('FROM')) {
-							Dockerfile.splice(index + 1, 0, `ARG ${secret.name}=${secret.value}`);
-						}
-					});
 				}
-			}
+			});
 		});
 	}
-
+	await fs.writeFile(`${data.workdir}${dockerFileLocation}`, Dockerfile.join('\n'));
-	await fs.writeFile(`${workdir}${dockerFileLocation}`, Dockerfile.join('\n'));
 	await buildImage(data);
 }

apps/api/src/lib/buildPacks/gatsby.ts

@@ -8,10 +8,11 @@ const createDockerfile = async (data, imageforBuild): Promise<void> => {
 	Dockerfile.push(`FROM ${imageforBuild}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`EXPOSE ${port}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };

apps/api/src/lib/buildPacks/laravel.ts

@@ -1,12 +1,18 @@
 import { promises as fs } from 'fs';
+import { generateSecrets } from '../common';
 import { buildCacheImageForLaravel, buildImage } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
-	const { workdir, applicationId, tag, buildId, port } = data;
+	const { workdir, applicationId, tag, buildId, port, secrets, pullmergeRequestId } = data;
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
+	if (secrets.length > 0) {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
+			Dockerfile.push(env);
+		});
+	}
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`ENV WEB_DOCUMENT_ROOT /app/public`);
 	Dockerfile.push(`COPY --chown=application:application composer.* ./`);
@@ -24,6 +30,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		`COPY --chown=application:application --from=${applicationId}:${tag}-cache /app/mix-manifest.json /app/public/mix-manifest.json`
 	);
 	Dockerfile.push(`COPY --chown=application:application . ./`);
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`EXPOSE ${port}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };

apps/api/src/lib/buildPacks/nestjs.ts

@@ -2,7 +2,7 @@ import { promises as fs } from 'fs';
 import { buildCacheImageWithNode, buildImage } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
-	const { buildId, applicationId, tag, port, startCommand, workdir, baseDirectory } = data;
+	const { buildId, applicationId, tag, port, startCommand, workdir, publishDirectory } = data;
 	const Dockerfile: Array<string> = [];
 	const isPnpm = startCommand.includes('pnpm');
 
@@ -12,8 +12,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 	if (isPnpm) {
 		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7');
 	}
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${baseDirectory || ''} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
-
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`EXPOSE ${port}`);
 	Dockerfile.push(`CMD ${startCommand}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));

apps/api/src/lib/buildPacks/nextjs.ts

@@ -1,4 +1,5 @@
 import { promises as fs } from 'fs';
+import { generateSecrets } from '../common';
 import { buildCacheImageWithNode, buildImage, checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
@@ -24,21 +25,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
-			if (secret.isBuildSecret) {
+			Dockerfile.push(env);
-				if (pullmergeRequestId) {
-					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
-					if (isSecretFound.length > 0) {
-						Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`);
-					} else {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				} else {
-					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				}
-			}
 		});
 	}
 	if (isPnpm) {
@@ -48,13 +36,15 @@ const createDockerfile = async (data, image): Promise<void> => {
 		Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 		Dockerfile.push(`RUN ${installCommand}`);
 		Dockerfile.push(`RUN ${buildCommand}`);
+		Dockerfile.push('RUN rm -fr .git');
 		Dockerfile.push(`EXPOSE ${port}`);
 		Dockerfile.push(`CMD ${startCommand}`);
 	} else if (deploymentType === 'static') {
 		if (baseImage?.includes('nginx')) {
 			Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 		}
-		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
+		Dockerfile.push('RUN rm -fr .git');
 		Dockerfile.push(`EXPOSE 80`);
 	}
 

apps/api/src/lib/buildPacks/node.ts

@@ -1,4 +1,5 @@
 import { promises as fs } from 'fs';
+import { generateSecrets } from '../common';
 import { buildImage, checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
@@ -20,21 +21,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
-			if (secret.isBuildSecret) {
+			Dockerfile.push(env);
-				if (pullmergeRequestId) {
-					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
-					if (isSecretFound.length > 0) {
-						Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`);
-					} else {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				} else {
-					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				}
-			}
 		});
 	}
 	if (isPnpm) {
@@ -46,6 +34,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 		Dockerfile.push(`RUN ${buildCommand}`);
 	}
 	Dockerfile.push(`EXPOSE ${port}`);
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`CMD ${startCommand}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };

apps/api/src/lib/buildPacks/nuxtjs.ts

@@ -1,4 +1,5 @@
 import { promises as fs } from 'fs';
+import { generateSecrets } from '../common';
 import { buildCacheImageWithNode, buildImage, checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
@@ -24,21 +25,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
-			if (secret.isBuildSecret) {
+			Dockerfile.push(env);
-				if (pullmergeRequestId) {
-					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
-					if (isSecretFound.length > 0) {
-						Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`);
-					} else {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				} else {
-					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				}
-			}
 		});
 	}
 	if (isPnpm) {
@@ -48,13 +36,15 @@ const createDockerfile = async (data, image): Promise<void> => {
 		Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 		Dockerfile.push(`RUN ${installCommand}`);
 		Dockerfile.push(`RUN ${buildCommand}`);
+		Dockerfile.push('RUN rm -fr .git');
 		Dockerfile.push(`EXPOSE ${port}`);
 		Dockerfile.push(`CMD ${startCommand}`);
 	} else if (deploymentType === 'static') {
 		if (baseImage?.includes('nginx')) {
 			Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 		}
-		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
+		Dockerfile.push('RUN rm -fr .git');
 		Dockerfile.push(`EXPOSE 80`);
 	}
 

apps/api/src/lib/buildPacks/php.ts

@@ -1,4 +1,5 @@
 import { promises as fs } from 'fs';
+import { generateSecrets } from '../common';
 import { buildImage } from './common';
 
 const createDockerfile = async (data, image, htaccessFound): Promise<void> => {
@@ -13,21 +14,8 @@ const createDockerfile = async (data, image, htaccessFound): Promise<void> => {
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
-			if (secret.isBuildSecret) {
+			Dockerfile.push(env);
-				if (pullmergeRequestId) {
-					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
-					if (isSecretFound.length > 0) {
-						Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`);
-					} else {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				} else {
-					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				}
-			}
 		});
 	}
 	Dockerfile.push('WORKDIR /app');
@@ -40,6 +28,7 @@ const createDockerfile = async (data, image, htaccessFound): Promise<void> => {
 	}
 
 	Dockerfile.push(`COPY /entrypoint.sh /opt/docker/provision/entrypoint.d/30-entrypoint.sh`);
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`EXPOSE ${port}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };

apps/api/src/lib/buildPacks/python.ts

@@ -1,4 +1,5 @@
 import { promises as fs } from 'fs';
+import { generateSecrets } from '../common';
 import { buildImage } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
@@ -18,21 +19,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
-			if (secret.isBuildSecret) {
+			Dockerfile.push(env);
-				if (pullmergeRequestId) {
-					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
-					if (isSecretFound.length > 0) {
-						Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`);
-					} else {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				} else {
-					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				}
-			}
 		});
 	}
 	if (pythonWSGI?.toLowerCase() === 'gunicorn') {
@@ -64,7 +52,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	} else {
 		Dockerfile.push(`CMD python ${pythonModule}`);
 	}
-
+	Dockerfile.push('RUN rm -fr .git');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 

apps/api/src/lib/buildPacks/react.ts

@@ -8,10 +8,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	Dockerfile.push('WORKDIR /app');
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`EXPOSE ${port}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };

apps/api/src/lib/buildPacks/rust.ts

@@ -20,6 +20,7 @@ const createDockerfile = async (data, image, name): Promise<void> => {
 	);
 	Dockerfile.push(`RUN update-ca-certificates`);
 	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/target/release/${name} ${name}`);
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`EXPOSE ${port}`);
 	Dockerfile.push(`CMD ["/app/${name}"]`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));

apps/api/src/lib/buildPacks/static.ts

@@ -1,4 +1,5 @@
 import { promises as fs } from 'fs';
+import { generateSecrets } from '../common';
 import { buildCacheImageWithNode, buildImage } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
@@ -25,31 +26,19 @@ const createDockerfile = async (data, image): Promise<void> => {
 	}
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	if (secrets.length > 0) {
-		secrets.forEach((secret) => {
+		generateSecrets(secrets, pullmergeRequestId, true).forEach((env) => {
-			if (secret.isBuildSecret) {
+			Dockerfile.push(env);
-				if (pullmergeRequestId) {
-					const isSecretFound = secrets.filter(s => s.name === secret.name && s.isPRMRSecret)
-					if (isSecretFound.length > 0) {
-						Dockerfile.push(`ARG ${secret.name}=${isSecretFound[0].value}`);
-					} else {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				} else {
-					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-					}
-				}
-			}
 		});
 	}
 	if (buildCommand) {
-		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 	} else {
 		Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	}
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`EXPOSE ${port}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };

apps/api/src/lib/buildPacks/svelte.ts

@@ -8,10 +8,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`EXPOSE ${port}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };

apps/api/src/lib/buildPacks/vuejs.ts

@@ -8,10 +8,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app${publishDirectory} ./`);
 	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
+	Dockerfile.push('RUN rm -fr .git');
 	Dockerfile.push(`EXPOSE ${port}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };

apps/api/src/lib/common.ts

@@ -1,6 +1,5 @@
-import { exec } from 'node:child_process';
-import util from 'util';
 import fs from 'fs/promises';
+import fsNormal from 'fs';
 import yaml from 'js-yaml';
 import forge from 'node-forge';
 import { uniqueNamesGenerator, adjectives, colors, animals } from 'unique-names-generator';
@@ -8,21 +7,22 @@ import type { Config } from 'unique-names-generator';
 import generator from 'generate-password';
 import crypto from 'crypto';
 import { promises as dns } from 'dns';
-import * as Sentry from '@sentry/node';
 import { PrismaClient } from '@prisma/client';
 import os from 'os';
-import sshConfig from 'ssh-config';
+import * as SSHConfig from 'ssh-config/src/ssh-config';
 import jsonwebtoken from 'jsonwebtoken';
 import { checkContainer, removeContainer } from './docker';
 import { day } from './dayjs';
-import { saveBuildLog, saveDockerRegistryCredentials } from './buildPacks/common';
+import { saveBuildLog } from './buildPacks/common';
 import { scheduler } from './scheduler';
 import type { ExecaChildProcess } from 'execa';
+import { FastifyReply } from 'fastify';
 
-export const version = '3.12.1';
+export const version = '3.12.39';
 export const isDev = process.env.NODE_ENV === 'development';
-export const sentryDSN =
+export const proxyPort = process.env.COOLIFY_PROXY_PORT;
-	'https://409f09bcb7af47928d3e0f46b78987f3@o1082494.ingest.sentry.io/4504236622217216';
+export const proxySecurePort = process.env.COOLIFY_PROXY_SECURE_PORT;
+
 const algorithm = 'aes-256-ctr';
 const customConfig: Config = {
 	dictionaries: [adjectives, colors, animals],
@@ -170,13 +170,19 @@ export const base64Encode = (text: string): string => {
 export const base64Decode = (text: string): string => {
 	return Buffer.from(text, 'base64').toString('ascii');
 };
+export const getSecretKey = () => {
+	if (process.env['COOLIFY_SECRET_KEY_BETTER']) {
+		return process.env['COOLIFY_SECRET_KEY_BETTER'];
+	}
+	return process.env['COOLIFY_SECRET_KEY'];
+};
 export const decrypt = (hashString: string) => {
 	if (hashString) {
 		try {
 			const hash = JSON.parse(hashString);
 			const decipher = crypto.createDecipheriv(
 				algorithm,
-				process.env['COOLIFY_SECRET_KEY'],
+				getSecretKey(),
 				Buffer.from(hash.iv, 'hex')
 			);
 			const decrpyted = Buffer.concat([
@@ -193,7 +199,7 @@ export const decrypt = (hashString: string) => {
 export const encrypt = (text: string) => {
 	if (text) {
 		const iv = crypto.randomBytes(16);
-		const cipher = crypto.createCipheriv(algorithm, process.env['COOLIFY_SECRET_KEY'], iv);
+		const cipher = crypto.createCipheriv(algorithm, getSecretKey(), iv);
 		const encrypted = Buffer.concat([cipher.update(text.trim()), cipher.final()]);
 		return JSON.stringify({
 			iv: iv.toString('hex'),
@@ -400,8 +406,8 @@ export const supportedDatabaseTypesAndVersions = [
 		fancyName: 'MongoDB',
 		baseImage: 'bitnami/mongodb',
 		baseImageARM: 'mongo',
-		versions: ['5.0', '4.4', '4.2'],
+		versions: ['6.0', '5.0', '4.4', '4.2'],
-		versionsARM: ['5.0', '4.4', '4.2']
+		versionsARM: ['6.0', '5.0', '4.4', '4.2']
 	},
 	{
 		name: 'mysql',
@@ -416,16 +422,16 @@ export const supportedDatabaseTypesAndVersions = [
 		fancyName: 'MariaDB',
 		baseImage: 'bitnami/mariadb',
 		baseImageARM: 'mariadb',
-		versions: ['10.8', '10.7', '10.6', '10.5', '10.4', '10.3', '10.2'],
+		versions: ['10.11', '10.10', '10.9', '10.8', '10.7', '10.6', '10.5', '10.4', '10.3', '10.2'],
-		versionsARM: ['10.8', '10.7', '10.6', '10.5', '10.4', '10.3', '10.2']
+		versionsARM: ['10.11', '10.10', '10.9', '10.8', '10.7', '10.6', '10.5', '10.4', '10.3', '10.2']
 	},
 	{
 		name: 'postgresql',
 		fancyName: 'PostgreSQL',
 		baseImage: 'bitnami/postgresql',
 		baseImageARM: 'postgres',
-		versions: ['14.5.0', '13.8.0', '12.12.0', '11.17.0', '10.22.0'],
+		versions: ['15.2.0', '14.7.0', '14.5.0', '13.8.0', '12.12.0', '11.17.0', '10.22.0'],
-		versionsARM: ['14.5', '13.8', '12.12', '11.17', '10.22']
+		versionsARM: ['15.2', '14.7', '14.5', '13.8', '12.12', '11.17', '10.22']
 	},
 	{
 		name: 'redis',
@@ -440,14 +446,14 @@ export const supportedDatabaseTypesAndVersions = [
 		fancyName: 'CouchDB',
 		baseImage: 'bitnami/couchdb',
 		baseImageARM: 'couchdb',
-		versions: ['3.2.2', '3.1.2', '2.3.1'],
+		versions: ['3.3.1', '3.2.2', '3.1.2', '2.3.1'],
-		versionsARM: ['3.2.2', '3.1.2', '2.3.1']
+		versionsARM: ['3.3', '3.2.2', '3.1.2', '2.3.1']
 	},
 	{
 		name: 'edgedb',
 		fancyName: 'EdgeDB',
 		baseImage: 'edgedb/edgedb',
-		versions: ['latest', '2.1', '2.0', '1.4']
+		versions: ['latest', '2.9', '2.8', '2.7']
 	}
 ];
 
@@ -496,33 +502,56 @@ export async function getFreeSSHLocalPort(id: string): Promise<number | boolean>
 	return false;
 }
 
+/**
+ * Update the ssh config file with a host
+ *
+ * @param id Destination ID
+ * @returns
+ */
 export async function createRemoteEngineConfiguration(id: string) {
-	const homedir = os.homedir();
 	const sshKeyFile = `/tmp/id_rsa-${id}`;
 	const localPort = await getFreeSSHLocalPort(id);
 	const {
 		sshKey: { privateKey },
-		network,
 		remoteIpAddress,
 		remotePort,
 		remoteUser
 	} = await prisma.destinationDocker.findFirst({ where: { id }, include: { sshKey: true } });
+
+	// Write new keyfile
 	await fs.writeFile(sshKeyFile, decrypt(privateKey) + '\n', { encoding: 'utf8', mode: 400 });
-	const config = sshConfig.parse('');
+
 	const Host = `${remoteIpAddress}-remote`;
 
+	// Removes previous ssh-keys
 	try {
 		await executeCommand({ command: `ssh-keygen -R ${Host}` });
 		await executeCommand({ command: `ssh-keygen -R ${remoteIpAddress}` });
 		await executeCommand({ command: `ssh-keygen -R localhost:${localPort}` });
-	} catch (error) {}
+	} catch (error) {
+		//
+	}
 
+	const homedir = os.homedir();
+	let currentConfigFileContent = '';
+	try {
+		// Read the current config file
+		currentConfigFileContent = (await fs.readFile(`${homedir}/.ssh/config`)).toString();
+	} catch (error) {
+		// File doesn't exist, so we do nothing, a new one is going to be created
+	}
+
+	// Parse the config file
+	const config = SSHConfig.parse(currentConfigFileContent);
+
+	// Remove current config for the given host
 	const found = config.find({ Host });
 	const foundIp = config.find({ Host: remoteIpAddress });
 
 	if (found) config.remove({ Host });
 	if (foundIp) config.remove({ Host: remoteIpAddress });
 
+	// Create the new config
 	config.append({
 		Host,
 		Hostname: remoteIpAddress,
@@ -535,13 +564,17 @@ export async function createRemoteEngineConfiguration(id: string) {
 		ControlPersist: '10m'
 	});
 
+	// Check if .ssh folder exists, and if not create one
 	try {
 		await fs.stat(`${homedir}/.ssh/`);
 	} catch (error) {
 		await fs.mkdir(`${homedir}/.ssh/`);
 	}
-	return await fs.writeFile(`${homedir}/.ssh/config`, sshConfig.stringify(config));
+
+	// Write the config
+	return await fs.writeFile(`${homedir}/.ssh/config`, SSHConfig.stringify(config));
 }
+
 export async function executeCommand({
 	command,
 	dockerId = null,
@@ -550,7 +583,8 @@ export async function executeCommand({
 	stream = false,
 	buildId,
 	applicationId,
-	debug
+	debug,
+	timeout = 0
 }: {
 	command: string;
 	sshCommand?: boolean;
@@ -560,6 +594,7 @@ export async function executeCommand({
 	buildId?: string;
 	applicationId?: string;
 	debug?: boolean;
+	timeout?: number;
 }): Promise<ExecaChildProcess<string>> {
 	const { execa, execaCommand } = await import('execa');
 	const { parse } = await import('shell-quote');
@@ -584,20 +619,26 @@ export async function executeCommand({
 		}
 		if (sshCommand) {
 			if (shell) {
-				return execaCommand(`ssh ${remoteIpAddress}-remote ${command}`);
+				return execaCommand(`ssh ${remoteIpAddress}-remote ${command}`, {
+					timeout
+				});
 			}
-			return await execa('ssh', [`${remoteIpAddress}-remote`, dockerCommand, ...dockerArgs]);
+			return await execa('ssh', [`${remoteIpAddress}-remote`, dockerCommand, ...dockerArgs], {
+				timeout
+			});
 		}
 		if (stream) {
 			return await new Promise(async (resolve, reject) => {
 				let subprocess = null;
 				if (shell) {
 					subprocess = execaCommand(command, {
-						env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine }
+						env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine },
+						timeout
 					});
 				} else {
 					subprocess = execa(dockerCommand, dockerArgs, {
-						env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine }
+						env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine },
+						timeout
 					});
 				}
 				const logs = [];
@@ -651,19 +692,26 @@ export async function executeCommand({
 		} else {
 			if (shell) {
 				return await execaCommand(command, {
-					env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine }
+					env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine },
+					timeout
 				});
 			} else {
 				return await execa(dockerCommand, dockerArgs, {
-					env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine }
+					env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine },
+					timeout
 				});
 			}
 		}
 	} else {
 		if (shell) {
-			return execaCommand(command, { shell: true });
+			return execaCommand(command, {
+				shell: true,
+				timeout
+			});
 		}
-		return await execa(dockerCommand, dockerArgs);
+		return await execa(dockerCommand, dockerArgs, {
+			timeout
+		});
 	}
 }
 
@@ -712,10 +760,12 @@ export async function startTraefikProxy(id: string): Promise<void> {
 			-v coolify-traefik-letsencrypt:/etc/traefik/acme \
 			-v /var/run/docker.sock:/var/run/docker.sock \
 			--network coolify-infra \
-			-p "80:80" \
+			-p ${proxyPort ? `${proxyPort}:80` : `80:80`} \
-			-p "443:443" \
+			-p ${proxySecurePort ? `${proxySecurePort}:443` : `443:443`} \
+			${isDev ? '-p "8080:8080"' : ''} \
 			--name coolify-proxy \
 			-d ${defaultTraefikImage} \
+			${isDev ? '--api.insecure=true' : ''} \
 			--entrypoints.web.address=:80 \
 			--entrypoints.web.forwardedHeaders.insecure=true \
 			--entrypoints.websecure.address=:443 \
@@ -795,7 +845,7 @@ export function generateToken() {
 		{
 			nbf: Math.floor(Date.now() / 1000) - 30
 		},
-		process.env['COOLIFY_SECRET_KEY']
+		getSecretKey()
 	);
 }
 export function generatePassword({
@@ -818,101 +868,101 @@ export function generatePassword({
 
 type DatabaseConfiguration =
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				MYSQL_DATABASE: string;
+			MYSQL_DATABASE: string;
-				MYSQL_PASSWORD: string;
+			MYSQL_PASSWORD: string;
-				MYSQL_ROOT_USER: string;
+			MYSQL_ROOT_USER: string;
-				MYSQL_USER: string;
+			MYSQL_USER: string;
-				MYSQL_ROOT_PASSWORD: string;
+			MYSQL_ROOT_PASSWORD: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				MONGO_INITDB_ROOT_USERNAME?: string;
+			MONGO_INITDB_ROOT_USERNAME?: string;
-				MONGO_INITDB_ROOT_PASSWORD?: string;
+			MONGO_INITDB_ROOT_PASSWORD?: string;
-				MONGODB_ROOT_USER?: string;
+			MONGODB_ROOT_USER?: string;
-				MONGODB_ROOT_PASSWORD?: string;
+			MONGODB_ROOT_PASSWORD?: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				MARIADB_ROOT_USER: string;
+			MARIADB_ROOT_USER: string;
-				MARIADB_ROOT_PASSWORD: string;
+			MARIADB_ROOT_PASSWORD: string;
-				MARIADB_USER: string;
+			MARIADB_USER: string;
-				MARIADB_PASSWORD: string;
+			MARIADB_PASSWORD: string;
-				MARIADB_DATABASE: string;
+			MARIADB_DATABASE: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				POSTGRES_PASSWORD?: string;
+			POSTGRES_PASSWORD?: string;
-				POSTGRES_USER?: string;
+			POSTGRES_USER?: string;
-				POSTGRES_DB?: string;
+			POSTGRES_DB?: string;
-				POSTGRESQL_POSTGRES_PASSWORD?: string;
+			POSTGRESQL_POSTGRES_PASSWORD?: string;
-				POSTGRESQL_USERNAME?: string;
+			POSTGRESQL_USERNAME?: string;
-				POSTGRESQL_PASSWORD?: string;
+			POSTGRESQL_PASSWORD?: string;
-				POSTGRESQL_DATABASE?: string;
+			POSTGRESQL_DATABASE?: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				REDIS_AOF_ENABLED: string;
+			REDIS_AOF_ENABLED: string;
-				REDIS_PASSWORD: string;
+			REDIS_PASSWORD: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				COUCHDB_PASSWORD: string;
+			COUCHDB_PASSWORD: string;
-				COUCHDB_USER: string;
+			COUCHDB_USER: string;
-			};
+		};
-	  }
+	}
 	| {
-			volume: string;
+		volume: string;
-			image: string;
+		image: string;
-			command?: string;
+		command?: string;
-			ulimits: Record<string, unknown>;
+		ulimits: Record<string, unknown>;
-			privatePort: number;
+		privatePort: number;
-			environmentVariables: {
+		environmentVariables: {
-				EDGEDB_SERVER_PASSWORD: string;
+			EDGEDB_SERVER_PASSWORD: string;
-				EDGEDB_SERVER_USER: string;
+			EDGEDB_SERVER_USER: string;
-				EDGEDB_SERVER_DATABASE: string;
+			EDGEDB_SERVER_DATABASE: string;
-				EDGEDB_SERVER_TLS_CERT_MODE: string;
+			EDGEDB_SERVER_TLS_CERT_MODE: string;
-			};
+		};
-	  };
+	};
-export function generateDatabaseConfiguration(database: any, arch: string): DatabaseConfiguration {
+export function generateDatabaseConfiguration(database: any): DatabaseConfiguration {
 	const { id, dbUser, dbUserPassword, rootUser, rootUserPassword, defaultDatabase, version, type } =
 		database;
-	const baseImage = getDatabaseImage(type, arch);
+	const baseImage = getDatabaseImage(type);
 	if (type === 'mysql') {
 		const configuration = {
 			privatePort: 3306,
@@ -927,7 +977,7 @@ export function generateDatabaseConfiguration(database: any, arch: string): Data
 			volume: `${id}-${type}-data:/bitnami/mysql/data`,
 			ulimits: {}
 		};
-		if (isARM(arch)) {
+		if (isARM()) {
 			configuration.volume = `${id}-${type}-data:/var/lib/mysql`;
 		}
 		return configuration;
@@ -945,7 +995,7 @@ export function generateDatabaseConfiguration(database: any, arch: string): Data
 			volume: `${id}-${type}-data:/bitnami/mariadb`,
 			ulimits: {}
 		};
-		if (isARM(arch)) {
+		if (isARM()) {
 			configuration.volume = `${id}-${type}-data:/var/lib/mysql`;
 		}
 		return configuration;
@@ -960,7 +1010,7 @@ export function generateDatabaseConfiguration(database: any, arch: string): Data
 			volume: `${id}-${type}-data:/bitnami/mongodb`,
 			ulimits: {}
 		};
-		if (isARM(arch)) {
+		if (isARM()) {
 			configuration.environmentVariables = {
 				MONGO_INITDB_ROOT_USERNAME: rootUser,
 				MONGO_INITDB_ROOT_PASSWORD: rootUserPassword
@@ -981,8 +1031,8 @@ export function generateDatabaseConfiguration(database: any, arch: string): Data
 			volume: `${id}-${type}-data:/bitnami/postgresql`,
 			ulimits: {}
 		};
-		if (isARM(arch)) {
+		if (isARM()) {
-			configuration.volume = `${id}-${type}-data:/var/lib/postgresql`;
+			configuration.volume = `${id}-${type}-data:/var/lib/postgresql/data`;
 			configuration.environmentVariables = {
 				POSTGRES_PASSWORD: dbUserPassword,
 				POSTGRES_USER: dbUser,
@@ -1005,11 +1055,10 @@ export function generateDatabaseConfiguration(database: any, arch: string): Data
 			volume: `${id}-${type}-data:/bitnami/redis/data`,
 			ulimits: {}
 		};
-		if (isARM(arch)) {
+		if (isARM()) {
 			configuration.volume = `${id}-${type}-data:/data`;
-			configuration.command = `/usr/local/bin/redis-server --appendonly ${
+			configuration.command = `/usr/local/bin/redis-server --appendonly ${appendOnly ? 'yes' : 'no'
-				appendOnly ? 'yes' : 'no'
+				} --requirepass ${dbUserPassword}`;
-			} --requirepass ${dbUserPassword}`;
 		}
 		return configuration;
 	} else if (type === 'couchdb') {
@@ -1023,7 +1072,7 @@ export function generateDatabaseConfiguration(database: any, arch: string): Data
 			volume: `${id}-${type}-data:/bitnami/couchdb`,
 			ulimits: {}
 		};
-		if (isARM(arch)) {
+		if (isARM()) {
 			configuration.volume = `${id}-${type}-data:/opt/couchdb/data`;
 		}
 		return configuration;
@@ -1043,16 +1092,17 @@ export function generateDatabaseConfiguration(database: any, arch: string): Data
 		return configuration;
 	}
 }
-export function isARM(arch: string) {
+export function isARM() {
+	const arch = process.arch;
 	if (arch === 'arm' || arch === 'arm64' || arch === 'aarch' || arch === 'aarch64') {
 		return true;
 	}
 	return false;
 }
-export function getDatabaseImage(type: string, arch: string): string {
+export function getDatabaseImage(type: string): string {
 	const found = supportedDatabaseTypesAndVersions.find((t) => t.name === type);
 	if (found) {
-		if (isARM(arch)) {
+		if (isARM()) {
 			return found.baseImageARM || found.baseImage;
 		}
 		return found.baseImage;
@@ -1060,10 +1110,10 @@ export function getDatabaseImage(type: string, arch: string): string {
 	return '';
 }
 
-export function getDatabaseVersions(type: string, arch: string): string[] {
+export function getDatabaseVersions(type: string): string[] {
 	const found = supportedDatabaseTypesAndVersions.find((t) => t.name === type);
 	if (found) {
-		if (isARM(arch)) {
+		if (isARM()) {
 			return found.versionsARM || found.versions;
 		}
 		return found.versions;
@@ -1093,12 +1143,12 @@ export type ComposeFileService = {
 	command?: string;
 	ports?: string[];
 	build?:
-		| {
+	| {
-				context: string;
+		context: string;
-				dockerfile: string;
+		dockerfile: string;
-				args?: Record<string, unknown>;
+		args?: Record<string, unknown>;
-		  }
+	}
-		| string;
+	| string;
 	deploy?: {
 		restart_policy?: {
 			condition?: string;
@@ -1169,7 +1219,7 @@ export const createDirectories = async ({
 	let workdirFound = false;
 	try {
 		workdirFound = !!(await fs.stat(workdir));
-	} catch (error) {}
+	} catch (error) { }
 	if (workdirFound) {
 		await executeCommand({ command: `rm -fr ${workdir}` });
 	}
@@ -1629,8 +1679,8 @@ export function errorHandler({
 	type?: string | null;
 }) {
 	if (message.message) message = message.message;
-	if (type === 'normal') {
+	if (message.includes('Unique constraint failed')) {
-		Sentry.captureException(message);
+		message = 'This data is unique and already exists. Please try again with a different value.';
 	}
 	throw { status, message };
 }
@@ -1693,7 +1743,7 @@ export async function stopBuild(buildId, applicationId) {
 					}
 				}
 				count++;
-			} catch (error) {}
+			} catch (error) { }
 		}, 100);
 	});
 }
@@ -1712,69 +1762,28 @@ export function convertTolOldVolumeNames(type) {
 	}
 }
 
-export async function cleanupDockerStorage(dockerId, lowDiskSpace, force) {
+export async function cleanupDockerStorage(dockerId, volumes = false) {
-	// Cleanup old coolify images
+	// Cleanup images that are not used by any container
 	try {
-		let { stdout: images } = await executeCommand({
+		await executeCommand({ dockerId, command: `docker image prune -af` });
+	} catch (error) { }
+
+	// Prune coolify managed containers
+	try {
+		await executeCommand({
 			dockerId,
-			command: `docker images coollabsio/coolify --filter before="coollabsio/coolify:${version}" -q | xargs -r`,
+			command: `docker container prune -f --filter "label=coolify.managed=true"`
-			shell: true
 		});
+	} catch (error) { }
 
-		images = images.trim();
+	// Cleanup build caches
-		if (images) {
+	try {
-			await executeCommand({
+		await executeCommand({ dockerId, command: `docker builder prune -af` });
-				dockerId,
+	} catch (error) { }
-				command: `docker rmi -f ${images}" -q | xargs -r`,
+	if (volumes) {
-				shell: true
-			});
-		}
-	} catch (error) {}
-	if (lowDiskSpace || force) {
-		// Cleanup images that are not used
 		try {
-			await executeCommand({ dockerId, command: `docker image prune -f` });
+			await executeCommand({ dockerId, command: `docker volume prune -af` });
-		} catch (error) {}
+		} catch (error) { }
-
-		const { numberOfDockerImagesKeptLocally } = await prisma.setting.findUnique({
-			where: { id: '0' }
-		});
-		const { stdout: images } = await executeCommand({
-			dockerId,
-			command: `docker images|grep -v "<none>"|grep -v REPOSITORY|awk '{print $1, $2}'`,
-			shell: true
-		});
-		const imagesArray = images.trim().replaceAll(' ', ':').split('\n');
-		const imagesSet = new Set(imagesArray.map((image) => image.split(':')[0]));
-		let deleteImage = [];
-		for (const image of imagesSet) {
-			let keepImage = [];
-			for (const image2 of imagesArray) {
-				if (image2.startsWith(image)) {
-					if (keepImage.length >= numberOfDockerImagesKeptLocally) {
-						deleteImage.push(image2);
-					} else {
-						keepImage.push(image2);
-					}
-				}
-			}
-		}
-		for (const image of deleteImage) {
-			await executeCommand({ dockerId, command: `docker image rm -f ${image}` });
-		}
-
-		// Prune coolify managed containers
-		try {
-			await executeCommand({
-				dockerId,
-				command: `docker container prune -f --filter "label=coolify.managed=true"`
-			});
-		} catch (error) {}
-
-		// Cleanup build caches
-		try {
-			await executeCommand({ dockerId, command: `docker builder prune -a -f` });
-		} catch (error) {}
 	}
 }
 
@@ -1875,3 +1884,112 @@ export async function pushToRegistry(
 		command: pushCommand
 	});
 }
+
+function parseSecret(secret, isBuild) {
+	if (secret.value.includes('$')) {
+		secret.value = secret.value.replaceAll('$', '$$$$');
+	}
+	if (secret.value.includes('\\n')) {
+		if (isBuild) {
+			return `ARG ${secret.name}=${secret.value}`;
+		} else {
+			return `${secret.name}=${secret.value}`;
+		}
+	} else if (secret.value.includes(' ')) {
+		if (isBuild) {
+			return `ARG ${secret.name}='${secret.value}'`;
+		} else {
+			return `${secret.name}='${secret.value}'`;
+		}
+	} else {
+		if (isBuild) {
+			return `ARG ${secret.name}=${secret.value}`;
+		} else {
+			return `${secret.name}=${secret.value}`;
+		}
+	}
+}
+export function generateSecrets(
+	secrets: Array<any>,
+	pullmergeRequestId: string,
+	isBuild = false,
+	port = null,
+	compose = false
+): Array<string> {
+	const envs = [];
+	const isPRMRSecret = secrets.filter((s) => s.isPRMRSecret);
+	const normalSecrets = secrets.filter((s) => !s.isPRMRSecret);
+	if (pullmergeRequestId && isPRMRSecret.length > 0) {
+		isPRMRSecret.forEach((secret) => {
+			if (isBuild && !secret.isBuildSecret) {
+				return;
+			}
+			const build = isBuild && secret.isBuildSecret;
+			envs.push(parseSecret(secret, compose ? false : build));
+		});
+	}
+	if (!pullmergeRequestId && normalSecrets.length > 0) {
+		normalSecrets.forEach((secret) => {
+			if (isBuild && !secret.isBuildSecret) {
+				return;
+			}
+			const build = isBuild && secret.isBuildSecret;
+			envs.push(parseSecret(secret, compose ? false : build));
+		});
+	}
+	const portFound = envs.filter((env) => env.startsWith('PORT'));
+	if (portFound.length === 0 && port && !isBuild) {
+		envs.push(`PORT=${port}`);
+	}
+	const nodeEnv = envs.filter((env) => env.startsWith('NODE_ENV'));
+	if (nodeEnv.length === 0 && !isBuild) {
+		envs.push(`NODE_ENV=production`);
+	}
+	return envs;
+}
+
+export async function backupDatabaseNow(database, reply) {
+	const backupFolder = '/tmp'
+	const fileName = `${database.id}-${new Date().getTime()}.gz`
+	const backupFileName = `${backupFolder}/${fileName}`
+	const backupStorageFilename = `/app/backups/${fileName}`
+	let command = null
+	switch (database?.type) {
+		case 'postgresql':
+			command = `docker exec ${database.id} sh -c "PGPASSWORD=${database.rootUserPassword} pg_dumpall -U postgres | gzip > ${backupFileName}"`
+			break;
+		case 'mongodb':
+			command = `docker exec ${database.id} sh -c "mongodump --archive=${backupFileName} --gzip --username=${database.rootUser} --password=${database.rootUserPassword}"`
+			break;
+		case 'mysql':
+			command = `docker exec ${database.id} sh -c "mysqldump --all-databases --single-transaction --quick --lock-tables=false --user=${database.rootUser} --password=${database.rootUserPassword} | gzip > ${backupFileName}"`
+			break;
+		case 'mariadb':
+			command = `docker exec ${database.id} sh -c "mysqldump --all-databases --single-transaction --quick --lock-tables=false --user=${database.rootUser} --password=${database.rootUserPassword} | gzip > ${backupFileName}"`
+			break;
+		case 'couchdb':
+			command = `docker exec ${database.id} sh -c "tar -czvf ${backupFileName} /bitnami/couchdb/data"`
+			break;
+		default:
+			return;
+	}
+	await executeCommand({
+		dockerId: database.destinationDockerId,
+		command,
+	});
+	const copyCommand = `docker cp ${database.id}:${backupFileName} ${backupFileName}`
+	await executeCommand({
+		dockerId: database.destinationDockerId,
+		command: copyCommand
+	});
+	await executeCommand({
+		dockerId: database.destinationDockerId,
+		command: `docker cp ${database.id}:${backupFileName} /app/backups/`
+	});
+	const stream = fsNormal.createReadStream(backupFileName);
+	reply.header('Content-Type', 'application/octet-stream');
+	reply.header('Content-Disposition', `attachment; filename=${fileName}`);
+	reply.header('Content-Length', fsNormal.statSync(backupFileName).size);
+	reply.header('Content-Transfer-Encoding', 'binary');
+	return reply.send(stream)
+}

apps/api/src/lib/importers/gitlab.ts

@@ -12,7 +12,8 @@ export default async function ({
 	buildId,
 	privateSshKey,
 	customPort,
-	forPublic
+	forPublic,
+	customUser,
 }: {
 	applicationId: string;
 	workdir: string;
@@ -25,6 +26,7 @@ export default async function ({
 	privateSshKey: string;
 	customPort: number;
 	forPublic: boolean;
+	customUser: string;
 }): Promise<string> {
 	const url = htmlUrl.replace('https://', '').replace('http://', '').replace(/\/$/, '');
 	if (!forPublic) {
@@ -53,7 +55,7 @@ export default async function ({
 	} else {
 		await executeCommand({
 			command:
-				`git clone -q -b ${branch} git@${url}:${repository}.git --config core.sshCommand="ssh -p ${customPort} -q -i ${repodir}id.rsa -o StrictHostKeyChecking=no" ${workdir}/ && cd ${workdir}/ && git checkout ${gitCommitHash || ""} && git submodule update --init --recursive && git lfs pull && cd .. `, shell: true
+				`git clone -q -b ${branch} ${customUser}@${url}:${repository}.git --config core.sshCommand="ssh -p ${customPort} -q -i ${repodir}id.rsa -o StrictHostKeyChecking=no" ${workdir}/ && cd ${workdir}/ && git checkout ${gitCommitHash || ""} && git submodule update --init --recursive && git lfs pull && cd .. `, shell: true
 		}
 		);
 	}

apps/api/src/lib/services.ts

@@ -1,51 +1,47 @@
-import { isARM, isDev } from "./common";
+import { isARM, isDev } from './common';
 import fs from 'fs/promises';
 export async function getTemplates() {
-    const templatePath = isDev ? './templates.json' : '/app/templates.json';
+	const templatePath = isDev ? './templates.json' : '/app/templates.json';
-    const open = await fs.open(templatePath, 'r');
+	const open = await fs.open(templatePath, 'r');
-    try {
+	try {
-        let data = await open.readFile({ encoding: 'utf-8' });
+		let data = await open.readFile({ encoding: 'utf-8' });
-        let jsonData = JSON.parse(data)
+		let jsonData = JSON.parse(data);
-        if (isARM(process.arch)) {
+		if (isARM()) {
-            jsonData = jsonData.filter(d => d.arch !== 'amd64')
+			jsonData = jsonData.filter((d) => d.arch !== 'amd64');
-        }
+		}
-        return jsonData;
+		return jsonData;
-    } catch (error) {
+	} catch (error) {
-        return []
+		return [];
-    } finally {
+	} finally {
-        await open?.close()
+		await open?.close();
-    }
+	}
 }
 const compareSemanticVersions = (a: string, b: string) => {
-    const a1 = a.split('.');
+	const a1 = a.split('.');
-    const b1 = b.split('.');
+	const b1 = b.split('.');
-    const len = Math.min(a1.length, b1.length);
+	const len = Math.min(a1.length, b1.length);
-    for (let i = 0; i < len; i++) {
+	for (let i = 0; i < len; i++) {
-        const a2 = +a1[i] || 0;
+		const a2 = +a1[i] || 0;
-        const b2 = +b1[i] || 0;
+		const b2 = +b1[i] || 0;
-        if (a2 !== b2) {
+		if (a2 !== b2) {
-            return a2 > b2 ? 1 : -1;
+			return a2 > b2 ? 1 : -1;
-        }
+		}
-    }
+	}
-    return b1.length - a1.length;
+	return b1.length - a1.length;
 };
 export async function getTags(type: string) {
-
+	try {
-    try {
+		if (type) {
-        if (type) {
+			const tagsPath = isDev ? './tags.json' : '/app/tags.json';
-            const tagsPath = isDev ? './tags.json' : '/app/tags.json';
+			const data = await fs.readFile(tagsPath, 'utf8');
-            const data = await fs.readFile(tagsPath, 'utf8')
+			let tags = JSON.parse(data);
-            let tags = JSON.parse(data)
+			if (tags) {
-            if (tags) {
+				tags = tags.find((tag: any) => tag.name.includes(type));
-                tags = tags.find((tag: any) => tag.name.includes(type))
+				tags.tags = tags.tags.sort(compareSemanticVersions).reverse();
-                tags.tags = tags.tags.sort(compareSemanticVersions).reverse();
+				return tags;
-                return tags
+			}
-            }
+		}
-        }
+	} catch (error) {
-    } catch (error) {
+		return [];
-        return []
+	}
-
-    }
-
-
 }

apps/api/src/lib/services/handlers.ts

@@ -40,7 +40,7 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
         const { id } = request.params;
         const teamId = request.user.teamId;
         const service = await getServiceFromDB({ id, teamId });
-        const arm = isARM(service.arch);
+        const arm = isARM();
         const { type, destinationDockerId, destinationDocker, persistentStorage, exposePort } =
             service;
 
@@ -50,24 +50,12 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
         const config = {};
         for (const s in template.services) {
             let newEnvironments = []
-            if (arm) {
+            if (template.services[s]?.environment?.length > 0) {
-                if (template.services[s]?.environmentArm?.length > 0) {
+                for (const environment of template.services[s].environment) {
-                    for (const environment of template.services[s].environmentArm) {
+                    let [env, ...value] = environment.split("=");
-                        let [env, ...value] = environment.split("=");
+                    value = value.join("=")
-                        value = value.join("=")
+                    if (!value.startsWith('$$secret') && value !== '') {
-                        if (!value.startsWith('$$secret') && value !== '') {
+                        newEnvironments.push(`${env}=${value}`)
-                            newEnvironments.push(`${env}=${value}`)
-                        }
-                    }
-                }
-            } else {
-                if (template.services[s]?.environment?.length > 0) {
-                    for (const environment of template.services[s].environment) {
-                        let [env, ...value] = environment.split("=");
-                        value = value.join("=")
-                        if (!value.startsWith('$$secret') && value !== '') {
-                            newEnvironments.push(`${env}=${value}`)
-                        }
                     }
                 }
             }
@@ -87,12 +75,13 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
             }
             const customVolumes = await prisma.servicePersistentStorage.findMany({ where: { serviceId: id } })
             let volumes = new Set()
-            if (arm) {
+            if (arm && template.services[s]?.volumesArm?.length > 0) {
-                template.services[s]?.volumesArm && template.services[s].volumesArm.length > 0 && template.services[s].volumesArm.forEach(v => volumes.add(v))
+                template.services[s].volumesArm.forEach(v => volumes.add(v))
             } else {
-                template.services[s]?.volumes && template.services[s].volumes.length > 0 && template.services[s].volumes.forEach(v => volumes.add(v))
+                if (template.services[s]?.volumes?.length > 0) {
+                    template.services[s].volumes.forEach(v => volumes.add(v))
+                }
             }
-
             // Workaround: old plausible analytics service wrong volume id name
             if (service.type === 'plausibleanalytics' && service.plausibleAnalytics?.id) {
                 let temp = Array.from(volumes)

apps/api/src/lib/services/serviceFields.ts

@@ -624,7 +624,7 @@ export const glitchTip = [{
 	isEncrypted: false
 },
 {
-	name: 'emailSmtpUseSsl',
+	name: 'emailSmtpUseTls',
 	isEditable: true,
 	isLowerCase: false,
 	isNumber: false,

apps/api/src/plugins/jwt.ts

@@ -1,33 +1,37 @@
-import fp from 'fastify-plugin'
+import fp from 'fastify-plugin';
-import fastifyJwt, { FastifyJWTOptions } from '@fastify/jwt'
+import fastifyJwt, { FastifyJWTOptions } from '@fastify/jwt';
 
-declare module "@fastify/jwt" {
+declare module '@fastify/jwt' {
-    interface FastifyJWT {
+	interface FastifyJWT {
-        user: {
+		user: {
-            userId: string,
+			userId: string;
-            teamId: string,
+			teamId: string;
-            permission: string,
+			permission: string;
-            isAdmin: boolean
+			isAdmin: boolean;
-        }
+		};
-    }
+	}
 }
 
 export default fp<FastifyJWTOptions>(async (fastify, opts) => {
-    fastify.register(fastifyJwt, {
+	let secretKey = fastify.config.COOLIFY_SECRET_KEY_BETTER;
-        secret: fastify.config.COOLIFY_SECRET_KEY
+	if (!secretKey) {
-    })
+		secretKey = fastify.config.COOLIFY_SECRET_KEY;
+	}
+	fastify.register(fastifyJwt, {
+		secret: secretKey
+	});
 
-    fastify.decorate("authenticate", async function (request, reply) {
+	fastify.decorate('authenticate', async function (request, reply) {
-        try {
+		try {
-            await request.jwtVerify()
+			await request.jwtVerify();
-        } catch (err) {
+		} catch (err) {
-            reply.send(err)
+			reply.send(err);
-        }
+		}
-    })
+	});
-})
+});
 
 declare module 'fastify' {
-    export interface FastifyInstance {
+	export interface FastifyInstance {
-        authenticate(): Promise<void>
+		authenticate(): Promise<void>;
-    }
+	}
 }

apps/api/src/routes/api/v1/applications/types.ts

@@ -1,154 +1,174 @@
-import type { OnlyId } from "../../../../types";
+import type { OnlyId } from '../../../../types';
 
 export interface SaveApplication extends OnlyId {
-    Body: {
+	Body: {
-        name: string,
+		name: string;
-        buildPack: string,
+		buildPack: string;
-        fqdn: string,
+		fqdn: string;
-        port: number,
+		port: number;
-        exposePort: number,
+		exposePort: number;
-        installCommand: string,
+		installCommand: string;
-        buildCommand: string,
+		buildCommand: string;
-        startCommand: string,
+		startCommand: string;
-        baseDirectory: string,
+		baseDirectory: string;
-        publishDirectory: string,
+		publishDirectory: string;
-        pythonWSGI: string,
+		pythonWSGI: string;
-        pythonModule: string,
+		pythonModule: string;
-        pythonVariable: string,
+		pythonVariable: string;
-        dockerFileLocation: string,
+		dockerFileLocation: string;
-        denoMainFile: string,
+		denoMainFile: string;
-        denoOptions: string,
+		denoOptions: string;
-        baseImage: string,
+		baseImage: string;
-        gitCommitHash: string,
+		gitCommitHash: string;
-        baseBuildImage: string,
+		baseBuildImage: string;
-        deploymentType: string,
+		deploymentType: string;
-        baseDatabaseBranch: string,
+		baseDatabaseBranch: string;
-        dockerComposeFile: string,
+		dockerComposeFile: string;
-        dockerComposeFileLocation: string,
+		dockerComposeFileLocation: string;
-        dockerComposeConfiguration: string,
+		dockerComposeConfiguration: string;
-        simpleDockerfile: string,
+		simpleDockerfile: string;
-        dockerRegistryImageName: string
+		dockerRegistryImageName: string;
-    }
+		basicAuthPw: string;
+		basicAuthUser: string;
+	};
 }
 export interface SaveApplicationSettings extends OnlyId {
-    Querystring: { domain: string; };
+	Querystring: { domain: string };
-    Body: { debug: boolean; previews: boolean; dualCerts: boolean; autodeploy: boolean; branch: string; projectId: number; isBot: boolean; isDBBranching: boolean, isCustomSSL: boolean };
+	Body: {
+		debug: boolean;
+		previews: boolean;
+		dualCerts: boolean;
+		autodeploy: boolean;
+		branch: string;
+		projectId: number;
+		isBot: boolean;
+		isDBBranching: boolean;
+		isCustomSSL: boolean;
+		isHttp2: boolean;
+		basicAuth: boolean;
+	};
 }
 export interface DeleteApplication extends OnlyId {
-    Querystring: { domain: string; };
+	Querystring: { domain: string };
-    Body: { force: boolean }
+	Body: { force: boolean };
 }
 export interface CheckDomain extends OnlyId {
-    Querystring: { domain: string; };
+	Querystring: { domain: string };
 }
 export interface CheckDNS extends OnlyId {
-    Querystring: { domain: string; };
+	Querystring: { domain: string };
-    Body: {
+	Body: {
-        exposePort: number,
+		exposePort: number;
-        fqdn: string,
+		fqdn: string;
-        forceSave: boolean,
+		forceSave: boolean;
-        dualCerts: boolean
+		dualCerts: boolean;
-    }
+	};
 }
 export interface DeployApplication {
-    Querystring: { domain: string }
+	Querystring: { domain: string };
-    Body: { pullmergeRequestId: string | null, branch: string, forceRebuild?: boolean }
+	Body: { pullmergeRequestId: string | null; branch: string; forceRebuild?: boolean };
 }
 export interface GetImages {
-    Body: { buildPack: string, deploymentType: string }
+	Body: { buildPack: string; deploymentType: string };
 }
 export interface SaveApplicationSource extends OnlyId {
-    Body: { gitSourceId?: string | null, forPublic?: boolean, type?: string, simpleDockerfile?: string }
+	Body: {
+		gitSourceId?: string | null;
+		forPublic?: boolean;
+		type?: string;
+		simpleDockerfile?: string;
+	};
 }
 export interface CheckRepository extends OnlyId {
-    Querystring: { repository: string, branch: string }
+	Querystring: { repository: string; branch: string };
 }
 export interface SaveDestination extends OnlyId {
-    Body: { destinationId: string }
+	Body: { destinationId: string };
 }
 export interface SaveSecret extends OnlyId {
-    Body: {
+	Body: {
-        name: string,
+		name: string;
-        value: string,
+		value: string;
-        isBuildSecret: boolean,
+		isBuildSecret: boolean;
-        previewSecret: boolean,
+		previewSecret: boolean;
-        isNew: boolean
+		isNew: boolean;
-    }
+	};
 }
 export interface DeleteSecret extends OnlyId {
-    Body: { name: string }
+	Body: { name: string };
 }
 export interface SaveStorage extends OnlyId {
-    Body: {
+	Body: {
-        path: string,
+		hostPath?: string;
-        newStorage: boolean,
+		path: string;
-        storageId: string
+		newStorage: boolean;
-    }
+		storageId: string;
+	};
 }
 export interface DeleteStorage extends OnlyId {
-    Body: {
+	Body: {
-        path: string,
+		path: string;
-    }
+	};
 }
 export interface GetApplicationLogs {
-    Params: {
+	Params: {
-        id: string,
+		id: string;
-        containerId: string
+		containerId: string;
-    }
+	};
-    Querystring: {
+	Querystring: {
-        since: number,
+		since: number;
-    }
+	};
 }
 export interface GetBuilds extends OnlyId {
-    Querystring: {
+	Querystring: {
-        buildId: string
+		buildId: string;
-        skip: number,
+		skip: number;
-    }
+	};
 }
 export interface GetBuildIdLogs {
-    Params: {
+	Params: {
-        id: string,
+		id: string;
-        buildId: string
+		buildId: string;
-    },
+	};
-    Querystring: {
+	Querystring: {
-        sequence: number
+		sequence: number;
-    }
+	};
 }
 export interface SaveDeployKey extends OnlyId {
-    Body: {
+	Body: {
-        deployKeyId: number
+		deployKeyId: number;
-    }
+	};
 }
 export interface CancelDeployment {
-    Body: {
+	Body: {
-        buildId: string,
+		buildId: string;
-        applicationId: string
+		applicationId: string;
-    }
+	};
 }
 export interface DeployApplication extends OnlyId {
-    Body: {
+	Body: {
-        pullmergeRequestId: string | null,
+		pullmergeRequestId: string | null;
-        branch: string,
+		branch: string;
-        forceRebuild?: boolean
+		forceRebuild?: boolean;
-    }
+	};
 }
 
 export interface StopPreviewApplication extends OnlyId {
-    Body: {
+	Body: {
-        pullmergeRequestId: string | null,
+		pullmergeRequestId: string | null;
-    }
+	};
 }
 export interface RestartPreviewApplication {
-    Params: {
+	Params: {
-        id: string,
+		id: string;
-        pullmergeRequestId: string | null,
+		pullmergeRequestId: string | null;
-    }
+	};
 }
 export interface RestartApplication {
-    Params: {
+	Params: {
-        id: string,
+		id: string;
-    },
+	};
-    Body: {
+	Body: {
-        imageId: string | null,
+		imageId: string | null;
-    }
+	};
 }

apps/api/src/routes/api/v1/base/index.ts

@@ -1,31 +1,31 @@
 import { FastifyPluginAsync } from 'fastify';
-import { errorHandler, listSettings, version } from '../../../../lib/common';
+import { errorHandler, isARM, listSettings, version } from '../../../../lib/common';
 
 const root: FastifyPluginAsync = async (fastify): Promise<void> => {
-    fastify.addHook('onRequest', async (request) => {
+	fastify.addHook('onRequest', async (request) => {
-        try {
+		try {
-            await request.jwtVerify()
+			await request.jwtVerify();
-        } catch(error) {
+		} catch (error) {
-            return
+			return;
-        }
+		}
-    });
+	});
-    fastify.get('/', async (request) => {
+	fastify.get('/', async (request) => {
-        const teamId = request.user?.teamId;
+		const teamId = request.user?.teamId;
-        const settings = await listSettings()
+		const settings = await listSettings();
-        try {
+		try {
-            return {
+			return {
-                ipv4: teamId ? settings.ipv4 : null,
+				ipv4: teamId ? settings.ipv4 : null,
-                ipv6: teamId ? settings.ipv6 : null,
+				ipv6: teamId ? settings.ipv6 : null,
-                version,
+				version,
-                whiteLabeled: process.env.COOLIFY_WHITE_LABELED === 'true',
+				whiteLabeled: process.env.COOLIFY_WHITE_LABELED === 'true',
-                whiteLabeledIcon: process.env.COOLIFY_WHITE_LABELED_ICON,
+				whiteLabeledIcon: process.env.COOLIFY_WHITE_LABELED_ICON,
-                isRegistrationEnabled: settings.isRegistrationEnabled,
+				isRegistrationEnabled: settings.isRegistrationEnabled,
-            }
+				isARM: isARM()
-        } catch ({ status, message }) {
+			};
-            return errorHandler({ status, message })
+		} catch ({ status, message }) {
-        }
+			return errorHandler({ status, message });
-    });
+		}
-
+	});
 };
 
 export default root;

apps/api/src/routes/api/v1/databases/index.ts

@@ -1,5 +1,5 @@
 import { FastifyPluginAsync } from 'fastify';
-import { cleanupUnconfiguredDatabases, deleteDatabase, deleteDatabaseSecret, getDatabase, getDatabaseLogs, getDatabaseSecrets, getDatabaseStatus, getDatabaseTypes, getDatabaseUsage, getVersions, listDatabases, newDatabase, saveDatabase, saveDatabaseDestination, saveDatabaseSecret, saveDatabaseSettings, saveDatabaseType, saveVersion, startDatabase, stopDatabase } from './handlers';
+import { backupDatabase, cleanupUnconfiguredDatabases, deleteDatabase, deleteDatabaseSecret, getDatabase, getDatabaseLogs, getDatabaseSecrets, getDatabaseStatus, getDatabaseTypes, getDatabaseUsage, getVersions, listDatabases, newDatabase, saveDatabase, saveDatabaseDestination, saveDatabaseSecret, saveDatabaseSettings, saveDatabaseType, saveVersion, startDatabase, stopDatabase } from './handlers';
 
 import type { OnlyId } from '../../../../types';
 
@@ -39,6 +39,7 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
 
     fastify.post<OnlyId>('/:id/start', async (request) => await startDatabase(request));
     fastify.post<OnlyId>('/:id/stop', async (request) => await stopDatabase(request));
+    fastify.post<OnlyId>('/:id/backup', async (request, reply) => await backupDatabase(request, reply));
 };
 
 export default root;

apps/api/src/routes/api/v1/databases/types.ts

@@ -4,7 +4,7 @@ export interface SaveDatabaseType extends OnlyId {
     Body: { type: string }
 }
 export interface DeleteDatabase extends OnlyId {
-    Body: { force: string }
+    Body: { }
 }
 export interface SaveVersion extends OnlyId {
     Body: {

apps/api/src/routes/api/v1/destinations/handlers.ts

@@ -1,279 +1,384 @@
 import type { FastifyRequest } from 'fastify';
 import { FastifyReply } from 'fastify';
-import sshConfig from 'ssh-config'
+import {
-import fs from 'fs/promises'
+	errorHandler,
-import os from 'os';
+	executeCommand,
-
+	listSettings,
-import { createRemoteEngineConfiguration, decrypt, errorHandler, executeCommand, listSettings, prisma, startTraefikProxy, stopTraefikProxy } from '../../../../lib/common';
+	prisma,
+	startTraefikProxy,
+	stopTraefikProxy
+} from '../../../../lib/common';
 import { checkContainer } from '../../../../lib/docker';
 
 import type { OnlyId } from '../../../../types';
-import type { CheckDestination, ListDestinations, NewDestination, Proxy, SaveDestinationSettings } from './types';
+import type {
+	CheckDestination,
+	ListDestinations,
+	NewDestination,
+	Proxy,
+	SaveDestinationSettings
+} from './types';
+import { removeService } from '../../../../lib/services/common';
 
 export async function listDestinations(request: FastifyRequest<ListDestinations>) {
-    try {
+	try {
-        const teamId = request.user.teamId;
+		const teamId = request.user.teamId;
-        const { onlyVerified = false } = request.query
+		const { onlyVerified = false } = request.query;
-        let destinations = []
+		let destinations = [];
-        if (teamId === '0') {
+		if (teamId === '0') {
-            destinations = await prisma.destinationDocker.findMany({ include: { teams: true } });
+			destinations = await prisma.destinationDocker.findMany({ include: { teams: true } });
-        } else {
+		} else {
-            destinations = await prisma.destinationDocker.findMany({
+			destinations = await prisma.destinationDocker.findMany({
-                where: { teams: { some: { id: teamId } } },
+				where: { teams: { some: { id: teamId } } },
-                include: { teams: true }
+				include: { teams: true }
-            });
+			});
-        }
+		}
-        if (onlyVerified) {
+		if (onlyVerified) {
-            destinations = destinations.filter(destination => destination.engine || (destination.remoteEngine && destination.remoteVerified))
+			destinations = destinations.filter(
-        }
+				(destination) =>
-        return {
+					destination.engine || (destination.remoteEngine && destination.remoteVerified)
-            destinations
+			);
-        }
+		}
-    } catch ({ status, message }) {
+		return {
-        return errorHandler({ status, message })
+			destinations
-    }
+		};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function checkDestination(request: FastifyRequest<CheckDestination>) {
-    try {
+	try {
-        const { network } = request.body;
+		const { network } = request.body;
-        const found = await prisma.destinationDocker.findFirst({ where: { network } });
+		const found = await prisma.destinationDocker.findFirst({ where: { network } });
-        if (found) {
+		if (found) {
-            throw {
+			throw {
-                message: `Network already exists: ${network}`
+				message: `Network already exists: ${network}`
-            };
+			};
-        }
+		}
-        return {}
+		return {};
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 export async function getDestination(request: FastifyRequest<OnlyId>) {
-    try {
+	try {
-        const { id } = request.params
+		const { id } = request.params;
-        const teamId = request.user?.teamId;
+		const teamId = request.user?.teamId;
-        const destination = await prisma.destinationDocker.findFirst({
+		const destination = await prisma.destinationDocker.findFirst({
-            where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
+			where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
-            include: { sshKey: true, application: true, service: true, database: true }
+			include: { sshKey: true, application: true, service: true, database: true }
-        });
+		});
-        if (!destination && id !== 'new') {
+		if (!destination && id !== 'new') {
-            throw { status: 404, message: `Destination not found.` };
+			throw { status: 404, message: `Destination not found.` };
-        }
+		}
-        const settings = await listSettings();
+		const settings = await listSettings();
-        const payload = {
+		const payload = {
-            destination,
+			destination,
-            settings
+			settings
-        };
+		};
-        return {
+		return {
-            ...payload
+			...payload
-        };
+		};
-
+	} catch ({ status, message }) {
-    } catch ({ status, message }) {
+		return errorHandler({ status, message });
-        return errorHandler({ status, message })
+	}
-    }
 }
 export async function newDestination(request: FastifyRequest<NewDestination>, reply: FastifyReply) {
-    try {
+	try {
-        const teamId = request.user.teamId;
+		const teamId = request.user.teamId;
-        const { id } = request.params
+		const { id } = request.params;
 
-        let { name, network, engine, isCoolifyProxyUsed, remoteIpAddress, remoteUser, remotePort } = request.body
+		let { name, network, engine, isCoolifyProxyUsed, remoteIpAddress, remoteUser, remotePort } =
-        if (id === 'new') {
+			request.body;
-            if (engine) {
+		if (id === 'new') {
-                const { stdout } = await await executeCommand({ command: `docker network ls --filter 'name=^${network}$' --format '{{json .}}'` });
+			if (engine) {
-                if (stdout === '') {
+				const { stdout } = await await executeCommand({
-                    await await executeCommand({ command: `docker network create --attachable ${network}` });
+					command: `docker network ls --filter 'name=^${network}$' --format '{{json .}}'`
-                }
+				});
-                await prisma.destinationDocker.create({
+				if (stdout === '') {
-                    data: { name, teams: { connect: { id: teamId } }, engine, network, isCoolifyProxyUsed }
+					await await executeCommand({ command: `docker network create --attachable ${network}` });
-                });
+				}
-                const destinations = await prisma.destinationDocker.findMany({ where: { engine } });
+				await prisma.destinationDocker.create({
-                const destination = destinations.find((destination) => destination.network === network);
+					data: { name, teams: { connect: { id: teamId } }, engine, network, isCoolifyProxyUsed }
-                if (destinations.length > 0) {
+				});
-                    const proxyConfigured = destinations.find(
+				const destinations = await prisma.destinationDocker.findMany({ where: { engine } });
-                        (destination) => destination.network !== network && destination.isCoolifyProxyUsed === true
+				const destination = destinations.find((destination) => destination.network === network);
-                    );
+				if (destinations.length > 0) {
-                    if (proxyConfigured) {
+					const proxyConfigured = destinations.find(
-                        isCoolifyProxyUsed = !!proxyConfigured.isCoolifyProxyUsed;
+						(destination) =>
-                    }
+							destination.network !== network && destination.isCoolifyProxyUsed === true
-                    await prisma.destinationDocker.updateMany({ where: { engine }, data: { isCoolifyProxyUsed } });
+					);
-                }
+					if (proxyConfigured) {
-                if (isCoolifyProxyUsed) {
+						isCoolifyProxyUsed = !!proxyConfigured.isCoolifyProxyUsed;
-                    await startTraefikProxy(destination.id);
+					}
-                }
+					await prisma.destinationDocker.updateMany({
-                return reply.code(201).send({ id: destination.id });
+						where: { engine },
-            } else {
+						data: { isCoolifyProxyUsed }
-                const destination = await prisma.destinationDocker.create({
+					});
-                    data: { name, teams: { connect: { id: teamId } }, engine, network, isCoolifyProxyUsed, remoteEngine: true, remoteIpAddress, remoteUser, remotePort: Number(remotePort) }
+				}
-                });
+				if (isCoolifyProxyUsed) {
-                return reply.code(201).send({ id: destination.id })
+					await startTraefikProxy(destination.id);
-            }
+				}
-        } else {
+				return reply.code(201).send({ id: destination.id });
-            await prisma.destinationDocker.update({ where: { id }, data: { name, engine, network } });
+			} else {
-            return reply.code(201).send();
+				const destination = await prisma.destinationDocker.create({
-        }
+					data: {
-
+						name,
-    } catch ({ status, message }) {
+						teams: { connect: { id: teamId } },
-        return errorHandler({ status, message })
+						engine,
-    }
+						network,
+						isCoolifyProxyUsed,
+						remoteEngine: true,
+						remoteIpAddress,
+						remoteUser,
+						remotePort: Number(remotePort)
+					}
+				});
+				return reply.code(201).send({ id: destination.id });
+			}
+		} else {
+			await prisma.destinationDocker.update({ where: { id }, data: { name, engine, network } });
+			return reply.code(201).send();
+		}
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
+}
+export async function forceDeleteDestination(request: FastifyRequest<OnlyId>) {
+	try {
+		const { id } = request.params;
+		const services = await prisma.service.findMany({ where: { destinationDockerId: id } });
+		for (const service of services) {
+			await removeService({ id: service.id });
+		}
+		const applications = await prisma.application.findMany({ where: { destinationDockerId: id } });
+		for (const application of applications) {
+			await prisma.applicationSettings.deleteMany({ where: { application: { id: application.id } } });
+			await prisma.buildLog.deleteMany({ where: { applicationId: application.id } });
+			await prisma.build.deleteMany({ where: { applicationId: application.id } });
+			await prisma.secret.deleteMany({ where: { applicationId: application.id } });
+			await prisma.applicationPersistentStorage.deleteMany({ where: { applicationId: application.id } });
+			await prisma.applicationConnectedDatabase.deleteMany({ where: { applicationId: application.id } });
+			await prisma.previewApplication.deleteMany({ where: { applicationId: application.id } });
+		}
+		const databases = await prisma.database.findMany({ where: { destinationDockerId: id } });
+		for (const database of databases) {
+			await prisma.databaseSettings.deleteMany({ where: { databaseId: database.id } });
+			await prisma.databaseSecret.deleteMany({ where: { databaseId: database.id } });
+			await prisma.database.delete({ where: { id: database.id } });
+		}
+		await prisma.destinationDocker.delete({ where: { id } });
+		return {};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function deleteDestination(request: FastifyRequest<OnlyId>) {
-    try {
+	try {
-        const { id } = request.params
+		const { id } = request.params;
-        const { network, remoteVerified, engine, isCoolifyProxyUsed } = await prisma.destinationDocker.findUnique({ where: { id } });
+		const appFound = await prisma.application.findFirst({ where: { destinationDockerId: id } });
-        if (isCoolifyProxyUsed) {
+		const serviceFound = await prisma.service.findFirst({ where: { destinationDockerId: id } });
-            if (engine || remoteVerified) {
+		const databaseFound = await prisma.database.findFirst({ where: { destinationDockerId: id } });
-                const { stdout: found } = await executeCommand({
+		if (appFound || serviceFound || databaseFound) {
-                    dockerId: id,
+			throw {
-                    command: `docker ps -a --filter network=${network} --filter name=coolify-proxy --format '{{.}}'`
+				message: `Destination is in use.<br>Remove all applications, services and databases using this destination first.`
-                })
+			};
-                if (found) {
+		}
-                    await executeCommand({ dockerId: id, command: `docker network disconnect ${network} coolify-proxy` })
+		const { network, remoteVerified, engine, isCoolifyProxyUsed } =
-                    await executeCommand({ dockerId: id, command: `docker network rm ${network}` })
+			await prisma.destinationDocker.findUnique({ where: { id } });
-                }
+		if (isCoolifyProxyUsed) {
-            }
+			if (engine || remoteVerified) {
-        }
+				const { stdout: found } = await executeCommand({
-        await prisma.destinationDocker.delete({ where: { id } });
+					dockerId: id,
-        return {}
+					command: `docker ps -a --filter network=${network} --filter name=coolify-proxy --format '{{.}}'`
-    } catch ({ status, message }) {
+				});
-        return errorHandler({ status, message })
+				if (found) {
-    }
+					await executeCommand({
+						dockerId: id,
+						command: `docker network disconnect ${network} coolify-proxy`
+					});
+					await executeCommand({ dockerId: id, command: `docker network rm ${network}` });
+				}
+			}
+		}
+		await prisma.destinationDocker.delete({ where: { id } });
+		return {};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function saveDestinationSettings(request: FastifyRequest<SaveDestinationSettings>) {
-    try {
+	try {
-        const { engine, isCoolifyProxyUsed } = request.body;
+		const { engine, isCoolifyProxyUsed } = request.body;
-        await prisma.destinationDocker.updateMany({
+		await prisma.destinationDocker.updateMany({
-            where: { engine },
+			where: { engine },
-            data: { isCoolifyProxyUsed }
+			data: { isCoolifyProxyUsed }
-        });
+		});
 
-        return {
+		return {
-            status: 202
+			status: 202
-        }
+		};
-        // return reply.code(201).send();
+		// return reply.code(201).send();
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 export async function startProxy(request: FastifyRequest<Proxy>) {
-    const { id } = request.params
+	const { id } = request.params;
-    try {
+	try {
-        await startTraefikProxy(id);
+		await startTraefikProxy(id);
-        return {}
+		return {};
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        await stopTraefikProxy(id);
+		await stopTraefikProxy(id);
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 export async function stopProxy(request: FastifyRequest<Proxy>) {
-    const { id } = request.params
+	const { id } = request.params;
-    try {
+	try {
-        await stopTraefikProxy(id);
+		await stopTraefikProxy(id);
-        return {}
+		return {};
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 export async function restartProxy(request: FastifyRequest<Proxy>) {
-    const { id } = request.params
+	const { id } = request.params;
-    try {
+	try {
-        await stopTraefikProxy(id);
+		await stopTraefikProxy(id);
-        await startTraefikProxy(id);
+		await startTraefikProxy(id);
-        await prisma.destinationDocker.update({
+		await prisma.destinationDocker.update({
-            where: { id },
+			where: { id },
-            data: { isCoolifyProxyUsed: true }
+			data: { isCoolifyProxyUsed: true }
-        });
+		});
-        return {}
+		return {};
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        await prisma.destinationDocker.update({
+		await prisma.destinationDocker.update({
-            where: { id },
+			where: { id },
-            data: { isCoolifyProxyUsed: false }
+			data: { isCoolifyProxyUsed: false }
-        });
+		});
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 
 export async function assignSSHKey(request: FastifyRequest) {
-    try {
+	try {
-        const { id: sshKeyId } = request.body;
+		const { id: sshKeyId } = request.body;
-        const { id } = request.params;
+		const { id } = request.params;
-        await prisma.destinationDocker.update({ where: { id }, data: { sshKey: { connect: { id: sshKeyId } } } })
+		await prisma.destinationDocker.update({
-        return {}
+			where: { id },
-    } catch ({ status, message }) {
+			data: { sshKey: { connect: { id: sshKeyId } } }
-        return errorHandler({ status, message })
+		});
-    }
+		return {};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function verifyRemoteDockerEngineFn(id: string) {
-    const { remoteIpAddress, network, isCoolifyProxyUsed } = await prisma.destinationDocker.findFirst({ where: { id } })
+	const { remoteIpAddress, network, isCoolifyProxyUsed } = await prisma.destinationDocker.findFirst(
-    const daemonJson = `daemon-${id}.json`
+		{ where: { id } }
-    try {
+	);
-        await executeCommand({ sshCommand: true, command: `docker network inspect ${network}`, dockerId: id });
+	const daemonJson = `daemon-${id}.json`;
-    } catch (error) {
+	try {
-        await executeCommand({ command: `docker network create --attachable ${network}`, dockerId: id });
+		await executeCommand({
-    }
+			sshCommand: true,
+			command: `docker network inspect ${network}`,
+			dockerId: id
+		});
+	} catch (error) {
+		await executeCommand({
+			command: `docker network create --attachable ${network}`,
+			dockerId: id
+		});
+	}
 
-    try {
+	try {
-        await executeCommand({ sshCommand: true, command: `docker network inspect coolify-infra`, dockerId: id });
+		await executeCommand({
-    } catch (error) {
+			sshCommand: true,
-        await executeCommand({ command: `docker network create --attachable coolify-infra`, dockerId: id });
+			command: `docker network inspect coolify-infra`,
-    }
+			dockerId: id
+		});
+	} catch (error) {
+		await executeCommand({
+			command: `docker network create --attachable coolify-infra`,
+			dockerId: id
+		});
+	}
 
-    if (isCoolifyProxyUsed) await startTraefikProxy(id);
+	if (isCoolifyProxyUsed) await startTraefikProxy(id);
-    let isUpdated = false;
+	let isUpdated = false;
-    let daemonJsonParsed = {
+	let daemonJsonParsed = {
-        "live-restore": true,
+		'live-restore': true,
-        "features": {
+		features: {
-            "buildkit": true
+			buildkit: true
-        }
+		}
-    };
+	};
-    try {
+	try {
-        const { stdout: daemonJson } = await executeCommand({ sshCommand: true, dockerId: id, command: `cat /etc/docker/daemon.json` });
+		const { stdout: daemonJson } = await executeCommand({
-        daemonJsonParsed = JSON.parse(daemonJson);
+			sshCommand: true,
-        if (!daemonJsonParsed['live-restore'] || daemonJsonParsed['live-restore'] !== true) {
+			dockerId: id,
-            isUpdated = true;
+			command: `cat /etc/docker/daemon.json`
-            daemonJsonParsed['live-restore'] = true
+		});
-
+		daemonJsonParsed = JSON.parse(daemonJson);
-        }
+		if (!daemonJsonParsed['live-restore'] || daemonJsonParsed['live-restore'] !== true) {
-        if (!daemonJsonParsed?.features?.buildkit) {
+			isUpdated = true;
-            isUpdated = true;
+			daemonJsonParsed['live-restore'] = true;
-            daemonJsonParsed.features = {
+		}
-                buildkit: true
+		if (!daemonJsonParsed?.features?.buildkit) {
-            }
+			isUpdated = true;
-        }
+			daemonJsonParsed.features = {
-    } catch (error) {
+				buildkit: true
-        isUpdated = true;
+			};
-    }
+		}
-    try {
+	} catch (error) {
-        if (isUpdated) {
+		isUpdated = true;
-            await executeCommand({ shell: true, command: `echo '${JSON.stringify(daemonJsonParsed, null, 2)}' > /tmp/${daemonJson}` })
+	}
-            await executeCommand({ dockerId: id, command: `scp /tmp/${daemonJson} ${remoteIpAddress}-remote:/etc/docker/daemon.json` });
+	try {
-            await executeCommand({ command: `rm /tmp/${daemonJson}` })
+		if (isUpdated) {
-            await executeCommand({ sshCommand: true, dockerId: id, command: `systemctl restart docker` });
+			await executeCommand({
-        }
+				shell: true,
-        await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } })
+				command: `echo '${JSON.stringify(daemonJsonParsed, null, 2)}' > /tmp/${daemonJson}`
-    } catch (error) {
+			});
-        throw new Error('Error while verifying remote docker engine')
+			await executeCommand({
-    }
+				dockerId: id,
+				command: `scp /tmp/${daemonJson} ${remoteIpAddress}-remote:/etc/docker/daemon.json`
+			});
+			await executeCommand({ command: `rm /tmp/${daemonJson}` });
+			await executeCommand({ sshCommand: true, dockerId: id, command: `systemctl restart docker` });
+		}
+		await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } });
+	} catch (error) {
+		console.log(error)
+		throw new Error('Error while verifying remote docker engine');
+	}
 }
-export async function verifyRemoteDockerEngine(request: FastifyRequest<OnlyId>, reply: FastifyReply) {
+export async function verifyRemoteDockerEngine(
-    const { id } = request.params;
+	request: FastifyRequest<OnlyId>,
-    try {
+	reply: FastifyReply
-        await verifyRemoteDockerEngineFn(id);
+) {
-        return reply.code(201).send()
+	const { id } = request.params;
-    } catch ({ status, message }) {
+	try {
-        await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: false } })
+		await verifyRemoteDockerEngineFn(id);
-        return errorHandler({ status, message })
+		return reply.code(201).send();
-    }
+	} catch ({ status, message }) {
+		await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: false } });
+		return errorHandler({ status, message });
+	}
 }
 
 export async function getDestinationStatus(request: FastifyRequest<OnlyId>) {
-    try {
+	try {
-        const { id } = request.params
+		const { id } = request.params;
-        const destination = await prisma.destinationDocker.findUnique({ where: { id } })
+		const destination = await prisma.destinationDocker.findUnique({ where: { id } });
-        const { found: isRunning } = await checkContainer({ dockerId: destination.id, container: 'coolify-proxy', remove: true })
+		const { found: isRunning } = await checkContainer({
-        return {
+			dockerId: destination.id,
-            isRunning
+			container: 'coolify-proxy',
-        }
+			remove: true
-    } catch ({ status, message }) {
+		});
-        return errorHandler({ status, message })
+		return {
-    }
+			isRunning
+		};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }

apps/api/src/routes/api/v1/destinations/index.ts

@@ -1,5 +1,5 @@
 import { FastifyPluginAsync } from 'fastify';
-import { assignSSHKey, checkDestination, deleteDestination, getDestination, getDestinationStatus, listDestinations, newDestination, restartProxy, saveDestinationSettings, startProxy, stopProxy, verifyRemoteDockerEngine } from './handlers';
+import { assignSSHKey, checkDestination, deleteDestination, forceDeleteDestination, getDestination, getDestinationStatus, listDestinations, newDestination, restartProxy, saveDestinationSettings, startProxy, stopProxy, verifyRemoteDockerEngine } from './handlers';
 
 import type { OnlyId } from '../../../../types';
 import type { CheckDestination, ListDestinations, NewDestination, Proxy, SaveDestinationSettings } from './types';
@@ -14,6 +14,7 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
     fastify.get<OnlyId>('/:id', async (request) => await getDestination(request));
     fastify.post<NewDestination>('/:id', async (request, reply) => await newDestination(request, reply));
     fastify.delete<OnlyId>('/:id', async (request) => await deleteDestination(request));
+    fastify.delete<OnlyId>('/:id/force', async (request) => await forceDeleteDestination(request));
     fastify.get<OnlyId>('/:id/status', async (request) => await getDestinationStatus(request));
 
     fastify.post<SaveDestinationSettings>('/:id/settings', async (request) => await saveDestinationSettings(request));

apps/api/src/routes/api/v1/handlers.ts

@@ -1,6 +1,6 @@
-import { compareVersions } from "compare-versions";
+import { compareVersions } from 'compare-versions';
-import cuid from "cuid";
+import cuid from 'cuid';
-import bcrypt from "bcryptjs";
+import bcrypt from 'bcryptjs';
 import fs from 'fs/promises';
 import yaml from 'js-yaml';
 import {
@@ -12,16 +12,14 @@ import {
 	prisma,
 	uniqueName,
 	version,
-	sentryDSN,
+	executeCommand
-	executeCommand,
+} from '../../../lib/common';
-} from "../../../lib/common";
+import { scheduler } from '../../../lib/scheduler';
-import { scheduler } from "../../../lib/scheduler";
+import type { FastifyReply, FastifyRequest } from 'fastify';
-import type { FastifyReply, FastifyRequest } from "fastify";
+import type { Login, Update } from '.';
-import type { Login, Update } from ".";
+import type { GetCurrentUser } from './types';
-import type { GetCurrentUser } from "./types";
 
-export async function hashPassword(password: string): Promise<string> {
+export async function hashPassword(password: string, saltRounds = 15): Promise<string> {
-	const saltRounds = 15;
 	return bcrypt.hash(password, saltRounds);
 }
 
@@ -29,9 +27,9 @@ export async function backup(request: FastifyRequest) {
 	try {
 		const { backupData } = request.params;
 		let std = null;
-		const [id, backupType, type, zipped, storage] = backupData.split(':')
+		const [id, backupType, type, zipped, storage] = backupData.split(':');
-		console.log(id, backupType, type, zipped, storage)
+		console.log(id, backupType, type, zipped, storage);
-		const database = await prisma.database.findUnique({ where: { id } })
+		const database = await prisma.database.findUnique({ where: { id } });
 		if (database) {
 			// await executeDockerCmd({
 			// 	dockerId: database.destinationDockerId,
@@ -40,8 +38,7 @@ export async function backup(request: FastifyRequest) {
 			std = await executeCommand({
 				dockerId: database.destinationDockerId,
 				command: `docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v coolify-local-backup:/app/backups -e CONTAINERS_TO_BACKUP="${backupData}" coollabsio/backup`
-			})
+			});
-
 		}
 		if (std.stdout) {
 			return std.stdout;
@@ -58,9 +55,9 @@ export async function cleanupManually(request: FastifyRequest) {
 	try {
 		const { serverId } = request.body;
 		const destination = await prisma.destinationDocker.findUnique({
-			where: { id: serverId },
+			where: { id: serverId }
 		});
-		await cleanupDockerStorage(destination.id, true, true);
+		await cleanupDockerStorage(destination.id, true);
 		return {};
 	} catch ({ status, message }) {
 		return errorHandler({ status, message });
@@ -68,17 +65,25 @@ export async function cleanupManually(request: FastifyRequest) {
 }
 export async function refreshTags() {
 	try {
-		const { default: got } = await import('got')
+		const { default: got } = await import('got');
 		try {
 			if (isDev) {
-				const tags = await fs.readFile('./devTags.json', 'utf8')
+				let tags = await fs.readFile('./devTags.json', 'utf8');
-				await fs.writeFile('./tags.json', tags)
+				try {
+					if (await fs.stat('./testTags.json')) {
+						const testTags = await fs.readFile('./testTags.json', 'utf8');
+						if (testTags.length > 0) {
+							tags = JSON.parse(tags).concat(JSON.parse(testTags));
+						}
+					}
+				} catch (error) { }
+				await fs.writeFile('./tags.json', tags);
 			} else {
-				const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text()
+				const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text();
-				await fs.writeFile('/app/tags.json', tags)
+				await fs.writeFile('/app/tags.json', tags);
 			}
 		} catch (error) {
-			console.log(error)
+			console.log(error);
 		}
 
 		return {};
@@ -88,17 +93,25 @@ export async function refreshTags() {
 }
 export async function refreshTemplates() {
 	try {
-		const { default: got } = await import('got')
+		const { default: got } = await import('got');
 		try {
 			if (isDev) {
-				const response = await fs.readFile('./devTemplates.yaml', 'utf8')
+				let templates = await fs.readFile('./devTemplates.yaml', 'utf8');
-				await fs.writeFile('./templates.json', JSON.stringify(yaml.load(response)))
+				try {
+					if (await fs.stat('./testTemplate.yaml')) {
+						templates = templates + (await fs.readFile('./testTemplate.yaml', 'utf8'));
+					}
+				} catch (error) { }
+				const response = await fs.readFile('./devTemplates.yaml', 'utf8');
+				await fs.writeFile('./templates.json', JSON.stringify(yaml.load(response)));
 			} else {
-				const response = await got.get('https://get.coollabs.io/coolify/service-templates.yaml').text()
+				const response = await got
-				await fs.writeFile('/app/templates.json', JSON.stringify(yaml.load(response)))
+					.get('https://get.coollabs.io/coolify/service-templates.yaml')
+					.text();
+				await fs.writeFile('/app/templates.json', JSON.stringify(yaml.load(response)));
 			}
 		} catch (error) {
-			console.log(error)
+			console.log(error);
 		}
 		return {};
 	} catch ({ status, message }) {
@@ -107,28 +120,29 @@ export async function refreshTemplates() {
 }
 export async function checkUpdate(request: FastifyRequest) {
 	try {
-		const { default: got } = await import('got')
+		const { default: got } = await import('got');
 		const isStaging =
-			request.hostname === "staging.coolify.io" ||
+			request.hostname === 'staging.coolify.io' || request.hostname === 'arm.coolify.io';
-			request.hostname === "arm.coolify.io";
 		const currentVersion = version;
-		const { coolify } = await got.get('https://get.coollabs.io/versions.json', {
+		const { coolify } = await got
-			searchParams: {
+			.get('https://get.coollabs.io/versions.json', {
-				appId: process.env['COOLIFY_APP_ID'] || undefined,
+				searchParams: {
-				version: currentVersion
+					appId: process.env['COOLIFY_APP_ID'] || undefined,
-			}
+					version: currentVersion
-		}).json()
+				}
+			})
+			.json();
 		const latestVersion = coolify.main.version;
 		const isUpdateAvailable = compareVersions(latestVersion, currentVersion);
 		if (isStaging) {
 			return {
 				isUpdateAvailable: true,
-				latestVersion: "next",
+				latestVersion: 'next'
 			};
 		}
 		return {
 			isUpdateAvailable: isStaging ? true : isUpdateAvailable === 1,
-			latestVersion,
+			latestVersion
 		};
 	} catch ({ status, message }) {
 		return errorHandler({ status, message });
@@ -140,10 +154,22 @@ export async function update(request: FastifyRequest<Update>) {
 	try {
 		if (!isDev) {
 			const { isAutoUpdateEnabled } = await prisma.setting.findFirst();
-			await executeCommand({ command: `docker pull coollabsio/coolify:${latestVersion}` });
+			let image = `ghcr.io/coollabsio/coolify:${latestVersion}`;
-			await executeCommand({ shell: true, command: `env | grep COOLIFY > .env` });
+			try {
-			await executeCommand({ command: `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=${isAutoUpdateEnabled}' .env` });
+				await executeCommand({ command: `docker pull ${image}` });
-			await executeCommand({ shell: true, command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-fluentbit && docker rm coolify coolify-fluentbit && docker compose pull && docker compose up -d --force-recreate"` });
+			} catch (error) {
+				image = `coollabsio/coolify:${latestVersion}`;
+				await executeCommand({ command: `docker pull ${image}` });
+			}
+
+			await executeCommand({ shell: true, command: `ls .env || env | grep "^COOLIFY" | sort > .env` });
+			await executeCommand({
+				command: `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=${isAutoUpdateEnabled}' .env`
+			});
+			await executeCommand({
+				shell: true,
+				command: `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db ${image} /bin/sh -c "env | grep "^COOLIFY" | sort > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-fluentbit && docker rm coolify coolify-fluentbit && docker compose pull && docker compose up -d --force-recreate"`
+			});
 			return {};
 		} else {
 			await asyncSleep(2000);
@@ -156,12 +182,12 @@ export async function update(request: FastifyRequest<Update>) {
 export async function resetQueue(request: FastifyRequest<any>) {
 	try {
 		const teamId = request.user.teamId;
-		if (teamId === "0") {
+		if (teamId === '0') {
 			await prisma.build.updateMany({
-				where: { status: { in: ["queued", "running"] } },
+				where: { status: { in: ['queued', 'running'] } },
-				data: { status: "canceled" },
+				data: { status: 'canceled' }
 			});
-			scheduler.workers.get("deployApplication").postMessage("cancel");
+			scheduler.workers.get('deployApplication').postMessage('cancel');
 		}
 	} catch ({ status, message }) {
 		return errorHandler({ status, message });
@@ -170,7 +196,7 @@ export async function resetQueue(request: FastifyRequest<any>) {
 export async function restartCoolify(request: FastifyRequest<any>) {
 	try {
 		const teamId = request.user.teamId;
-		if (teamId === "0") {
+		if (teamId === '0') {
 			if (!isDev) {
 				await executeCommand({ command: `docker restart coolify` });
 				return {};
@@ -180,7 +206,7 @@ export async function restartCoolify(request: FastifyRequest<any>) {
 		}
 		throw {
 			status: 500,
-			message: "You are not authorized to restart Coolify.",
+			message: 'You are not authorized to restart Coolify.'
 		};
 	} catch ({ status, message }) {
 		return errorHandler({ status, message });
@@ -192,43 +218,52 @@ export async function showDashboard(request: FastifyRequest) {
 		const userId = request.user.userId;
 		const teamId = request.user.teamId;
 		let applications = await prisma.application.findMany({
-			where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } },
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } },
-			include: { settings: true, destinationDocker: true, teams: true },
+			include: { settings: true, destinationDocker: true, teams: true }
 		});
 		const databases = await prisma.database.findMany({
-			where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } },
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } },
-			include: { settings: true, destinationDocker: true, teams: true },
+			include: { settings: true, destinationDocker: true, teams: true }
 		});
 		const services = await prisma.service.findMany({
-			where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } },
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } },
-			include: { destinationDocker: true, teams: true },
+			include: { destinationDocker: true, teams: true }
 		});
 		const gitSources = await prisma.gitSource.findMany({
-			where: { OR: [{ teams: { some: { id: teamId === "0" ? undefined : teamId } } }, { isSystemWide: true }] },
+			where: {
-			include: { teams: true },
+				OR: [
+					{ teams: { some: { id: teamId === '0' ? undefined : teamId } } },
+					{ isSystemWide: true }
+				]
+			},
+			include: { teams: true }
 		});
 		const destinations = await prisma.destinationDocker.findMany({
-			where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } },
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } },
-			include: { teams: true },
+			include: { teams: true }
 		});
 		const settings = await listSettings();
 
 		let foundUnconfiguredApplication = false;
 		for (const application of applications) {
-			if (((!application.buildPack || !application.branch) && !application.simpleDockerfile) || !application.destinationDockerId || (!application.settings?.isBot && !application?.fqdn) && application.buildPack !== "compose") {
+			if (
-				foundUnconfiguredApplication = true
+				((!application.buildPack || !application.branch) && !application.simpleDockerfile) ||
+				!application.destinationDockerId ||
+				(!application.settings?.isBot && !application?.fqdn && application.buildPack !== 'compose')
+			) {
+				foundUnconfiguredApplication = true;
 			}
 		}
 		let foundUnconfiguredService = false;
 		for (const service of services) {
 			if (!service.fqdn) {
-				foundUnconfiguredService = true
+				foundUnconfiguredService = true;
 			}
 		}
 		let foundUnconfiguredDatabase = false;
 		for (const database of databases) {
 			if (!database.version) {
-				foundUnconfiguredDatabase = true
+				foundUnconfiguredDatabase = true;
 			}
 		}
 		return {
@@ -240,101 +275,94 @@ export async function showDashboard(request: FastifyRequest) {
 			services,
 			gitSources,
 			destinations,
-			settings,
+			settings
 		};
 	} catch ({ status, message }) {
 		return errorHandler({ status, message });
 	}
 }
 
-export async function login(
+export async function login(request: FastifyRequest<Login>, reply: FastifyReply) {
-	request: FastifyRequest<Login>,
-	reply: FastifyReply
-) {
 	if (request.user) {
-		return reply.redirect("/dashboard");
+		return reply.redirect('/dashboard');
 	} else {
 		const { email, password, isLogin } = request.body || {};
 		if (!email || !password) {
-			throw { status: 500, message: "Email and password are required." };
+			throw { status: 500, message: 'Email and password are required.' };
 		}
 		const users = await prisma.user.count();
 		const userFound = await prisma.user.findUnique({
 			where: { email },
 			include: { teams: true, permission: true },
-			rejectOnNotFound: false,
+			rejectOnNotFound: false
 		});
 		if (!userFound && isLogin) {
-			throw { status: 500, message: "User not found." };
+			throw { status: 500, message: 'User not found.' };
 		}
 		const { isRegistrationEnabled, id } = await prisma.setting.findFirst();
 		let uid = cuid();
-		let permission = "read";
+		let permission = 'read';
 		let isAdmin = false;
 
 		if (users === 0) {
 			await prisma.setting.update({
 				where: { id },
-				data: { isRegistrationEnabled: false },
+				data: { isRegistrationEnabled: false }
 			});
-			uid = "0";
+			uid = '0';
 		}
 		if (userFound) {
-			if (userFound.type === "email") {
+			if (userFound.type === 'email') {
-				if (userFound.password === "RESETME") {
+				if (userFound.password === 'RESETME') {
 					const hashedPassword = await hashPassword(password);
 					if (userFound.updatedAt < new Date(Date.now() - 1000 * 60 * 10)) {
-						if (userFound.id === "0") {
+						if (userFound.id === '0') {
 							await prisma.user.update({
 								where: { email: userFound.email },
-								data: { password: "RESETME" },
+								data: { password: 'RESETME' }
 							});
 						} else {
 							await prisma.user.update({
 								where: { email: userFound.email },
-								data: { password: "RESETTIMEOUT" },
+								data: { password: 'RESETTIMEOUT' }
 							});
 						}
 
 						throw {
 							status: 500,
-							message:
+							message: 'Password reset link has expired. Please request a new one.'
-								"Password reset link has expired. Please request a new one.",
 						};
 					} else {
 						await prisma.user.update({
 							where: { email: userFound.email },
-							data: { password: hashedPassword },
+							data: { password: hashedPassword }
 						});
 						return {
 							userId: userFound.id,
 							teamId: userFound.id,
 							permission: userFound.permission,
-							isAdmin: true,
+							isAdmin: true
 						};
 					}
 				}
 
-				const passwordMatch = await bcrypt.compare(
+				const passwordMatch = await bcrypt.compare(password, userFound.password);
-					password,
-					userFound.password
-				);
 				if (!passwordMatch) {
 					throw {
 						status: 500,
-						message: "Wrong password or email address.",
+						message: 'Wrong password or email address.'
 					};
 				}
 				uid = userFound.id;
 				isAdmin = true;
 			}
 		} else {
-			permission = "owner";
+			permission = 'owner';
 			isAdmin = true;
 			if (!isRegistrationEnabled) {
 				throw {
 					status: 404,
-					message: "Registration disabled by administrator.",
+					message: 'Registration disabled by administrator.'
 				};
 			}
 			const hashedPassword = await hashPassword(password);
@@ -344,17 +372,17 @@ export async function login(
 						id: uid,
 						email,
 						password: hashedPassword,
-						type: "email",
+						type: 'email',
 						teams: {
 							create: {
 								id: uid,
 								name: uniqueName(),
-								destinationDocker: { connect: { network: "coolify" } },
+								destinationDocker: { connect: { network: 'coolify' } }
-							},
+							}
 						},
-						permission: { create: { teamId: uid, permission: "owner" } },
+						permission: { create: { teamId: uid, permission: 'owner' } }
 					},
-					include: { teams: true },
+					include: { teams: true }
 				});
 			} else {
 				await prisma.user.create({
@@ -362,16 +390,16 @@ export async function login(
 						id: uid,
 						email,
 						password: hashedPassword,
-						type: "email",
+						type: 'email',
 						teams: {
 							create: {
 								id: uid,
-								name: uniqueName(),
+								name: uniqueName()
-							},
+							}
 						},
-						permission: { create: { teamId: uid, permission: "owner" } },
+						permission: { create: { teamId: uid, permission: 'owner' } }
 					},
-					include: { teams: true },
+					include: { teams: true }
 				});
 			}
 		}
@@ -379,23 +407,20 @@ export async function login(
 			userId: uid,
 			teamId: uid,
 			permission,
-			isAdmin,
+			isAdmin
 		};
 	}
 }
 
-export async function getCurrentUser(
+export async function getCurrentUser(request: FastifyRequest<GetCurrentUser>, fastify) {
-	request: FastifyRequest<GetCurrentUser>,
-	fastify
-) {
 	let token = null;
 	const { teamId } = request.query;
 	try {
 		const user = await prisma.user.findUnique({
-			where: { id: request.user.userId },
+			where: { id: request.user.userId }
 		});
 		if (!user) {
-			throw "User not found";
+			throw 'User not found';
 		}
 	} catch (error) {
 		throw { status: 401, message: error };
@@ -404,17 +429,15 @@ export async function getCurrentUser(
 		try {
 			const user = await prisma.user.findFirst({
 				where: { id: request.user.userId, teams: { some: { id: teamId } } },
-				include: { teams: true, permission: true },
+				include: { teams: true, permission: true }
 			});
 			if (user) {
-				const permission = user.permission.find(
+				const permission = user.permission.find((p) => p.teamId === teamId).permission;
-					(p) => p.teamId === teamId
-				).permission;
 				const payload = {
 					...request.user,
 					teamId,
 					permission: permission || null,
-					isAdmin: permission === "owner" || permission === "admin",
+					isAdmin: permission === 'owner' || permission === 'admin'
 				};
 				token = fastify.jwt.sign(payload);
 			}
@@ -422,12 +445,13 @@ export async function getCurrentUser(
 			// No new token -> not switching teams
 		}
 	}
-	const pendingInvitations = await prisma.teamInvitation.findMany({ where: { uid: request.user.userId } })
+	const pendingInvitations = await prisma.teamInvitation.findMany({
+		where: { uid: request.user.userId }
+	});
 	return {
-		settings: await prisma.setting.findUnique({ where: { id: "0" } }),
+		settings: await prisma.setting.findUnique({ where: { id: '0' } }),
-		sentryDSN,
 		pendingInvitations,
 		token,
-		...request.user,
+		...request.user
 	};
 }

apps/api/src/routes/api/v1/settings/handlers.ts

@@ -1,235 +1,312 @@
 import { promises as dns } from 'dns';
 import { X509Certificate } from 'node:crypto';
-import * as Sentry from '@sentry/node';
 import type { FastifyReply, FastifyRequest } from 'fastify';
-import { checkDomainsIsValidInDNS, decrypt, encrypt, errorHandler, executeCommand, getDomain, isDev, isDNSValid, isDomainConfigured, listSettings, prisma, sentryDSN, version } from '../../../../lib/common';
+import {
-import { AddDefaultRegistry, CheckDNS, CheckDomain, DeleteDomain, OnlyIdInBody, SaveSettings, SaveSSHKey, SetDefaultRegistry } from './types';
+	checkDomainsIsValidInDNS,
-
+	decrypt,
+	encrypt,
+	errorHandler,
+	executeCommand,
+	getDomain,
+	isDev,
+	isDNSValid,
+	isDomainConfigured,
+	listSettings,
+	prisma
+} from '../../../../lib/common';
+import {
+	AddDefaultRegistry,
+	CheckDNS,
+	CheckDomain,
+	DeleteDomain,
+	OnlyIdInBody,
+	SaveSettings,
+	SaveSSHKey,
+	SetDefaultRegistry
+} from './types';
 
 export async function listAllSettings(request: FastifyRequest) {
-    try {
+	try {
-        const teamId = request.user.teamId;
+		const teamId = request.user.teamId;
-        const settings = await listSettings();
+		const settings = await listSettings();
-        const sshKeys = await prisma.sshKey.findMany({ where: { team: { id: teamId } } })
+		const sshKeys = await prisma.sshKey.findMany({ where: { team: { id: teamId } } });
-        let registries = await prisma.dockerRegistry.findMany({ where: { team: { id: teamId } } })
+		let registries = await prisma.dockerRegistry.findMany({ where: { team: { id: teamId } } });
-        registries = registries.map((registry) => {
+		registries = registries.map((registry) => {
-            if (registry.password) {
+			if (registry.password) {
-                registry.password = decrypt(registry.password)
+				registry.password = decrypt(registry.password);
-            }
+			}
-            return registry
+			return registry;
-        })
+		});
-        const unencryptedKeys = []
+		const unencryptedKeys = [];
-        if (sshKeys.length > 0) {
+		if (sshKeys.length > 0) {
-            for (const key of sshKeys) {
+			for (const key of sshKeys) {
-                unencryptedKeys.push({ id: key.id, name: key.name, privateKey: decrypt(key.privateKey), createdAt: key.createdAt })
+				unencryptedKeys.push({
-            }
+					id: key.id,
-        }
+					name: key.name,
-        const certificates = await prisma.certificate.findMany({ where: { team: { id: teamId } } })
+					privateKey: decrypt(key.privateKey),
-        let cns = [];
+					createdAt: key.createdAt
-        for (const certificate of certificates) {
+				});
-            const x509 = new X509Certificate(certificate.cert);
+			}
-            cns.push({ commonName: x509.subject.split('\n').find((s) => s.startsWith('CN=')).replace('CN=', ''), id: certificate.id, createdAt: certificate.createdAt })
+		}
-        }
+		const certificates = await prisma.certificate.findMany({ where: { team: { id: teamId } } });
+		let cns = [];
+		for (const certificate of certificates) {
+			const x509 = new X509Certificate(certificate.cert);
+			cns.push({
+				commonName: x509.subject
+					.split('\n')
+					.find((s) => s.startsWith('CN='))
+					.replace('CN=', ''),
+				id: certificate.id,
+				createdAt: certificate.createdAt
+			});
+		}
 
-        return {
+		return {
-            settings,
+			settings,
-            certificates: cns,
+			certificates: cns,
-            sshKeys: unencryptedKeys,
+			sshKeys: unencryptedKeys,
-            registries
+			registries
-        }
+		};
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 export async function saveSettings(request: FastifyRequest<SaveSettings>, reply: FastifyReply) {
-    try {
+	try {
-        let {
+		let {
-            previewSeparator,
+			previewSeparator,
-            numberOfDockerImagesKeptLocally,
+			numberOfDockerImagesKeptLocally,
-            doNotTrack,
+			doNotTrack,
-            fqdn,
+			fqdn,
-            isAPIDebuggingEnabled,
+			isAPIDebuggingEnabled,
-            isRegistrationEnabled,
+			isRegistrationEnabled,
-            dualCerts,
+			dualCerts,
-            minPort,
+			minPort,
-            maxPort,
+			maxPort,
-            isAutoUpdateEnabled,
+			isAutoUpdateEnabled,
-            isDNSCheckEnabled,
+			isDNSCheckEnabled,
-            DNSServers,
+			DNSServers,
-            proxyDefaultRedirect
+			proxyDefaultRedirect
-        } = request.body
+		} = request.body;
-        const { id, previewSeparator: SetPreviewSeparator } = await listSettings();
+		const { id, previewSeparator: SetPreviewSeparator } = await listSettings();
-        if (numberOfDockerImagesKeptLocally) {
+		if (numberOfDockerImagesKeptLocally) {
-            numberOfDockerImagesKeptLocally = Number(numberOfDockerImagesKeptLocally)
+			numberOfDockerImagesKeptLocally = Number(numberOfDockerImagesKeptLocally);
-        }
+		}
-        if (previewSeparator == '') {
+		if (previewSeparator == '') {
-            previewSeparator = '.'
+			previewSeparator = '.';
-        }
+		}
-        if (SetPreviewSeparator != previewSeparator) {
+		if (SetPreviewSeparator != previewSeparator) {
-            const applications = await prisma.application.findMany({ where: { previewApplication: { some: { id: { not: undefined } } } }, include: { previewApplication: true } })
+			const applications = await prisma.application.findMany({
-            for (const application of applications) {
+				where: { previewApplication: { some: { id: { not: undefined } } } },
-                for (const preview of application.previewApplication) {
+				include: { previewApplication: true }
-                    const { protocol } = new URL(preview.customDomain)
+			});
-                    const { pullmergeRequestId } = preview
+			for (const application of applications) {
-                    const { fqdn } = application
+				for (const preview of application.previewApplication) {
-                    const newPreviewDomain = `${protocol}//${pullmergeRequestId}${previewSeparator}${getDomain(fqdn)}`
+					const { protocol } = new URL(preview.customDomain);
-                    await prisma.previewApplication.update({ where: { id: preview.id }, data: { customDomain: newPreviewDomain } })
+					const { pullmergeRequestId } = preview;
-                }
+					const { fqdn } = application;
-            }
+					const newPreviewDomain = `${protocol}//${pullmergeRequestId}${previewSeparator}${getDomain(
-        }
+						fqdn
+					)}`;
+					await prisma.previewApplication.update({
+						where: { id: preview.id },
+						data: { customDomain: newPreviewDomain }
+					});
+				}
+			}
+		}
 
-        await prisma.setting.update({
+		await prisma.setting.update({
-            where: { id },
+			where: { id },
-            data: { previewSeparator, numberOfDockerImagesKeptLocally, doNotTrack, isRegistrationEnabled, dualCerts, isAutoUpdateEnabled, isDNSCheckEnabled, DNSServers, isAPIDebuggingEnabled }
+			data: {
-        });
+				previewSeparator,
-        if (fqdn) {
+				numberOfDockerImagesKeptLocally,
-            await prisma.setting.update({ where: { id }, data: { fqdn } });
+				doNotTrack,
-        }
+				isRegistrationEnabled,
-        await prisma.setting.update({ where: { id }, data: { proxyDefaultRedirect } });
+				dualCerts,
-        if (minPort && maxPort) {
+				isAutoUpdateEnabled,
-            await prisma.setting.update({ where: { id }, data: { minPort, maxPort } });
+				isDNSCheckEnabled,
-        }
+				DNSServers,
-        if (doNotTrack === false) {
+				isAPIDebuggingEnabled
-            // Sentry.init({
+			}
-            //     dsn: sentryDSN,
+		});
-            //     environment: isDev ? 'development' : 'production',
+		if (fqdn) {
-            //     release: version
+			await prisma.setting.update({ where: { id }, data: { fqdn } });
-            // });
+		}
-            // console.log('Sentry initialized')
+		await prisma.setting.update({ where: { id }, data: { proxyDefaultRedirect } });
-        }
+		if (minPort && maxPort) {
-        return reply.code(201).send()
+			await prisma.setting.update({ where: { id }, data: { minPort, maxPort } });
-    } catch ({ status, message }) {
+		}
-        return errorHandler({ status, message })
+		if (doNotTrack === false) {
-    }
+			// Sentry.init({
+			//     dsn: sentryDSN,
+			//     environment: isDev ? 'development' : 'production',
+			//     release: version
+			// });
+			// console.log('Sentry initialized')
+		}
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function deleteDomain(request: FastifyRequest<DeleteDomain>, reply: FastifyReply) {
-    try {
+	try {
-        const { fqdn } = request.body
+		const { fqdn } = request.body;
-        const { DNSServers } = await listSettings();
+		const { DNSServers } = await listSettings();
-        if (DNSServers) {
+		if (DNSServers) {
-            dns.setServers([...DNSServers.split(',')]);
+			dns.setServers([...DNSServers.split(',')]);
-        }
+		}
-        let ip;
+		let ip;
-        try {
+		try {
-            ip = await dns.resolve(fqdn);
+			ip = await dns.resolve(fqdn);
-        } catch (error) {
+		} catch (error) {
-            // Do not care.
+			// Do not care.
-        }
+		}
-        await prisma.setting.update({ where: { fqdn }, data: { fqdn: null } });
+		await prisma.setting.update({ where: { fqdn }, data: { fqdn: null } });
-        return reply.redirect(302, ip ? `http://${ip[0]}:3000/settings` : undefined)
+		return reply.redirect(302, ip ? `http://${ip[0]}:3000/settings` : undefined);
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 
 export async function checkDomain(request: FastifyRequest<CheckDomain>) {
-    try {
+	try {
-        const { id } = request.params;
+		const { id } = request.params;
-        let { fqdn, forceSave, dualCerts, isDNSCheckEnabled } = request.body
+		let { fqdn, forceSave, dualCerts, isDNSCheckEnabled } = request.body;
-        if (fqdn) fqdn = fqdn.toLowerCase();
+		if (fqdn) fqdn = fqdn.toLowerCase();
-        const found = await isDomainConfigured({ id, fqdn });
+		const found = await isDomainConfigured({ id, fqdn });
-        if (found) {
+		if (found) {
-            throw { message: "Domain already configured" };
+			throw { message: 'Domain already configured' };
-        }
+		}
-        if (isDNSCheckEnabled && !forceSave && !isDev) {
+		if (isDNSCheckEnabled && !forceSave && !isDev) {
-            const hostname = request.hostname.split(':')[0]
+			const hostname = request.hostname.split(':')[0];
-            return await checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts });
+			return await checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts });
-        }
+		}
-        return {};
+		return {};
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 export async function checkDNS(request: FastifyRequest<CheckDNS>) {
-    try {
+	try {
-        const { domain } = request.params;
+		const { domain } = request.params;
-        await isDNSValid(request.hostname, domain);
+		await isDNSValid(request.hostname, domain);
-        return {}
+		return {};
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 
 export async function saveSSHKey(request: FastifyRequest<SaveSSHKey>, reply: FastifyReply) {
-    try {
+	try {
-        const teamId = request.user.teamId;
+		const teamId = request.user.teamId;
-        const { privateKey, name } = request.body;
+		const { privateKey, name } = request.body;
-        const found = await prisma.sshKey.findMany({ where: { name } })
+		const found = await prisma.sshKey.findMany({ where: { name } });
-        if (found.length > 0) {
+		if (found.length > 0) {
-            throw {
+			throw {
-                message: "Name already used. Choose another one please."
+				message: 'Name already used. Choose another one please.'
-            }
+			};
-        }
+		}
-        const encryptedSSHKey = encrypt(privateKey)
+		const encryptedSSHKey = encrypt(privateKey);
-        await prisma.sshKey.create({ data: { name, privateKey: encryptedSSHKey, team: { connect: { id: teamId } } } })
+		await prisma.sshKey.create({
-        return reply.code(201).send()
+			data: { name, privateKey: encryptedSSHKey, team: { connect: { id: teamId } } }
-    } catch ({ status, message }) {
+		});
-        return errorHandler({ status, message })
+		return reply.code(201).send();
-    }
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function deleteSSHKey(request: FastifyRequest<OnlyIdInBody>, reply: FastifyReply) {
-    try {
+	try {
-        const teamId = request.user.teamId;
+		const teamId = request.user.teamId;
-        const { id } = request.body;
+		const { id } = request.body;
-        await prisma.sshKey.deleteMany({ where: { id, teamId } })
+		await prisma.sshKey.deleteMany({ where: { id, teamId } });
-        return reply.code(201).send()
+		return reply.code(201).send();
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 
-export async function deleteCertificates(request: FastifyRequest<OnlyIdInBody>, reply: FastifyReply) {
+export async function deleteCertificates(
-    try {
+	request: FastifyRequest<OnlyIdInBody>,
-        const teamId = request.user.teamId;
+	reply: FastifyReply
-        const { id } = request.body;
+) {
-        await executeCommand({ command: `docker exec coolify-proxy sh -c 'rm -f /etc/traefik/acme/custom/${id}-key.pem /etc/traefik/acme/custom/${id}-cert.pem'`, shell: true })
+	try {
-        await prisma.certificate.deleteMany({ where: { id, teamId } })
+		const teamId = request.user.teamId;
-        return reply.code(201).send()
+		const { id } = request.body;
-    } catch ({ status, message }) {
+		await executeCommand({
-        return errorHandler({ status, message })
+			command: `docker exec coolify-proxy sh -c 'rm -f /etc/traefik/acme/custom/${id}-key.pem /etc/traefik/acme/custom/${id}-cert.pem'`,
-    }
+			shell: true
+		});
+		await prisma.certificate.deleteMany({ where: { id, teamId } });
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 
-export async function setDockerRegistry(request: FastifyRequest<SetDefaultRegistry>, reply: FastifyReply) {
+export async function setDockerRegistry(
-    try {
+	request: FastifyRequest<SetDefaultRegistry>,
-        const teamId = request.user.teamId;
+	reply: FastifyReply
-        const { id, username, password } = request.body;
+) {
+	try {
+		const teamId = request.user.teamId;
+		const { id, username, password } = request.body;
 
-        let encryptedPassword = ''
+		let encryptedPassword = '';
-        if (password) encryptedPassword = encrypt(password)
+		if (password) encryptedPassword = encrypt(password);
 
-        if (teamId === '0') {
+		if (teamId === '0') {
-            await prisma.dockerRegistry.update({ where: { id }, data: { username, password: encryptedPassword } })
+			await prisma.dockerRegistry.update({
-        } else {
+				where: { id },
-            await prisma.dockerRegistry.updateMany({ where: { id, teamId }, data: { username, password: encryptedPassword } })
+				data: { username, password: encryptedPassword }
-        }
+			});
-        return reply.code(201).send()
+		} else {
-    } catch ({ status, message }) {
+			await prisma.dockerRegistry.updateMany({
-        return errorHandler({ status, message })
+				where: { id, teamId },
-    }
+				data: { username, password: encryptedPassword }
+			});
+		}
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
-export async function addDockerRegistry(request: FastifyRequest<AddDefaultRegistry>, reply: FastifyReply) {
+export async function addDockerRegistry(
-    try {
+	request: FastifyRequest<AddDefaultRegistry>,
-        const teamId = request.user.teamId;
+	reply: FastifyReply
-        const { name, url, username, password } = request.body;
+) {
+	try {
+		const teamId = request.user.teamId;
+		const { name, url, username, password } = request.body;
 
-        let encryptedPassword = ''
+		let encryptedPassword = '';
-        if (password) encryptedPassword = encrypt(password)
+		if (password) encryptedPassword = encrypt(password);
-        await prisma.dockerRegistry.create({ data: { name, url, username, password: encryptedPassword, team: { connect: { id: teamId } } } })
+		await prisma.dockerRegistry.create({
+			data: { name, url, username, password: encryptedPassword, team: { connect: { id: teamId } } }
+		});
 
-        return reply.code(201).send()
+		return reply.code(201).send();
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
-export async function deleteDockerRegistry(request: FastifyRequest<OnlyIdInBody>, reply: FastifyReply) {
+export async function deleteDockerRegistry(
-    try {
+	request: FastifyRequest<OnlyIdInBody>,
-        const teamId = request.user.teamId;
+	reply: FastifyReply
-        const { id } = request.body;
+) {
-        await prisma.application.updateMany({ where: { dockerRegistryId: id }, data: { dockerRegistryId: null } })
+	try {
-        await prisma.dockerRegistry.deleteMany({ where: { id, teamId } })
+		const teamId = request.user.teamId;
-        return reply.code(201).send()
+		const { id } = request.body;
-    } catch ({ status, message }) {
+		await prisma.application.updateMany({
-        return errorHandler({ status, message })
+			where: { dockerRegistryId: id },
-    }
+			data: { dockerRegistryId: null }
+		});
+		await prisma.dockerRegistry.deleteMany({ where: { id, teamId } });
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }

apps/api/src/routes/api/v1/sources/handlers.ts

@@ -1,190 +1,231 @@
 import cuid from 'cuid';
 import type { FastifyRequest } from 'fastify';
-import { FastifyReply } from 'fastify';
 import { decrypt, encrypt, errorHandler, prisma } from '../../../../lib/common';
 import { OnlyId } from '../../../../types';
 import { CheckGitLabOAuthId, SaveGitHubSource, SaveGitLabSource } from './types';
 
 export async function listSources(request: FastifyRequest) {
-    try {
+	try {
-        const teamId = request.user?.teamId;
+		const teamId = request.user?.teamId;
-        const sources = await prisma.gitSource.findMany({
+		const sources = await prisma.gitSource.findMany({
-            where: { OR: [{ teams: { some: { id: teamId === "0" ? undefined : teamId } } }, { isSystemWide: true }] },
+			where: {
-            include: { teams: true, githubApp: true, gitlabApp: true }
+				OR: [
-        });
+					{ teams: { some: { id: teamId === '0' ? undefined : teamId } } },
-        return {
+					{ isSystemWide: true }
-            sources
+				]
-        }
+			},
-    } catch ({ status, message }) {
+			include: { teams: true, githubApp: true, gitlabApp: true }
-        return errorHandler({ status, message })
+		});
-    }
+		return {
+			sources
+		};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function saveSource(request, reply) {
-    try {
+	try {
-        const { id } = request.params
+		const { id } = request.params;
-        let { name, htmlUrl, apiUrl, customPort, isSystemWide } = request.body
+		let { name, htmlUrl, apiUrl, customPort, customUser, isSystemWide } = request.body;
-        if (customPort) customPort = Number(customPort)
+		if (customPort) customPort = Number(customPort);
-        await prisma.gitSource.update({
+		await prisma.gitSource.update({
-            where: { id },
+			where: { id },
-            data: { name, htmlUrl, apiUrl, customPort, isSystemWide }
+			data: { name, htmlUrl, apiUrl, customPort, customUser, isSystemWide }
-        });
+		});
-        return reply.code(201).send()
+		return reply.code(201).send();
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 export async function getSource(request: FastifyRequest<OnlyId>) {
-    try {
+	try {
-        const { id } = request.params
+		const { id } = request.params;
-        const { teamId } = request.user
+		const { teamId } = request.user;
-        const settings = await prisma.setting.findFirst({});
+		const settings = await prisma.setting.findFirst({});
 
-        if (id === 'new') {
+		if (id === 'new') {
-            return {
+			return {
-                source: {
+				source: {
-                    name: null,
+					name: null,
-                    type: null,
+					type: null,
-                    htmlUrl: null,
+					htmlUrl: null,
-                    apiUrl: null,
+					apiUrl: null,
-                    organization: null,
+					organization: null,
-                    customPort: 22,
+					customPort: 22,
-                },
+					customUser: 'git'
-                settings
+				},
-            }
+				settings
-        }
+			};
+		}
 
-        const source = await prisma.gitSource.findFirst({
+		const source = await prisma.gitSource.findFirst({
-            where: { id, OR: [{ teams: { some: { id: teamId === "0" ? undefined : teamId } } }, { isSystemWide: true }] },
+			where: {
-            include: { githubApp: true, gitlabApp: true }
+				id,
-        });
+				OR: [
-        if (!source) {
+					{ teams: { some: { id: teamId === '0' ? undefined : teamId } } },
-            throw { status: 404, message: 'Source not found.' }
+					{ isSystemWide: true }
-        }
+				]
+			},
+			include: { githubApp: true, gitlabApp: true }
+		});
+		if (!source) {
+			throw { status: 404, message: 'Source not found.' };
+		}
 
-        if (source?.githubApp?.clientSecret)
+		if (source?.githubApp?.clientSecret)
-            source.githubApp.clientSecret = decrypt(source.githubApp.clientSecret);
+			source.githubApp.clientSecret = decrypt(source.githubApp.clientSecret);
-        if (source?.githubApp?.webhookSecret)
+		if (source?.githubApp?.webhookSecret)
-            source.githubApp.webhookSecret = decrypt(source.githubApp.webhookSecret);
+			source.githubApp.webhookSecret = decrypt(source.githubApp.webhookSecret);
-        if (source?.githubApp?.privateKey) source.githubApp.privateKey = decrypt(source.githubApp.privateKey);
+		if (source?.githubApp?.privateKey)
-        if (source?.gitlabApp?.appSecret) source.gitlabApp.appSecret = decrypt(source.gitlabApp.appSecret);
+			source.githubApp.privateKey = decrypt(source.githubApp.privateKey);
+		if (source?.gitlabApp?.appSecret)
+			source.gitlabApp.appSecret = decrypt(source.gitlabApp.appSecret);
 
-        return {
+		return {
-            source,
+			source,
-            settings
+			settings
-        };
+		};
-
+	} catch ({ status, message }) {
-    } catch ({ status, message }) {
+		return errorHandler({ status, message });
-        return errorHandler({ status, message })
+	}
-    }
 }
 
 export async function deleteSource(request) {
-    try {
+	try {
-        const { id } = request.params
+		const { id } = request.params;
-        const source = await prisma.gitSource.delete({
+		const gitAppFound = await prisma.application.findFirst({ where: { gitSourceId: id } });
-            where: { id },
+		if (gitAppFound) {
-            include: { githubApp: true, gitlabApp: true }
+			throw {
-        });
+				status: 400,
-        if (source.githubAppId) {
+				message: 'This source is used by an application. Please remove the application first.'
-            await prisma.githubApp.delete({ where: { id: source.githubAppId } });
+			};
-        }
+		}
-        if (source.gitlabAppId) {
+		const source = await prisma.gitSource.delete({
-            await prisma.gitlabApp.delete({ where: { id: source.gitlabAppId } });
+			where: { id },
-        }
+			include: { githubApp: true, gitlabApp: true }
-        return {}
+		});
-    } catch ({ status, message }) {
+		if (source.githubAppId) {
-        return errorHandler({ status, message })
+			await prisma.githubApp.delete({ where: { id: source.githubAppId } });
-    }
+		}
-
+		if (source.gitlabAppId) {
+			await prisma.gitlabApp.delete({ where: { id: source.gitlabAppId } });
+		}
+		return {};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function saveGitHubSource(request: FastifyRequest<SaveGitHubSource>) {
-    try {
+	try {
-        const { teamId } = request.user
+		const { teamId } = request.user;
 
-        const { id } = request.params
+		const { id } = request.params;
-        let { name, htmlUrl, apiUrl, organization, customPort, isSystemWide } = request.body
+		let { name, htmlUrl, apiUrl, organization, customPort, isSystemWide } = request.body;
 
-        if (customPort) customPort = Number(customPort)
+		if (customPort) customPort = Number(customPort);
-        if (id === 'new') {
+		if (id === 'new') {
-            const newId = cuid()
+			const newId = cuid();
-            await prisma.gitSource.create({
+			await prisma.gitSource.create({
-                data: {
+				data: {
-                    id: newId,
+					id: newId,
-                    name,
+					name,
-                    htmlUrl,
+					htmlUrl,
-                    apiUrl,
+					apiUrl,
-                    organization,
+					organization,
-                    customPort,
+					customPort,
-                    isSystemWide,
+					isSystemWide,
-                    type: 'github',
+					type: 'github',
-                    teams: { connect: { id: teamId } }
+					teams: { connect: { id: teamId } }
-                }
+				}
-            });
+			});
-            return {
+			return {
-                id: newId
+				id: newId
-            }
+			};
-        }
+		}
-        throw { status: 500, message: 'Wrong request.' }
+		throw { status: 500, message: 'Wrong request.' };
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }
 export async function saveGitLabSource(request: FastifyRequest<SaveGitLabSource>) {
-    try {
+	try {
-        const { id } = request.params
+		const { id } = request.params;
-        const { teamId } = request.user
+		const { teamId } = request.user;
-        let { type, name, htmlUrl, apiUrl, oauthId, appId, appSecret, groupName, customPort } =
+		let {
-            request.body
+			type,
+			name,
+			htmlUrl,
+			apiUrl,
+			oauthId,
+			appId,
+			appSecret,
+			groupName,
+			customPort,
+			customUser
+		} = request.body;
 
-        if (oauthId) oauthId = Number(oauthId);
+		if (oauthId) oauthId = Number(oauthId);
-        if (customPort) customPort = Number(customPort)
+		if (customPort) customPort = Number(customPort);
-        const encryptedAppSecret = encrypt(appSecret);
+		const encryptedAppSecret = encrypt(appSecret);
 
-        if (id === 'new') {
+		if (id === 'new') {
-            const newId = cuid()
+			const newId = cuid();
-            await prisma.gitSource.create({ data: { id: newId, type, apiUrl, htmlUrl, name, customPort, teams: { connect: { id: teamId } } } });
+			await prisma.gitSource.create({
-            await prisma.gitlabApp.create({
+				data: {
-                data: {
+					id: newId,
-                    teams: { connect: { id: teamId } },
+					type,
-                    appId,
+					apiUrl,
-                    oauthId,
+					htmlUrl,
-                    groupName,
+					name,
-                    appSecret: encryptedAppSecret,
+					customPort,
-                    gitSource: { connect: { id: newId } }
+					customUser,
-                }
+					teams: { connect: { id: teamId } }
-            });
+				}
-            return {
+			});
-                status: 201,
+			await prisma.gitlabApp.create({
-                id: newId
+				data: {
-            }
+					teams: { connect: { id: teamId } },
-        } else {
+					appId,
-            await prisma.gitSource.update({ where: { id }, data: { type, apiUrl, htmlUrl, name, customPort } });
+					oauthId,
-            await prisma.gitlabApp.update({
+					groupName,
-                where: { id },
+					appSecret: encryptedAppSecret,
-                data: {
+					gitSource: { connect: { id: newId } }
-                    appId,
+				}
-                    oauthId,
+			});
-                    groupName,
+			return {
-                    appSecret: encryptedAppSecret,
+				status: 201,
-                }
+				id: newId
-            });
+			};
-        }
+		} else {
-        return { status: 201 };
+			await prisma.gitSource.update({
-
+				where: { id },
-    } catch ({ status, message }) {
+				data: { type, apiUrl, htmlUrl, name, customPort, customUser }
-        return errorHandler({ status, message })
+			});
-    }
+			await prisma.gitlabApp.update({
+				where: { id },
+				data: {
+					appId,
+					oauthId,
+					groupName,
+					appSecret: encryptedAppSecret
+				}
+			});
+		}
+		return { status: 201 };
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 
 export async function checkGitLabOAuthID(request: FastifyRequest<CheckGitLabOAuthId>) {
-    try {
+	try {
-        const { oauthId } = request.body
+		const { oauthId } = request.body;
-        const found = await prisma.gitlabApp.findFirst({ where: { oauthId: Number(oauthId) } });
+		const found = await prisma.gitlabApp.findFirst({ where: { oauthId: Number(oauthId) } });
-        if (found) {
+		if (found) {
-            throw { status: 500, message: 'OAuthID already configured in Coolify.' }
+			throw { status: 500, message: 'OAuthID already configured in Coolify.' };
-        }
+		}
-        return {}
+		return {};
-    } catch ({ status, message }) {
+	} catch ({ status, message }) {
-        return errorHandler({ status, message })
+		return errorHandler({ status, message });
-    }
+	}
 }

apps/api/src/routes/api/v1/sources/types.ts

@@ -21,6 +21,7 @@ export interface SaveGitLabSource extends OnlyId {
         appSecret: string,
         groupName: string,
         customPort: number,
+        customUser: string,
     }
 }
 export interface CheckGitLabOAuthId extends OnlyId {

apps/api/src/routes/webhooks/traefik/handlers.ts

@@ -1,9 +1,33 @@
-import { FastifyRequest } from "fastify";
+import { FastifyRequest } from 'fastify';
-import { errorHandler, getDomain, isDev, prisma, executeCommand } from "../../../lib/common";
+import { errorHandler, executeCommand, getDomain, isDev, prisma } from '../../../lib/common';
-import { getTemplates } from "../../../lib/services";
+import { getTemplates } from '../../../lib/services';
-import { OnlyId } from "../../../types";
+import { OnlyId } from '../../../types';
+import { parseAndFindServiceTemplates } from '../../api/v1/services/handlers';
+import { hashPassword } from '../../api/v1/handlers';
 
-function generateServices(serviceId, containerId, port) {
+function generateServices(serviceId, containerId, port, isHttp2 = false, isHttps = false) {
+	if (isHttp2) {
+		return {
+			[serviceId]: {
+				loadbalancer: {
+					servers: [
+						{
+							url: `${isHttps ? 'https' : 'http'}://${containerId}:${port}`
+						}
+					]
+				}
+			},
+			[`${serviceId}-http2`]: {
+				loadbalancer: {
+					servers: [
+						{
+							url: `h2c://${containerId}:${port}`
+						}
+					]
+				}
+			}
+		};
+	}
 	return {
 		[serviceId]: {
 			loadbalancer: {
@@ -14,43 +38,59 @@ function generateServices(serviceId, containerId, port) {
 				]
 			}
 		}
-	}
+	};
 }
-function generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, isDualCerts, isCustomSSL) {
+async function generateRouters({
-	let http: any = {
+	serviceId,
+	domain,
+	nakedDomain,
+	pathPrefix,
+	isHttps,
+	isWWW,
+	isDualCerts,
+	isCustomSSL,
+	isHttp2 = false,
+	httpBasicAuth = null,
+}) {
+	const rule = `Host(\`${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`;
+	const ruleWWW = `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''
+		}`;
+
+
+	const http: any = {
 		entrypoints: ['web'],
-		rule: `Host(\`${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
+		rule,
 		service: `${serviceId}`,
 		priority: 2,
 		middlewares: []
-	}
+	};
-	let https: any = {
+	const https: any = {
 		entrypoints: ['websecure'],
-		rule: `Host(\`${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
+		rule,
 		service: `${serviceId}`,
 		priority: 2,
 		tls: {
 			certresolver: 'letsencrypt'
 		},
 		middlewares: []
-	}
+	};
-	let httpWWW: any = {
+	const httpWWW: any = {
 		entrypoints: ['web'],
-		rule: `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
+		rule: ruleWWW,
 		service: `${serviceId}`,
 		priority: 2,
 		middlewares: []
-	}
+	};
-	let httpsWWW: any = {
+	const httpsWWW: any = {
 		entrypoints: ['websecure'],
-		rule: `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
+		rule: ruleWWW,
 		service: `${serviceId}`,
 		priority: 2,
 		tls: {
 			certresolver: 'letsencrypt'
 		},
 		middlewares: []
-	}
+	};
 	// 2. http + non-www only
 	if (!isHttps && !isWWW) {
 		https.middlewares.push('redirect-to-http');
@@ -58,8 +98,12 @@ function generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, is
 
 		httpWWW.middlewares.push('redirect-to-non-www');
 		httpsWWW.middlewares.push('redirect-to-non-www');
-		delete https.tls
+		delete https.tls;
-		delete httpsWWW.tls
+		delete httpsWWW.tls;
+
+		if (httpBasicAuth) {
+			http.middlewares.push(`${serviceId}-${pathPrefix}-basic-auth`);
+		}
 	}
 
 	// 3. http + www only
@@ -69,8 +113,12 @@ function generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, is
 
 		http.middlewares.push('redirect-to-www');
 		https.middlewares.push('redirect-to-www');
-		delete https.tls
+		delete https.tls;
-		delete httpsWWW.tls
+		delete httpsWWW.tls;
+
+		if (httpBasicAuth) {
+			httpWWW.middlewares.push(`${serviceId}-${pathPrefix}-basic-auth`);
+		}
 	}
 	// 5. https + non-www only
 	if (isHttps && !isWWW) {
@@ -86,19 +134,23 @@ function generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, is
 				httpsWWW.tls = true;
 			} else {
 				https.tls = true;
-				delete httpsWWW.tls.certresolver
+				delete httpsWWW.tls.certresolver;
 				httpsWWW.tls.domains = {
 					main: domain
-				}
+				};
 			}
 		} else {
 			if (!isDualCerts) {
-				delete httpsWWW.tls.certresolver
+				delete httpsWWW.tls.certresolver;
 				httpsWWW.tls.domains = {
 					main: domain
-				}
+				};
 			}
 		}
+
+		if (httpBasicAuth) {
+			https.middlewares.push(`${serviceId}-${pathPrefix}-basic-auth`);
+		}
 	}
 	// 6. https + www only
 	if (isHttps && isWWW) {
@@ -108,34 +160,75 @@ function generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, is
 			http.middlewares.push('redirect-to-www');
 			https.middlewares.push('redirect-to-www');
 		}
+
+		if (httpBasicAuth) {
+			httpsWWW.middlewares.push(`${serviceId}-${pathPrefix}-basic-auth`);
+		}
+
 		if (isCustomSSL) {
 			if (isDualCerts) {
 				https.tls = true;
 				httpsWWW.tls = true;
 			} else {
 				httpsWWW.tls = true;
-				delete https.tls.certresolver
+				delete https.tls.certresolver;
 				https.tls.domains = {
 					main: domain
-				}
+				};
 			}
 		} else {
 			if (!isDualCerts) {
-				delete https.tls.certresolver
+				delete https.tls.certresolver;
 				https.tls.domains = {
 					main: domain
-				}
+				};
 			}
 		}
 	}
-	return {
+	if (isHttp2) {
+		const http2 = {
+			...http,
+			service: `${serviceId}-http2`,
+			rule: `${rule} && HeadersRegexp(\`Content-Type\`, \`application/grpc*\`)`
+		};
+		const http2WWW = {
+			...httpWWW,
+			service: `${serviceId}-http2`,
+			rule: `${rule} && HeadersRegexp(\`Content-Type\`, \`application/grpc*\`)`
+		};
+		const https2 = {
+			...https,
+			service: `${serviceId}-http2`,
+			rule: `${rule} && HeadersRegexp(\`Content-Type\`, \`application/grpc*\`)`
+		};
+
+		const https2WWW = {
+			...httpsWWW,
+			service: `${serviceId}-http2`,
+			rule: `${rule} && HeadersRegexp(\`Content-Type\`, \`application/grpc*\`)`
+		};
+		return {
+			[`${serviceId}-${pathPrefix}`]: { ...http },
+			[`${serviceId}-${pathPrefix}-http2`]: { ...http2 },
+			[`${serviceId}-${pathPrefix}-secure`]: { ...https },
+			[`${serviceId}-${pathPrefix}-secure-http2`]: { ...https2 },
+			[`${serviceId}-${pathPrefix}-www`]: { ...httpWWW },
+			[`${serviceId}-${pathPrefix}-www-http2`]: { ...http2WWW },
+			[`${serviceId}-${pathPrefix}-secure-www`]: { ...httpsWWW },
+			[`${serviceId}-${pathPrefix}-secure-www-http2`]: { ...https2WWW }
+		};
+	}
+
+	const result = {
 		[`${serviceId}-${pathPrefix}`]: { ...http },
 		[`${serviceId}-${pathPrefix}-secure`]: { ...https },
 		[`${serviceId}-${pathPrefix}-www`]: { ...httpWWW },
-		[`${serviceId}-${pathPrefix}-secure-www`]: { ...httpsWWW },
+		[`${serviceId}-${pathPrefix}-secure-www`]: { ...httpsWWW }
-	}
+	};
+
+	return result;
 }
-export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote: boolean = false) {
+export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote = false) {
 	const traefik = {
 		tls: {
 			certificates: []
@@ -174,26 +267,26 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 		const coolifySettings = await prisma.setting.findFirst();
 		if (coolifySettings.isTraefikUsed && coolifySettings.proxyDefaultRedirect) {
 			traefik.http.routers['catchall-http'] = {
-				entrypoints: ["web"],
+				entrypoints: ['web'],
-				rule: "HostRegexp(`{catchall:.*}`)",
+				rule: 'HostRegexp(`{catchall:.*}`)',
-				service: "noop",
+				service: 'noop',
 				priority: 1,
-				middlewares: ["redirect-regexp"]
+				middlewares: ['redirect-regexp']
-			}
+			};
 			traefik.http.routers['catchall-https'] = {
-				entrypoints: ["websecure"],
+				entrypoints: ['websecure'],
-				rule: "HostRegexp(`{catchall:.*}`)",
+				rule: 'HostRegexp(`{catchall:.*}`)',
-				service: "noop",
+				service: 'noop',
 				priority: 1,
-				middlewares: ["redirect-regexp"]
+				middlewares: ['redirect-regexp']
-			}
+			};
 			traefik.http.middlewares['redirect-regexp'] = {
 				redirectregex: {
 					regex: '(.*)',
 					replacement: coolifySettings.proxyDefaultRedirect,
 					permanent: false
 				}
-			}
+			};
 			traefik.http.services['noop'] = {
 				loadBalancer: {
 					servers: [
@@ -202,25 +295,41 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 						}
 					]
 				}
-			}
+			};
 		}
 		const sslpath = '/etc/traefik/acme/custom';
 
-		let certificates = await prisma.certificate.findMany({ where: { team: { applications: { some: { settings: { isCustomSSL: true } } }, destinationDocker: { some: { remoteEngine: false, isCoolifyProxyUsed: true } } } } })
+		let certificates = await prisma.certificate.findMany({
+			where: {
+				team: {
+					applications: { some: { settings: { isCustomSSL: true } } },
+					destinationDocker: { some: { remoteEngine: false, isCoolifyProxyUsed: true } }
+				}
+			}
+		});
 
 		if (remote) {
-			certificates = await prisma.certificate.findMany({ where: { team: { applications: { some: { settings: { isCustomSSL: true } } }, destinationDocker: { some: { id, remoteEngine: true, isCoolifyProxyUsed: true, remoteVerified: true } } } } })
+			certificates = await prisma.certificate.findMany({
+				where: {
+					team: {
+						applications: { some: { settings: { isCustomSSL: true } } },
+						destinationDocker: {
+							some: { id, remoteEngine: true, isCoolifyProxyUsed: true, remoteVerified: true }
+						}
+					}
+				}
+			});
 		}
 
-		let parsedCertificates = []
+		const parsedCertificates = [];
 		for (const certificate of certificates) {
 			parsedCertificates.push({
 				certFile: `${sslpath}/${certificate.id}-cert.pem`,
 				keyFile: `${sslpath}/${certificate.id}-key.pem`
-			})
+			});
 		}
 		if (parsedCertificates.length > 0) {
-			traefik.tls.certificates = parsedCertificates
+			traefik.tls.certificates = parsedCertificates;
 		}
 
 		let applications = [];
@@ -236,7 +345,7 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 					destinationDocker: true,
 					persistentStorage: true,
 					serviceSecret: true,
-					serviceSetting: true,
+					serviceSetting: true
 				},
 				orderBy: { createdAt: 'desc' }
 			});
@@ -251,23 +360,25 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 					destinationDocker: true,
 					persistentStorage: true,
 					serviceSecret: true,
-					serviceSetting: true,
+					serviceSetting: true
 				},
-				orderBy: { createdAt: 'desc' },
+				orderBy: { createdAt: 'desc' }
 			});
 		}
 
-
 		if (applications.length > 0) {
-			const dockerIds = new Set()
+			const dockerIds = new Set();
-			const runningContainers = {}
+			const runningContainers = {};
 			applications.forEach((app) => dockerIds.add(app.destinationDocker.id));
 			for (const dockerId of dockerIds) {
-				const { stdout: container } = await executeCommand({ dockerId, command: `docker container ls --filter 'label=coolify.managed=true' --format '{{ .Names}}'` })
+				const { stdout: container } = await executeCommand({
+					dockerId,
+					command: `docker container ls --filter 'label=coolify.managed=true' --format '{{ .Names}}'`
+				});
 				if (container) {
 					const containersArray = container.trim().split('\n');
 					if (containersArray.length > 0) {
-						runningContainers[dockerId] = containersArray
+						runningContainers[dockerId] = containersArray;
 					}
 				}
 			}
@@ -281,7 +392,10 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 						dockerComposeConfiguration,
 						destinationDocker,
 						destinationDockerId,
-						settings
+						settings,
+						basicAuthUser,
+						basicAuthPw,
+						settings: { basicAuth: isBasicAuthEnabled }
 					} = application;
 					if (!destinationDockerId) {
 						continue;
@@ -289,38 +403,68 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 					if (
 						!runningContainers[destinationDockerId] ||
 						runningContainers[destinationDockerId].length === 0 ||
-						runningContainers[destinationDockerId].filter((container) => container.startsWith(id)).length === 0
+						runningContainers[destinationDockerId].filter((container) => container.startsWith(id))
+							.length === 0
 					) {
-						continue
+						continue;
+					}
+					let httpBasicAuth = null;
+					if (basicAuthUser && basicAuthPw && isBasicAuthEnabled) {
+						httpBasicAuth = {
+							basicAuth: {
+								users: [basicAuthUser + ':' + await hashPassword(basicAuthPw, 1)]
+							}
+						};
 					}
 					if (buildPack === 'compose') {
-						const services = Object.entries(JSON.parse(dockerComposeConfiguration))
+						const services = Object.entries(JSON.parse(dockerComposeConfiguration));
 						if (services.length > 0) {
 							for (const service of services) {
-								const [key, value] = service
+								const [key, value] = service;
 								if (key && value) {
 									if (!value.fqdn || !value.port) {
 										continue;
 									}
-									const { fqdn, port } = value
+									const { fqdn, port } = value;
-									const containerId = `${id}-${key}`
+									const containerId = `${id}-${key}`;
 									const domain = getDomain(fqdn);
 									const nakedDomain = domain.replace(/^www\./, '');
 									const isHttps = fqdn.startsWith('https://');
 									const isWWW = fqdn.includes('www.');
-									const pathPrefix = '/'
+									const pathPrefix = '/';
 									const isCustomSSL = false;
 									const dualCerts = false;
-									const serviceId = `${id}-${port || 'default'}`
+									const serviceId = `${id}-${port || 'default'}`;
 
-									traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+									traefik.http.routers = {
-									traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, containerId, port) }
+										...traefik.http.routers,
+										...await generateRouters({
+											serviceId,
+											domain,
+											nakedDomain,
+											pathPrefix,
+											isHttps,
+											isWWW,
+											isDualCerts: dualCerts,
+											isCustomSSL,
+											httpBasicAuth
+										})
+									};
+									traefik.http.services = {
+										...traefik.http.services,
+										...generateServices(serviceId, containerId, port)
+									};
+									if (httpBasicAuth) {
+										traefik.http.middlewares[`${serviceId}-${pathPrefix}-basic-auth`] = {
+											...httpBasicAuth
+										};
+									}
 								}
 							}
 						}
 						continue;
 					}
-					const { previews, dualCerts, isCustomSSL } = settings;
+					const { previews, dualCerts, isCustomSSL, isHttp2, basicAuth } = settings;
 					const { network, id: dockerId } = destinationDocker;
 					if (!fqdn) {
 						continue;
@@ -329,12 +473,37 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 					const nakedDomain = domain.replace(/^www\./, '');
 					const isHttps = fqdn.startsWith('https://');
 					const isWWW = fqdn.includes('www.');
-					const pathPrefix = '/'
+					const pathPrefix = '/';
-					const serviceId = `${id}-${port || 'default'}`
+					const serviceId = `${id}-${port || 'default'}`;
-					traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+					traefik.http.routers = {
-					traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, id, port) }
+						...traefik.http.routers,
+						...await generateRouters({
+							serviceId,
+							domain,
+							nakedDomain,
+							pathPrefix,
+							isHttps,
+							isWWW,
+							isDualCerts: dualCerts,
+							isCustomSSL,
+							isHttp2,
+							httpBasicAuth
+						})
+					};
+					traefik.http.services = {
+						...traefik.http.services,
+						...generateServices(serviceId, id, port, isHttp2, isHttps)
+					};
+					if (httpBasicAuth) {
+						traefik.http.middlewares[`${serviceId}-${pathPrefix}-basic-auth`] = {
+							...httpBasicAuth
+						};
+					}
 					if (previews) {
-						const { stdout } = await executeCommand({ dockerId, command: `docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"` })
+						const { stdout } = await executeCommand({
+							dockerId,
+							command: `docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"`
+						});
 						if (stdout) {
 							const containers = stdout
 								.trim()
@@ -343,44 +512,63 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 								.map((c) => c.replace(/"/g, ''));
 							if (containers.length > 0) {
 								for (const container of containers) {
-									const previewDomain = `${container.split('-')[1]}${coolifySettings.previewSeparator}${domain}`;
+									const previewDomain = `${container.split('-')[1]}${coolifySettings.previewSeparator
+										}${domain}`;
 									const nakedDomain = previewDomain.replace(/^www\./, '');
-									const pathPrefix = '/'
+									const pathPrefix = '/';
-									const serviceId = `${container}-${port || 'default'}`
+									const serviceId = `${container}-${port || 'default'}`;
-									traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, previewDomain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+									traefik.http.routers = {
-									traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, container, port) }
+										...traefik.http.routers,
+										...await generateRouters({
+											serviceId,
+											domain: previewDomain,
+											nakedDomain,
+											pathPrefix,
+											isHttps,
+											isWWW,
+											isDualCerts: dualCerts,
+											isCustomSSL,
+											isHttp2: false,
+											httpBasicAuth
+										})
+									};
+									traefik.http.services = {
+										...traefik.http.services,
+										...generateServices(serviceId, container, port, isHttp2)
+									};
+									if (httpBasicAuth) {
+										traefik.http.middlewares[`${serviceId}-${pathPrefix}-basic-auth`] = {
+											...httpBasicAuth
+										};
+									}
 								}
 							}
 						}
 					}
 				} catch (error) {
-					console.log(error)
+					console.log(error);
 				}
 			}
 		}
 		if (services.length > 0) {
-			const dockerIds = new Set()
+			const dockerIds = new Set();
-			const runningContainers = {}
+			const runningContainers = {};
 			services.forEach((app) => dockerIds.add(app.destinationDocker.id));
 			for (const dockerId of dockerIds) {
-				const { stdout: container } = await executeCommand({ dockerId, command: `docker container ls --filter 'label=coolify.managed=true' --format '{{ .Names}}'` })
+				const { stdout: container } = await executeCommand({
+					dockerId,
+					command: `docker container ls --filter 'label=coolify.managed=true' --format '{{ .Names}}'`
+				});
 				if (container) {
 					const containersArray = container.trim().split('\n');
 					if (containersArray.length > 0) {
-						runningContainers[dockerId] = containersArray
+						runningContainers[dockerId] = containersArray;
 					}
 				}
 			}
 			for (const service of services) {
 				try {
-					let {
+					let { fqdn, id, type, destinationDockerId, dualCerts, serviceSetting } = service;
-						fqdn,
-						id,
-						type,
-						destinationDockerId,
-						dualCerts,
-						serviceSetting
-					} = service;
 					if (!fqdn) {
 						continue;
 					}
@@ -392,7 +580,7 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 						runningContainers[destinationDockerId].length === 0 ||
 						!runningContainers[destinationDockerId].includes(id)
 					) {
-						continue
+						continue;
 					}
 					const templates = await getTemplates();
 					let found = templates.find((a) => a.type === type);
@@ -401,88 +589,147 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 					}
 					found = JSON.parse(JSON.stringify(found).replaceAll('$$id', id));
 					for (const oneService of Object.keys(found.services)) {
-						const isDomainConfiguration = found?.services[oneService]?.proxy?.filter(p => p.domain) ?? [];
+						const isDomainAndProxyConfiguration =
-						if (isDomainConfiguration.length > 0) {
+							found?.services[oneService]?.proxy?.filter((p) => p.port) ?? [];
-							const { proxy } = found.services[oneService];
+						if (isDomainAndProxyConfiguration.length > 0) {
-							for (let configuration of proxy) {
+							const template: any = await parseAndFindServiceTemplates(service, null, true);
+							const { proxy } = template.services[oneService] || found.services[oneService];
+							for (const configuration of proxy) {
+								if (configuration.hostPort) {
+									continue;
+								}
 								if (configuration.domain) {
-									const setting = serviceSetting.find((a) => a.variableName === configuration.domain);
+									const setting = serviceSetting.find(
+										(a) => a.variableName === configuration.domain
+									);
 									if (setting) {
-										configuration.domain = configuration.domain.replace(configuration.domain, setting.value);
+										configuration.domain = configuration.domain.replace(
+											configuration.domain,
+											setting.value
+										);
 									}
 								}
-								const foundPortVariable = serviceSetting.find((a) => a.name.toLowerCase() === 'port')
+								const foundPortVariable = serviceSetting.find(
+									(a) => a.name.toLowerCase() === 'port'
+								);
 								if (foundPortVariable) {
-									configuration.port = foundPortVariable.value
+									configuration.port = foundPortVariable.value;
 								}
 								let port, pathPrefix, customDomain;
 								if (configuration) {
 									port = configuration?.port;
 									pathPrefix = configuration?.pathPrefix || '/';
-									customDomain = configuration?.domain
+									customDomain = configuration?.domain;
 								}
 								if (customDomain) {
-									fqdn = customDomain
+									fqdn = customDomain;
 								} else {
-									fqdn = service.fqdn
+									fqdn = service.fqdn;
 								}
 								const domain = getDomain(fqdn);
 								const nakedDomain = domain.replace(/^www\./, '');
 								const isHttps = fqdn.startsWith('https://');
 								const isWWW = fqdn.includes('www.');
 								const isCustomSSL = false;
-								const serviceId = `${oneService}-${port || 'default'}`
+								const serviceId = `${oneService}-${port || 'default'}`;
-								traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+								traefik.http.routers = {
-								traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, oneService, port) }
+									...traefik.http.routers,
+									...await generateRouters({
+										serviceId,
+										domain,
+										nakedDomain,
+										pathPrefix,
+										isHttps,
+										isWWW,
+										isDualCerts: dualCerts,
+										isCustomSSL,
+									})
+								};
+								traefik.http.services = {
+									...traefik.http.services,
+									...generateServices(serviceId, oneService, port)
+								};
 							}
 						} else {
 							if (found.services[oneService].ports && found.services[oneService].ports.length > 0) {
 								for (let [index, port] of found.services[oneService].ports.entries()) {
 									if (port == 22) continue;
 									if (index === 0) {
-										const foundPortVariable = serviceSetting.find((a) => a.name.toLowerCase() === 'port')
+										const foundPortVariable = serviceSetting.find(
+											(a) => a.name.toLowerCase() === 'port'
+										);
 										if (foundPortVariable) {
-											port = foundPortVariable.value
+											port = foundPortVariable.value;
 										}
 									}
 									const domain = getDomain(fqdn);
 									const nakedDomain = domain.replace(/^www\./, '');
 									const isHttps = fqdn.startsWith('https://');
 									const isWWW = fqdn.includes('www.');
-									const pathPrefix = '/'
+									const pathPrefix = '/';
-									const isCustomSSL = false
+									const isCustomSSL = false;
-									const serviceId = `${oneService}-${port || 'default'}`
+									const serviceId = `${oneService}-${port || 'default'}`;
-									traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+									traefik.http.routers = {
-									traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, id, port) }
+										...traefik.http.routers,
+										...await generateRouters({
+											serviceId,
+											domain,
+											nakedDomain,
+											pathPrefix,
+											isHttps,
+											isWWW,
+											isDualCerts: dualCerts,
+											isCustomSSL
+										})
+									};
+									traefik.http.services = {
+										...traefik.http.services,
+										...generateServices(serviceId, id, port)
+									};
 								}
 							}
 						}
 					}
 				} catch (error) {
-					console.log(error)
+					console.log(error);
 				}
 			}
 		}
 		if (!remote) {
 			const { fqdn, dualCerts } = await prisma.setting.findFirst();
 			if (!fqdn) {
-				return
+				return;
 			}
 			const domain = getDomain(fqdn);
 			const nakedDomain = domain.replace(/^www\./, '');
 			const isHttps = fqdn.startsWith('https://');
 			const isWWW = fqdn.includes('www.');
-			const id = isDev ? 'host.docker.internal' : 'coolify'
+			const id = isDev ? 'host.docker.internal' : 'coolify';
-			const container = isDev ? 'host.docker.internal' : 'coolify'
+			const container = isDev ? 'host.docker.internal' : 'coolify';
-			const port = 3000
+			const port = 3000;
-			const pathPrefix = '/'
+			const pathPrefix = '/';
-			const isCustomSSL = false
+			const isCustomSSL = false;
-			const serviceId = `${id}-${port || 'default'}`
+			const serviceId = `${id}-${port || 'default'}`;
-			traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+			traefik.http.routers = {
-			traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, container, port) }
+				...traefik.http.routers,
+				...await generateRouters({
+					serviceId,
+					domain,
+					nakedDomain,
+					pathPrefix,
+					isHttps,
+					isWWW,
+					isDualCerts: dualCerts,
+					isCustomSSL
+				})
+			};
+			traefik.http.services = {
+				...traefik.http.services,
+				...generateServices(serviceId, container, port)
+			};
 		}
 	} catch (error) {
-		console.log(error)
+		console.log(error);
 	} finally {
 		if (Object.keys(traefik.http.routers).length === 0) {
 			traefik.http.routers = null;
@@ -496,9 +743,9 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 
 export async function otherProxyConfiguration(request: FastifyRequest<TraefikOtherConfiguration>) {
 	try {
-		const { id } = request.query
+		const { id } = request.query;
 		if (id) {
-			const { privatePort, publicPort, type, address = id } = request.query
+			const { privatePort, publicPort, type, address = id } = request.query;
 			let traefik = {};
 			if (publicPort && type && privatePort) {
 				if (type === 'tcp') {
@@ -559,18 +806,18 @@ export async function otherProxyConfiguration(request: FastifyRequest<TraefikOth
 							}
 						}
 					} else {
-						throw { status: 500 }
+						throw { status: 500 };
 					}
 				}
 			} else {
-				throw { status: 500 }
+				throw { status: 500 };
 			}
 			return {
 				...traefik
 			};
 		}
-		throw { status: 500 }
+		throw { status: 500 };
 	} catch ({ status, message }) {
-		return errorHandler({ status, message })
+		return errorHandler({ status, message });
 	}
 }

apps/api/src/routes/webhooks/traefik/index.ts

@@ -4,9 +4,11 @@ import { proxyConfiguration, otherProxyConfiguration } from './handlers';
 import { OtherProxyConfiguration } from './types';
 
 const root: FastifyPluginAsync = async (fastify): Promise<void> => {
-    fastify.get<OnlyId>('/main.json', async (request, reply) => proxyConfiguration(request, false));
+	fastify.get<OnlyId>('/main.json', async (request) => proxyConfiguration(request, false));
-    fastify.get<OnlyId>('/remote/:id', async (request) => proxyConfiguration(request, true));
+	fastify.get<OnlyId>('/remote/:id', async (request) => proxyConfiguration(request, true));
-    fastify.get<OtherProxyConfiguration>('/other.json', async (request, reply) => otherProxyConfiguration(request));
+	fastify.get<OtherProxyConfiguration>('/other.json', async (request) =>
+		otherProxyConfiguration(request)
+	);
 };
 
 export default root;

apps/ui/package.json

@@ -42,8 +42,6 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"@sentry/svelte": "7.21.1",
-		"@sentry/tracing": "7.21.1",
 		"@sveltejs/adapter-static": "1.0.0-next.48",
 		"@tailwindcss/typography": "0.5.8",
 		"cuid": "2.1.8",

apps/ui/src/hooks.ts

@@ -1,13 +1,10 @@
-import * as Sentry from '@sentry/svelte';
 export async function handle({ event, resolve }) {
-    const response = await resolve(event, { ssr: false });
+	const response = await resolve(event, { ssr: false });
-    return response;
+	return response;
 }
 export const handleError = ({ error, event }) => {
-    Sentry.captureException(error, { event });
+	return {
-
+		message: 'Whoops!',
-    return {
+		code: error?.code ?? 'UNKNOWN'
-        message: 'Whoops!',
+	};
-        code: error?.code ?? 'UNKNOWN'
-    };
 };

apps/ui/src/lib/api.ts

@@ -1,5 +1,6 @@
 import { dev } from '$app/env';
 import Cookies from 'js-cookie';
+import { dashify } from './common';
 
 export function getAPIUrl() {
 	if (GITPOD_WORKSPACE_URL) {
@@ -72,17 +73,19 @@ async function send({
 			...headers
 		};
 	}
-	if (token && !path.startsWith('https://')) {
+
+	if (token && !path.startsWith('https://') && !path.startsWith('http://')) {
 		opts.headers = {
 			...opts.headers,
 			Authorization: `Bearer ${token}`
 		};
 	}
-	if (!path.startsWith('https://')) {
+
+	if (!path.startsWith('https://') && !path.startsWith('http://')) {
 		path = `/api/v1${path}`;
 	}
 
-	if (dev && !path.startsWith('https://')) {
+	if (dev && !path.startsWith('https://') && !path.startsWith('http://')) {
 		path = `${getAPIUrl()}${path}`;
 	}
 	if (method === 'POST' && data && !opts.body) {
@@ -100,6 +103,14 @@ async function send({
 			responseData = await response.json();
 		} else if (contentType?.indexOf('text/plain') !== -1) {
 			responseData = await response.text();
+		} else if (contentType?.indexOf('application/octet-stream') !== -1) {
+			responseData = await response.blob();
+			const fileName = dashify(data.id + '-' + data.name)
+			const fileLink = document.createElement('a');
+			fileLink.href = URL.createObjectURL(new Blob([responseData]))
+			fileLink.download = fileName + '.gz';
+			fileLink.click();
+			fileLink.remove();
 		} else {
 			return {};
 		}

apps/ui/src/lib/components/CopyVolumeField.svelte

@@ -0,0 +1,51 @@
+<script>
+	import { addToast } from '$lib/store';
+
+	export let value = '';
+	let isHttps = window.location.protocol === 'https:';
+
+	function copyToClipboard() {
+		if (isHttps && navigator.clipboard) {
+			navigator.clipboard.writeText(value);
+			addToast({
+				message: 'Copied to clipboard.',
+				type: 'success'
+			});
+		}
+	}
+</script>
+
+<div class="w-full relative box">
+	<p class="text-white  p-2">{value}</p>
+	<div
+		class="absolute top-0 right-0 flex justify-center items-center h-full cursor-pointer text-stone-600 mr-3"
+	>
+		{#if isHttps}
+			<div on:click={copyToClipboard}>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="h-6 w-6"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					fill="none"
+					stroke-linecap="round"
+					stroke-linejoin="round"
+				>
+					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+					<rect x="8" y="8" width="12" height="12" rx="2" />
+					<path d="M16 8v-2a2 2 0 0 0 -2 -2h-8a2 2 0 0 0 -2 2v8a2 2 0 0 0 2 2h2" />
+				</svg>
+			</div>
+		{/if}
+	</div>
+</div>
+
+<style>
+	.box {
+		position: relative;
+		border: 1px dashed #202020;
+		border-radius: 5px;
+		padding: 5px;
+	}
+</style>

apps/ui/src/lib/components/svg/services/ServiceIcons.svelte

@@ -1,23 +1,14 @@
 <script lang="ts">
 	export let type: string;
 	export let isAbsolute = false;
+	let githubRawIconUrl =
+		'https://raw.githubusercontent.com/coollabsio/coolify-community-templates/main/services/icons';
+
 	let fallback = '/icons/default.png';
-	const handleError = (ev: { target: { src: string } }) => (ev.target.src = fallback);
+
-	let extension = 'png';
+	const handleError = (ev: { target: { src: string } }) => {
-	let svgs = [
+		ev.target.src = fallback;
-		'pocketbase',
+	};
-		'gitea',
-		'languagetool',
-		'meilisearch',
-		'n8n',
-		'glitchtip',
-		'searxng',
-		'umami',
-		'uptimekuma',
-		'vaultwarden',
-		'weblate',
-		'wordpress'
-	];
 
 	const name: any =
 		type &&
@@ -27,32 +18,15 @@
 			.split('-')[0]
 			.toLowerCase();
 
-	if (svgs.includes(name)) {
-		extension = 'svg';
-	}
-
 	function generateClass() {
-		switch (name) {
+		return isAbsolute ? 'w-10 h-10 absolute -m-4 -mt-9 left-0' : 'w-10 h-10';
-			case 'n8n':
-				if (isAbsolute) {
-					return 'w-12 h-12 absolute -m-9 -mt-12';
-				}
-				return 'w-12 h-12 -mt-3';
-			case 'weblate':
-				if (isAbsolute) {
-					return 'w-12 h-12 absolute -m-9 -mt-12';
-				}
-				return 'w-12 h-12 -mt-3';
-			default:
-				return isAbsolute ? 'w-10 h-10 absolute -m-4 -mt-9 left-0' : 'w-10 h-10';
-		}
 	}
 </script>
 
 {#if name}
 	<img
 		class={generateClass()}
-		src={`/icons/${name}.${extension}`}
+		src={`${githubRawIconUrl}/${name}.png`}
 		on:error={handleError}
 		alt={`Icon of ${name}`}
 	/>

apps/ui/src/lib/locales/en.json

@@ -196,6 +196,9 @@
 		"domain_fqdn": "Domain (FQDN)",
 		"https_explainer": "If you specify <span class='text-settings '>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-settings '>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application.<br><br><span class='text-white '>You must set your DNS to point to the server IP in advance.</span>",
 		"ssl_www_and_non_www": "Generate SSL for www and non-www?",
+		"basic_auth": "Basic Auth",
+		"basic_auth_user": "User",
+		"basic_auth_pw": "Password",
 		"ssl_explainer": "It will generate certificates for both www and non-www. <br>You need to have <span class=' text-settings'>both DNS entries</span> set in advance.<br><br>Useful if you expect to have visitors on both.",
 		"install_command": "Install Command",
 		"build_command": "Build Command",

apps/ui/src/lib/store.ts

@@ -23,7 +23,8 @@ interface AppSession {
         github: string | null,
         gitlab: string | null,
     },
-    pendingInvitations: Array<any>
+    pendingInvitations: Array<any>,
+    isARM: boolean
 }
 interface AddToast {
     type?: "info" | "success" | "error",
@@ -52,15 +53,15 @@ export const appSession: Writable<AppSession> = writable({
         github: null,
         gitlab: null
     },
-    pendingInvitations: []
+    pendingInvitations: [],
+    isARM: false
 });
 export const disabledButton: Writable<boolean> = writable(false);
 export const isDeploymentEnabled: Writable<boolean> = writable(false);
-export function checkIfDeploymentEnabledApplications(isAdmin: boolean, application: any) {
+export function checkIfDeploymentEnabledApplications(application: any) {
     return !!(
-        isAdmin &&
         (application.buildPack === 'compose') ||
-        (application.fqdn || application.settings.isBot) &&
+        (application.fqdn || application.settings?.isBot) &&
         ((application.gitSource &&
             application.repository &&
             application.buildPack) || application.simpleDockerfile) &&
@@ -68,9 +69,8 @@ export function checkIfDeploymentEnabledApplications(isAdmin: boolean, applicati
 
     );
 }
-export function checkIfDeploymentEnabledServices(isAdmin: boolean, service: any) {
+export function checkIfDeploymentEnabledServices( service: any) {
     return (
-        isAdmin &&
         service.fqdn &&
         service.destinationDocker &&
         service.version &&

apps/ui/src/routes/__layout.svelte

@@ -65,7 +65,6 @@
 
 <script lang="ts">
 	export let settings: any;
-	export let sentryDSN: any;
 	export let baseSettings: any;
 	export let pendingInvitations: any = 0;
 
@@ -75,6 +74,7 @@
 	$appSession.version = baseSettings.version;
 	$appSession.whiteLabeled = baseSettings.whiteLabeled;
 	$appSession.whiteLabeledDetails.icon = baseSettings.whiteLabeledIcon;
+	$appSession.isARM = baseSettings.isARM;
 
 	$appSession.pendingInvitations = pendingInvitations;
 
@@ -97,10 +97,6 @@
 	import Toasts from '$lib/components/Toasts.svelte';
 	import Tooltip from '$lib/components/Tooltip.svelte';
 	import { onMount } from 'svelte';
-	import LocalePicker from '$lib/components/LocalePicker.svelte';
-	import * as Sentry from '@sentry/svelte';
-	import { BrowserTracing } from '@sentry/tracing';
-	import { dev } from '$app/env';
 
 	if (userId) $appSession.userId = userId;
 	if (teamId) $appSession.teamId = teamId;
@@ -135,6 +131,10 @@
 			});
 		}
 	});
+
+	let sidedrawerToggler: HTMLInputElement;
+
+	const closeDrawer = () => (sidedrawerToggler.checked = false);
 </script>
 
 <svelte:head>
@@ -154,9 +154,11 @@
 {/if}
 
 <div class="drawer">
-	<input id="main-drawer" type="checkbox" class="drawer-toggle" />
+	<input id="main-drawer" type="checkbox" class="drawer-toggle" bind:this={sidedrawerToggler} />
 	<div class="drawer-content">
 		{#if $appSession.userId}
+			<Tooltip triggeredBy="#dashboard" placement="right" color="bg-pink-500">Dashboard</Tooltip>
+			<Tooltip triggeredBy="#servers" placement="right" color="bg-sky-500">Servers</Tooltip>
 			<Tooltip triggeredBy="#iam" placement="right" color="bg-iam">IAM</Tooltip>
 			<Tooltip triggeredBy="#settings" placement="right" color="bg-settings text-black"
 				>Settings</Tooltip
@@ -176,7 +178,6 @@
 					<div class="flex flex-col space-y-2 py-2" class:mt-2={$appSession.whiteLabeled}>
 						<a
 							id="dashboard"
-							sveltekit:prefetch
 							href="/"
 							class="icons hover:text-pink-500"
 							class:text-pink-500={$page.url.pathname === '/'}
@@ -203,7 +204,6 @@
 						{#if $appSession.teamId === '0'}
 							<a
 								id="servers"
-								sveltekit:prefetch
 								href="/servers"
 								class="icons hover:text-sky-500"
 								class:text-sky-500={$page.url.pathname === '/servers'}
@@ -229,8 +229,6 @@
 							</a>
 						{/if}
 					</div>
-					<Tooltip triggeredBy="#dashboard" placement="right">Dashboard</Tooltip>
-					<Tooltip triggeredBy="#servers" placement="right">Servers</Tooltip>
 					<div class="flex-1" />
 					<div class="lg:block hidden">
 						<UpdateAvailable />
@@ -238,7 +236,6 @@
 					<div class="flex flex-col space-y-2 py-2">
 						<a
 							id="iam"
-							sveltekit:prefetch
 							href={$appSession.pendingInvitations.length > 0 ? '/iam/pending' : '/iam'}
 							class="icons hover:text-iam indicator"
 							class:text-iam={$page.url.pathname.startsWith('/iam')}
@@ -267,7 +264,6 @@
 						</a>
 						<a
 							id="settings"
-							sveltekit:prefetch
 							href={$appSession.teamId === '0' ? '/settings/coolify' : '/settings/docker'}
 							class="icons hover:text-settings"
 							class:text-settings={$page.url.pathname.startsWith('/settings')}
@@ -290,6 +286,28 @@
 								<circle cx="12" cy="12" r="3" />
 							</svg>
 						</a>
+						<a
+							id="documentation"
+							href="https://docs.coollabs.io/coolify-v3/"
+							target="_blank"
+							rel="noreferrer external"
+							class="icons hover:text-info"
+						>
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								fill="none"
+								viewBox="0 0 24 24"
+								stroke-width="1.5"
+								stroke="currentColor"
+								class="w-9 h-9"
+							>
+								<path
+									stroke-linecap="round"
+									stroke-linejoin="round"
+									d="M12 6.042A8.967 8.967 0 006 3.75c-1.052 0-2.062.18-3 .512v14.25A8.987 8.987 0 016 18c2.305 0 4.408.867 6 2.292m0-14.25a8.966 8.966 0 016-2.292c1.052 0 2.062.18 3 .512v14.25A8.987 8.987 0 0018 18a8.967 8.967 0 00-6 2.292m0-14.25v14.25"
+								/>
+							</svg>
+						</a>
 
 						<!-- svelte-ignore a11y-click-events-have-key-events -->
 						<div
@@ -361,13 +379,13 @@
 	</div>
 	<div class="drawer-side">
 		<label for="main-drawer" class="drawer-overlay w-full" />
-		<ul class="menu bg-coolgray-200 w-60 p-2  space-y-3 pt-4 ">
+		<ul class="menu bg-coolgray-200 w-60 p-2 space-y-3 pt-4">
 			<li>
 				<a
 					class="no-underline icons hover:text-white hover:bg-pink-500"
-					sveltekit:prefetch
 					href="/"
 					class:bg-pink-500={$page.url.pathname === '/'}
+					on:click={closeDrawer}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -393,9 +411,9 @@
 				<a
 					id="servers"
 					class="no-underline icons hover:text-white hover:bg-sky-500"
-					sveltekit:prefetch
 					href="/servers"
 					class:bg-sky-500={$page.url.pathname.startsWith('/servers')}
+					on:click={closeDrawer}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -421,6 +439,7 @@
 					class="no-underline icons hover:text-white hover:bg-iam"
 					href="/iam"
 					class:bg-iam={$page.url.pathname.startsWith('/iam')}
+					on:click={closeDrawer}
 					><svg
 						xmlns="http://www.w3.org/2000/svg"
 						viewBox="0 0 24 24"
@@ -450,6 +469,7 @@
 					href={$appSession.teamId === '0' ? '/settings/coolify' : '/settings/ssh'}
 					class:bg-settings={$page.url.pathname.startsWith('/settings')}
 					class:text-black={$page.url.pathname.startsWith('/settings')}
+					on:click={closeDrawer}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -470,6 +490,30 @@
 					Settings
 				</a>
 			</li>
+			<li>
+				<a
+					class="no-underline icons hover:text-white hover:bg-info"
+					href="https://docs.coollabs.io/coolify-v3/"
+					target="_blank"
+					rel="noreferrer external"
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						fill="none"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						class="w-8 h-8"
+					>
+						<path
+							stroke-linecap="round"
+							stroke-linejoin="round"
+							d="M12 6.042A8.967 8.967 0 006 3.75c-1.052 0-2.062.18-3 .512v14.25A8.987 8.987 0 016 18c2.305 0 4.408.867 6 2.292m0-14.25a8.966 8.966 0 016-2.292c1.052 0 2.062.18 3 .512v14.25A8.987 8.987 0 0018 18a8.967 8.967 0 00-6 2.292m0-14.25v14.25"
+						/>
+					</svg>
+					Documentation
+				</a>
+			</li>
 			<li class="flex-1 bg-transparent" />
 			<div class="block lg:hidden">
 				<UpdateAvailable />

apps/ui/src/routes/applications/[id]/_Menu.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	export let application: any;
-	import { status } from '$lib/store';
+	import { appSession, status } from '$lib/store';
 	import { page } from '$app/stores';
 </script>
 
@@ -220,7 +220,7 @@
 	<li class="menu-title">
 		<span>Advanced</span>
 	</li>
-	{#if application.gitSourceId}
+	{#if application.gitSourceId && $appSession.isAdmin}
 		<li
 			class="rounded"
 			class:bg-coollabs={$page.url.pathname === `/applications/${$page.params.id}/revert`}
@@ -295,6 +295,7 @@
 			>
 		</li>
 	{/if}
+	{#if $appSession.isAdmin}
 	<li
 		class="rounded"
 		class:bg-coollabs={$page.url.pathname === `/applications/${$page.params.id}/danger`}
@@ -318,4 +319,5 @@
 			</svg>Danger Zone</a
 		>
 	</li>
+	{/if}
 </ul>

apps/ui/src/routes/applications/[id]/_PreviewSecret.svelte

@@ -9,7 +9,7 @@
 	import { del, post, put } from '$lib/api';
 	import { errorNotification } from '$lib/common';
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
-	import { addToast } from '$lib/store';
+	import { addToast, appSession } from '$lib/store';
 	import { t } from '$lib/translations';
 	import { createEventDispatcher } from 'svelte';
 
@@ -120,6 +120,7 @@
 			<label for="name" class="pb-5 uppercase lg:block hidden font-bold" />
 		{/if}
 
+		{#if $appSession.isAdmin}
 		<div class="flex justify-center h-full items-center pt-3">
 			<div class="flex flex-row justify-center space-x-2">
 				<div class="flex items-center justify-center">
@@ -127,5 +128,6 @@
 				</div>
 			</div>
 		</div>
+		{/if}
 	</div>
 </div>

apps/ui/src/routes/applications/[id]/_Secret.svelte

@@ -10,7 +10,7 @@
 	import { del, post, put } from '$lib/api';
 	import { errorNotification } from '$lib/common';
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
-	import { addToast } from '$lib/store';
+	import { addToast, appSession } from '$lib/store';
 	import { t } from '$lib/translations';
 	import { createEventDispatcher } from 'svelte';
 
@@ -124,8 +124,9 @@
 		<div class="flex justify-center h-full items-center pt-0 lg:pt-0 pl-4 lg:pl-0">
 			<button
 				on:click={() => updateSecret({ changeIsBuildSecret: true })}
+				disabled={!$appSession.isAdmin}
 				aria-pressed="false"
-				class="relative inline-flex h-6 w-11 flex-shrink-0 rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out "
+				class="relative inline-flex h-6 w-11 flex-shrink-0 rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out"
 				class:bg-green-600={isBuildSecret}
 				class:bg-stone-700={!isBuildSecret}
 			>
@@ -177,7 +178,7 @@
 				<div class="flex items-center justify-center">
 					<button class="btn btn-sm btn-primary" on:click={addNewSecret}>Add</button>
 				</div>
-			{:else}
+			{:else if $appSession.isAdmin}
 				<div class="flex flex-row justify-center space-x-2">
 					<div class="flex items-center justify-center">
 						<button class="btn btn-sm btn-primary" on:click={() => updateSecret()}>Set</button>

apps/ui/src/routes/applications/[id]/_Storage.svelte

@@ -7,12 +7,24 @@
 	import { del, post } from '$lib/api';
 	import { page } from '$app/stores';
 	import { createEventDispatcher } from 'svelte';
-
+	import { browser } from '$app/env';
 	import { t } from '$lib/translations';
 	import { errorNotification } from '$lib/common';
 	import { addToast } from '$lib/store';
+	import CopyVolumeField from '$lib/components/CopyVolumeField.svelte';
+	import SimpleExplainer from '$lib/components/SimpleExplainer.svelte';
 	const { id } = $page.params;
-
+	let isHttps = browser && window.location.protocol === 'https:';
+	export let value: string;
+	function copyToClipboard() {
+		if (isHttps && navigator.clipboard) {
+			navigator.clipboard.writeText(value);
+			addToast({
+				message: 'Copied to clipboard.',
+				type: 'success'
+			});
+		}
+	}
 	const dispatch = createEventDispatcher();
 	async function saveStorage(newStorage = false) {
 		try {
@@ -22,11 +34,13 @@
 			storage.path.replace(/\/\//g, '/');
 			await post(`/applications/${id}/storages`, {
 				path: storage.path,
+				hostPath: storage.hostPath,
 				storageId: storage.id,
 				newStorage
 			});
 			dispatch('refresh');
 			if (isNew) {
+				storage.hostPath = null;
 				storage.path = null;
 				storage.id = null;
 			}
@@ -69,31 +83,42 @@
 		<div class="flex gap-4 pb-2" class:pt-8={isNew}>
 			{#if storage.applicationId}
 				{#if storage.oldPath}
-					<input
+					<CopyVolumeField
-						disabled
-						readonly
-						class="w-full"
 						value="{storage.applicationId}{storage.path.replace(/\//gi, '-').replace('-app', '')}"
 					/>
-				{:else}
+				{:else if !storage.hostPath}
-					<input
+					<CopyVolumeField
-						disabled
+						value="{storage.applicationId}{storage.path.replace(/\//gi, '-').replace('-app', '')}"
-						readonly
-						class="w-full"
-						value="{storage.applicationId}{storage.path.replace(/\//gi, '-')}"
 					/>
 				{/if}
 			{/if}
+
+			{#if isNew}
+				<div class="w-full">
+					<input
+						disabled={!isNew}
+						readonly={!isNew}
+						bind:value={storage.hostPath}
+						placeholder="Host path, example: ~/.directory"
+					/>
+
+					<SimpleExplainer
+						text="You can mount <span class='text-yellow-400 font-bold'>host paths</span> from the operating system.<br>Leave it empty to define a volume based volume."
+					/>
+				</div>
+			{:else if storage.hostPath}
+				<input disabled readonly value={storage.hostPath} />
+			{/if}
 			<input
 				disabled={!isNew}
 				readonly={!isNew}
 				class="w-full"
 				bind:value={storage.path}
 				required
-				placeholder="eg: /data"
+				placeholder="Mount point inside the container, example: /data"
 			/>
 
-			<div class="flex items-center justify-center">
+			<div class="flex items-start justify-center">
 				{#if isNew}
 					<div class="w-full lg:w-64">
 						<button class="btn btn-sm btn-primary w-full" on:click={() => saveStorage(true)}

apps/ui/src/routes/applications/[id]/__layout.svelte

@@ -83,13 +83,13 @@
 	let forceDelete = false;
 	let stopping = false;
 	const { id } = $page.params;
-	$isDeploymentEnabled = checkIfDeploymentEnabledApplications($appSession.isAdmin, application);
+	$isDeploymentEnabled = checkIfDeploymentEnabledApplications(application);
 
 	async function deleteApplication(name: string, force: boolean) {
 		const sure = confirm($t('application.confirm_to_delete', { name }));
 		if (sure) {
 			try {
-				await del(`/applications/${id}`, { id, force });
+				await del(`/applications/${id}`, {});
 				return await goto('/');
 			} catch (error) {
 				if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid`)) {
@@ -292,7 +292,6 @@
 			<a
 				href={$isDeploymentEnabled ? `/applications/${id}/logs` : null}
 				class="btn btn-sm text-sm gap-2"
-				sveltekit:prefetch
 			>
 				<svg
 					xmlns="http://www.w3.org/2000/svg"
@@ -363,7 +362,7 @@
 				<button
 					on:click={restartApplication}
 					type="submit"
-					disabled={!$isDeploymentEnabled}
+					disabled={!$isDeploymentEnabled || !$appSession.isAdmin}
 					class="btn btn-sm gap-2"
 				>
 					<svg
@@ -383,7 +382,7 @@
 				</button>
 			{/if}
 			<button
-				disabled={!$isDeploymentEnabled}
+				disabled={!$isDeploymentEnabled || !$appSession.isAdmin}
 				class="btn btn-sm gap-2"
 				on:click={() => handleDeploySubmit(true)}
 			>
@@ -409,7 +408,7 @@
 			<button
 				on:click={stopApplication}
 				type="submit"
-				disabled={!$isDeploymentEnabled}
+				disabled={!$isDeploymentEnabled || !$appSession.isAdmin}
 				class="btn btn-sm  gap-2"
 			>
 				<svg
@@ -428,32 +427,9 @@
 				</svg> Stop
 			</button>
 		{:else if $isDeploymentEnabled && !$page.url.pathname.startsWith(`/applications/${id}/configuration/`)}
-			{#if $status.application.overallStatus === 'degraded'}
-				<button
-					on:click={stopApplication}
-					type="submit"
-					disabled={!$isDeploymentEnabled}
-					class="btn btn-sm gap-2"
-				>
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						class="w-6 h-6 text-error"
-						viewBox="0 0 24 24"
-						stroke-width="1.5"
-						stroke="currentColor"
-						fill="none"
-						stroke-linecap="round"
-						stroke-linejoin="round"
-					>
-						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<rect x="6" y="5" width="4" height="14" rx="1" />
-						<rect x="14" y="5" width="4" height="14" rx="1" />
-					</svg> Stop
-				</button>
-			{/if}
 			<button
 				class="btn btn-sm gap-2"
-				disabled={!$isDeploymentEnabled}
+				disabled={!$isDeploymentEnabled || !$appSession.isAdmin}
 				on:click={() => handleDeploySubmit(true)}
 			>
 				{#if $status.application.overallStatus !== 'degraded'}
@@ -494,6 +470,29 @@
 						: 'Redeploy Stack'
 					: 'Deploy'}
 			</button>
+			{#if $status.application.overallStatus === 'degraded'}
+				<button
+					on:click={stopApplication}
+					type="submit"
+					disabled={!$isDeploymentEnabled || !$appSession.isAdmin}
+					class="btn btn-sm gap-2"
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="w-6 h-6 text-error"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<rect x="6" y="5" width="4" height="14" rx="1" />
+						<rect x="14" y="5" width="4" height="14" rx="1" />
+					</svg> Stop
+				</button>
+			{/if}
 		{/if}
 		{#if $location && $status.application.overallStatus === 'healthy'}
 			<a href={$location} target="_blank noreferrer" class="btn btn-sm gap-2 text-sm bg-primary"

apps/ui/src/routes/applications/[id]/configuration/_BuildPack.svelte

@@ -28,12 +28,15 @@
 			delete tempBuildPack.fancyName;
 			delete tempBuildPack.color;
 			delete tempBuildPack.hoverColor;
-			let composeConfiguration: any = {}
+			let composeConfiguration: any = {};
-			if (!dockerComposeConfiguration && dockerComposeFile) {
+			if (!dockerComposeConfiguration && dockerComposeFile && buildPack.name === 'compose') {
-				for (const [name, _] of Object.entries(JSON.parse(dockerComposeFile).services)) {
+				const parsed = JSON.parse(dockerComposeFile);
+				if (!parsed?.services) {
+					throw new Error('No services found in docker-compose file. <br>Choose a different buildpack.');
+				}
+				for (const [name, _] of Object.entries(parsed.services)) {
 					composeConfiguration[name] = {};
 				}
-				
 			}
 			await post(`/applications/${id}`, {
 				...tempBuildPack,

apps/ui/src/routes/applications/[id]/configuration/_GithubRepositories.svelte

@@ -125,6 +125,7 @@
 		}
 	}
 </script>
+
 {#if repositories.length === 0 && loading.repositories === false}
 	<div class="flex-col text-center">
 		<div class="pb-4">{$t('application.configuration.no_repositories_configured')}</div>
@@ -134,43 +135,45 @@
 	</div>
 {:else}
 	<form on:submit|preventDefault={handleSubmit} class="px-10">
-		<div class="flex lg:flex-row flex-col lg:space-y-0 space-y-2 space-x-0 lg:space-x-2 items-center lg:justify-center">
+		<div
-				<div class="custom-select-wrapper w-full"><label for="repository" class="pb-1">Repository</label>
+			class="flex lg:flex-row flex-col lg:space-y-0 space-y-2 space-x-0 lg:space-x-2 items-center lg:justify-center"
-					<Select
+		>
-						placeholder={loading.repositories
+			<div class="custom-select-wrapper w-full">
-							? $t('application.configuration.loading_repositories')
+				<label for="repository" class="pb-1">Repository</label>
-							: $t('application.configuration.select_a_repository')}
+				<Select
-						id="repository"
+					placeholder={loading.repositories
-						showIndicator={!loading.repositories}
+						? $t('application.configuration.loading_repositories')
-						isWaiting={loading.repositories}
+						: $t('application.configuration.select_a_repository')}
-						on:select={loadBranches}
+					id="repository"
-						items={reposSelectOptions}
+					showIndicator={!loading.repositories}
-						isDisabled={loading.repositories}
+					isWaiting={loading.repositories}
-						isClearable={false}
+					on:select={loadBranches}
-					/>
+					items={reposSelectOptions}
-				</div>
+					isDisabled={loading.repositories}
-				<input class="hidden" bind:value={selected.projectId} name="projectId" />
+					isClearable={false}
-				<div class="custom-select-wrapper w-full"><label for="repository" class="pb-1">Branch</label>
+				/>
-					<Select
+			</div>
-						placeholder={loading.branches
+			<input class="hidden" bind:value={selected.projectId} name="projectId" />
-							? $t('application.configuration.loading_branches')
+			<div class="custom-select-wrapper w-full">
-							: !selected.repository
+				<label for="repository" class="pb-1">Branch</label>
-							? $t('application.configuration.select_a_repository_first')
+				<Select
-							: $t('application.configuration.select_a_branch')}
+					placeholder={loading.branches
-						isWaiting={loading.branches}
+						? $t('application.configuration.loading_branches')
-						showIndicator={selected.repository && !loading.branches}
+						: !selected.repository
-						id="branches"
+						? $t('application.configuration.select_a_repository_first')
-						on:select={selectBranch}
+						: $t('application.configuration.select_a_branch')}
-						items={branchSelectOptions}
+					isWaiting={loading.branches}
-						isDisabled={loading.branches || !selected.repository}
+					showIndicator={selected.repository && !loading.branches}
-						isClearable={false}
+					id="branches"
-					/>
+					on:select={selectBranch}
-				</div></div>
+					items={branchSelectOptions}
+					isDisabled={loading.branches || !selected.repository}
+					isClearable={false}
+				/>
+			</div>
+		</div>
 		<div class="pt-5 flex-col flex justify-center items-center space-y-4">
-			<button
+			<button class="btn btn-wide btn-primary" type="submit" disabled={!showSave}
-				class="btn btn-wide btn-primary"
-				type="submit"
-				disabled={!showSave}
 				>{$t('forms.save')}</button
 			>
 		</div>

apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte

@@ -56,6 +56,10 @@
 				Authorization: `Bearer ${$appSession.tokens.gitlab}`
 			});
 			username = user.username;
+			groups.push({
+				full_name: username,
+				name: username
+			});
 			await loadGroups();
 		} catch (error) {
 			loading.base = false;
@@ -402,7 +406,7 @@
 		>
 		{#if tryAgain}
 			<div class="p-5">
-				An error occured during authenticating with GitLab. Please check your GitLab Source
+				An error occurred during authenticating with GitLab. Please check your GitLab Source
 				configuration <a href={`/sources/${application.gitSource.id}`}>here.</a>
 			</div>
 			<button

apps/ui/src/routes/applications/[id]/configuration/destination.svelte

@@ -72,7 +72,6 @@
 			<div class="flex justify-center">
 				<a
 					href={`/destinations/new?from=/applications/${id}/configuration/destination`}
-					sveltekit:prefetch
 					class="add-icon bg-sky-600 hover:bg-sky-500"
 				>
 					<svg

apps/ui/src/routes/applications/[id]/configuration/source.svelte

@@ -105,7 +105,7 @@
 	{#if ownSources.length > 0 || otherSources.length > 0}
 		<div class="title pb-8">Integrated with Git App</div>
 	{/if}
-	{#if ownSources.length > 0}
+	{#if ownSources.length > 0 || otherSources.length > 0}
 		<div class="flex flex-wrap justify-center">
 			<div class="flex flex-col lg:flex-row lg:flex-wrap justify-center">
 				{#each ownSources as source}
@@ -255,12 +255,12 @@
 	{/if}
 	<div class="flex flex-row items-center">
 		<div class="title py-4 pr-4">Public Repository from Git</div>
-		<DocLink url="https://docs.coollabs.io/coolify/applications/#public-repository" />
+		<DocLink url="https://docs.coollabs.io/coolify-v3/applications/#public-repository-from-git" />
 	</div>
 	<PublicRepository />
 	<div class="flex flex-row items-center pt-10">
 		<div class="title py-4 pr-4">Simple Dockerfile <Beta /></div>
-		<DocLink url="https://docs.coollabs.io/coolify/applications/#dockerfile" />
+		<DocLink url="https://docs.coollabs.io/coolify-v3/applications/#simple-dockerfile" />
 	</div>
 	<div class="mx-auto max-w-screen-2xl">
 		<form class="flex flex-col" on:submit|preventDefault={handleDockerImage}>

apps/ui/src/routes/applications/[id]/danger.svelte

@@ -34,7 +34,7 @@
 		if (sure) {
 			$status.application.initialLoading = true;
 			try {
-				await del(`/applications/${id}`, { id, force });
+				await del(`/applications/${id}`,{});
 				return await goto('/')
 			} catch (error) {
 				if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid`)) {

apps/ui/src/routes/applications/[id]/features.svelte

@@ -51,6 +51,7 @@
 	let isDBBranching = application.settings.isDBBranching;
 
 	async function changeSettings(name: any) {
+		if (!$appSession.isAdmin) return
 		if (name === 'previews') {
 			previews = !previews;
 		}
@@ -102,7 +103,7 @@
 			}
 			return errorNotification(error);
 		} finally {
-			$isDeploymentEnabled = checkIfDeploymentEnabledApplications($appSession.isAdmin, application);
+			$isDeploymentEnabled = checkIfDeploymentEnabledApplications(application);
 		}
 	}
 </script>
@@ -119,6 +120,7 @@
 						id="autodeploy"
 						isCenter={false}
 						bind:setting={autodeploy}
+						disabled={!$appSession.isAdmin}
 						on:click={() => changeSettings('autodeploy')}
 						title={$t('application.enable_automatic_deployment')}
 						description={$t('application.enable_auto_deploy_webhooks')}
@@ -130,6 +132,7 @@
 							id="previews"
 							isCenter={false}
 							bind:setting={previews}
+							disabled={!$appSession.isAdmin}
 							on:click={() => changeSettings('previews')}
 							title={$t('application.enable_mr_pr_previews')}
 							description={$t('application.enable_preview_deploy_mr_pr_requests')}

apps/ui/src/routes/applications/[id]/index.svelte

@@ -29,27 +29,28 @@
 	export let application: any;
 	export let settings: any;
 
-	import yaml from 'js-yaml';
+	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
-	import { onMount } from 'svelte';
-	import Select from 'svelte-select';
 	import { get, getAPIUrl, post } from '$lib/api';
-	import cuid from 'cuid';
+	import { errorNotification, getDomain, notNodeDeployments, staticDeployments } from '$lib/common';
+	import Beta from '$lib/components/Beta.svelte';
+	import Explainer from '$lib/components/Explainer.svelte';
+	import Setting from '$lib/components/Setting.svelte';
+	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import {
 		addToast,
 		appSession,
 		checkIfDeploymentEnabledApplications,
-		setLocation,
+		features,
-		status,
 		isDeploymentEnabled,
-		features
+		setLocation,
+		status
 	} from '$lib/store';
 	import { t } from '$lib/translations';
-	import { errorNotification, getDomain, notNodeDeployments, staticDeployments } from '$lib/common';
+	import cuid from 'cuid';
-	import Setting from '$lib/components/Setting.svelte';
+	import yaml from 'js-yaml';
-	import Explainer from '$lib/components/Explainer.svelte';
+	import { onMount } from 'svelte';
-	import { goto } from '$app/navigation';
+	import Select from 'svelte-select';
-	import Beta from '$lib/components/Beta.svelte';
 	import { saveForm } from './utils';
 
 	const { id } = $page.params;
@@ -58,7 +59,7 @@
 		$status.application.overallStatus === 'degraded' ||
 		$status.application.overallStatus === 'healthy' ||
 		$status.application.initialLoading;
-	$isDeploymentEnabled = checkIfDeploymentEnabledApplications($appSession.isAdmin, application);
+	$isDeploymentEnabled = checkIfDeploymentEnabledApplications(application);
 	let statues: any = {};
 	let loading = {
 		save: false,
@@ -77,8 +78,10 @@
 	let isCustomSSL = application.settings?.isCustomSSL;
 	let autodeploy = application.settings?.autodeploy;
 	let isBot = application.settings?.isBot;
+	let basicAuth = application.settings?.basicAuth;
 	let isDBBranching = application.settings?.isDBBranching;
 	let htmlUrl = application.gitSource?.htmlUrl;
+	let isHttp2 = application.settings.isHttp2;
 
 	let dockerComposeFile = JSON.parse(application.dockerComposeFile) || null;
 	let dockerComposeServices: any[] = [];
@@ -185,6 +188,9 @@
 		if (name === 'isCustomSSL') {
 			isCustomSSL = !isCustomSSL;
 		}
+		if (name === 'basicAuth') {
+			basicAuth = !basicAuth;
+		}
 		if (name === 'isBot') {
 			if ($status.application.overallStatus !== 'stopped') return;
 			isBot = !isBot;
@@ -195,6 +201,9 @@
 		if (name === 'isDBBranching') {
 			isDBBranching = !isDBBranching;
 		}
+		if (name === 'isHttp2') {
+			isHttp2 = !isHttp2;
+		}
 		try {
 			await post(`/applications/${id}/settings`, {
 				previews,
@@ -204,8 +213,10 @@
 				autodeploy,
 				isDBBranching,
 				isCustomSSL,
+				isHttp2,
 				branch: application.branch,
-				projectId: application.projectId
+				projectId: application.projectId,
+				basicAuth
 			});
 			return addToast({
 				message: $t('application.settings_saved'),
@@ -227,6 +238,9 @@
 			if (name === 'isBot') {
 				isBot = !isBot;
 			}
+			if (name === 'basicAuth') {
+				basicAuth = !basicAuth;
+			}
 			if (name === 'isDBBranching') {
 				isDBBranching = !isDBBranching;
 			}
@@ -235,7 +249,7 @@
 			}
 			return errorNotification(error);
 		} finally {
-			$isDeploymentEnabled = checkIfDeploymentEnabledApplications($appSession.isAdmin, application);
+			$isDeploymentEnabled = checkIfDeploymentEnabledApplications(application);
 		}
 	}
 	async function handleSubmit(toast: boolean = true) {
@@ -267,9 +281,10 @@
 					}
 				}
 			}
+			console.log(application);
 			await saveForm(id, application, baseDatabaseBranch, dockerComposeConfiguration);
 			setLocation(application, settings);
-			$isDeploymentEnabled = checkIfDeploymentEnabledApplications($appSession.isAdmin, application);
+			$isDeploymentEnabled = checkIfDeploymentEnabledApplications(application);
 
 			forceSave = false;
 			if (toast) {
@@ -366,11 +381,16 @@
 	async function reloadCompose() {
 		if (loading.reloadCompose) return;
 		loading.reloadCompose = true;
-		const composeLocation = application.dockerComposeFileLocation.startsWith('/')
+		if (!$appSession.tokens.github && !isPublicRepository) {
-			? application.dockerComposeFileLocation
+			const { token } = await get(`/applications/${id}/configuration/githubToken`);
-			: `/${application.dockerComposeFileLocation}`;
+			$appSession.tokens.github = token;
+		}
 		try {
 			if (application.gitSource.type === 'github') {
+				const composeLocation = application.dockerComposeFileLocation.startsWith('/')
+					? application.dockerComposeFileLocation
+					: `/${application.dockerComposeFileLocation}`;
+
 				const headers = isPublicRepository
 					? {}
 					: {
@@ -397,6 +417,17 @@
 				if (!$appSession.tokens.gitlab) {
 					await getGitlabToken();
 				}
+
+				const composeLocation = application.dockerComposeFileLocation.startsWith('/')
+					? application.dockerComposeFileLocation.substring(1) // Remove the '/' from the start
+					: application.dockerComposeFileLocation;
+
+				// If the file is in a subdirectory, lastIndex will be > 0
+				// Otherwise it will be -1 and path will be an empty string
+				const lastIndex = composeLocation.lastIndexOf('/') + 1;
+				const path = composeLocation.substring(0, lastIndex);
+				const fileName = composeLocation.substring(lastIndex);
+
 				const headers = isPublicRepository
 					? {}
 					: {
@@ -404,13 +435,12 @@
 					  };
 				const url = isPublicRepository
 					? ``
-					: `/v4/projects/${application.projectId}/repository/tree`;
+					: `/v4/projects/${application.projectId}/repository/tree?path=${path}`;
 				const files = await get(`${apiUrl}${url}`, {
 					...headers
 				});
 				const dockerComposeFileYml = files.find(
-					(file: { name: string; type: string }) =>
+					(file: { name: string; type: string }) => file.name === fileName && file.type === 'blob'
-						file.name === composeLocation && file.type === 'blob'
 				);
 				const id = dockerComposeFileYml.id;
 
@@ -478,7 +508,7 @@
 				<div class="title font-bold pb-3">General</div>
 				{#if $appSession.isAdmin}
 					<button
-						class="btn btn-sm  btn-primary"
+						class="btn btn-sm btn-primary"
 						type="submit"
 						class:loading={loading.save}
 						class:bg-orange-600={forceSave}
@@ -490,7 +520,14 @@
 			<div class="grid grid-flow-row gap-2 px-4">
 				<div class="mt-2 grid grid-cols-2 items-center">
 					<label for="name">{$t('forms.name')}</label>
-					<input name="name" id="name" class="w-full" bind:value={application.name} required />
+					<input
+						name="name"
+						id="name"
+						class="w-full"
+						bind:value={application.name}
+						disabled={!$appSession.isAdmin}
+						required
+					/>
 				</div>
 				{#if !isSimpleDockerfile}
 					<div class="grid grid-cols-2 items-center">
@@ -712,7 +749,7 @@
 							{/if}
 						</div>
 					</div>
-					<div class="grid grid-cols-2 items-center pb-4">
+					<div class="grid grid-cols-2 items-center">
 						<Setting
 							id="dualCerts"
 							dataTooltip={$t('forms.must_be_stopped_to_modify')}
@@ -724,6 +761,7 @@
 							on:click={() => !isDisabled && changeSettings('dualCerts')}
 						/>
 					</div>
+
 					{#if isHttps && application.buildPack !== 'compose'}
 						<div class="grid grid-cols-2 items-center pb-4">
 							<Setting
@@ -736,6 +774,56 @@
 							/>
 						</div>
 					{/if}
+					<div class="grid grid-cols-2 items-center pb-4">
+						<Setting
+							id="isHttp2"
+							isCenter={false}
+							bind:setting={isHttp2}
+							title="Enable HTTP/2 protocol?"
+							description="Enable HTTP/2 protocol. <br><br>HTTP/2 is a major revision of the HTTP network protocol used by the World Wide Web that allows faster web page loading by reducing the number of requests needed to load a web page.<br><br>Useful for gRPC and other HTTP/2 based services."
+							on:click={() => changeSettings('isHttp2')}
+						/>
+					</div>
+					<div class="grid grid-cols-2 items-center">
+						<Setting
+							id="basicAuth"
+							isCenter={false}
+							bind:setting={basicAuth}
+							title={$t('application.basic_auth')}
+							description="Activate basic authentication for your application. <br>Useful if you want to protect your application with a password. <br><br>Use the <span class='font-bold text-settings'>username</span> and <span class='font-bold text-settings'>password</span> fields to set the credentials."
+							on:click={() => changeSettings('basicAuth')}
+						/>
+					</div>
+
+					{#if basicAuth}
+						<div class="grid grid-cols-2 items-center">
+							<label for="basicAuthUser">{$t('application.basic_auth_user')}</label>
+							<input
+								bind:this={fqdnEl}
+								class="w-full"
+								required={!application.settings?.basicAuth}
+								name="basicAuthUser"
+								id="basicAuthUser"
+								class:border={!application.settings?.basicAuth && !application.basicAuthUser}
+								class:border-red-500={!application.settings?.basicAuth &&
+									!application.basicAuthUser}
+								bind:value={application.basicAuthUser}
+								placeholder="eg: admin"
+							/>
+						</div>
+						<div class="grid grid-cols-2 items-center">
+							<label for="basicAuthPw">{$t('application.basic_auth_pw')}</label>
+							<CopyPasswordField
+								bind:this={fqdnEl}
+								isPasswordField={true}
+								required={!application.settings?.basicAuth}
+								name="basicAuthPw"
+								id="basicAuthPw"
+								bind:value={application.basicAuthPw}
+								placeholder="**********"
+							/>
+						</div>
+					{/if}
 				{/if}
 			</div>
 			{#if isSimpleDockerfile}
@@ -744,7 +832,7 @@
 				</div>
 
 				<div class="grid grid-flow-row gap-2 px-4 pr-5">
-					<div class="grid grid-cols-2 items-center  pt-4">
+					<div class="grid grid-cols-2 items-center pt-4">
 						<label for="simpleDockerfile">Dockerfile</label>
 						<div class="flex gap-2">
 							<textarea

apps/ui/src/routes/applications/[id]/logs/index.svelte

@@ -21,7 +21,7 @@
 	onMount(async () => {
 		const response = await get(`/applications/${id}`);
 		application = response.application;
-		if (response.application.dockerComposeFile) {
+		if (response.application.dockerComposeFile && application.buildPack === 'compose') {
 			services = normalizeDockerServices(
 				JSON.parse(response.application.dockerComposeFile).services
 			);
@@ -51,16 +51,22 @@
 	async function loadLogs() {
 		if (logsLoading) return;
 		try {
-			const newLogs: any = await get(
+			const since = lastLog?.split(' ')[0] || 0;
-				`/applications/${id}/logs/${selectedService}?since=${lastLog?.split(' ')[0] || 0}`
+			const newLogs: any = await get(`/applications/${id}/logs/${selectedService}?since=${since}`);
-			);
 			if (newLogs.noContainer) {
 				noContainer = true;
 			} else {
 				noContainer = false;
 			}
 			if (newLogs?.logs && newLogs.logs[newLogs.logs.length - 1] !== logs[logs.length - 1]) {
-				logs = logs.concat(newLogs.logs);
+				if (since === 0) {
+					logs = logs.concat(newLogs.logs);
+				} else {
+					const newParsedLogs = newLogs.logs.filter((log: any) => {
+						return log !== logs[logs.length - 1];
+					});
+					logs = logs.concat(newParsedLogs);
+				}
 				lastLog = newLogs.logs[newLogs.logs.length - 1];
 			}
 		} catch (error) {
@@ -111,7 +117,7 @@
 		<div class="title font-bold pb-3">Application Logs</div>
 	</div>
 </div>
-<div class="flex gap-2 lg:gap-8 pb-4">
+<div class="grid grid-cols-3 gap-2 lg:gap-8 pb-4">
 	{#each services as service}
 		<button
 			on:click={() => selectService(service, true)}
@@ -135,7 +141,7 @@
 		{:else}
 			<div class="relative w-full">
 				<div class="flex justify-start sticky space-x-2 pb-2">
-					<button on:click={followBuild} class="btn btn-sm " class:bg-coollabs={followingLogs}>
+					<button on:click={followBuild} class="btn btn-sm" class:bg-coollabs={followingLogs}>
 						<svg
 							xmlns="http://www.w3.org/2000/svg"
 							class="w-6 h-6 mr-2"

apps/ui/src/routes/applications/[id]/previews/index.svelte

@@ -23,7 +23,7 @@
 	import { goto } from '$app/navigation';
 	import { asyncSleep, errorNotification, getRndInteger } from '$lib/common';
 	import { onDestroy, onMount } from 'svelte';
-	import { addToast } from '$lib/store';
+	import { addToast, appSession } from '$lib/store';
 	import Tooltip from '$lib/components/Tooltip.svelte';
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 
@@ -264,6 +264,7 @@
 								{:else}
 									<button
 										id="restart"
+										disabled={!$appSession.isAdmin}
 										on:click={() => restartPreview(preview)}
 										type="submit"
 										class="icons bg-transparent text-sm flex items-center space-x-2"
@@ -286,7 +287,12 @@
 								{/if}
 
 								<Tooltip triggeredBy="#restart">Restart (useful to change secrets)</Tooltip>
-								<button id="forceredeploypreview" class="icons" on:click={() => redeploy(preview)}>
+								<button
+									id="forceredeploypreview"
+									class="icons"
+									disabled={!$appSession.isAdmin}
+									on:click={() => redeploy(preview)}
+								>
 									<svg
 										xmlns="http://www.w3.org/2000/svg"
 										class="w-6 h-6"
@@ -310,7 +316,7 @@
 									id="deletepreview"
 									class="icons"
 									class:hover:text-error={!loading.removing}
-									disabled={loading.removing}
+									disabled={loading.removing || !$appSession.isAdmin}
 									on:click={() => removeApplication(preview)}
 									><DeleteIcon />
 								</button>

apps/ui/src/routes/applications/[id]/revert.svelte

@@ -158,7 +158,7 @@
 				id="dockerImage"
 				name="dockerImage"
 				required
-				placeholder="coollabsio/coolify:0.0.1"
+				placeholder="ghcr.io/coollabsio/coolify:0.0.1"
 				bind:value={remoteImage}
 			/>
 			<button class="btn btn-sm btn-primary" type="submit">Revert Now</button>