[autofix.ci] apply automated fixes

.github/workflows/pull-request.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.16.0
+          node-version: 20.9.0
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - run: pnpm run server:build
@@ -26,7 +26,7 @@ jobs:
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.16.0
+          node-version: 20.9.0
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - run: pnpm run server:build
@@ -39,7 +39,7 @@ jobs:
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.16.0
+          node-version: 20.9.0
           cache: "pnpm"
       - run: pnpm install --frozen-lockfile
       - run: pnpm run server:build

.nvmrc

@@ -1 +1 @@
-20.16.0
+20.9.0

CONTRIBUTING.md

@@ -52,7 +52,7 @@ feat: add new feature
 
 Before you start, please make the clone based on the `canary` branch, since the `main` branch is the source of truth and should always reflect the latest stable release, also the PRs will be merged to the `canary` branch.
 
-We use Node v20.16.0 and recommend this specific version. If you have nvm installed, you can run `nvm install 20.16.0 && nvm use` in the root directory.
+We use Node v20.9.0 and recommend this specific version. If you have nvm installed, you can run `nvm install 20.9.0 && nvm use` in the root directory.
 
 ```bash
 git clone https://github.com/dokploy/dokploy.git

Dockerfile

@@ -1,9 +1,7 @@
-# syntax=docker/dockerfile:1
-FROM node:20.16.0-slim AS base
+FROM node:20.9-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
-RUN corepack prepare pnpm@9.12.0 --activate
 
 FROM base AS build
 COPY . /usr/src/app
@@ -31,7 +29,7 @@ WORKDIR /app
 # Set production
 ENV NODE_ENV=production
 
-RUN apt-get update && apt-get install -y curl unzip zip apache2-utils iproute2 rsync git-lfs && git lfs install && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y curl unzip zip apache2-utils iproute2 rsync && rm -rf /var/lib/apt/lists/*
 
 # Copy only the necessary files
 COPY --from=build /prod/dokploy/.next ./.next
@@ -51,7 +49,7 @@ RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && rm
 # Install Nixpacks and tsx
 # | VERBOSE=1 VERSION=1.21.0 bash
 
-ARG NIXPACKS_VERSION=1.39.0
+ARG NIXPACKS_VERSION=1.35.0
 RUN curl -sSL https://nixpacks.com/install.sh -o install.sh \
     && chmod +x install.sh \
     && ./install.sh \
@@ -65,4 +63,4 @@ RUN curl -sSL https://railpack.com/install.sh | bash
 COPY --from=buildpacksio/pack:0.35.0 /usr/local/bin/pack /usr/local/bin/pack
 
 EXPOSE 3000
-CMD [ "pnpm", "start" ]
+CMD [ "pnpm", "start" ]

Dockerfile.cloud

@@ -1,9 +1,7 @@
-# syntax=docker/dockerfile:1
-FROM node:20.16.0-slim AS base
+FROM node:20.9-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
-RUN corepack prepare pnpm@9.12.0 --activate
 
 FROM base AS build
 COPY . /usr/src/app

Dockerfile.monitoring

@@ -1,4 +1,3 @@
-# syntax=docker/dockerfile:1
 # Build stage
 FROM golang:1.21-alpine3.19 AS builder
 

Dockerfile.schedule

@@ -1,9 +1,7 @@
-# syntax=docker/dockerfile:1
-FROM node:20.16.0-slim AS base
+FROM node:20.9-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
-RUN corepack prepare pnpm@9.12.0 --activate
 
 FROM base AS build
 COPY . /usr/src/app

Dockerfile.server

@@ -1,9 +1,7 @@
-# syntax=docker/dockerfile:1
-FROM node:20.16.0-slim AS base
+FROM node:20.9-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
-RUN corepack prepare pnpm@9.12.0 --activate
 
 FROM base AS build
 COPY . /usr/src/app

GUIDES.md

@@ -16,29 +16,28 @@ Here's how to install docker on different operating systems:
 ### Ubuntu
 
 ```bash
-# Uninstall old versions
-for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done
-
 # Update package index
 sudo apt-get update
 
 # Install prerequisites
-sudo apt-get install ca-certificates curl
-sudo install -m 0755 -d /etc/apt/keyrings
+sudo apt-get install \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg \
+    lsb-release
 
 # Add Docker's official GPG key
-sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
-sudo chmod a+r /etc/apt/keyrings/docker.asc
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
 
-# Add the repository to Apt sources
+# Set up stable repository
 echo \
-  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
-  $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
-  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+  "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
+  $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 
 # Install Docker Engine
 sudo apt-get update
-sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+sudo apt-get install docker-ce docker-ce-cli containerd.io
 ```
 
 ## Windows

LICENSE.MD

@@ -2,7 +2,7 @@
 
 ## Core License (Apache License 2.0)
 
-Copyright 2025 Mauricio Siu.
+Copyright 2024 Mauricio Siu.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -1,16 +1,20 @@
 <div align="center">
-  <a href="https://dokploy.com">
-    <img src=".github/sponsors/logo.png" alt="Dokploy - Open Source Alternative to Vercel, Heroku and Netlify." align="center" width="100%"  />
-  </a>
+   <div>
+    <a href="https://dokploy.com" target="_blank" rel="noopener">
+        <img style="object-fit: cover;" align="center" width="100%"src=".github/sponsors/logo.png" alt="Dokploy - Open Source Alternative to Vercel, Heroku and Netlify." />
+    </a>
+</div>
+
+</br>
+<div align="center">
+  <div>Join us on Discord for help, feedback, and discussions!</div>
   </br>
-  </br>
-  <p>Join us on Discord for help, feedback, and discussions!</p>
   <a href="https://discord.gg/2tBnJ3jDJc">
     <img src="https://discordapp.com/api/guilds/1234073262418563112/widget.png?style=banner2" alt="Discord Shield"/>
   </a>
 </div>
+</div>
 <br />
-
 Dokploy is a free, self-hostable Platform as a Service (PaaS) that simplifies the deployment and management of applications and databases.
 
 ### Features
@@ -57,48 +61,76 @@ For detailed documentation, visit [docs.dokploy.com](https://docs.dokploy.com).
 
 ### Hero Sponsors 🎖
 
-<div>
-  <a href="https://www.hostinger.com/vps-hosting?ref=dokploy"><img src=".github/sponsors/hostinger.jpg" alt="Hostinger" width="300"/></a>
-  <a href="https://www.lxaer.com/?ref=dokploy"><img src=".github/sponsors/lxaer.png" alt="LX Aer" width="100"/></a>
+<div style="display: flex; align-items: center; gap: 20px;">
+  <a href="https://www.hostinger.com/vps-hosting?ref=dokploy" target="_blank" style="display: inline-block; margin-right: 10px;">
+    <img src=".github/sponsors/hostinger.jpg" alt="Hostinger" height="50"/>
+  </a>
+  <a href="https://www.lxaer.com/?ref=dokploy" target="_blank" style="display: inline-block; margin-right: 10px;">
+    <img src=".github/sponsors/lxaer.png" alt="LX Aer" height="50"/>
+  </a>
+    <a href="https://mandarin3d.com/?ref=dokploy" target="_blank" style="display: inline-block;">
+    <img src=".github/sponsors/mandarin.png" alt="Mandarin" height="50"/>
+  </a>
+    <a href="https://lightnode.com/?ref=dokploy" target="_blank" style="display: inline-block;">
+    <img src=".github/sponsors/light-node.webp" alt="Lightnode" height="70"/>
+  </a>
+
+  
 </div>
 
-<!-- Premium Supporters 🥇 -->
-
-<!-- Add Premium Supporters here -->
-
 ### Premium Supporters 🥇
 
-<div>
-  <a href="https://supafort.com/?ref=dokploy"><img src="https://supafort.com/build/q-4Ht4rBZR.webp" alt="Supafort.com" width="300"/></a>
-  <a href="https://agentdock.ai/?ref=dokploy"><img src=".github/sponsors/agentdock.png" alt="agentdock.ai" width="100"/></a>
+<div style="display: flex; align-items: center; gap: 20px;">
+  <a href="https://supafort.com/?ref=dokploy" target="_blank" style="display: inline-block; margin-right: 20px;">
+    <img src="https://supafort.com/build/q-4Ht4rBZR.webp" alt="Supafort.com" height="50"/>
+  </a>
+
+  <a href="https://agentdock.ai/?ref=dokploy" target="_blank" style="display: inline-block; margin-right: 50px;">
+    <img src=".github/sponsors/agentdock.png" alt="agentdock.ai" height="70"/>
+  </a>
+
 </div>
 
-<!-- Elite Contributors 🥈 -->
-
-<!-- Add Elite Contributors here -->
-
 ### Elite Contributors 🥈
 
-<div>
-  <a href="https://americancloud.com/?ref=dokploy"><img src=".github/sponsors/american-cloud.png" alt="AmericanCloud" width="300"/></a>
-  <a href="https://tolgee.io/?utm_source=github_dokploy&utm_medium=banner&utm_campaign=dokploy"><img src="https://dokploy.com/tolgee-logo.png" alt="Tolgee" width="100"/></a>
+<div style="display: flex; align-items: center; gap: 20px;">
+
+  <a href="https://americancloud.com/?ref=dokploy" target="_blank" style="display: inline-block; padding: 10px; border-radius: 10px;">
+    <img src=".github/sponsors/american-cloud.png" alt="AmericanCloud" height="70"/>
+  </a>
+
 </div>
+<!-- Elite Contributors 🥈 -->
+
+
+
+<!-- Add Elite Contributors here -->
 
 ### Supporting Members 🥉
 
-<div>
+<div style="display: flex; gap: 30px; flex-wrap: wrap;">
+<a href="https://lightspeed.run/?ref=dokploy"><img src="https://github.com/lightspeedrun.png" width="60px" alt="Lightspeed.run"/></a>
+<a href="https://cloudblast.io/?ref=dokploy "><img src="https://cloudblast.io/img/logo-icon.193cf13e.svg" width="250px" alt="Cloudblast.io"/></a>
+<a href="https://startupfa.me/?ref=dokploy "><img src=".github/sponsors/startupfame.png" width="65px" alt="Startupfame"/></a>
+<a href="https://itsdb-center.com?ref=dokploy "><img src=".github/sponsors/its.png" width="65px" alt="Itsdb-center"/></a>
+<a href="https://openalternative.co/?ref=dokploy "><img src=".github/sponsors/openalternative.png" width="65px" alt="Openalternative"/></a>
+<a href="https://synexa.ai/?ref=dokploy"><img src=".github/sponsors/synexa.png" width="65px" alt="Synexa"/></a>
 
-  <a href="https://cloudblast.io/?ref=dokploy"><img src="https://cloudblast.io/img/logo-icon.193cf13e.svg" width="250px" alt="Cloudblast.io"/></a>
-
-  <a href="https://synexa.ai/?ref=dokploy"><img src=".github/sponsors/synexa.png" width="65px" alt="Synexa"/></a>
 </div>
 
+
 ### Community Backers 🤝
 
+<div style="display: flex; gap: 30px; flex-wrap: wrap;">
+<a href="https://steamsets.com/?ref=dokploy"><img src="https://avatars.githubusercontent.com/u/111978405?s=200&v=4" width="60px" alt="Steamsets.com"/></a>
+<a href="https://rivo.gg/?ref=dokploy"><img src="https://avatars.githubusercontent.com/u/126797452?s=200&v=4" width="60px" alt="Rivo.gg"/></a>
+<a href="https://photoquest.wedding/?ref=dokploy"><img src="https://photoquest.wedding/favicon/android-chrome-512x512.png" width="60px" alt="Rivo.gg"/></a>
+
+</div>
 
 #### Organizations:
 
-[Sponsors on Open Collective](https://opencollective.com/dokploy)
+[![Sponsors on Open Collective](https://opencollective.com/dokploy/organizations.svg?width=890)](https://opencollective.com/dokploy)
 
 #### Individuals:
 
@@ -108,14 +140,27 @@ For detailed documentation, visit [docs.dokploy.com](https://docs.dokploy.com).
 
 <a href="https://github.com/dokploy/dokploy/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=dokploy/dokploy" />
-</a>
+  </a>
 
 ## Video Tutorial
 
 <a href="https://youtu.be/mznYKPvhcfw">
-  <img src="https://dokploy.com/banner.png" alt="Watch the video" width="400"/>
+  <img src="https://dokploy.com/banner.png" alt="Watch the video" width="400" style="border-radius:20px;"/>
 </a>
 
+<!-- ## Supported OS
+
+- Ubuntu 24.04 LTS
+- Ubuntu 23.10
+- Ubuntu 22.04 LTS
+- Ubuntu 20.04 LTS
+- Ubuntu 18.04 LTS
+- Debian 12
+- Debian 11
+- Fedora 40
+- Centos 9
+- Centos 8 -->
+
 ## Contributing
 
 Check out the [Contributing Guide](CONTRIBUTING.md) for more information.

SECURITY.md

@@ -1,28 +0,0 @@
-# Dokploy Security Policy
-
-At Dokploy, security is a top priority. We appreciate the help of security researchers and the community in identifying and reporting vulnerabilities.
-
-## How to Report a Vulnerability
-
-If you have discovered a security vulnerability in Dokploy, we ask that you report it responsibly by following these guidelines:
-
-1.  **Contact us:** Send an email to [contact@dokploy.com](mailto:contact@dokploy.com).
-2.  **Provide clear details:** Include as much information as possible to help us understand and reproduce the vulnerability. This should include:
-    *   A clear description of the vulnerability.
-    *   Steps to reproduce the vulnerability.
-    *   Any sample code, screenshots, or videos that might be helpful.
-    *   The potential impact of the vulnerability.
-3.  **Do not make the vulnerability public:** Please refrain from publicly disclosing the vulnerability until we have had the opportunity to investigate and address it. This is crucial for protecting our users.
-4.  **Allow us time:** We will endeavor to acknowledge receipt of your report as soon as possible and keep you informed of our progress. The time to resolve the vulnerability may vary depending on its complexity and severity.
-
-## What We Expect From You
-
-*   Do not access user data or systems beyond what is necessary to demonstrate the vulnerability.
-*   Do not perform denial-of-service (DoS) attacks, spamming, or social engineering.
-*   Do not modify or destroy data that does not belong to you.
-
-## Our Commitment
-
-We are committed to working with you quickly and responsibly to address any legitimate security vulnerability.
-
-Thank you for helping us keep Dokploy secure for everyone.

apps/api/package.json

@@ -9,25 +9,25 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@dokploy/server": "workspace:*",
-		"@hono/node-server": "^1.14.3",
-		"@hono/zod-validator": "0.3.0",
-		"@nerimity/mimiqueue": "1.2.3",
-		"dotenv": "^16.4.5",
-		"hono": "^4.7.10",
 		"pino": "9.4.0",
 		"pino-pretty": "11.2.2",
+		"@hono/zod-validator": "0.3.0",
+		"zod": "^3.23.4",
 		"react": "18.2.0",
 		"react-dom": "18.2.0",
+		"@dokploy/server": "workspace:*",
+		"@hono/node-server": "^1.12.1",
+		"hono": "^4.5.8",
+		"dotenv": "^16.3.1",
 		"redis": "4.7.0",
-		"zod": "^3.25.32"
+		"@nerimity/mimiqueue": "1.2.3"
 	},
 	"devDependencies": {
-		"@types/node": "^20.17.51",
+		"typescript": "^5.4.2",
 		"@types/react": "^18.2.37",
 		"@types/react-dom": "^18.2.15",
-		"tsx": "^4.16.2",
-		"typescript": "^5.8.3"
+		"@types/node": "^20.11.17",
+		"tsx": "^4.7.1"
 	},
 	"packageManager": "pnpm@9.5.0"
 }

apps/dokploy/.nvmrc

@@ -1 +1 @@
-20.16.0
+20.9.0

apps/dokploy/Dockerfile

@@ -0,0 +1,26 @@
+FROM node:18-slim AS base
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
+FROM base AS build
+COPY . /usr/src/app
+WORKDIR /usr/src/app
+
+
+RUN apt-get update && apt-get install -y python3 make g++ git && rm -rf /var/lib/apt/lists/*
+
+# Install dependencies
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
+
+# Build only the dokploy app
+RUN pnpm run dokploy:build 
+
+# Deploy only the dokploy app
+RUN pnpm deploy --filter=dokploy --prod /prod/dokploy
+
+FROM base AS dokploy
+COPY --from=build /prod/dokploy /prod/dokploy
+WORKDIR /prod/dokploy
+EXPOSE 3000
+CMD [ "pnpm", "start" ]

apps/dokploy/LICENSE.MD

@@ -0,0 +1,26 @@
+# License
+
+## Core License (Apache License 2.0)
+
+Copyright 2024 Mauricio Siu.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.
+
+## Additional Terms for Specific Features
+
+The following additional terms apply to the multi-node support, Docker Compose file, Preview Deployments and Multi Server features of Dokploy. In the event of a conflict, these provisions shall take precedence over those in the Apache License:
+
+- **Self-Hosted Version Free**: All features of Dokploy, including multi-node support, Docker Compose file support, Preview Deployments and Multi Server, will always be free to use in the self-hosted version.
+- **Restriction on Resale**: The multi-node support, Docker Compose file support, Preview Deployments and Multi Server features cannot be sold or offered as a service by any party other than the copyright holder without prior written consent.
+- **Modification Distribution**: Any modifications to the multi-node support, Docker Compose file support, Preview Deployments and Multi Server features must be distributed freely and cannot be sold or offered as a service.
+
+For further inquiries or permissions, please contact us directly.

apps/dokploy/__test__/compose/domain/labels.test.ts

@@ -19,8 +19,6 @@ describe("createDomainLabels", () => {
 		path: "/",
 		createdAt: "",
 		previewDeploymentId: "",
-		internalPath: "/",
-		stripPath: false,
 	};
 
 	it("should create basic labels for web entrypoint", async () => {

apps/dokploy/__test__/drop/drop.test.test.ts

@@ -105,7 +105,6 @@ const baseApp: ApplicationNested = {
 	ports: [],
 	projectId: "",
 	publishDirectory: null,
-	isStaticSpa: null,
 	redirects: [],
 	refreshToken: "",
 	registry: null,
@@ -121,7 +120,6 @@ const baseApp: ApplicationNested = {
 	updateConfigSwarm: null,
 	username: null,
 	dockerContextPath: null,
-	rollbackActive: false,
 };
 
 describe("unzipDrop using real zip files", () => {
@@ -151,68 +149,67 @@ describe("unzipDrop using real zip files", () => {
 		} finally {
 		}
 	});
+
+	it("should correctly extract a zip with a single root folder and a subfolder", async () => {
+		baseApp.appName = "folderwithfile";
+		// const appName = "folderwithfile";
+		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+		const zip = new AdmZip("./__test__/drop/zips/folder-with-file.zip");
+
+		const zipBuffer = zip.toBuffer();
+		const file = new File([zipBuffer], "single.zip");
+		await unzipDrop(file, baseApp);
+
+		const files = await fs.readdir(outputPath, { withFileTypes: true });
+		expect(files.some((f) => f.name === "folder1.txt")).toBe(true);
+	});
+
+	it("should correctly extract a zip with multiple root folders", async () => {
+		baseApp.appName = "two-folders";
+		// const appName = "two-folders";
+		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+		const zip = new AdmZip("./__test__/drop/zips/two-folders.zip");
+
+		const zipBuffer = zip.toBuffer();
+		const file = new File([zipBuffer], "single.zip");
+		await unzipDrop(file, baseApp);
+
+		const files = await fs.readdir(outputPath, { withFileTypes: true });
+
+		expect(files.some((f) => f.name === "folder1")).toBe(true);
+		expect(files.some((f) => f.name === "folder2")).toBe(true);
+	});
+
+	it("should correctly extract a zip with a single root with a file", async () => {
+		baseApp.appName = "nested";
+		// const appName = "nested";
+		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+		const zip = new AdmZip("./__test__/drop/zips/nested.zip");
+
+		const zipBuffer = zip.toBuffer();
+		const file = new File([zipBuffer], "single.zip");
+		await unzipDrop(file, baseApp);
+
+		const files = await fs.readdir(outputPath, { withFileTypes: true });
+
+		expect(files.some((f) => f.name === "folder1")).toBe(true);
+		expect(files.some((f) => f.name === "folder2")).toBe(true);
+		expect(files.some((f) => f.name === "folder3")).toBe(true);
+	});
+
+	it("should correctly extract a zip with a single root with a folder", async () => {
+		baseApp.appName = "folder-with-sibling-file";
+		// const appName = "folder-with-sibling-file";
+		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+		const zip = new AdmZip("./__test__/drop/zips/folder-with-sibling-file.zip");
+
+		const zipBuffer = zip.toBuffer();
+		const file = new File([zipBuffer], "single.zip");
+		await unzipDrop(file, baseApp);
+
+		const files = await fs.readdir(outputPath, { withFileTypes: true });
+
+		expect(files.some((f) => f.name === "folder1")).toBe(true);
+		expect(files.some((f) => f.name === "test.txt")).toBe(true);
+	});
 });
-
-// 	it("should correctly extract a zip with a single root folder and a subfolder", async () => {
-// 		baseApp.appName = "folderwithfile";
-// 		// const appName = "folderwithfile";
-// 		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
-// 		const zip = new AdmZip("./__test__/drop/zips/folder-with-file.zip");
-
-// 		const zipBuffer = zip.toBuffer();
-// 		const file = new File([zipBuffer], "single.zip");
-// 		await unzipDrop(file, baseApp);
-
-// 		const files = await fs.readdir(outputPath, { withFileTypes: true });
-// 		expect(files.some((f) => f.name === "folder1.txt")).toBe(true);
-// 	});
-
-// 	it("should correctly extract a zip with multiple root folders", async () => {
-// 		baseApp.appName = "two-folders";
-// 		// const appName = "two-folders";
-// 		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
-// 		const zip = new AdmZip("./__test__/drop/zips/two-folders.zip");
-
-// 		const zipBuffer = zip.toBuffer();
-// 		const file = new File([zipBuffer], "single.zip");
-// 		await unzipDrop(file, baseApp);
-
-// 		const files = await fs.readdir(outputPath, { withFileTypes: true });
-
-// 		expect(files.some((f) => f.name === "folder1")).toBe(true);
-// 		expect(files.some((f) => f.name === "folder2")).toBe(true);
-// 	});
-
-// 	it("should correctly extract a zip with a single root with a file", async () => {
-// 		baseApp.appName = "nested";
-// 		// const appName = "nested";
-// 		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
-// 		const zip = new AdmZip("./__test__/drop/zips/nested.zip");
-
-// 		const zipBuffer = zip.toBuffer();
-// 		const file = new File([zipBuffer], "single.zip");
-// 		await unzipDrop(file, baseApp);
-
-// 		const files = await fs.readdir(outputPath, { withFileTypes: true });
-
-// 		expect(files.some((f) => f.name === "folder1")).toBe(true);
-// 		expect(files.some((f) => f.name === "folder2")).toBe(true);
-// 		expect(files.some((f) => f.name === "folder3")).toBe(true);
-// 	});
-
-// 	it("should correctly extract a zip with a single root with a folder", async () => {
-// 		baseApp.appName = "folder-with-sibling-file";
-// 		// const appName = "folder-with-sibling-file";
-// 		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
-// 		const zip = new AdmZip("./__test__/drop/zips/folder-with-sibling-file.zip");
-
-// 		const zipBuffer = zip.toBuffer();
-// 		const file = new File([zipBuffer], "single.zip");
-// 		await unzipDrop(file, baseApp);
-
-// 		const files = await fs.readdir(outputPath, { withFileTypes: true });
-
-// 		expect(files.some((f) => f.name === "folder1")).toBe(true);
-// 		expect(files.some((f) => f.name === "test.txt")).toBe(true);
-// 	});
-// });

apps/dokploy/__test__/traefik/traefik.test.ts

@@ -5,7 +5,6 @@ import { createRouterConfig } from "@dokploy/server";
 import { expect, test } from "vitest";
 
 const baseApp: ApplicationNested = {
-	rollbackActive: false,
 	applicationId: "",
 	herokuVersion: "",
 	giteaRepository: "",
@@ -86,7 +85,6 @@ const baseApp: ApplicationNested = {
 	ports: [],
 	projectId: "",
 	publishDirectory: null,
-	isStaticSpa: null,
 	redirects: [],
 	refreshToken: "",
 	registry: null,
@@ -119,8 +117,6 @@ const baseDomain: Domain = {
 	domainType: "application",
 	uniqueConfigKey: 1,
 	previewDeploymentId: "",
-	internalPath: "/",
-	stripPath: false,
 };
 
 const baseRedirect: Redirect = {

apps/dokploy/__test__/utils/backups.test.ts

@@ -1,5 +1,5 @@
-import { normalizeS3Path } from "@dokploy/server/utils/backups/utils";
 import { describe, expect, test } from "vitest";
+import { normalizeS3Path } from "@dokploy/server/utils/backups/utils";
 
 describe("normalizeS3Path", () => {
 	test("should handle empty and whitespace-only prefix", () => {

apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx

@@ -130,7 +130,7 @@ const createStringToJSONSchema = (schema: z.ZodTypeAny) => {
 			}
 			try {
 				return JSON.parse(str);
-			} catch {
+			} catch (_e) {
 				ctx.addIssue({ code: "custom", message: "Invalid JSON format" });
 				return z.NEVER;
 			}
@@ -270,8 +270,8 @@ export const AddSwarmSettings = ({ applicationId }: Props) => {
 					Swarm Settings
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-5xl p-0">
-				<DialogHeader>
+			<DialogContent className="max-h-[85vh]  overflow-y-auto sm:max-w-5xl p-0">
+				<DialogHeader className="p-6">
 					<DialogTitle>Swarm Settings</DialogTitle>
 					<DialogDescription>
 						Update certain settings using a json object.
@@ -753,7 +753,7 @@ export const AddSwarmSettings = ({ applicationId }: Props) => {
 							)}
 						/>
 
-						<DialogFooter className="flex w-full flex-row justify-end md:col-span-2 m-0 sticky bottom-0 right-0 bg-muted border">
+						<DialogFooter className="flex w-full flex-row justify-end md:col-span-2 m-0 sticky bottom-0 right-0 bg-muted border p-2 ">
 							<Button
 								isLoading={isLoading}
 								form="hook-form-add-permissions"

apps/dokploy/components/dashboard/application/advanced/import/show-import.tsx

@@ -107,7 +107,7 @@ export const ShowImport = ({ composeId }: Props) => {
 				composeId,
 			});
 			setShowModal(false);
-		} catch {
+		} catch (_error) {
 			toast.error("Error importing template");
 		}
 	};
@@ -126,7 +126,7 @@ export const ShowImport = ({ composeId }: Props) => {
 			});
 			setTemplateInfo(result);
 			setShowModal(true);
-		} catch {
+		} catch (_error) {
 			toast.error("Error processing template");
 		}
 	};
@@ -185,7 +185,7 @@ export const ShowImport = ({ composeId }: Props) => {
 								</Button>
 							</div>
 							<Dialog open={showModal} onOpenChange={setShowModal}>
-								<DialogContent className="max-w-[50vw]">
+								<DialogContent className="max-h-[80vh] max-w-[50vw] overflow-y-auto">
 									<DialogHeader>
 										<DialogTitle className="text-2xl font-bold">
 											Template Information
@@ -263,7 +263,7 @@ export const ShowImport = ({ composeId }: Props) => {
 														{templateInfo.template.envs.map((env, index) => (
 															<div
 																key={index}
-																className="rounded-lg truncate border bg-card p-2 font-mono text-sm"
+																className="rounded-lg border bg-card p-2 font-mono text-sm"
 															>
 																{env}
 															</div>
@@ -328,7 +328,7 @@ export const ShowImport = ({ composeId }: Props) => {
 						<DialogDescription>Mount File Content</DialogDescription>
 					</DialogHeader>
 
-					<ScrollArea className="h-[45vh] pr-4">
+					<ScrollArea className="h-[25vh] pr-4">
 						<CodeEditor
 							language="yaml"
 							value={selectedMount?.content || ""}

apps/dokploy/components/dashboard/application/advanced/ports/handle-ports.tsx

@@ -35,9 +35,6 @@ import { z } from "zod";
 
 const AddPortSchema = z.object({
 	publishedPort: z.number().int().min(1).max(65535),
-	publishMode: z.enum(["ingress", "host"], {
-		required_error: "Publish mode is required",
-	}),
 	targetPort: z.number().int().min(1).max(65535),
 	protocol: z.enum(["tcp", "udp"], {
 		required_error: "Protocol is required",
@@ -83,7 +80,6 @@ export const HandlePorts = ({
 	useEffect(() => {
 		form.reset({
 			publishedPort: data?.publishedPort ?? 0,
-			publishMode: data?.publishMode ?? "ingress",
 			targetPort: data?.targetPort ?? 0,
 			protocol: data?.protocol ?? "tcp",
 		});
@@ -124,7 +120,7 @@ export const HandlePorts = ({
 					<Button>{children}</Button>
 				)}
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Ports</DialogTitle>
 					<DialogDescription>
@@ -169,32 +165,6 @@ export const HandlePorts = ({
 									</FormItem>
 								)}
 							/>
-							<FormField
-								control={form.control}
-								name="publishMode"
-								render={({ field }) => {
-									return (
-										<FormItem className="md:col-span-2">
-											<FormLabel>Published Port Mode</FormLabel>
-											<Select
-												onValueChange={field.onChange}
-												value={field.value}
-											>
-												<FormControl>
-													<SelectTrigger>
-														<SelectValue placeholder="Select a publish mode for the port" />
-													</SelectTrigger>
-												</FormControl>
-												<SelectContent>
-													<SelectItem value={"ingress"}>Ingress</SelectItem>
-													<SelectItem value={"host"}>Host</SelectItem>
-												</SelectContent>
-											</Select>
-											<FormMessage />
-										</FormItem>
-									);
-								}}
-							/>
 							<FormField
 								control={form.control}
 								name="targetPort"

apps/dokploy/components/dashboard/application/advanced/ports/show-port.tsx

@@ -60,7 +60,7 @@ export const ShowPorts = ({ applicationId }: Props) => {
 							{data?.ports.map((port) => (
 								<div key={port.portId}>
 									<div className="flex w-full flex-col sm:flex-row sm:items-center justify-between gap-4 sm:gap-10 border rounded-lg p-4">
-										<div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 flex-col gap-4 sm:gap-8">
+										<div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 flex-col gap-4 sm:gap-8">
 											<div className="flex flex-col gap-1">
 												<span className="font-medium">Published Port</span>
 												<span className="text-sm text-muted-foreground">
@@ -68,13 +68,7 @@ export const ShowPorts = ({ applicationId }: Props) => {
 												</span>
 											</div>
 											<div className="flex flex-col gap-1">
-												<span className="font-medium">Published Port Mode</span>
-												<span className="text-sm text-muted-foreground">
-													{port?.publishMode?.toUpperCase()}
-												</span>
-											</div>
-											<div className="flex flex-col gap-1">
-												<span className="font-medium">Target Port</span>
+												<span className="font-medium"> Target Port</span>
 												<span className="text-sm text-muted-foreground">
 													{port.targetPort}
 												</span>

apps/dokploy/components/dashboard/application/advanced/redirects/handle-redirect.tsx

@@ -179,7 +179,7 @@ export const HandleRedirect = ({
 					<Button>{children}</Button>
 				)}
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Redirects</DialogTitle>
 					<DialogDescription>

apps/dokploy/components/dashboard/application/advanced/security/handle-security.tsx

@@ -114,7 +114,7 @@ export const HandleSecurity = ({
 					<Button>{children}</Button>
 				)}
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Security</DialogTitle>
 					<DialogDescription>

apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx

@@ -122,7 +122,7 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => {
 			<DialogTrigger asChild>
 				<Button isLoading={isLoading}>Modify</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-4xl">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-4xl">
 				<DialogHeader>
 					<DialogTitle>Update traefik config</DialogTitle>
 					<DialogDescription>Update the traefik config</DialogDescription>

apps/dokploy/components/dashboard/application/advanced/volumes/add-volumes.tsx

@@ -1,4 +1,3 @@
-import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { Button } from "@/components/ui/button";
 import {
@@ -151,7 +150,7 @@ export const AddVolumes = ({
 			<DialogTrigger className="" asChild>
 				<Button>{children}</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-3xl">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-3xl">
 				<DialogHeader>
 					<DialogTitle>Volumes / Mounts</DialogTitle>
 				</DialogHeader>
@@ -170,23 +169,6 @@ export const AddVolumes = ({
 						onSubmit={form.handleSubmit(onSubmit)}
 						className="grid w-full gap-8 "
 					>
-						{type === "bind" && (
-							<AlertBlock>
-								<div className="space-y-2">
-									<p>
-										Make sure the host path is a valid path and exists in the
-										host machine.
-									</p>
-									<p className="text-sm text-muted-foreground">
-										<strong>Cluster Warning:</strong> If you're using cluster
-										features, bind mounts may cause deployment failures since
-										the path must exist on all worker/manager nodes. Consider
-										using external tools to distribute the folder across nodes
-										or use named volumes instead.
-									</p>
-								</div>
-							</AlertBlock>
-						)}
 						<FormField
 							control={form.control}
 							defaultValue={form.control._defaultValues.type}

apps/dokploy/components/dashboard/application/advanced/volumes/update-volume.tsx

@@ -186,7 +186,7 @@ export const UpdateVolume = ({
 					<PenBoxIcon className="size-3.5  text-primary group-hover:text-blue-500" />
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-3xl">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-3xl">
 				<DialogHeader>
 					<DialogTitle>Update</DialogTitle>
 					<DialogDescription>Update the mount</DialogDescription>
@@ -247,7 +247,7 @@ export const UpdateVolume = ({
 										control={form.control}
 										name="content"
 										render={({ field }) => (
-											<FormItem className="max-w-full max-w-[45rem]">
+											<FormItem>
 												<FormLabel>Content</FormLabel>
 												<FormControl>
 													<FormControl>
@@ -256,7 +256,7 @@ export const UpdateVolume = ({
 															placeholder={`NODE_ENV=production
 PORT=3000
 `}
-															className="h-96 font-mono w-full"
+															className="h-96 font-mono"
 															{...field}
 														/>
 													</FormControl>

apps/dokploy/components/dashboard/application/build/show.tsx

@@ -2,7 +2,6 @@ import { AlertBlock } from "@/components/shared/alert-block";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Checkbox } from "@/components/ui/checkbox";
 import {
 	Form,
 	FormControl,
@@ -64,11 +63,10 @@ const mySchema = z.discriminatedUnion("buildType", [
 		publishDirectory: z.string().optional(),
 	}),
 	z.object({
-		buildType: z.literal(BuildType.railpack),
+		buildType: z.literal(BuildType.static),
 	}),
 	z.object({
-		buildType: z.literal(BuildType.static),
-		isStaticSpa: z.boolean().default(false),
+		buildType: z.literal(BuildType.railpack),
 	}),
 ]);
 
@@ -85,7 +83,6 @@ interface ApplicationData {
 	dockerBuildStage?: string | null;
 	herokuVersion?: string | null;
 	publishDirectory?: string | null;
-	isStaticSpa?: boolean | null;
 }
 
 function isValidBuildType(value: string): value is BuildType {
@@ -118,18 +115,16 @@ const resetData = (data: ApplicationData): AddTemplate => {
 		case BuildType.static:
 			return {
 				buildType: BuildType.static,
-				isStaticSpa: data.isStaticSpa ?? false,
 			};
 		case BuildType.railpack:
 			return {
 				buildType: BuildType.railpack,
 			};
-		default: {
+		default:
 			const buildType = data.buildType as BuildType;
 			return {
 				buildType,
 			} as AddTemplate;
-		}
 	}
 };
 
@@ -179,8 +174,6 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 				data.buildType === BuildType.heroku_buildpacks
 					? data.herokuVersion
 					: null,
-			isStaticSpa:
-				data.buildType === BuildType.static ? data.isStaticSpa : null,
 		})
 			.then(async () => {
 				toast.success("Build type saved");
@@ -371,30 +364,6 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 								)}
 							/>
 						)}
-						{buildType === BuildType.static && (
-							<FormField
-								control={form.control}
-								name="isStaticSpa"
-								render={({ field }) => (
-									<FormItem>
-										<FormControl>
-											<div className="flex items-center gap-x-2 p-2">
-												<Checkbox
-													id="checkboxIsStaticSpa"
-													value={String(field.value)}
-													checked={field.value}
-													onCheckedChange={field.onChange}
-												/>
-												<FormLabel htmlFor="checkboxIsStaticSpa">
-													Single Page Application (SPA)
-												</FormLabel>
-											</div>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						)}
 						<div className="flex w-full justify-end">
 							<Button isLoading={isLoading} type="submit">
 								Save

apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx

@@ -124,7 +124,7 @@ export const ShowDeployment = ({
 				}
 			}}
 		>
-			<DialogContent className={"sm:max-w-5xl"}>
+			<DialogContent className={"sm:max-w-5xl overflow-y-auto max-h-screen"}>
 				<DialogHeader>
 					<DialogTitle>Deployment</DialogTitle>
 					<DialogDescription className="flex items-center gap-2">

apps/dokploy/components/dashboard/application/deployments/show-deployments-modal.tsx

@@ -14,8 +14,7 @@ interface Props {
 		| "schedule"
 		| "server"
 		| "backup"
-		| "previewDeployment"
-		| "volumeBackup";
+		| "previewDeployment";
 	serverId?: string;
 	refreshToken?: string;
 	children?: React.ReactNode;
@@ -50,7 +49,7 @@ export const ShowDeploymentsModal = ({
 					</Button>
 				)}
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-5xl p-0">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-5xl p-0">
 				<ShowDeployments
 					id={id}
 					type={type}

apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx

@@ -1,6 +1,5 @@
 import { DateTooltip } from "@/components/shared/date-tooltip";
 import { StatusTooltip } from "@/components/shared/status-tooltip";
-import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
 	Card,
@@ -10,14 +9,12 @@ import {
 	CardTitle,
 } from "@/components/ui/card";
 import { type RouterOutputs, api } from "@/utils/api";
-import { Clock, Loader2, RocketIcon, Settings, RefreshCcw } from "lucide-react";
+import { RocketIcon, Clock, Loader2 } from "lucide-react";
 import React, { useEffect, useState } from "react";
 import { CancelQueues } from "./cancel-queues";
 import { RefreshToken } from "./refresh-token";
 import { ShowDeployment } from "./show-deployment";
-import { ShowRollbackSettings } from "../rollbacks/show-rollback-settings";
-import { DialogAction } from "@/components/shared/dialog-action";
-import { toast } from "sonner";
+import { Badge } from "@/components/ui/badge";
 
 interface Props {
 	id: string;
@@ -27,8 +24,7 @@ interface Props {
 		| "schedule"
 		| "server"
 		| "backup"
-		| "previewDeployment"
-		| "volumeBackup";
+		| "previewDeployment";
 	refreshToken?: string;
 	serverId?: string;
 }
@@ -61,11 +57,6 @@ export const ShowDeployments = ({
 			},
 		);
 
-	const { mutateAsync: rollback, isLoading: isRollingBack } =
-		api.rollback.rollback.useMutation();
-	const { mutateAsync: killProcess, isLoading: isKillingProcess } =
-		api.deployment.killProcess.useMutation();
-
 	const [url, setUrl] = React.useState("");
 	useEffect(() => {
 		setUrl(document.location.origin);
@@ -80,18 +71,9 @@ export const ShowDeployments = ({
 						See all the 10 last deployments for this {type}
 					</CardDescription>
 				</div>
-				<div className="flex flex-row items-center gap-2">
-					{(type === "application" || type === "compose") && (
-						<CancelQueues id={id} type={type} />
-					)}
-					{type === "application" && (
-						<ShowRollbackSettings applicationId={id}>
-							<Button variant="outline">
-								Configure Rollbacks <Settings className="size-4" />
-							</Button>
-						</ShowRollbackSettings>
-					)}
-				</div>
+				{(type === "application" || type === "compose") && (
+					<CancelQueues id={id} type={type} />
+				)}
 			</CardHeader>
 			<CardContent className="flex flex-col gap-4">
 				{refreshToken && (
@@ -172,73 +154,13 @@ export const ShowDeployments = ({
 										)}
 									</div>
 
-									<div className="flex flex-row items-center gap-2">
-										{deployment.pid && deployment.status === "running" && (
-											<DialogAction
-												title="Kill Process"
-												description="Are you sure you want to kill the process?"
-												type="default"
-												onClick={async () => {
-													await killProcess({
-														deploymentId: deployment.deploymentId,
-													})
-														.then(() => {
-															toast.success("Process killed successfully");
-														})
-														.catch(() => {
-															toast.error("Error killing process");
-														});
-												}}
-											>
-												<Button
-													variant="destructive"
-													size="sm"
-													isLoading={isKillingProcess}
-												>
-													Kill Process
-												</Button>
-											</DialogAction>
-										)}
-										<Button
-											onClick={() => {
-												setActiveLog(deployment);
-											}}
-										>
-											View
-										</Button>
-
-										{deployment?.rollback &&
-											deployment.status === "done" &&
-											type === "application" && (
-												<DialogAction
-													title="Rollback to this deployment"
-													description="Are you sure you want to rollback to this deployment?"
-													type="default"
-													onClick={async () => {
-														await rollback({
-															rollbackId: deployment.rollback.rollbackId,
-														})
-															.then(() => {
-																toast.success(
-																	"Rollback initiated successfully",
-																);
-															})
-															.catch(() => {
-																toast.error("Error initiating rollback");
-															});
-													}}
-												>
-													<Button
-														variant="secondary"
-														size="sm"
-														isLoading={isRollingBack}
-													>
-														<RefreshCcw className="size-4 text-primary group-hover:text-red-500" />
-														Rollback
-													</Button>
-												</DialogAction>
-											)}
-									</div>
+									<Button
+										onClick={() => {
+											setActiveLog(deployment);
+										}}
+									>
+										View
+									</Button>
 								</div>
 							</div>
 						))}

apps/dokploy/components/dashboard/application/domains/dns-helper-modal.tsx

@@ -1,5 +1,3 @@
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
 import {
 	Dialog,
 	DialogContent,
@@ -8,6 +6,8 @@ import {
 	DialogTitle,
 	DialogTrigger,
 } from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import { AlertBlock } from "@/components/shared/alert-block";
 import { Copy, HelpCircle, Server } from "lucide-react";
 import { toast } from "sonner";
 
@@ -33,7 +33,7 @@ export const DnsHelperModal = ({ domain, serverIp }: Props) => {
 					<HelpCircle className="size-4" />
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-2xl">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-2xl">
 				<DialogHeader>
 					<DialogTitle className="flex items-center gap-2">
 						<Server className="size-5" />

apps/dokploy/components/dashboard/application/domains/handle-domain.tsx

@@ -49,8 +49,6 @@ export const domain = z
 	.object({
 		host: z.string().min(1, { message: "Add a hostname" }),
 		path: z.string().min(1).optional(),
-		internalPath: z.string().optional(),
-		stripPath: z.boolean().optional(),
 		port: z
 			.number()
 			.min(1, { message: "Port must be at least 1" })
@@ -86,29 +84,6 @@ export const domain = z
 				message: "Required",
 			});
 		}
-
-		// Validate stripPath requires a valid path
-		if (input.stripPath && (!input.path || input.path === "/")) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				path: ["stripPath"],
-				message:
-					"Strip path can only be enabled when a path other than '/' is specified",
-			});
-		}
-
-		// Validate internalPath starts with /
-		if (
-			input.internalPath &&
-			input.internalPath !== "/" &&
-			!input.internalPath.startsWith("/")
-		) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				path: ["internalPath"],
-				message: "Internal path must start with '/'",
-			});
-		}
 	});
 
 type Domain = z.infer<typeof domain>;
@@ -187,8 +162,6 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 		defaultValues: {
 			host: "",
 			path: undefined,
-			internalPath: undefined,
-			stripPath: false,
 			port: undefined,
 			https: false,
 			certificateType: undefined,
@@ -209,8 +182,6 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 				...data,
 				/* Convert null to undefined */
 				path: data?.path || undefined,
-				internalPath: data?.internalPath || undefined,
-				stripPath: data?.stripPath || false,
 				port: data?.port || undefined,
 				certificateType: data?.certificateType || undefined,
 				customCertResolver: data?.customCertResolver || undefined,
@@ -223,8 +194,6 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 			form.reset({
 				host: "",
 				path: undefined,
-				internalPath: undefined,
-				stripPath: false,
 				port: undefined,
 				https: false,
 				certificateType: undefined,
@@ -292,7 +261,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 			<DialogTrigger className="" asChild>
 				{children}
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-2xl">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-2xl">
 				<DialogHeader>
 					<DialogTitle>Domain</DialogTitle>
 					<DialogDescription>{dictionary.dialogDescription}</DialogDescription>
@@ -500,49 +469,6 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 									}}
 								/>
 
-								<FormField
-									control={form.control}
-									name="internalPath"
-									render={({ field }) => {
-										return (
-											<FormItem>
-												<FormLabel>Internal Path</FormLabel>
-												<FormDescription>
-													The path where your application expects to receive
-													requests internally (defaults to "/")
-												</FormDescription>
-												<FormControl>
-													<Input placeholder={"/"} {...field} />
-												</FormControl>
-												<FormMessage />
-											</FormItem>
-										);
-									}}
-								/>
-
-								<FormField
-									control={form.control}
-									name="stripPath"
-									render={({ field }) => (
-										<FormItem className="flex flex-row items-center justify-between p-3 border rounded-lg shadow-sm">
-											<div className="space-y-0.5">
-												<FormLabel>Strip Path</FormLabel>
-												<FormDescription>
-													Remove the external path from the request before
-													forwarding to the application
-												</FormDescription>
-												<FormMessage />
-											</div>
-											<FormControl>
-												<Switch
-													checked={field.value}
-													onCheckedChange={field.onChange}
-												/>
-											</FormControl>
-										</FormItem>
-									)}
-								/>
-
 								<FormField
 									control={form.control}
 									name="port"

apps/dokploy/components/dashboard/application/domains/show-domains.tsx

@@ -1,5 +1,4 @@
 import { DialogAction } from "@/components/shared/dialog-action";
-import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
 	Card,
@@ -8,12 +7,6 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@/components/ui/card";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import {
 	CheckCircle2,
@@ -28,10 +21,17 @@ import {
 	XCircle,
 } from "lucide-react";
 import Link from "next/link";
-import { useState } from "react";
 import { toast } from "sonner";
-import { DnsHelperModal } from "./dns-helper-modal";
 import { AddDomain } from "./handle-domain";
+import { useState } from "react";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipProvider,
+	TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { DnsHelperModal } from "./dns-helper-modal";
+import { Badge } from "@/components/ui/badge";
 
 export type ValidationState = {
 	isLoading: boolean;
@@ -39,7 +39,6 @@ export type ValidationState = {
 	error?: string;
 	resolvedIp?: string;
 	message?: string;
-	cdnProvider?: string;
 };
 
 export type ValidationStates = Record<string, ValidationState>;
@@ -120,7 +119,6 @@ export const ShowDomains = ({ id, type }: Props) => {
 					isValid: result.isValid,
 					error: result.error,
 					resolvedIp: result.resolvedIp,
-					cdnProvider: result.cdnProvider,
 					message: result.error && result.isValid ? result.error : undefined,
 				},
 			}));
@@ -356,9 +354,8 @@ export const ShowDomains = ({ id, type }: Props) => {
 																	) : validationState?.isValid ? (
 																		<>
 																			<CheckCircle2 className="size-3 mr-1" />
-																			{validationState.message &&
-																			validationState.cdnProvider
-																				? `Behind ${validationState.cdnProvider}`
+																			{validationState.message
+																				? "Behind Cloudflare"
 																				: "DNS Valid"}
 																		</>
 																	) : validationState?.error ? (

apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx

@@ -136,7 +136,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 				enableSubmodules: data.enableSubmodules || false,
 			});
 		}
-	}, [form.reset, data?.applicationId, form]);
+	}, [form.reset, data, form]);
 
 	const onSubmit = async (data: BitbucketProvider) => {
 		await mutateAsync({

apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx

@@ -53,7 +53,7 @@ export const SaveDockerProvider = ({ applicationId }: Props) => {
 				registryURL: data.registryUrl || "",
 			});
 		}
-	}, [form.reset, data?.applicationId, form]);
+	}, [form.reset, data, form]);
 
 	const onSubmit = async (values: DockerProvider) => {
 		await mutateAsync({

apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx

@@ -17,13 +17,13 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
 	TooltipProvider,
 	TooltipTrigger,
 } from "@/components/ui/tooltip";
+import { Switch } from "@/components/ui/switch";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { KeyRoundIcon, LockIcon, X } from "lucide-react";

apps/dokploy/components/dashboard/application/general/generic/save-gitea-provider.tsx

@@ -158,7 +158,7 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
 				enableSubmodules: data.enableSubmodules || false,
 			});
 		}
-	}, [form.reset, data?.applicationId, form]);
+	}, [form.reset, data, form]);
 
 	const onSubmit = async (data: GiteaProvider) => {
 		await mutateAsync({

apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx

@@ -134,7 +134,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data?.applicationId, form]);
+	}, [form.reset, data, form]);
 
 	const onSubmit = async (data: GithubProvider) => {
 		await mutateAsync({

apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx

@@ -43,7 +43,7 @@ import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { CheckIcon, ChevronsUpDown, HelpCircle, Plus, X } from "lucide-react";
 import Link from "next/link";
-import { useEffect, useMemo } from "react";
+import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -96,16 +96,6 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 	const repository = form.watch("repository");
 	const gitlabId = form.watch("gitlabId");
 
-	const gitlabUrl = useMemo(() => {
-		const url = gitlabProviders?.find(
-			(provider) => provider.gitlabId === gitlabId,
-		)?.gitlabUrl;
-
-		const gitlabUrl = url?.replace(/\/$/, "");
-
-		return gitlabUrl || "https://gitlab.com";
-	}, [gitlabId, gitlabProviders]);
-
 	const {
 		data: repositories,
 		isLoading: isLoadingRepositories,
@@ -151,7 +141,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data?.applicationId, form]);
+	}, [form.reset, data, form]);
 
 	const onSubmit = async (data: GitlabProvider) => {
 		await mutateAsync({
@@ -234,7 +224,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 										<FormLabel>Repository</FormLabel>
 										{field.value.owner && field.value.repo && (
 											<Link
-												href={`${gitlabUrl}/${field.value.owner}/${field.value.repo}`}
+												href={`https://gitlab.com/${field.value.owner}/${field.value.repo}`}
 												target="_blank"
 												rel="noopener noreferrer"
 												className="flex items-center gap-1 text-sm text-muted-foreground hover:text-primary"
@@ -288,7 +278,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 														{repositories?.map((repo) => {
 															return (
 																<CommandItem
-																	value={repo.url}
+																	value={repo.name}
 																	key={repo.url}
 																	onSelect={() => {
 																		form.setValue("repository", {
@@ -309,8 +299,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 																	<CheckIcon
 																		className={cn(
 																			"ml-auto h-4 w-4",
-																			repo.url ===
-																				field.value.gitlabPathNamespace
+																			repo.name === field.value.repo
 																				? "opacity-100"
 																				: "opacity-0",
 																		)}

apps/dokploy/components/dashboard/application/general/generic/show.tsx

@@ -16,11 +16,9 @@ import { api } from "@/utils/api";
 import { GitBranch, Loader2, UploadCloud } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
-import { toast } from "sonner";
 import { SaveBitbucketProvider } from "./save-bitbucket-provider";
 import { SaveDragNDrop } from "./save-drag-n-drop";
 import { SaveGitlabProvider } from "./save-gitlab-provider";
-import { UnauthorizedGitProvider } from "./unauthorized-git-provider";
 
 type TabState =
 	| "github"
@@ -45,31 +43,12 @@ export const ShowProviderForm = ({ applicationId }: Props) => {
 	const { data: giteaProviders, isLoading: isLoadingGitea } =
 		api.gitea.giteaProviders.useQuery();
 
-	const { data: application, refetch } = api.application.one.useQuery({
-		applicationId,
-	});
-	const { mutateAsync: disconnectGitProvider } =
-		api.application.disconnectGitProvider.useMutation();
-
+	const { data: application } = api.application.one.useQuery({ applicationId });
 	const [tab, setSab] = useState<TabState>(application?.sourceType || "github");
 
 	const isLoading =
 		isLoadingGithub || isLoadingGitlab || isLoadingBitbucket || isLoadingGitea;
 
-	const handleDisconnect = async () => {
-		try {
-			await disconnectGitProvider({ applicationId });
-			toast.success("Repository disconnected successfully");
-			await refetch();
-		} catch (error) {
-			toast.error(
-				`Failed to disconnect repository: ${
-					error instanceof Error ? error.message : "Unknown error"
-				}`,
-			);
-		}
-	};
-
 	if (isLoading) {
 		return (
 			<Card className="group relative w-full bg-transparent">
@@ -98,38 +77,6 @@ export const ShowProviderForm = ({ applicationId }: Props) => {
 		);
 	}
 
-	// Check if user doesn't have access to the current git provider
-	if (
-		application &&
-		!application.hasGitProviderAccess &&
-		application.sourceType !== "docker" &&
-		application.sourceType !== "drop"
-	) {
-		return (
-			<Card className="group relative w-full bg-transparent">
-				<CardHeader>
-					<CardTitle className="flex items-start justify-between">
-						<div className="flex flex-col gap-2">
-							<span className="flex flex-col space-y-0.5">Provider</span>
-							<p className="flex items-center text-sm font-normal text-muted-foreground">
-								Repository connection through unauthorized provider
-							</p>
-						</div>
-						<div className="hidden space-y-1 text-sm font-normal md:block">
-							<GitBranch className="size-6 text-muted-foreground" />
-						</div>
-					</CardTitle>
-				</CardHeader>
-				<CardContent>
-					<UnauthorizedGitProvider
-						service={application}
-						onDisconnect={handleDisconnect}
-					/>
-				</CardContent>
-			</Card>
-		);
-	}
-
 	return (
 		<Card className="group relative w-full bg-transparent">
 			<CardHeader>
@@ -153,8 +100,8 @@ export const ShowProviderForm = ({ applicationId }: Props) => {
 						setSab(e as TabState);
 					}}
 				>
-					<div className="flex flex-row items-center justify-between w-full overflow-auto">
-						<TabsList className="flex gap-4 justify-start bg-transparent">
+					<div className="flex flex-row items-center justify-between w-full gap-4">
+						<TabsList className="md:grid md:w-fit md:grid-cols-7 max-md:overflow-x-scroll justify-start bg-transparent overflow-y-hidden">
 							<TabsTrigger
 								value="github"
 								className="rounded-none border-b-2 gap-2 border-b-transparent data-[state=active]:border-b-2 data-[state=active]:border-b-border"

apps/dokploy/components/dashboard/application/general/generic/unauthorized-git-provider.tsx

@@ -1,149 +0,0 @@
-import {
-	BitbucketIcon,
-	GitIcon,
-	GiteaIcon,
-	GithubIcon,
-	GitlabIcon,
-} from "@/components/icons/data-tools-icons";
-import { DialogAction } from "@/components/shared/dialog-action";
-import { Alert, AlertDescription } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import type { RouterOutputs } from "@/utils/api";
-import { AlertCircle, GitBranch, Unlink } from "lucide-react";
-
-interface Props {
-	service:
-		| RouterOutputs["application"]["one"]
-		| RouterOutputs["compose"]["one"];
-	onDisconnect: () => void;
-}
-
-export const UnauthorizedGitProvider = ({ service, onDisconnect }: Props) => {
-	const getProviderIcon = (sourceType: string) => {
-		switch (sourceType) {
-			case "github":
-				return <GithubIcon className="size-5 text-muted-foreground" />;
-			case "gitlab":
-				return <GitlabIcon className="size-5 text-muted-foreground" />;
-			case "bitbucket":
-				return <BitbucketIcon className="size-5 text-muted-foreground" />;
-			case "gitea":
-				return <GiteaIcon className="size-5 text-muted-foreground" />;
-			case "git":
-				return <GitIcon className="size-5 text-muted-foreground" />;
-			default:
-				return <GitBranch className="size-5 text-muted-foreground" />;
-		}
-	};
-
-	const getRepositoryInfo = () => {
-		switch (service.sourceType) {
-			case "github":
-				return {
-					repo: service.repository,
-					branch: service.branch,
-					owner: service.owner,
-				};
-			case "gitlab":
-				return {
-					repo: service.gitlabRepository,
-					branch: service.gitlabBranch,
-					owner: service.gitlabOwner,
-				};
-			case "bitbucket":
-				return {
-					repo: service.bitbucketRepository,
-					branch: service.bitbucketBranch,
-					owner: service.bitbucketOwner,
-				};
-			case "gitea":
-				return {
-					repo: service.giteaRepository,
-					branch: service.giteaBranch,
-					owner: service.giteaOwner,
-				};
-			case "git":
-				return {
-					repo: service.customGitUrl,
-					branch: service.customGitBranch,
-					owner: null,
-				};
-			default:
-				return { repo: null, branch: null, owner: null };
-		}
-	};
-
-	const { repo, branch, owner } = getRepositoryInfo();
-
-	return (
-		<div className="space-y-4">
-			<Alert>
-				<AlertCircle className="h-4 w-4" />
-				<AlertDescription>
-					This application is connected to a {service.sourceType} repository
-					through a git provider that you don't have access to. You can see
-					basic repository information below, but cannot modify the
-					configuration.
-				</AlertDescription>
-			</Alert>
-
-			<Card className="border-dashed border-2 border-muted-foreground/20 bg-transparent">
-				<CardHeader>
-					<CardTitle className="flex items-center gap-2">
-						{getProviderIcon(service.sourceType)}
-						<span className="capitalize text-sm font-medium">
-							{service.sourceType} Repository
-						</span>
-					</CardTitle>
-				</CardHeader>
-				<CardContent className="space-y-3">
-					{owner && (
-						<div>
-							<span className="text-sm font-medium text-muted-foreground">
-								Owner:
-							</span>
-							<p className="text-sm">{owner}</p>
-						</div>
-					)}
-					{repo && (
-						<div>
-							<span className="text-sm font-medium text-muted-foreground">
-								Repository:
-							</span>
-							<p className="text-sm">{repo}</p>
-						</div>
-					)}
-					{branch && (
-						<div>
-							<span className="text-sm font-medium text-muted-foreground">
-								Branch:
-							</span>
-							<p className="text-sm">{branch}</p>
-						</div>
-					)}
-
-					<div className="pt-4 border-t">
-						<DialogAction
-							title="Disconnect Repository"
-							description="Are you sure you want to disconnect this repository?"
-							type="default"
-							onClick={async () => {
-								onDisconnect();
-							}}
-						>
-							<Button variant="secondary" className="w-full">
-								<Unlink className="size-4 mr-2" />
-								Disconnect Repository
-							</Button>
-						</DialogAction>
-						<p className="text-xs text-muted-foreground mt-2">
-							Disconnecting will allow you to configure a new repository with
-							your own git providers.
-						</p>
-					</div>
-				</CardContent>
-			</Card>
-		</div>
-	);
-};

apps/dokploy/components/dashboard/application/preview-deployments/add-preview-domain.tsx

@@ -138,7 +138,7 @@ export const AddPreviewDomain = ({
 			<DialogTrigger className="" asChild>
 				{children}
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-2xl">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-2xl">
 				<DialogHeader>
 					<DialogTitle>Domain</DialogTitle>
 					<DialogDescription>{dictionary.dialogDescription}</DialogDescription>

apps/dokploy/components/dashboard/application/preview-deployments/show-preview-deployments.tsx

@@ -24,9 +24,9 @@ import {
 } from "lucide-react";
 import { toast } from "sonner";
 import { ShowModalLogs } from "../../settings/web-server/show-modal-logs";
-import { ShowDeploymentsModal } from "../deployments/show-deployments-modal";
 import { AddPreviewDomain } from "./add-preview-domain";
 import { ShowPreviewSettings } from "./show-preview-settings";
+import { ShowDeploymentsModal } from "../deployments/show-deployments-modal";
 
 interface Props {
 	applicationId: string;

apps/dokploy/components/dashboard/application/preview-deployments/show-preview-settings.tsx

@@ -138,7 +138,7 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
 						Configure
 					</Button>
 				</DialogTrigger>
-				<DialogContent className="sm:max-w-5xl w-full">
+				<DialogContent className="max-h-screen overflow-y-auto sm:max-w-5xl w-full">
 					<DialogHeader>
 						<DialogTitle>Preview Deployment Settings</DialogTitle>
 						<DialogDescription>

apps/dokploy/components/dashboard/application/rollbacks/Backup

@@ -1,108 +0,0 @@
-Backup
-# license-namedbackups-abxelc
-1. docker ps --filter "label=com.docker.swarm.service.name=license-namedbackups-abxelc" --format "{{.Names}}"
-2. docker run --rm \
---volumes-from "license-namedbackups-abxelc.1.m3cxy78ocj3w0zu42kmgamc5y" \
--v $(pwd):/backup \
-ubuntu \
-tar cvf /backup/backup.tar /var/lib/postgresql/data
-
-
-# Official Command Backup
-
-1. Backup
-
-docker run --rm \
-  -v license-namedbackups-abxelc-data:/volume_data \
-  -v $(pwd):/backup \
-  ubuntu \
-  bash -c "cd /volume_data && tar cvf /backup/generic_backup.tar ."
-
-
-2. Restore
-
-docker service scale license-namedbackups-abxelc=0
-
-docker volume rm license-namedbackups-abxelc-data
-
-2. docker run --rm \
--v license-namedbackups-abxelc-data:/volume_data \
--v $(pwd):/backup \
-ubuntu \
-bash -c "cd /volume_data && tar xvf /backup/generic_backup.tar ."
-
-docker service scale license-namedbackups-abxelc=1
-
-
-root@srv594061:~# docker volume inspect  n8n_data-data
-[
-    {
-        "CreatedAt": "2025-06-28T18:07:44Z",
-        "Driver": "local",
-        "Labels": null,
-        "Mountpoint": "/var/lib/docker/volumes/n8n_data-data/_data",
-        "Name": "n8n_data-data",
-        "Options": null,
-        "Scope": "local"
-    }
-]
-
-Archivos funcuionando creados por N8N
-
-# root@srv594061:~# cd /var/lib/docker/volumes/n8n_data-data/_data
-# root@srv594061:/var/lib/docker/volumes/n8n_data-data/_data# ls
-# binaryData  config  crash.journal  database.sqlite  git  n8nEventLog.log  ssh
-
-Luego que intente hacer el backup con el comando de backup
-
-
-root@srv594061:~# docker run --rm   -v n8n_data-data:/volume_data   -v $(pwd):/backup   ubuntu   bash -c "cd /volume_data && tar cvf /backup/generic_backup6.tar ."
-./
-./config
-./crash.journal
-./binaryData/
-./git/
-./database.sqlite
-./ssh/
-./n8nEventLog.log
-root@srv594061:~# 
-
-# Paramos la aplicacion
-docker service scale n8n=0
-
-# Haciendo el restore
-root@srv594061:~# docker volume rm n8n_data-data
-n8n_data-data
-root@srv594061:~# docker run --rm -v n8n_data-data:/volume_data -v $(pwd):/backup ubuntu bash -c "cd /volume_data && tar xvf /backup/generic_backup6.tar && chown -R 999:999 ."
-./
-./config
-./crash.journal
-./binaryData/
-./git/
-./database.sqlite
-./ssh/
-./n8nEventLog.log
-
-# Tenemos los archivos en el volumen
-root@srv594061:~# ls /var/lib/docker/volumes/n8n_data-data/_data
-binaryData  config  crash.journal  database.sqlite  git  n8nEventLog.log  ssh
-root@srv594061:~# 
-
-docker service scale n8n=1
-
-# Luego en N8N Cuando se que el volumen tiene la data 
-Permissions 0644 for n8n settings file /home/node/.n8n/config are too wide. This is ignored for now, but in the future n8n will attempt to change the permissions automatically. To automatically enforce correct permissions now set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true (recommended), or turn this check off set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.
-User settings loaded from: /home/node/.n8n/config
-Last session crashed
-Error: EACCES: permission denied, open '/home/node/.n8n/crash.journal'
-at open (node:internal/fs/promises:639:25)
-at touchFile (/usr/local/lib/node_modules/n8n/dist/crash-journal.js:18:20)
-at Object.init (/usr/local/lib/node_modules/n8n/dist/crash-journal.js:32:5)
-at Start.initCrashJournal (/usr/local/lib/node_modules/n8n/dist/commands/base-command.js:113:9)
-at Start.init (/usr/local/lib/node_modules/n8n/dist/commands/start.js:141:9)
-at Start._run (/usr/local/lib/node_modules/n8n/node_modules/@oclif/core/lib/command.js:301:13)
-at Config.runCommand (/usr/local/lib/node_modules/n8n/node_modules/@oclif/core/lib/config/config.js:424:25)
-at run (/usr/local/lib/node_modules/n8n/node_modules/@oclif/core/lib/main.js:94:16)
-at /usr/local/lib/node_modules/n8n/bin/n8n:71:2
-TypeError: Cannot read properties of undefined (reading 'error')
-

apps/dokploy/components/dashboard/application/rollbacks/show-rollback-settings.tsx

@@ -1,123 +0,0 @@
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-} from "@/components/ui/form";
-import { Switch } from "@/components/ui/switch";
-import { api } from "@/utils/api";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-
-const formSchema = z.object({
-	rollbackActive: z.boolean(),
-});
-
-type FormValues = z.infer<typeof formSchema>;
-
-interface Props {
-	applicationId: string;
-	children?: React.ReactNode;
-}
-
-export const ShowRollbackSettings = ({ applicationId, children }: Props) => {
-	const [isOpen, setIsOpen] = useState(false);
-	const { data: application, refetch } = api.application.one.useQuery(
-		{
-			applicationId,
-		},
-		{
-			enabled: !!applicationId,
-		},
-	);
-
-	const { mutateAsync: updateApplication, isLoading } =
-		api.application.update.useMutation();
-
-	const form = useForm<FormValues>({
-		resolver: zodResolver(formSchema),
-		defaultValues: {
-			rollbackActive: application?.rollbackActive ?? false,
-		},
-	});
-
-	const onSubmit = async (data: FormValues) => {
-		await updateApplication({
-			applicationId,
-			rollbackActive: data.rollbackActive,
-		})
-			.then(() => {
-				toast.success("Rollback settings updated");
-				setIsOpen(false);
-				refetch();
-			})
-			.catch(() => {
-				toast.error("Failed to update rollback settings");
-			});
-	};
-
-	return (
-		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			<DialogTrigger asChild>{children}</DialogTrigger>
-			<DialogContent>
-				<DialogHeader>
-					<DialogTitle>Rollback Settings</DialogTitle>
-					<DialogDescription>
-						Configure how rollbacks work for this application
-					</DialogDescription>
-					<AlertBlock>
-						Having rollbacks enabled increases storage usage. Be careful with
-						this option. Note that manually cleaning the cache may delete
-						rollback images, making them unavailable for future rollbacks.
-					</AlertBlock>
-				</DialogHeader>
-
-				<Form {...form}>
-					<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
-						<FormField
-							control={form.control}
-							name="rollbackActive"
-							render={({ field }) => (
-								<FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
-									<div className="space-y-0.5">
-										<FormLabel className="text-base">
-											Enable Rollbacks
-										</FormLabel>
-										<FormDescription>
-											Allow rolling back to previous deployments
-										</FormDescription>
-									</div>
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-								</FormItem>
-							)}
-						/>
-
-						<Button type="submit" className="w-full" isLoading={isLoading}>
-							Save Settings
-						</Button>
-					</form>
-				</Form>
-			</DialogContent>
-		</Dialog>
-	);
-};

apps/dokploy/components/dashboard/application/schedules/handle-schedules.tsx

@@ -1,24 +1,25 @@
-import { AlertBlock } from "@/components/shared/alert-block";
-import { CodeEditor } from "@/components/shared/code-editor";
 import { Button } from "@/components/ui/button";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
 import {
 	Form,
 	FormControl,
-	FormDescription,
 	FormField,
 	FormItem,
 	FormLabel,
 	FormMessage,
+	FormDescription,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { api } from "@/utils/api";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+import {
+	Info,
+	PlusCircle,
+	PenBoxIcon,
+	RefreshCw,
+	DatabaseZap,
+} from "lucide-react";
 import {
 	Select,
 	SelectContent,
@@ -26,27 +27,25 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
 import {
 	Tooltip,
 	TooltipContent,
 	TooltipProvider,
 	TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
-import { api } from "@/utils/api";
-import { zodResolver } from "@hookform/resolvers/zod";
-import {
-	DatabaseZap,
-	Info,
-	PenBoxIcon,
-	PlusCircle,
-	RefreshCw,
-} from "lucide-react";
+import { Switch } from "@/components/ui/switch";
 import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
+import {
+	Dialog,
+	DialogContent,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
 import { toast } from "sonner";
-import { z } from "zod";
+import { AlertBlock } from "@/components/shared/alert-block";
+import { CodeEditor } from "@/components/shared/code-editor";
+import { cn } from "@/lib/utils";
 import type { CacheType } from "../domains/handle-domain";
 
 export const commonCronExpressions = [
@@ -233,17 +232,14 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 			</DialogTrigger>
 			<DialogContent
 				className={cn(
+					"max-h-screen overflow-y-auto",
 					scheduleTypeForm === "dokploy-server" || scheduleTypeForm === "server"
-						? "sm:max-w-2xl"
-						: "sm:max-w-lg",
+						? "max-h-[95vh] sm:max-w-2xl"
+						: " sm:max-w-lg",
 				)}
 			>
 				<DialogHeader>
 					<DialogTitle>{scheduleId ? "Edit" : "Create"} Schedule</DialogTitle>
-					<DialogDescription>
-						{scheduleId ? "Manage" : "Create"} a schedule to run a task at a
-						specific time or interval.
-					</DialogDescription>
 				</DialogHeader>
 				<Form {...form}>
 					<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">

apps/dokploy/components/dashboard/application/schedules/show-schedules.tsx

@@ -1,6 +1,14 @@
-import { DialogAction } from "@/components/shared/dialog-action";
-import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import { api } from "@/utils/api";
+import { HandleSchedules } from "./handle-schedules";
+import {
+	Clock,
+	Play,
+	Terminal,
+	Trash2,
+	ClipboardList,
+	Loader2,
+} from "lucide-react";
 import {
 	Card,
 	CardContent,
@@ -8,24 +16,16 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@/components/ui/card";
+import { Badge } from "@/components/ui/badge";
+import { toast } from "sonner";
 import {
 	Tooltip,
 	TooltipContent,
 	TooltipProvider,
 	TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { api } from "@/utils/api";
-import {
-	ClipboardList,
-	Clock,
-	Loader2,
-	Play,
-	Terminal,
-	Trash2,
-} from "lucide-react";
-import { toast } from "sonner";
+import { DialogAction } from "@/components/shared/dialog-action";
 import { ShowDeploymentsModal } from "../deployments/show-deployments-modal";
-import { HandleSchedules } from "./handle-schedules";
 
 interface Props {
 	id: string;
@@ -91,7 +91,7 @@ export const ShowSchedules = ({ id, scheduleType = "application" }: Props) => {
 							return (
 								<div
 									key={schedule.scheduleId}
-									className="flex items-center justify-between rounded-lg border p-3 transition-colors bg-muted/50"
+									className=" flex items-center justify-between rounded-lg border p-3 transition-colors bg-muted/50"
 								>
 									<div className="flex items-start gap-3">
 										<div className="flex h-9 w-9 items-center justify-center rounded-full bg-primary/5">
@@ -166,16 +166,12 @@ export const ShowSchedules = ({ id, scheduleType = "application" }: Props) => {
 
 															await runManually({
 																scheduleId: schedule.scheduleId,
-															})
-																.then(async () => {
-																	await new Promise((resolve) =>
-																		setTimeout(resolve, 1500),
-																	);
-																	refetchSchedules();
-																})
-																.catch(() => {
-																	toast.error("Error running schedule");
-																});
+															}).then(async () => {
+																await new Promise((resolve) =>
+																	setTimeout(resolve, 1500),
+																);
+																refetchSchedules();
+															});
 														}}
 													>
 														<Play className="size-4  transition-colors" />

apps/dokploy/components/dashboard/application/update-application.tsx

@@ -99,7 +99,7 @@ export const UpdateApplication = ({ applicationId }: Props) => {
 					<PenBoxIcon className="size-3.5  text-primary group-hover:text-blue-500" />
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Modify Application</DialogTitle>
 					<DialogDescription>Update the application data</DialogDescription>

apps/dokploy/components/dashboard/application/volume-backups/handle-volume-backups.tsx

@@ -1,672 +0,0 @@
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { Switch } from "@/components/ui/switch";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
-import { api } from "@/utils/api";
-import { zodResolver } from "@hookform/resolvers/zod";
-import {
-	DatabaseZap,
-	Info,
-	PenBoxIcon,
-	PlusCircle,
-	RefreshCw,
-} from "lucide-react";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import type { CacheType } from "../domains/handle-domain";
-import { commonCronExpressions } from "../schedules/handle-schedules";
-
-const formSchema = z
-	.object({
-		name: z.string().min(1, "Name is required"),
-		cronExpression: z.string().min(1, "Cron expression is required"),
-		volumeName: z.string().min(1, "Volume name is required"),
-		prefix: z.string(),
-		// keepLatestCount: z.coerce.number().optional(),
-		turnOff: z.boolean().default(false),
-		enabled: z.boolean().default(true),
-		serviceType: z.enum([
-			"application",
-			"compose",
-			"postgres",
-			"mariadb",
-			"mongo",
-			"mysql",
-			"redis",
-		]),
-		serviceName: z.string(),
-		destinationId: z.string().min(1, "Destination required"),
-	})
-	.superRefine((data, ctx) => {
-		if (data.serviceType === "compose" && !data.serviceName) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				message: "Service name is required",
-				path: ["serviceName"],
-			});
-		}
-
-		if (data.serviceType === "compose" && !data.serviceName) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				message: "Service name is required",
-				path: ["serviceName"],
-			});
-		}
-	});
-
-interface Props {
-	id?: string;
-	volumeBackupId?: string;
-	volumeBackupType?:
-		| "application"
-		| "compose"
-		| "postgres"
-		| "mariadb"
-		| "mongo"
-		| "mysql"
-		| "redis";
-}
-
-export const HandleVolumeBackups = ({
-	id,
-	volumeBackupId,
-	volumeBackupType,
-}: Props) => {
-	const [isOpen, setIsOpen] = useState(false);
-	const [cacheType, setCacheType] = useState<CacheType>("cache");
-
-	const utils = api.useUtils();
-	const form = useForm<z.infer<typeof formSchema>>({
-		resolver: zodResolver(formSchema),
-		defaultValues: {
-			name: "",
-			cronExpression: "",
-			volumeName: "",
-			prefix: "",
-			// keepLatestCount: undefined,
-			turnOff: false,
-			enabled: true,
-			serviceName: "",
-			serviceType: volumeBackupType,
-		},
-	});
-
-	const serviceTypeForm = volumeBackupType;
-	const { data: destinations } = api.destination.all.useQuery();
-	const { data: volumeBackup } = api.volumeBackups.one.useQuery(
-		{ volumeBackupId: volumeBackupId || "" },
-		{ enabled: !!volumeBackupId },
-	);
-
-	const { data: mounts } = api.mounts.allNamedByApplicationId.useQuery(
-		{ applicationId: id || "" },
-		{ enabled: !!id && volumeBackupType === "application" },
-	);
-
-	const {
-		data: services,
-		isFetching: isLoadingServices,
-		error: errorServices,
-		refetch: refetchServices,
-	} = api.compose.loadServices.useQuery(
-		{
-			composeId: id || "",
-			type: cacheType,
-		},
-		{
-			retry: false,
-			refetchOnWindowFocus: false,
-			enabled: !!id && volumeBackupType === "compose",
-		},
-	);
-
-	const serviceName = form.watch("serviceName");
-
-	const { data: mountsByService } = api.compose.loadMountsByService.useQuery(
-		{
-			composeId: id || "",
-			serviceName,
-		},
-		{
-			enabled: !!id && volumeBackupType === "compose" && !!serviceName,
-		},
-	);
-
-	useEffect(() => {
-		if (volumeBackupId && volumeBackup) {
-			form.reset({
-				name: volumeBackup.name,
-				cronExpression: volumeBackup.cronExpression,
-				volumeName: volumeBackup.volumeName || "",
-				prefix: volumeBackup.prefix,
-				// keepLatestCount: volumeBackup.keepLatestCount || undefined,
-				turnOff: volumeBackup.turnOff,
-				enabled: volumeBackup.enabled || false,
-				serviceName: volumeBackup.serviceName || "",
-				destinationId: volumeBackup.destinationId,
-				serviceType: volumeBackup.serviceType,
-			});
-		}
-	}, [form, volumeBackup, volumeBackupId]);
-
-	const { mutateAsync, isLoading } = volumeBackupId
-		? api.volumeBackups.update.useMutation()
-		: api.volumeBackups.create.useMutation();
-
-	const onSubmit = async (values: z.infer<typeof formSchema>) => {
-		if (!id && !volumeBackupId) return;
-
-		await mutateAsync({
-			...values,
-			destinationId: values.destinationId,
-			volumeBackupId: volumeBackupId || "",
-			serviceType: volumeBackupType,
-			...(volumeBackupType === "application" && {
-				applicationId: id || "",
-			}),
-			...(volumeBackupType === "compose" && {
-				composeId: id || "",
-			}),
-			...(volumeBackupType === "postgres" && {
-				serverId: id || "",
-			}),
-			...(volumeBackupType === "postgres" && {
-				postgresId: id || "",
-			}),
-			...(volumeBackupType === "mariadb" && {
-				mariadbId: id || "",
-			}),
-			...(volumeBackupType === "mongo" && {
-				mongoId: id || "",
-			}),
-			...(volumeBackupType === "mysql" && {
-				mysqlId: id || "",
-			}),
-			...(volumeBackupType === "redis" && {
-				redisId: id || "",
-			}),
-		})
-			.then(() => {
-				toast.success(
-					`Volume backup ${volumeBackupId ? "updated" : "created"} successfully`,
-				);
-				utils.volumeBackups.list.invalidate({
-					id,
-					volumeBackupType,
-				});
-				setIsOpen(false);
-			})
-			.catch((error) => {
-				toast.error(
-					error instanceof Error ? error.message : "An unknown error occurred",
-				);
-			});
-	};
-
-	return (
-		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			<DialogTrigger asChild>
-				{volumeBackupId ? (
-					<Button
-						variant="ghost"
-						size="icon"
-						className="group hover:bg-blue-500/10"
-					>
-						<PenBoxIcon className="size-3.5 text-primary group-hover:text-blue-500" />
-					</Button>
-				) : (
-					<Button>
-						<PlusCircle className="w-4 h-4 mr-2" />
-						Add Volume Backup
-					</Button>
-				)}
-			</DialogTrigger>
-			<DialogContent
-				className={cn(
-					"overflow-y-auto",
-					volumeBackupType === "compose" || volumeBackupType === "application"
-						? "max-h-[95vh] sm:max-w-2xl"
-						: " sm:max-w-lg",
-				)}
-			>
-				<DialogHeader>
-					<DialogTitle>
-						{volumeBackupId ? "Edit" : "Create"} Volume Backup
-					</DialogTitle>
-					<DialogDescription>
-						Create a volume backup to backup your volume to a destination
-					</DialogDescription>
-				</DialogHeader>
-				<Form {...form}>
-					<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
-						<FormField
-							control={form.control}
-							name="name"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel className="flex items-center gap-2">
-										Task Name
-									</FormLabel>
-									<FormControl>
-										<Input placeholder="Daily Database Backup" {...field} />
-									</FormControl>
-									<FormDescription>
-										A descriptive name for your scheduled task
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="cronExpression"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel className="flex items-center gap-2">
-										Schedule
-										<TooltipProvider>
-											<Tooltip>
-												<TooltipTrigger asChild>
-													<Info className="w-4 h-4 text-muted-foreground cursor-help" />
-												</TooltipTrigger>
-												<TooltipContent>
-													<p>
-														Cron expression format: minute hour day month
-														weekday
-													</p>
-													<p>Example: 0 0 * * * (daily at midnight)</p>
-												</TooltipContent>
-											</Tooltip>
-										</TooltipProvider>
-									</FormLabel>
-									<div className="flex flex-col gap-2">
-										<Select
-											onValueChange={(value) => {
-												field.onChange(value);
-											}}
-										>
-											<FormControl>
-												<SelectTrigger>
-													<SelectValue placeholder="Select a predefined schedule" />
-												</SelectTrigger>
-											</FormControl>
-											<SelectContent>
-												{commonCronExpressions.map((expr) => (
-													<SelectItem key={expr.value} value={expr.value}>
-														{expr.label} ({expr.value})
-													</SelectItem>
-												))}
-											</SelectContent>
-										</Select>
-										<div className="relative">
-											<FormControl>
-												<Input
-													placeholder="Custom cron expression (e.g., 0 0 * * *)"
-													{...field}
-												/>
-											</FormControl>
-										</div>
-									</div>
-									<FormDescription>
-										Choose a predefined schedule or enter a custom cron
-										expression
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="destinationId"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Destination</FormLabel>
-									<Select
-										onValueChange={field.onChange}
-										defaultValue={field.value}
-									>
-										<FormControl>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a destination" />
-											</SelectTrigger>
-										</FormControl>
-										<SelectContent>
-											{destinations?.map((destination) => (
-												<SelectItem
-													key={destination.destinationId}
-													value={destination.destinationId}
-												>
-													{destination.name}
-												</SelectItem>
-											))}
-										</SelectContent>
-									</Select>
-									<FormDescription>
-										Choose the backup destination where files will be stored
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-						{serviceTypeForm === "compose" && (
-							<>
-								<div className="flex flex-col w-full gap-4">
-									{errorServices && (
-										<AlertBlock
-											type="warning"
-											className="[overflow-wrap:anywhere]"
-										>
-											{errorServices?.message}
-										</AlertBlock>
-									)}
-									<FormField
-										control={form.control}
-										name="serviceName"
-										render={({ field }) => (
-											<FormItem className="w-full">
-												<FormLabel>Service Name</FormLabel>
-												<div className="flex gap-2">
-													<Select
-														onValueChange={field.onChange}
-														defaultValue={field.value || ""}
-													>
-														<FormControl>
-															<SelectTrigger>
-																<SelectValue placeholder="Select a service name" />
-															</SelectTrigger>
-														</FormControl>
-
-														<SelectContent>
-															{services?.map((service, index) => (
-																<SelectItem
-																	value={service}
-																	key={`${service}-${index}`}
-																>
-																	{service}
-																</SelectItem>
-															))}
-															<SelectItem value="none" disabled>
-																Empty
-															</SelectItem>
-														</SelectContent>
-													</Select>
-													<TooltipProvider delayDuration={0}>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Button
-																	variant="secondary"
-																	type="button"
-																	isLoading={isLoadingServices}
-																	onClick={() => {
-																		if (cacheType === "fetch") {
-																			refetchServices();
-																		} else {
-																			setCacheType("fetch");
-																		}
-																	}}
-																>
-																	<RefreshCw className="size-4 text-muted-foreground" />
-																</Button>
-															</TooltipTrigger>
-															<TooltipContent
-																side="left"
-																sideOffset={5}
-																className="max-w-[10rem]"
-															>
-																<p>
-																	Fetch: Will clone the repository and load the
-																	services
-																</p>
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-													<TooltipProvider delayDuration={0}>
-														<Tooltip>
-															<TooltipTrigger asChild>
-																<Button
-																	variant="secondary"
-																	type="button"
-																	isLoading={isLoadingServices}
-																	onClick={() => {
-																		if (cacheType === "cache") {
-																			refetchServices();
-																		} else {
-																			setCacheType("cache");
-																		}
-																	}}
-																>
-																	<DatabaseZap className="size-4 text-muted-foreground" />
-																</Button>
-															</TooltipTrigger>
-															<TooltipContent
-																side="left"
-																sideOffset={5}
-																className="max-w-[10rem]"
-															>
-																<p>
-																	Cache: If you previously deployed this
-																	compose, it will read the services from the
-																	last deployment/fetch from the repository
-																</p>
-															</TooltipContent>
-														</Tooltip>
-													</TooltipProvider>
-												</div>
-
-												<FormMessage />
-											</FormItem>
-										)}
-									/>
-								</div>
-								{mountsByService && mountsByService.length > 0 && (
-									<FormField
-										control={form.control}
-										name="volumeName"
-										render={({ field }) => (
-											<FormItem>
-												<FormLabel>Volumes</FormLabel>
-												<Select
-													onValueChange={field.onChange}
-													defaultValue={field.value || ""}
-												>
-													<FormControl>
-														<SelectTrigger>
-															<SelectValue placeholder="Select a volume name" />
-														</SelectTrigger>
-													</FormControl>
-													<SelectContent>
-														{mountsByService?.map((volume) => (
-															<SelectItem
-																key={volume.Name}
-																value={volume.Name || ""}
-															>
-																{volume.Name}
-															</SelectItem>
-														))}
-													</SelectContent>
-												</Select>
-												<FormDescription>
-													Choose the volume to backup, if you dont see the
-													volume here, you can type the volume name manually
-												</FormDescription>
-												<FormMessage />
-											</FormItem>
-										)}
-									/>
-								)}
-							</>
-						)}
-						{serviceTypeForm === "application" && (
-							<FormField
-								control={form.control}
-								name="volumeName"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Volumes</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											defaultValue={field.value || ""}
-										>
-											<FormControl>
-												<SelectTrigger>
-													<SelectValue placeholder="Select a volume name" />
-												</SelectTrigger>
-											</FormControl>
-											<SelectContent>
-												{mounts?.map((mount) => (
-													<SelectItem key={mount.Name} value={mount.Name || ""}>
-														{mount.Name}
-													</SelectItem>
-												))}
-											</SelectContent>
-										</Select>
-										<FormDescription>
-											Choose the volume to backup, if you dont see the volume
-											here, you can type the volume name manually
-										</FormDescription>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						)}
-
-						<FormField
-							control={form.control}
-							name="volumeName"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Volume Name</FormLabel>
-									<FormControl>
-										<Input placeholder="my-volume-name" {...field} />
-									</FormControl>
-									<FormDescription>
-										The name of the Docker volume to backup
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="prefix"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Backup Prefix</FormLabel>
-									<FormControl>
-										<Input placeholder="backup-" {...field} />
-									</FormControl>
-									<FormDescription>
-										Prefix for backup files (optional)
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						{/* <FormField
-							control={form.control}
-							name="keepLatestCount"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Keep Latest Count</FormLabel>
-									<FormControl>
-										<Input
-											type="number"
-											placeholder="5"
-											{...field}
-											onChange={(e) =>
-												field.onChange(Number(e.target.value) || undefined)
-											}
-										/>
-									</FormControl>
-									<FormDescription>
-										Number of backup files to keep (optional)
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/> */}
-
-						<FormField
-							control={form.control}
-							name="turnOff"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel className="flex items-center gap-2">
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-										Turn Off Container During Backup
-									</FormLabel>
-									<FormDescription className="text-amber-600 dark:text-amber-400">
-										⚠️ The container will be temporarily stopped during backup to
-										prevent file corruption. This ensures data integrity but may
-										cause temporary service interruption.
-									</FormDescription>
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="enabled"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel className="flex items-center gap-2">
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-										Enabled
-									</FormLabel>
-								</FormItem>
-							)}
-						/>
-
-						<Button type="submit" isLoading={isLoading} className="w-full">
-							{volumeBackupId ? "Update" : "Create"} Volume Backup
-						</Button>
-					</form>
-				</Form>
-			</DialogContent>
-		</Dialog>
-	);
-};

apps/dokploy/components/dashboard/application/volume-backups/restore-volume-backups.tsx

@@ -1,411 +0,0 @@
-import { DrawerLogs } from "@/components/shared/drawer-logs";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import {
-	Command,
-	CommandEmpty,
-	CommandGroup,
-	CommandInput,
-	CommandItem,
-} from "@/components/ui/command";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog";
-import {
-	Form,
-	FormControl,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-	Popover,
-	PopoverContent,
-	PopoverTrigger,
-} from "@/components/ui/popover";
-import { ScrollArea } from "@/components/ui/scroll-area";
-import { cn } from "@/lib/utils";
-import { api } from "@/utils/api";
-import { zodResolver } from "@hookform/resolvers/zod";
-import copy from "copy-to-clipboard";
-import { debounce } from "lodash";
-import { CheckIcon, ChevronsUpDown, Copy, RotateCcw } from "lucide-react";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { type LogLine, parseLogs } from "../../docker/logs/utils";
-import { formatBytes } from "../../database/backups/restore-backup";
-import { AlertBlock } from "@/components/shared/alert-block";
-
-interface Props {
-	id: string;
-	type: "application" | "compose";
-	serverId?: string;
-}
-
-const RestoreBackupSchema = z.object({
-	destinationId: z
-		.string({
-			required_error: "Please select a destination",
-		})
-		.min(1, {
-			message: "Destination is required",
-		}),
-	backupFile: z
-		.string({
-			required_error: "Please select a backup file",
-		})
-		.min(1, {
-			message: "Backup file is required",
-		}),
-	volumeName: z
-		.string({
-			required_error: "Please enter a volume name",
-		})
-		.min(1, {
-			message: "Volume name is required",
-		}),
-});
-
-export const RestoreVolumeBackups = ({ id, type, serverId }: Props) => {
-	const [isOpen, setIsOpen] = useState(false);
-	const [search, setSearch] = useState("");
-	const [debouncedSearchTerm, setDebouncedSearchTerm] = useState("");
-
-	const { data: destinations = [] } = api.destination.all.useQuery();
-
-	const form = useForm<z.infer<typeof RestoreBackupSchema>>({
-		defaultValues: {
-			destinationId: "",
-			backupFile: "",
-			volumeName: "",
-		},
-		resolver: zodResolver(RestoreBackupSchema),
-	});
-
-	const destinationId = form.watch("destinationId");
-	const volumeName = form.watch("volumeName");
-	const backupFile = form.watch("backupFile");
-
-	const debouncedSetSearch = debounce((value: string) => {
-		setDebouncedSearchTerm(value);
-	}, 350);
-
-	const handleSearchChange = (value: string) => {
-		setSearch(value);
-		debouncedSetSearch(value);
-	};
-
-	const { data: files = [], isLoading } = api.backup.listBackupFiles.useQuery(
-		{
-			destinationId: destinationId,
-			search: debouncedSearchTerm,
-			serverId: serverId ?? "",
-		},
-		{
-			enabled: isOpen && !!destinationId,
-		},
-	);
-
-	const [isDrawerOpen, setIsDrawerOpen] = useState(false);
-	const [filteredLogs, setFilteredLogs] = useState<LogLine[]>([]);
-	const [isDeploying, setIsDeploying] = useState(false);
-
-	api.volumeBackups.restoreVolumeBackupWithLogs.useSubscription(
-		{
-			id,
-			serviceType: type,
-			serverId,
-			destinationId,
-			volumeName,
-			backupFileName: backupFile,
-		},
-		{
-			enabled: isDeploying,
-			onData(log) {
-				if (!isDrawerOpen) {
-					setIsDrawerOpen(true);
-				}
-
-				if (log === "Restore completed successfully!") {
-					setIsDeploying(false);
-				}
-				const parsedLogs = parseLogs(log);
-				setFilteredLogs((prev) => [...prev, ...parsedLogs]);
-			},
-			onError(error) {
-				console.error("Restore logs error:", error);
-				setIsDeploying(false);
-			},
-		},
-	);
-
-	const onSubmit = async () => {
-		setIsDeploying(true);
-	};
-
-	return (
-		<Dialog open={isOpen} onOpenChange={setIsOpen}>
-			<DialogTrigger asChild>
-				<Button variant="outline">
-					<RotateCcw className="mr-2 size-4" />
-					Restore Volume Backup
-				</Button>
-			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
-				<DialogHeader>
-					<DialogTitle className="flex items-center">
-						<RotateCcw className="mr-2 size-4" />
-						Restore Volume Backup
-					</DialogTitle>
-					<DialogDescription>
-						Select a destination and search for volume backup files
-					</DialogDescription>
-					<AlertBlock>
-						Make sure the volume name is not being used by another container.
-					</AlertBlock>
-				</DialogHeader>
-
-				<Form {...form}>
-					<form
-						id="hook-form-restore-backup"
-						onSubmit={form.handleSubmit(onSubmit)}
-						className="grid w-full gap-4"
-					>
-						<FormField
-							control={form.control}
-							name="destinationId"
-							render={({ field }) => (
-								<FormItem className="">
-									<FormLabel>Destination</FormLabel>
-									<Popover>
-										<PopoverTrigger asChild>
-											<FormControl>
-												<Button
-													variant="outline"
-													className={cn(
-														"w-full justify-between !bg-input",
-														!field.value && "text-muted-foreground",
-													)}
-												>
-													{field.value
-														? destinations.find(
-																(d) => d.destinationId === field.value,
-															)?.name
-														: "Select Destination"}
-													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-												</Button>
-											</FormControl>
-										</PopoverTrigger>
-										<PopoverContent className="p-0" align="start">
-											<Command>
-												<CommandInput
-													placeholder="Search destinations..."
-													className="h-9"
-												/>
-												<CommandEmpty>No destinations found.</CommandEmpty>
-												<ScrollArea className="h-64">
-													<CommandGroup>
-														{destinations.map((destination) => (
-															<CommandItem
-																value={destination.destinationId}
-																key={destination.destinationId}
-																onSelect={() => {
-																	form.setValue(
-																		"destinationId",
-																		destination.destinationId,
-																	);
-																}}
-															>
-																{destination.name}
-																<CheckIcon
-																	className={cn(
-																		"ml-auto h-4 w-4",
-																		destination.destinationId === field.value
-																			? "opacity-100"
-																			: "opacity-0",
-																	)}
-																/>
-															</CommandItem>
-														))}
-													</CommandGroup>
-												</ScrollArea>
-											</Command>
-										</PopoverContent>
-									</Popover>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="backupFile"
-							render={({ field }) => (
-								<FormItem className="">
-									<FormLabel className="flex items-center">
-										Search Backup Files
-										{field.value && (
-											<Badge variant="outline" className="truncate w-52">
-												{field.value}
-												<Copy
-													className="ml-2 size-4 cursor-pointer"
-													onClick={(e) => {
-														e.stopPropagation();
-														e.preventDefault();
-														copy(field.value);
-														toast.success("Backup file copied to clipboard");
-													}}
-												/>
-											</Badge>
-										)}
-									</FormLabel>
-									<Popover modal>
-										<PopoverTrigger asChild>
-											<FormControl>
-												<Button
-													variant="outline"
-													className={cn(
-														"w-full justify-between !bg-input",
-														!field.value && "text-muted-foreground",
-													)}
-												>
-													<span className="truncate text-left flex-1 w-52">
-														{field.value || "Search and select a backup file"}
-													</span>
-													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-												</Button>
-											</FormControl>
-										</PopoverTrigger>
-										<PopoverContent className="p-0" align="start">
-											<Command>
-												<CommandInput
-													placeholder="Search backup files..."
-													value={search}
-													onValueChange={handleSearchChange}
-													className="h-9"
-												/>
-												{isLoading ? (
-													<div className="py-6 text-center text-sm">
-														Loading backup files...
-													</div>
-												) : files.length === 0 && search ? (
-													<div className="py-6 text-center text-sm text-muted-foreground">
-														No backup files found for "{search}"
-													</div>
-												) : files.length === 0 ? (
-													<div className="py-6 text-center text-sm text-muted-foreground">
-														No backup files available
-													</div>
-												) : (
-													<ScrollArea className="h-64">
-														<CommandGroup className="w-96">
-															{files?.map((file) => (
-																<CommandItem
-																	value={file.Path}
-																	key={file.Path}
-																	onSelect={() => {
-																		form.setValue("backupFile", file.Path);
-																		if (file.IsDir) {
-																			setSearch(`${file.Path}/`);
-																			setDebouncedSearchTerm(`${file.Path}/`);
-																		} else {
-																			setSearch(file.Path);
-																			setDebouncedSearchTerm(file.Path);
-																		}
-																	}}
-																>
-																	<div className="flex w-full flex-col gap-1">
-																		<div className="flex w-full justify-between">
-																			<span className="font-medium">
-																				{file.Path}
-																			</span>
-
-																			<CheckIcon
-																				className={cn(
-																					"ml-auto h-4 w-4",
-																					file.Path === field.value
-																						? "opacity-100"
-																						: "opacity-0",
-																				)}
-																			/>
-																		</div>
-																		<div className="flex items-center gap-4 text-xs text-muted-foreground">
-																			<span>
-																				Size: {formatBytes(file.Size)}
-																			</span>
-																			{file.IsDir && (
-																				<span className="text-blue-500">
-																					Directory
-																				</span>
-																			)}
-																			{file.Hashes?.MD5 && (
-																				<span>MD5: {file.Hashes.MD5}</span>
-																			)}
-																		</div>
-																	</div>
-																</CommandItem>
-															))}
-														</CommandGroup>
-													</ScrollArea>
-												)}
-											</Command>
-										</PopoverContent>
-									</Popover>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-						<FormField
-							control={form.control}
-							name="volumeName"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Volume Name</FormLabel>
-									<FormControl>
-										<Input placeholder="Enter volume name" {...field} />
-									</FormControl>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<DialogFooter>
-							<Button
-								isLoading={isDeploying}
-								form="hook-form-restore-backup"
-								type="submit"
-								// disabled={
-								// 	!form.watch("backupFile") ||
-								// 	(backupType === "compose" && !form.watch("databaseType"))
-								// }
-							>
-								Restore
-							</Button>
-						</DialogFooter>
-					</form>
-				</Form>
-
-				<DrawerLogs
-					isOpen={isDrawerOpen}
-					onClose={() => {
-						setIsDrawerOpen(false);
-						setFilteredLogs([]);
-						setIsDeploying(false);
-						// refetch();
-					}}
-					filteredLogs={filteredLogs}
-				/>
-			</DialogContent>
-		</Dialog>
-	);
-};

apps/dokploy/components/dashboard/application/volume-backups/show-volume-backups.tsx

@@ -1,250 +0,0 @@
-import { DialogAction } from "@/components/shared/dialog-action";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import {
-	Card,
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { api } from "@/utils/api";
-import {
-	ClipboardList,
-	DatabaseBackup,
-	Loader2,
-	Play,
-	Trash2,
-} from "lucide-react";
-import { toast } from "sonner";
-import { HandleVolumeBackups } from "./handle-volume-backups";
-import { ShowDeploymentsModal } from "../deployments/show-deployments-modal";
-import { RestoreVolumeBackups } from "./restore-volume-backups";
-
-interface Props {
-	id: string;
-	type?: "application" | "compose";
-	serverId?: string;
-}
-
-export const ShowVolumeBackups = ({
-	id,
-	type = "application",
-	serverId,
-}: Props) => {
-	const {
-		data: volumeBackups,
-		isLoading: isLoadingVolumeBackups,
-		refetch: refetchVolumeBackups,
-	} = api.volumeBackups.list.useQuery(
-		{
-			id: id || "",
-			volumeBackupType: type,
-		},
-		{
-			enabled: !!id,
-		},
-	);
-
-	const utils = api.useUtils();
-
-	const { mutateAsync: deleteVolumeBackup, isLoading: isDeleting } =
-		api.volumeBackups.delete.useMutation();
-
-	const { mutateAsync: runManually, isLoading } =
-		api.volumeBackups.runManually.useMutation();
-
-	return (
-		<Card className="border px-6 shadow-none bg-transparent h-full min-h-[50vh]">
-			<CardHeader className="px-0">
-				<div className="flex justify-between items-center">
-					<div className="flex flex-col gap-2">
-						<CardTitle className="text-xl font-bold flex items-center gap-2">
-							Volume Backups
-						</CardTitle>
-						<CardDescription>
-							Schedule volume backups to run automatically at specified
-							intervals.
-						</CardDescription>
-					</div>
-
-					<div className="flex items-center gap-2">
-						{volumeBackups && volumeBackups.length > 0 && (
-							<>
-								<HandleVolumeBackups id={id} volumeBackupType={type} />
-
-								<div className="flex items-center gap-2">
-									<RestoreVolumeBackups
-										id={id}
-										type={type}
-										serverId={serverId}
-									/>
-								</div>
-							</>
-						)}
-					</div>
-				</div>
-			</CardHeader>
-			<CardContent className="px-0">
-				{isLoadingVolumeBackups ? (
-					<div className="flex gap-4   w-full items-center justify-center text-center mx-auto min-h-[45vh]">
-						<Loader2 className="size-4 text-muted-foreground/70 transition-colors animate-spin self-center" />
-						<span className="text-sm text-muted-foreground/70">
-							Loading volume backups...
-						</span>
-					</div>
-				) : volumeBackups && volumeBackups.length > 0 ? (
-					<div className="grid xl:grid-cols-2 gap-4 grid-cols-1 h-full">
-						{volumeBackups.map((volumeBackup) => {
-							const serverId =
-								volumeBackup.application?.serverId ||
-								volumeBackup.postgres?.serverId ||
-								volumeBackup.mysql?.serverId ||
-								volumeBackup.mariadb?.serverId ||
-								volumeBackup.mongo?.serverId ||
-								volumeBackup.redis?.serverId ||
-								volumeBackup.compose?.serverId;
-							return (
-								<div
-									key={volumeBackup.volumeBackupId}
-									className="flex items-center justify-between rounded-lg border p-3 transition-colors bg-muted/50"
-								>
-									<div className="flex items-start gap-3">
-										<div className="flex h-9 w-9 items-center justify-center rounded-full bg-primary/5">
-											<DatabaseBackup className="size-4 text-primary/70" />
-										</div>
-										<div className="space-y-1.5">
-											<div className="flex items-center gap-2">
-												<h3 className="text-sm font-medium leading-none">
-													{volumeBackup.name}
-												</h3>
-												<Badge
-													variant={
-														volumeBackup.enabled ? "default" : "secondary"
-													}
-													className="text-[10px] px-1 py-0"
-												>
-													{volumeBackup.enabled ? "Enabled" : "Disabled"}
-												</Badge>
-											</div>
-											<div className="flex items-center gap-2 text-sm text-muted-foreground">
-												<Badge
-													variant="outline"
-													className="font-mono text-[10px] bg-transparent"
-												>
-													Cron: {volumeBackup.cronExpression}
-												</Badge>
-											</div>
-										</div>
-									</div>
-
-									<div className="flex items-center gap-1.5">
-										<ShowDeploymentsModal
-											id={volumeBackup.volumeBackupId}
-											type="volumeBackup"
-											serverId={serverId || undefined}
-										>
-											<Button variant="ghost" size="icon">
-												<ClipboardList className="size-4  transition-colors " />
-											</Button>
-										</ShowDeploymentsModal>
-
-										<TooltipProvider delayDuration={0}>
-											<Tooltip>
-												<TooltipTrigger asChild>
-													<Button
-														type="button"
-														variant="ghost"
-														size="icon"
-														isLoading={isLoading}
-														onClick={async () => {
-															toast.success("Volume backup run successfully");
-
-															await runManually({
-																volumeBackupId: volumeBackup.volumeBackupId,
-															})
-																.then(async () => {
-																	await new Promise((resolve) =>
-																		setTimeout(resolve, 1500),
-																	);
-																	refetchVolumeBackups();
-																})
-																.catch(() => {
-																	toast.error("Error running volume backup");
-																});
-														}}
-													>
-														<Play className="size-4  transition-colors" />
-													</Button>
-												</TooltipTrigger>
-												<TooltipContent>
-													Run Manual Volume Backup
-												</TooltipContent>
-											</Tooltip>
-										</TooltipProvider>
-
-										<HandleVolumeBackups
-											volumeBackupId={volumeBackup.volumeBackupId}
-											id={id}
-											volumeBackupType={type}
-										/>
-
-										<DialogAction
-											title="Delete Volume Backup"
-											description="Are you sure you want to delete this volume backup?"
-											type="destructive"
-											onClick={async () => {
-												await deleteVolumeBackup({
-													volumeBackupId: volumeBackup.volumeBackupId,
-												})
-													.then(() => {
-														utils.volumeBackups.list.invalidate({
-															id,
-															volumeBackupType: type,
-														});
-														toast.success("Volume backup deleted successfully");
-													})
-													.catch(() => {
-														toast.error("Error deleting volume backup");
-													});
-											}}
-										>
-											<Button
-												variant="ghost"
-												size="icon"
-												className="group hover:bg-red-500/10 "
-												isLoading={isDeleting}
-											>
-												<Trash2 className="size-4 text-primary group-hover:text-red-500" />
-											</Button>
-										</DialogAction>
-									</div>
-								</div>
-							);
-						})}
-					</div>
-				) : (
-					<div className="flex flex-col gap-2 items-center justify-center py-12  rounded-lg">
-						<DatabaseBackup className="size-8 mb-4 text-muted-foreground" />
-						<p className="text-lg font-medium text-muted-foreground">
-							No volume backups
-						</p>
-						<p className="text-sm text-muted-foreground mt-1">
-							Create your first volume backup to automate your workflows
-						</p>
-						<div className="flex items-center gap-2">
-							<HandleVolumeBackups id={id} volumeBackupType={type} />
-							<RestoreVolumeBackups id={id} type={type} serverId={serverId} />
-						</div>
-					</div>
-				)}
-			</CardContent>
-		</Card>
-	);
-};

apps/dokploy/components/dashboard/compose/delete-service.tsx

@@ -126,7 +126,7 @@ export const DeleteService = ({ id, type }: Props) => {
 					<Trash2 className="size-4 text-primary group-hover:text-red-500" />
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Are you absolutely sure?</DialogTitle>
 					<DialogDescription>

apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx

@@ -44,10 +44,8 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
 		resolver: zodResolver(AddComposeFile),
 	});
 
-	const composeFile = form.watch("composeFile");
-
 	useEffect(() => {
-		if (data && !composeFile) {
+		if (data) {
 			form.reset({
 				composeFile: data.composeFile || "",
 			});
@@ -77,7 +75,7 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
 					composeId,
 				});
 			})
-			.catch(() => {
+			.catch((_e) => {
 				toast.error("Error updating the Compose config");
 			});
 	};

apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx

@@ -136,7 +136,7 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data?.composeId, form]);
+	}, [form.reset, data, form]);
 
 	const onSubmit = async (data: BitbucketProvider) => {
 		await mutateAsync({

apps/dokploy/components/dashboard/compose/general/generic/save-gitea-provider-compose.tsx

@@ -142,7 +142,7 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data?.composeId, form]);
+	}, [form.reset, data, form]);
 
 	const onSubmit = async (data: GiteaProvider) => {
 		await mutateAsync({

apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx

@@ -134,7 +134,7 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data?.composeId, form]);
+	}, [form.reset, data, form]);
 
 	const onSubmit = async (data: GithubProvider) => {
 		await mutateAsync({

apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx

@@ -142,7 +142,7 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 				enableSubmodules: data.enableSubmodules ?? false,
 			});
 		}
-	}, [form.reset, data?.composeId, form]);
+	}, [form.reset, data, form]);
 
 	const onSubmit = async (data: GitlabProvider) => {
 		await mutateAsync({
@@ -280,7 +280,7 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 														{repositories?.map((repo) => {
 															return (
 																<CommandItem
-																	value={repo.url}
+																	value={repo.name}
 																	key={repo.url}
 																	onSelect={() => {
 																		form.setValue("repository", {
@@ -301,8 +301,7 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 																	<CheckIcon
 																		className={cn(
 																			"ml-auto h-4 w-4",
-																			repo.url ===
-																				field.value.gitlabPathNamespace
+																			repo.name === field.value.repo
 																				? "opacity-100"
 																				: "opacity-0",
 																		)}

apps/dokploy/components/dashboard/compose/general/generic/show.tsx

@@ -18,8 +18,6 @@ import { SaveGitProviderCompose } from "./save-git-provider-compose";
 import { SaveGiteaProviderCompose } from "./save-gitea-provider-compose";
 import { SaveGithubProviderCompose } from "./save-github-provider-compose";
 import { SaveGitlabProviderCompose } from "./save-gitlab-provider-compose";
-import { UnauthorizedGitProvider } from "@/components/dashboard/application/general/generic/unauthorized-git-provider";
-import { toast } from "sonner";
 
 type TabState = "github" | "git" | "raw" | "gitlab" | "bitbucket" | "gitea";
 interface Props {
@@ -36,29 +34,12 @@ export const ShowProviderFormCompose = ({ composeId }: Props) => {
 	const { data: giteaProviders, isLoading: isLoadingGitea } =
 		api.gitea.giteaProviders.useQuery();
 
-	const { mutateAsync: disconnectGitProvider } =
-		api.compose.disconnectGitProvider.useMutation();
-
-	const { data: compose, refetch } = api.compose.one.useQuery({ composeId });
+	const { data: compose } = api.compose.one.useQuery({ composeId });
 	const [tab, setSab] = useState<TabState>(compose?.sourceType || "github");
 
 	const isLoading =
 		isLoadingGithub || isLoadingGitlab || isLoadingBitbucket || isLoadingGitea;
 
-	const handleDisconnect = async () => {
-		try {
-			await disconnectGitProvider({ composeId });
-			toast.success("Repository disconnected successfully");
-			await refetch();
-		} catch (error) {
-			toast.error(
-				`Failed to disconnect repository: ${
-					error instanceof Error ? error.message : "Unknown error"
-				}`,
-			);
-		}
-	};
-
 	if (isLoading) {
 		return (
 			<Card className="group relative w-full bg-transparent">
@@ -87,37 +68,6 @@ export const ShowProviderFormCompose = ({ composeId }: Props) => {
 		);
 	}
 
-	// Check if user doesn't have access to the current git provider
-	if (
-		compose &&
-		!compose.hasGitProviderAccess &&
-		compose.sourceType !== "raw"
-	) {
-		return (
-			<Card className="group relative w-full bg-transparent">
-				<CardHeader>
-					<CardTitle className="flex items-start justify-between">
-						<div className="flex flex-col gap-2">
-							<span className="flex flex-col space-y-0.5">Provider</span>
-							<p className="flex items-center text-sm font-normal text-muted-foreground">
-								Repository connection through unauthorized provider
-							</p>
-						</div>
-						<div className="hidden space-y-1 text-sm font-normal md:block">
-							<GitBranch className="size-6 text-muted-foreground" />
-						</div>
-					</CardTitle>
-				</CardHeader>
-				<CardContent>
-					<UnauthorizedGitProvider
-						service={compose}
-						onDisconnect={handleDisconnect}
-					/>
-				</CardContent>
-			</Card>
-		);
-	}
-
 	return (
 		<Card className="group relative w-full bg-transparent">
 			<CardHeader>
@@ -142,8 +92,8 @@ export const ShowProviderFormCompose = ({ composeId }: Props) => {
 						setSab(e as TabState);
 					}}
 				>
-					<div className="flex flex-row items-center justify-between w-full overflow-auto">
-						<TabsList className="flex gap-4 justify-start bg-transparent">
+					<div className="flex flex-row items-center justify-between w-full gap-4">
+						<TabsList className="md:grid md:w-fit md:grid-cols-6 max-md:overflow-x-scroll justify-start bg-transparent overflow-y-hidden">
 							<TabsTrigger
 								value="github"
 								className="rounded-none border-b-2 gap-2 border-b-transparent data-[state=active]:border-b-2 data-[state=active]:border-b-border"

apps/dokploy/components/dashboard/compose/general/isolated-deployment.tsx

@@ -71,8 +71,8 @@ export const IsolatedDeployment = ({ composeId }: Props) => {
 			isolatedDeployment: formData?.isolatedDeployment || false,
 		})
 			.then(async (_data) => {
-				await randomizeCompose();
-				await refetch();
+				randomizeCompose();
+				refetch();
 				toast.success("Compose updated");
 			})
 			.catch(() => {
@@ -84,10 +84,15 @@ export const IsolatedDeployment = ({ composeId }: Props) => {
 		await mutateAsync({
 			composeId,
 			suffix: data?.appName || "",
-		}).then(async (data) => {
-			await utils.project.all.invalidate();
-			setCompose(data);
-		});
+		})
+			.then(async (data) => {
+				await utils.project.all.invalidate();
+				setCompose(data);
+				toast.success("Compose Isolated");
+			})
+			.catch(() => {
+				toast.error("Error isolating the compose");
+			});
 	};
 
 	return (

apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx

@@ -77,8 +77,8 @@ export const RandomizeCompose = ({ composeId }: Props) => {
 			randomize: formData?.randomize || false,
 		})
 			.then(async (_data) => {
-				await randomizeCompose();
-				await refetch();
+				randomizeCompose();
+				refetch();
 				toast.success("Compose updated");
 			})
 			.catch(() => {
@@ -90,10 +90,15 @@ export const RandomizeCompose = ({ composeId }: Props) => {
 		await mutateAsync({
 			composeId,
 			suffix,
-		}).then(async (data) => {
-			await utils.project.all.invalidate();
-			setCompose(data);
-		});
+		})
+			.then(async (data) => {
+				await utils.project.all.invalidate();
+				setCompose(data);
+				toast.success("Compose randomized");
+			})
+			.catch(() => {
+				toast.error("Error randomizing the compose");
+			});
 	};
 
 	return (

apps/dokploy/components/dashboard/compose/general/show-converted-compose.tsx

@@ -40,7 +40,7 @@ export const ShowConvertedCompose = ({ composeId }: Props) => {
 				.then(() => {
 					refetch();
 				})
-				.catch(() => {});
+				.catch((_err) => {});
 		}
 	}, [isOpen]);
 
@@ -52,7 +52,7 @@ export const ShowConvertedCompose = ({ composeId }: Props) => {
 					Preview Compose
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-6xl max-h-[50rem]">
+			<DialogContent className="sm:max-w-6xl max-h-[50rem] overflow-y-auto">
 				<DialogHeader>
 					<DialogTitle>Converted Compose</DialogTitle>
 					<DialogDescription>

apps/dokploy/components/dashboard/compose/general/show-utilities.tsx

@@ -23,7 +23,7 @@ export const ShowUtilities = ({ composeId }: Props) => {
 			<DialogTrigger asChild>
 				<Button variant="ghost">Show Utilities</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-5xl">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-5xl">
 				<DialogHeader>
 					<DialogTitle>Utilities </DialogTitle>
 					<DialogDescription>Modify the application data</DialogDescription>

apps/dokploy/components/dashboard/compose/update-compose.tsx

@@ -99,7 +99,7 @@ export const UpdateCompose = ({ composeId }: Props) => {
 					<PenBoxIcon className="size-3.5  text-primary group-hover:text-blue-500" />
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Modify Compose</DialogTitle>
 					<DialogDescription>Update the compose data</DialogDescription>

apps/dokploy/components/dashboard/database/backups/handle-backup.tsx

@@ -329,7 +329,7 @@ export const HandleBackup = ({
 					</Button>
 				)}
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-2xl">
+			<DialogContent className="sm:max-w-2xl max-h-screen overflow-y-auto">
 				<DialogHeader>
 					<DialogTitle>
 						{backupId ? "Update Backup" : "Create Backup"}

apps/dokploy/components/dashboard/database/backups/restore-backup.tsx

@@ -39,12 +39,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -54,9 +48,9 @@ import {
 	CheckIcon,
 	ChevronsUpDown,
 	Copy,
-	DatabaseZap,
-	RefreshCw,
 	RotateCcw,
+	RefreshCw,
+	DatabaseZap,
 } from "lucide-react";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
@@ -64,6 +58,12 @@ import { toast } from "sonner";
 import { z } from "zod";
 import type { ServiceType } from "../../application/advanced/show-resources";
 import { type LogLine, parseLogs } from "../../docker/logs/utils";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipProvider,
+	TooltipTrigger,
+} from "@/components/ui/tooltip";
 
 type DatabaseType =
 	| Exclude<ServiceType, "application" | "redis">
@@ -199,7 +199,7 @@ const RestoreBackupSchema = z
 		}
 	});
 
-export const formatBytes = (bytes: number): string => {
+const formatBytes = (bytes: number): string => {
 	if (bytes === 0) return "0 Bytes";
 	const k = 1024;
 	const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
@@ -324,7 +324,7 @@ export const RestoreBackup = ({
 					Restore Backup
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle className="flex items-center">
 						<RotateCcw className="mr-2 size-4" />
@@ -415,7 +415,7 @@ export const RestoreBackup = ({
 									<FormLabel className="flex items-center justify-between">
 										Search Backup Files
 										{field.value && (
-											<Badge variant="outline" className="truncate">
+											<Badge variant="outline">
 												{field.value}
 												<Copy
 													className="ml-2 size-4 cursor-pointer"
@@ -439,9 +439,7 @@ export const RestoreBackup = ({
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													<span className="truncate text-left flex-1 w-52">
-														{field.value || "Search and select a backup file"}
-													</span>
+													{field.value || "Search and select a backup file"}
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
 											</FormControl>

apps/dokploy/components/dashboard/database/backups/show-backups.tsx

@@ -1,10 +1,3 @@
-import {
-	MariadbIcon,
-	MongodbIcon,
-	MysqlIcon,
-	PostgresqlIcon,
-} from "@/components/icons/data-tools-icons";
-import { AlertBlock } from "@/components/shared/alert-block";
 import { DialogAction } from "@/components/shared/dialog-action";
 import { Button } from "@/components/ui/button";
 import {
@@ -20,7 +13,6 @@ import {
 	TooltipProvider,
 	TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import {
 	ClipboardList,
@@ -33,9 +25,17 @@ import Link from "next/link";
 import { useState } from "react";
 import { toast } from "sonner";
 import type { ServiceType } from "../../application/advanced/show-resources";
-import { ShowDeploymentsModal } from "../../application/deployments/show-deployments-modal";
-import { HandleBackup } from "./handle-backup";
 import { RestoreBackup } from "./restore-backup";
+import { HandleBackup } from "./handle-backup";
+import { cn } from "@/lib/utils";
+import {
+	MariadbIcon,
+	MongodbIcon,
+	MysqlIcon,
+	PostgresqlIcon,
+} from "@/components/icons/data-tools-icons";
+import { AlertBlock } from "@/components/shared/alert-block";
+import { ShowDeploymentsModal } from "../../application/deployments/show-deployments-modal";
 
 interface Props {
 	id: string;

apps/dokploy/components/dashboard/docker/config/show-container-config.tsx

@@ -42,7 +42,7 @@ export const ShowContainerConfig = ({ containerId, serverId }: Props) => {
 						See in detail the config of this container
 					</DialogDescription>
 				</DialogHeader>
-				<div className="text-wrap rounded-lg border p-4 overflow-y-auto text-sm bg-card max-h-[80vh]">
+				<div className="text-wrap rounded-lg border p-4 text-sm bg-card overflow-y-auto max-h-[80vh]">
 					<code>
 						<pre className="whitespace-pre-wrap break-words">
 							<CodeEditor

apps/dokploy/components/dashboard/docker/logs/show-docker-modal-logs.tsx

@@ -40,7 +40,7 @@ export const ShowDockerModalLogs = ({
 					{children}
 				</DropdownMenuItem>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-7xl">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-7xl">
 				<DialogHeader>
 					<DialogTitle>View Logs</DialogTitle>
 					<DialogDescription>View the logs for {containerId}</DialogDescription>

apps/dokploy/components/dashboard/docker/logs/show-docker-modal-stack-logs.tsx

@@ -40,7 +40,7 @@ export const ShowDockerModalStackLogs = ({
 					{children}
 				</DropdownMenuItem>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-7xl">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-7xl">
 				<DialogHeader>
 					<DialogTitle>View Logs</DialogTitle>
 					<DialogDescription>View the logs for {containerId}</DialogDescription>

apps/dokploy/components/dashboard/docker/terminal/docker-terminal-modal.tsx

@@ -60,7 +60,7 @@ export const DockerTerminalModal = ({
 				</DropdownMenuItem>
 			</DialogTrigger>
 			<DialogContent
-				className="sm:max-w-7xl"
+				className="max-h-screen  overflow-y-auto sm:max-w-7xl"
 				onEscapeKeyDown={(event) => event.preventDefault()}
 			>
 				<DialogHeader>

apps/dokploy/components/dashboard/impersonation/impersonation-bar.tsx

@@ -1,9 +1,24 @@
 "use client";
 
-import { Logo } from "@/components/shared/logo";
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
-import { Badge } from "@/components/ui/badge";
+import { authClient } from "@/lib/auth-client";
+import { useEffect, useState } from "react";
 import { Button } from "@/components/ui/button";
+import {
+	CheckIcon,
+	ChevronsUpDown,
+	Settings2,
+	UserIcon,
+	XIcon,
+	Shield,
+	Calendar,
+	Key,
+	Copy,
+	Fingerprint,
+	Building2,
+	CreditCard,
+	Server,
+} from "lucide-react";
+import { toast } from "sonner";
 import {
 	Command,
 	CommandEmpty,
@@ -17,34 +32,19 @@ import {
 	PopoverContent,
 	PopoverTrigger,
 } from "@/components/ui/popover";
+import { cn } from "@/lib/utils";
+import { Logo } from "@/components/shared/logo";
+import { Badge } from "@/components/ui/badge";
 import {
 	Tooltip,
 	TooltipContent,
-	TooltipProvider,
 	TooltipTrigger,
+	TooltipProvider,
 } from "@/components/ui/tooltip";
-import { authClient } from "@/lib/auth-client";
-import { cn } from "@/lib/utils";
-import { api } from "@/utils/api";
-import copy from "copy-to-clipboard";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { format } from "date-fns";
-import {
-	Building2,
-	Calendar,
-	CheckIcon,
-	ChevronsUpDown,
-	Copy,
-	CreditCard,
-	Fingerprint,
-	Key,
-	Server,
-	Settings2,
-	Shield,
-	UserIcon,
-	XIcon,
-} from "lucide-react";
-import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import copy from "copy-to-clipboard";
+import { api } from "@/utils/api";
 
 type User = typeof authClient.$Infer.Session.user;
 

apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx

@@ -97,7 +97,7 @@ export const UpdateMariadb = ({ mariadbId }: Props) => {
 					<PenBoxIcon className="size-3.5  text-primary group-hover:text-blue-500" />
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Modify MariaDB</DialogTitle>
 					<DialogDescription>Update the MariaDB data</DialogDescription>

apps/dokploy/components/dashboard/mongo/update-mongo.tsx

@@ -99,7 +99,7 @@ export const UpdateMongo = ({ mongoId }: Props) => {
 					<PenBoxIcon className="size-3.5  text-primary group-hover:text-blue-500" />
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Modify MongoDB</DialogTitle>
 					<DialogDescription>Update the MongoDB data</DialogDescription>

apps/dokploy/components/dashboard/monitoring/paid/container/show-paid-container-monitoring.tsx

@@ -123,7 +123,7 @@ export const ContainerPaidMonitoring = ({ appName, baseUrl, token }: Props) => {
 							? queryError.message
 							: "Failed to fetch metrics, Please check your monitoring Instance is Configured correctly."}
 					</p>
-					<p className="text-sm text-muted-foreground">URL: {baseUrl}</p>
+					<p className=" text-sm text-muted-foreground">URL: {baseUrl}</p>
 				</div>
 			</div>
 		);

apps/dokploy/components/dashboard/monitoring/paid/servers/show-paid-monitoring.tsx

@@ -143,7 +143,7 @@ export const ShowPaidMonitoring = ({
 							? queryError.message
 							: "Failed to fetch metrics, Please check your monitoring Instance is Configured correctly."}
 					</p>
-					<p className="text-sm text-muted-foreground">URL: {BASE_URL}</p>
+					<p className=" text-sm text-muted-foreground">URL: {BASE_URL}</p>
 				</div>
 			</div>
 		);

apps/dokploy/components/dashboard/mysql/update-mysql.tsx

@@ -97,7 +97,7 @@ export const UpdateMysql = ({ mysqlId }: Props) => {
 					<PenBoxIcon className="size-3.5  text-primary group-hover:text-blue-500" />
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Modify MySQL</DialogTitle>
 					<DialogDescription>Update the MySQL data</DialogDescription>

apps/dokploy/components/dashboard/organization/handle-organization.tsx

@@ -155,7 +155,7 @@ export function AddOrganization({ organizationId }: Props) {
 							control={form.control}
 							name="logo"
 							render={({ field }) => (
-								<FormItem className="gap-4">
+								<FormItem className=" gap-4">
 									<FormLabel className="text-right">Logo URL</FormLabel>
 									<FormControl>
 										<Input
@@ -169,7 +169,7 @@ export function AddOrganization({ organizationId }: Props) {
 								</FormItem>
 							)}
 						/>
-						<DialogFooter>
+						<DialogFooter className="mt-4">
 							<Button type="submit" isLoading={isLoading}>
 								{organizationId ? "Update organization" : "Create organization"}
 							</Button>

apps/dokploy/components/dashboard/postgres/update-postgres.tsx

@@ -99,7 +99,7 @@ export const UpdatePostgres = ({ postgresId }: Props) => {
 					<PenBox className="size-3.5 text-primary group-hover:text-blue-500" />
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Modify Postgres</DialogTitle>
 					<DialogDescription>Update the Postgres data</DialogDescription>

apps/dokploy/components/dashboard/project/add-application.tsx

@@ -103,7 +103,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 					projectId,
 				});
 			})
-			.catch(() => {
+			.catch((_e) => {
 				toast.error("Error creating the service");
 			});
 	};
@@ -119,7 +119,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 					<span>Application</span>
 				</DropdownMenuItem>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Create</DialogTitle>
 					<DialogDescription>

apps/dokploy/components/dashboard/project/add-compose.tsx

@@ -124,7 +124,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 					<span>Compose</span>
 				</DropdownMenuItem>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-xl">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-xl">
 				<DialogHeader>
 					<DialogTitle>Create Compose</DialogTitle>
 					<DialogDescription>

apps/dokploy/components/dashboard/project/add-database.tsx

@@ -283,7 +283,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 					<span>Database</span>
 				</DropdownMenuItem>
 			</DialogTrigger>
-			<DialogContent className="md:max-h-[90vh]  sm:max-w-2xl">
+			<DialogContent className="max-h-screen md:max-h-[90vh]  overflow-y-auto sm:max-w-2xl">
 				<DialogHeader>
 					<DialogTitle>Databases</DialogTitle>
 				</DialogHeader>

apps/dokploy/components/dashboard/project/add-template.tsx

@@ -148,7 +148,7 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 					<span>Template</span>
 				</DropdownMenuItem>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-[90vw] p-0">
+			<DialogContent className="max-h-screen sm:max-w-[90vw] p-0">
 				<DialogHeader className="sticky top-0 z-10 bg-background p-6 border-b">
 					<div className="flex flex-col space-y-6">
 						<div className="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-6">

apps/dokploy/components/dashboard/project/ai/step-two.tsx

@@ -259,7 +259,7 @@ export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
 									<AccordionItem value="description">
 										<AccordionTrigger>Description</AccordionTrigger>
 										<AccordionContent>
-											<ScrollArea className="w-full rounded-md border p-4">
+											<ScrollArea className=" w-full rounded-md border p-4">
 												<ReactMarkdown className="text-muted-foreground text-sm">
 													{selectedVariant?.description}
 												</ReactMarkdown>
@@ -289,7 +289,7 @@ export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
 									<AccordionItem value="env-variables">
 										<AccordionTrigger>Environment Variables</AccordionTrigger>
 										<AccordionContent>
-											<ScrollArea className="w-full rounded-md border">
+											<ScrollArea className=" w-full rounded-md border">
 												<div className="p-4 space-y-4">
 													{selectedVariant?.envVariables.map((env, index) => (
 														<div
@@ -364,7 +364,7 @@ export const StepTwo = ({ templateInfo, setTemplateInfo }: StepProps) => {
 									<AccordionItem value="domains">
 										<AccordionTrigger>Domains</AccordionTrigger>
 										<AccordionContent>
-											<ScrollArea className="w-full rounded-md border">
+											<ScrollArea className=" w-full rounded-md border">
 												<div className="p-4 space-y-4">
 													{selectedVariant?.domains.map((domain, index) => (
 														<div

apps/dokploy/components/dashboard/project/ai/template-generator.tsx

@@ -158,7 +158,7 @@ export const TemplateGenerator = ({ projectId }: Props) => {
 					<span>AI Assistant</span>
 				</DropdownMenuItem>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-4xl w-full  flex flex-col">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-4xl w-full  flex flex-col">
 				<DialogHeader>
 					<DialogTitle>AI Assistant</DialogTitle>
 					<DialogDescription>

apps/dokploy/components/dashboard/project/duplicate-project.tsx

@@ -10,7 +10,6 @@ import {
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
-import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { api } from "@/utils/api";
 import { Copy, Loader2 } from "lucide-react";
 import { useRouter } from "next/router";
@@ -49,7 +48,6 @@ export const DuplicateProject = ({
 	const [open, setOpen] = useState(false);
 	const [name, setName] = useState("");
 	const [description, setDescription] = useState("");
-	const [duplicateType, setDuplicateType] = useState("new-project"); // "new-project" or "same-project"
 	const utils = api.useUtils();
 	const router = useRouter();
 
@@ -61,15 +59,9 @@ export const DuplicateProject = ({
 		api.project.duplicate.useMutation({
 			onSuccess: async (newProject) => {
 				await utils.project.all.invalidate();
-				toast.success(
-					duplicateType === "new-project"
-						? "Project duplicated successfully"
-						: "Services duplicated successfully",
-				);
+				toast.success("Project duplicated successfully");
 				setOpen(false);
-				if (duplicateType === "new-project") {
-					router.push(`/dashboard/project/${newProject.projectId}`);
-				}
+				router.push(`/dashboard/project/${newProject.projectId}`);
 			},
 			onError: (error) => {
 				toast.error(error.message);
@@ -77,7 +69,7 @@ export const DuplicateProject = ({
 		});
 
 	const handleDuplicate = async () => {
-		if (duplicateType === "new-project" && !name) {
+		if (!name) {
 			toast.error("Project name is required");
 			return;
 		}
@@ -91,7 +83,6 @@ export const DuplicateProject = ({
 				id: service.id,
 				type: service.type,
 			})),
-			duplicateInSameProject: duplicateType === "same-project",
 		});
 	};
 
@@ -104,7 +95,6 @@ export const DuplicateProject = ({
 					// Reset form when closing
 					setName("");
 					setDescription("");
-					setDuplicateType("new-project");
 				}
 			}}
 		>
@@ -116,54 +106,32 @@ export const DuplicateProject = ({
 			</DialogTrigger>
 			<DialogContent>
 				<DialogHeader>
-					<DialogTitle>Duplicate Services</DialogTitle>
+					<DialogTitle>Duplicate Project</DialogTitle>
 					<DialogDescription>
-						Choose where to duplicate the selected services
+						Create a new project with the selected services
 					</DialogDescription>
 				</DialogHeader>
 
 				<div className="grid gap-4 py-4">
 					<div className="grid gap-2">
-						<Label>Duplicate to</Label>
-						<RadioGroup
-							value={duplicateType}
-							onValueChange={setDuplicateType}
-							className="grid gap-2"
-						>
-							<div className="flex items-center space-x-2">
-								<RadioGroupItem value="new-project" id="new-project" />
-								<Label htmlFor="new-project">New project</Label>
-							</div>
-							<div className="flex items-center space-x-2">
-								<RadioGroupItem value="same-project" id="same-project" />
-								<Label htmlFor="same-project">Same project</Label>
-							</div>
-						</RadioGroup>
+						<Label htmlFor="name">Name</Label>
+						<Input
+							id="name"
+							value={name}
+							onChange={(e) => setName(e.target.value)}
+							placeholder="New project name"
+						/>
 					</div>
 
-					{duplicateType === "new-project" && (
-						<>
-							<div className="grid gap-2">
-								<Label htmlFor="name">Name</Label>
-								<Input
-									id="name"
-									value={name}
-									onChange={(e) => setName(e.target.value)}
-									placeholder="New project name"
-								/>
-							</div>
-
-							<div className="grid gap-2">
-								<Label htmlFor="description">Description</Label>
-								<Input
-									id="description"
-									value={description}
-									onChange={(e) => setDescription(e.target.value)}
-									placeholder="Project description (optional)"
-								/>
-							</div>
-						</>
-					)}
+					<div className="grid gap-2">
+						<Label htmlFor="description">Description</Label>
+						<Input
+							id="description"
+							value={description}
+							onChange={(e) => setDescription(e.target.value)}
+							placeholder="Project description (optional)"
+						/>
+					</div>
 
 					<div className="grid gap-2">
 						<Label>Selected services to duplicate</Label>
@@ -191,14 +159,10 @@ export const DuplicateProject = ({
 						{isLoading ? (
 							<>
 								<Loader2 className="mr-2 h-4 w-4 animate-spin" />
-								{duplicateType === "new-project"
-									? "Duplicating project..."
-									: "Duplicating services..."}
+								Duplicating...
 							</>
-						) : duplicateType === "new-project" ? (
-							"Duplicate project"
 						) : (
-							"Duplicate services"
+							"Duplicate"
 						)}
 					</Button>
 				</DialogFooter>

apps/dokploy/components/dashboard/projects/handle-project.tsx

@@ -38,7 +38,7 @@ const AddProjectSchema = z.object({
 			(name) => {
 				const trimmedName = name.trim();
 				const validNameRegex =
-					/^[\p{L}\p{N}_-][\p{L}\p{N}\s_.-]*[\p{L}\p{N}_-]$/u;
+					/^[\p{L}\p{N}_-][\p{L}\p{N}\s_-]*[\p{L}\p{N}_-]$/u;
 				return validNameRegex.test(trimmedName);
 			},
 			{

apps/dokploy/components/dashboard/projects/project-environment.tsx

@@ -94,7 +94,7 @@ export const ProjectEnvironment = ({ projectId, children }: Props) => {
 					</DropdownMenuItem>
 				)}
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-6xl">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-6xl">
 				<DialogHeader>
 					<DialogTitle>Project Environment</DialogTitle>
 					<DialogDescription>

apps/dokploy/components/dashboard/redis/update-redis.tsx

@@ -97,7 +97,7 @@ export const UpdateRedis = ({ redisId }: Props) => {
 					<PenBoxIcon className="size-3.5  text-primary group-hover:text-blue-500" />
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Modify Redis</DialogTitle>
 					<DialogDescription>Update the redis data</DialogDescription>

apps/dokploy/components/dashboard/requests/columns.tsx

@@ -47,7 +47,7 @@ export const columns: ColumnDef<LogEntry>[] = [
 		cell: ({ row }) => {
 			const log = row.original;
 			return (
-				<div className="flex flex-col gap-2">
+				<div className=" flex flex-col gap-2">
 					<div className="flex items-center flex-row gap-3 ">
 						{log.RequestMethod}{" "}
 						<div className="inline-flex items-center gap-2 bg-muted px-1.5 py-1 rounded-lg">
@@ -86,7 +86,7 @@ export const columns: ColumnDef<LogEntry>[] = [
 		cell: ({ row }) => {
 			const log = row.original;
 			return (
-				<div className="flex flex-col gap-2">
+				<div className=" flex flex-col gap-2">
 					<div className="flex flex-row gap-3 w-full">
 						{format(new Date(log.StartUTC), "yyyy-MM-dd HH:mm:ss")}
 					</div>

apps/dokploy/components/dashboard/settings/api/add-api-key.tsx

@@ -142,7 +142,7 @@ export const AddApiKey = () => {
 				<DialogTrigger asChild>
 					<Button>Generate New Key</Button>
 				</DialogTrigger>
-				<DialogContent className="sm:max-w-xl max-h-[90vh]">
+				<DialogContent className="sm:max-w-xl max-h-[90vh] overflow-y-auto">
 					<DialogHeader>
 						<DialogTitle>Generate API Key</DialogTitle>
 						<DialogDescription>

apps/dokploy/components/dashboard/settings/billing/show-billing.tsx

@@ -171,7 +171,7 @@ export const ShowBilling = () => {
 													)}
 													{isAnnual ? (
 														<div className="flex flex-row gap-2 items-center">
-															<p className="text-2xl font-semibold tracking-tight text-primary ">
+															<p className=" text-2xl font-semibold tracking-tight text-primary ">
 																${" "}
 																{calculatePrice(
 																	serverQuantity,
@@ -180,7 +180,7 @@ export const ShowBilling = () => {
 																USD
 															</p>
 															|
-															<p className="text-base font-semibold tracking-tight text-muted-foreground">
+															<p className=" text-base font-semibold tracking-tight text-muted-foreground">
 																${" "}
 																{(
 																	calculatePrice(serverQuantity, isAnnual) / 12
@@ -189,7 +189,7 @@ export const ShowBilling = () => {
 															</p>
 														</div>
 													) : (
-														<p className="text-2xl font-semibold tracking-tight text-primary ">
+														<p className=" text-2xl font-semibold tracking-tight text-primary ">
 															${" "}
 															{calculatePrice(serverQuantity, isAnnual).toFixed(
 																2,

apps/dokploy/components/dashboard/settings/billing/show-welcome-dokploy.tsx

@@ -41,7 +41,7 @@ export const ShowWelcomeDokploy = () => {
 	return (
 		<>
 			<Dialog open={open} onOpenChange={handleClose}>
-				<DialogContent className="sm:max-w-xl">
+				<DialogContent className="sm:max-w-xl max-h-screen overflow-y-auto">
 					<DialogHeader>
 						<DialogTitle className="text-2xl font-semibold text-center">
 							Welcome to Dokploy Cloud 🎉

apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx

@@ -106,7 +106,7 @@ export const AddCertificate = () => {
 					Add Certificate
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-2xl">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-2xl">
 				<DialogHeader>
 					<DialogTitle>Add New Certificate</DialogTitle>
 					<DialogDescription>
@@ -222,7 +222,7 @@ export const AddCertificate = () => {
 						/>
 					</form>
 
-					<DialogFooter className="flex w-full flex-row !justify-end">
+					<DialogFooter className="flex w-full flex-row !justify-end pt-3">
 						<Button
 							isLoading={isLoading}
 							form="hook-form-add-certificate"

apps/dokploy/components/dashboard/settings/certificates/utils.ts

@@ -1,93 +1,80 @@
-// @ts-nocheck
-
 export const extractExpirationDate = (certData: string): Date | null => {
 	try {
-		// Decode PEM base64 to DER binary
-		const b64 = certData.replace(/-----[^-]+-----/g, "").replace(/\s+/g, "");
-		const binStr = atob(b64);
-		const der = new Uint8Array(binStr.length);
-		for (let i = 0; i < binStr.length; i++) {
-			der[i] = binStr.charCodeAt(i);
+		const match = certData.match(
+			/-----BEGIN CERTIFICATE-----\s*([^-]+)\s*-----END CERTIFICATE-----/,
+		);
+		if (!match?.[1]) return null;
+
+		const base64Cert = match[1].replace(/\s/g, "");
+		const binaryStr = window.atob(base64Cert);
+		const bytes = new Uint8Array(binaryStr.length);
+
+		for (let i = 0; i < binaryStr.length; i++) {
+			bytes[i] = binaryStr.charCodeAt(i);
 		}
 
-		let offset = 0;
+		// ASN.1 tag for UTCTime is 0x17, GeneralizedTime is 0x18
+		// We need to find the second occurrence of either tag as it's the "not after" (expiration) date
+		let dateFound = false;
+		for (let i = 0; i < bytes.length - 2; i++) {
+			// Look for sequence containing validity period (0x30)
+			if (bytes[i] === 0x30) {
+				// Check next bytes for UTCTime or GeneralizedTime
+				let j = i + 1;
+				while (j < bytes.length - 2) {
+					if (bytes[j] === 0x17 || bytes[j] === 0x18) {
+						const dateType = bytes[j];
+						const dateLength = bytes[j + 1];
+						if (typeof dateLength === "undefined") break;
 
-		// Helper: read ASN.1 length field
-		function readLength(pos: number): { length: number; offset: number } {
-			// biome-ignore lint/style/noParameterAssign: <explanation>
-			let len = der[pos++];
-			if (len & 0x80) {
-				const bytes = len & 0x7f;
-				len = 0;
-				for (let i = 0; i < bytes; i++) {
-					// biome-ignore lint/style/noParameterAssign: <explanation>
-					len = (len << 8) + der[pos++];
+						if (!dateFound) {
+							// Skip "not before" date
+							dateFound = true;
+							j += dateLength + 2;
+							continue;
+						}
+
+						// Found "not after" date
+						let dateStr = "";
+						for (let k = 0; k < dateLength; k++) {
+							const charCode = bytes[j + 2 + k];
+							if (typeof charCode === "undefined") continue;
+							dateStr += String.fromCharCode(charCode);
+						}
+
+						if (dateType === 0x17) {
+							// UTCTime (YYMMDDhhmmssZ)
+							const year = Number.parseInt(dateStr.slice(0, 2));
+							const fullYear = year >= 50 ? 1900 + year : 2000 + year;
+							return new Date(
+								Date.UTC(
+									fullYear,
+									Number.parseInt(dateStr.slice(2, 4)) - 1,
+									Number.parseInt(dateStr.slice(4, 6)),
+									Number.parseInt(dateStr.slice(6, 8)),
+									Number.parseInt(dateStr.slice(8, 10)),
+									Number.parseInt(dateStr.slice(10, 12)),
+								),
+							);
+						}
+
+						// GeneralizedTime (YYYYMMDDhhmmssZ)
+						return new Date(
+							Date.UTC(
+								Number.parseInt(dateStr.slice(0, 4)),
+								Number.parseInt(dateStr.slice(4, 6)) - 1,
+								Number.parseInt(dateStr.slice(6, 8)),
+								Number.parseInt(dateStr.slice(8, 10)),
+								Number.parseInt(dateStr.slice(10, 12)),
+								Number.parseInt(dateStr.slice(12, 14)),
+							),
+						);
+					}
+					j++;
 				}
 			}
-			return { length: len, offset: pos };
 		}
-
-		// Skip the outer certificate sequence
-		if (der[offset++] !== 0x30) throw new Error("Expected sequence");
-		({ offset } = readLength(offset));
-
-		// Skip tbsCertificate sequence
-		if (der[offset++] !== 0x30) throw new Error("Expected tbsCertificate");
-		({ offset } = readLength(offset));
-
-		// Check for optional version field (context-specific tag [0])
-		if (der[offset] === 0xa0) {
-			offset++;
-			const versionLen = readLength(offset);
-			offset = versionLen.offset + versionLen.length;
-		}
-
-		// Skip serialNumber, signature, issuer
-		for (let i = 0; i < 3; i++) {
-			if (der[offset] !== 0x30 && der[offset] !== 0x02)
-				throw new Error("Unexpected structure");
-			offset++;
-			const fieldLen = readLength(offset);
-			offset = fieldLen.offset + fieldLen.length;
-		}
-
-		// Validity sequence (notBefore and notAfter)
-		if (der[offset++] !== 0x30) throw new Error("Expected validity sequence");
-		const validityLen = readLength(offset);
-		offset = validityLen.offset;
-
-		// notBefore
-		offset++;
-		const notBeforeLen = readLength(offset);
-		offset = notBeforeLen.offset + notBeforeLen.length;
-
-		// notAfter
-		offset++;
-		const notAfterLen = readLength(offset);
-		const notAfterStr = new TextDecoder().decode(
-			der.slice(notAfterLen.offset, notAfterLen.offset + notAfterLen.length),
-		);
-
-		// Parse GeneralizedTime (15 chars) or UTCTime (13 chars)
-		function parseTime(str: string): Date {
-			if (str.length === 13) {
-				// UTCTime YYMMDDhhmmssZ
-				const year = Number.parseInt(str.slice(0, 2), 10);
-				const fullYear = year < 50 ? 2000 + year : 1900 + year;
-				return new Date(
-					`${fullYear}-${str.slice(2, 4)}-${str.slice(4, 6)}T${str.slice(6, 8)}:${str.slice(8, 10)}:${str.slice(10, 12)}Z`,
-				);
-			}
-			if (str.length === 15) {
-				// GeneralizedTime YYYYMMDDhhmmssZ
-				return new Date(
-					`${str.slice(0, 4)}-${str.slice(4, 6)}-${str.slice(6, 8)}T${str.slice(8, 10)}:${str.slice(10, 12)}:${str.slice(12, 14)}Z`,
-				);
-			}
-			throw new Error("Invalid ASN.1 time format");
-		}
-
-		return parseTime(notAfterStr);
+		return null;
 	} catch (error) {
 		console.error("Error parsing certificate:", error);
 		return null;

apps/dokploy/components/dashboard/settings/cluster/nodes/add-node.tsx

@@ -27,7 +27,7 @@ export const AddNode = ({ serverId }: Props) => {
 					Add Node
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:max-w-4xl">
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-4xl">
 				<DialogHeader>
 					<DialogTitle>Add Node</DialogTitle>
 					<DialogDescription className="flex flex-col gap-2">

apps/dokploy/components/dashboard/settings/cluster/nodes/show-node-data.tsx

@@ -24,7 +24,7 @@ export const ShowNodeData = ({ data }: Props) => {
 					View Config
 				</DropdownMenuItem>
 			</DialogTrigger>
-			<DialogContent className={"sm:max-w-5xl"}>
+			<DialogContent className={"sm:max-w-5xl overflow-y-auto max-h-screen"}>
 				<DialogHeader>
 					<DialogTitle>Node Config</DialogTitle>
 					<DialogDescription>