Merge branch 'canary' into feat/add-concurrent-builds

- Introduced tests for the GroupedQueue class, covering basic functionality, concurrency handling, and job processing across multiple groups.
- Added tests for the QueueManager class, ensuring correct queue creation, job management, and handler functionality.
- Implemented tests for concurrency changes and their effects on pending tasks, enhancing overall test coverage for the queue system.
- Created a new ChangeConcurrencyModal component for adjusting deployment concurrency settings in the UI.

.github/pull_request_template.md

@@ -8,7 +8,7 @@ Before submitting this PR, please make sure that:
 
 - [ ] You created a dedicated branch based on the `canary` branch.
 - [ ] You have read the suggestions in the CONTRIBUTING.md file https://github.com/Dokploy/dokploy/blob/canary/CONTRIBUTING.md#pull-request
-- [ ] You have tested this PR in your local instance. If you have not tested it yet, please do so before submitting. This helps avoid wasting maintainers' time reviewing code that has not been verified by you.
+- [ ] You have tested this PR in your local instance.
 
 ## Issues related (if applicable)
 

.github/workflows/pull-request.yml

@@ -20,32 +20,6 @@ jobs:
         with:
           node-version: 20.16.0
           cache: "pnpm"
-      
-      - name: Install Nixpacks
-        if: matrix.job == 'test'
-        run:  |
-          export NIXPACKS_VERSION=1.41.0
-          curl -sSL https://nixpacks.com/install.sh | bash
-          echo "Nixpacks installed $NIXPACKS_VERSION"
-
-      - name: Install Railpack
-        if: matrix.job == 'test'
-        run:  |
-          export RAILPACK_VERSION=0.15.4
-          curl -sSL https://railpack.com/install.sh | bash
-          echo "Railpack installed $RAILPACK_VERSION"
-      
-      - name: Add build tools to PATH
-        if: matrix.job == 'test'
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-      
-      - name: Initialize Docker Swarm
-        if: matrix.job == 'test'
-        run: |
-          docker swarm init
-          docker network create --driver overlay dokploy-network || true
-          echo "✅ Docker Swarm initialized"
-      
       - run: pnpm install --frozen-lockfile
       - run: pnpm server:build
       - run: pnpm ${{ matrix.job }}

.github/workflows/sync-openapi-docs.yml

@@ -1,70 +0,0 @@
-name: Generate and Sync OpenAPI
-
-on:
-  push:
-    branches:
-      - canary
-      - main
-    paths:
-      - 'apps/dokploy/server/api/routers/**'
-      - 'packages/server/src/services/**'
-      - 'packages/server/src/db/schema/**'
-
-  workflow_dispatch:
-
-jobs:
-  generate-and-commit:
-    name: Generate OpenAPI and commit to Dokploy repo
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Dokploy repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20.16.0
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Generate OpenAPI specification
-        run: |
-          pnpm generate:openapi
-          
-          # Verifica que se generó correctamente
-          if [ ! -f openapi.json ]; then
-            echo "❌ openapi.json not found"
-            exit 1
-          fi
-          
-          echo "✅ OpenAPI specification generated successfully"
-
-      - name: Sync to website repository
-        run: |
-          # Clona el repositorio de website
-          git clone https://x-access-token:${{ secrets.DOCS_SYNC_TOKEN }}@github.com/dokploy/website.git website-repo
-          
-          cd website-repo
-          
-          # Copia el openapi.json al website (sobrescribe)
-          mkdir -p apps/docs/public
-          cp -f ../openapi.json apps/docs/public/openapi.json
-          
-          # Configura git
-          git config user.name "Dokploy Bot"
-          git config user.email "bot@dokploy.com"
-          
-          # Agrega y commitea siempre
-          git add apps/docs/public/openapi.json
-          git commit -m "chore: sync OpenAPI specification [skip ci]" \
-            -m "Source: ${{ github.repository }}@${{ github.sha }}" \
-            -m "Updated: $(date -u +'%Y-%m-%d %H:%M:%S UTC')" \
-            --allow-empty
-          
-          git push
-          
-          echo "✅ OpenAPI synced to website successfully"
-

.gitignore

@@ -13,8 +13,6 @@ node_modules
 .env.test.local
 .env.production.local
 
-openapi.json
-
 # Testing
 coverage
 
@@ -43,7 +41,4 @@ yarn-error.log*
 *.pem
 
 
-.db
-
-# Development environment
-.devcontainer
+.db

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Hey, thanks for your interest in contributing to Dokploy! We appreciate your help and taking your time to contribute.
 
-Before you start, please first discuss the feature/bug you want to add with the owners and community via github issues.
+Before you start, please first discuss the feature/bug you want to add with the owners and comunity via github issues.
 
 We have a few guidelines to follow when contributing to this project:
 
@@ -11,7 +11,6 @@ We have a few guidelines to follow when contributing to this project:
 - [Development](#development)
 - [Build](#build)
 - [Pull Request](#pull-request)
-- [Important Considerations](#important-considerations-for-pull-requests)
 
 ## Commit Convention
 
@@ -149,7 +148,7 @@ curl -sSL https://railpack.com/install.sh | sh
 
 ```bash
 # Install Buildpacks
-curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.39.1/pack-v0.39.1-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
+curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.35.0/pack-v0.35.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
 ```
 
 ## Pull Request
@@ -163,9 +162,8 @@ curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.39.1/pack-v0.
 - If your pull request fixes an open issue, please reference the issue in the pull request description.
 - Once your pull request is merged, you will be automatically added as a contributor to the project.
 
-### Important Considerations for Pull Requests
+**Important Considerations for Pull Requests:**
 
-- **Testing is Mandatory:** All Pull Requests **must be tested** before submission. You must verify that your changes work as expected in a local development environment (see [Setup](#setup)). **Pull Requests that have not been tested will be closed.** This policy ensures clean contributions and reduces the time maintainers spend reviewing untested or broken code.
 - **Focus and Scope:** Each Pull Request should ideally address a single, well-defined problem or introduce one new feature. This greatly facilitates review and reduces the chances of introducing unintended side effects.
 - **Avoid Unfocused Changes:** Please avoid submitting Pull Requests that contain only minor changes such as whitespace adjustments, IDE-generated formatting, or removal of unused variables, unless these are part of a larger, clearly defined refactor or a dedicated "cleanup" Pull Request that addresses a specific `good first issue` or maintenance task.
 - **Issue Association:** For any significant change, it's highly recommended to open an issue first to discuss the proposed solution with the community and maintainers. This ensures alignment and avoids duplicated effort. If your PR resolves an existing issue, please link it in the description (e.g., `Fixes #123`, `Closes #456`).

Dockerfile

@@ -46,27 +46,23 @@ COPY --from=build /prod/dokploy/node_modules ./node_modules
 
 
 # Install docker
-RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh --version 28.5.2 && rm get-docker.sh && curl https://rclone.org/install.sh | bash
+RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && rm get-docker.sh && curl https://rclone.org/install.sh | bash
 
 # Install Nixpacks and tsx
 # | VERBOSE=1 VERSION=1.21.0 bash
 
-ARG NIXPACKS_VERSION=1.41.0
+ARG NIXPACKS_VERSION=1.39.0
 RUN curl -sSL https://nixpacks.com/install.sh -o install.sh \
     && chmod +x install.sh \
     && ./install.sh \
     && pnpm install -g tsx
 
 # Install Railpack
-ARG RAILPACK_VERSION=0.15.4
+ARG RAILPACK_VERSION=0.2.2
 RUN curl -sSL https://railpack.com/install.sh | bash
 
 # Install buildpacks
-COPY --from=buildpacksio/pack:0.39.1 /usr/local/bin/pack /usr/local/bin/pack
+COPY --from=buildpacksio/pack:0.35.0 /usr/local/bin/pack /usr/local/bin/pack
 
 EXPOSE 3000
-
-HEALTHCHECK --interval=10s --timeout=3s --retries=10 \
-  CMD curl -fs http://localhost:3000/api/trpc/settings.health || exit 1
-
-  CMD ["sh", "-c", "pnpm run wait-for-postgres && exec pnpm start"]
+CMD [ "pnpm", "start" ]

Dockerfile.cloud

@@ -16,11 +16,11 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server
 
 
 # Deploy only the dokploy app
-# ARG NEXT_PUBLIC_UMAMI_HOST
-# ENV NEXT_PUBLIC_UMAMI_HOST=$NEXT_PUBLIC_UMAMI_HOST
+ARG NEXT_PUBLIC_UMAMI_HOST
+ENV NEXT_PUBLIC_UMAMI_HOST=$NEXT_PUBLIC_UMAMI_HOST
 
-# ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
-# ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
+ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
+ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
 
 ARG NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
 ENV NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=$NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
@@ -60,4 +60,4 @@ RUN curl https://rclone.org/install.sh | bash
 RUN pnpm install -g tsx
 
 EXPOSE 3000
-CMD [ "pnpm", "start" ]
+CMD [ "pnpm", "start" ]

Dockerfile.schedule

@@ -35,5 +35,4 @@ COPY --from=build /prod/schedules/dist ./dist
 COPY --from=build /prod/schedules/package.json ./package.json
 COPY --from=build /prod/schedules/node_modules ./node_modules
 
-ENV HOSTNAME=0.0.0.0
-CMD ["pnpm", "start"]
+CMD HOSTNAME=0.0.0.0 && pnpm start

Dockerfile.server

@@ -35,5 +35,4 @@ COPY --from=build /prod/api/dist ./dist
 COPY --from=build /prod/api/package.json ./package.json
 COPY --from=build /prod/api/node_modules ./node_modules
 
-ENV HOSTNAME=0.0.0.0
-CMD ["pnpm", "start"]
+CMD HOSTNAME=0.0.0.0 && pnpm start

LICENSE.MD

@@ -1,13 +1,8 @@
-Copyright 2026-present Dokploy Technology, Inc.
+# License
 
-Portions of this software are licensed as follows:
+## Core License (Apache License 2.0)
 
-* All content that resides under a "/proprietary" directory of this repository, if that directory exists, is licensed under the license defined in "LICENSE_PROPRIETARY".
-* Content outside of the above mentioned directories or restrictions above is available under the "Apache License 2.0" license as defined below.
-
-## Apache License 2.0
-
-Copyright 2026-present Dokploy Technology, Inc.
+Copyright 2025 Mauricio Siu.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,4 +15,12 @@ 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, Schedules, 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, Schedules, 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, Schedules, 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.

LICENSE_PROPRIETARY.md

@@ -1,11 +0,0 @@
-The Dokploy Source Available license (DSAL) version 1.0
-
-Copyright (c) 2026-present Dokploy Technology, Inc.
-
-With regard to the Dokploy Software:This software and associated documentation files (the "Software") may only beused in production, if you (and any entity that you represent) have agreed to, and are in compliance with, a valid commercial agreement from Dokploy.Subject to the foregoing sentence, you are free to modify this Software and publish patches to the Software. You agree that Dokploy and/or its licensors (as applicable) retain all right, title and interest in and to all such modifications and/or patches, and all such modifications and/or patches may only be used, copied, modified, displayed, distributed, or otherwise exploited with a valid Dokploy Source Available License.  Notwithstanding the foregoing, you may copy and modify the Software for development and testing purposes, without requiring a subscription.  You agree that Dokploy and/or its licensors (as applicable) retain all right, title and interest in and to all such modifications.  You are not granted any other rights beyond what is expressly stated herein.  Subject to theforegoing, it is forbidden to copy, merge, publish, distribute, sublicense,and/or sell the Software.
-
-This Dokploy Source Available license applies only to the part of this Software that is in a /proprietary folder. The full text of this License shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THEAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHERLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THESOFTWARE.
-
-For all third party components incorporated into the Dokploy Software, thosecomponents are licensed under the original license provided by the owner of the applicable component.

README.md

@@ -12,8 +12,24 @@
 <br />
 
 
+
+<div align="center" markdown="1">
+   <sup>Special thanks to:</sup>
+   <br>
+   <br>
+   <a href="https://tuple.app/dokploy">
+     <img src=".github/sponsors/tuple.png" alt="Tuple's sponsorship image" width="400"/>
+   </a>
+
+### [Tuple, the premier screen sharing app for developers](https://tuple.app/dokploy)
+[Available for MacOS & Windows](https://tuple.app/dokploy)<br>
+
+</div>
+
+
 Dokploy is a free, self-hostable Platform as a Service (PaaS) that simplifies the deployment and management of applications and databases.
 
+
 ## ✨ Features
 
 Dokploy includes multiple features to make your life easier.
@@ -44,9 +60,70 @@ curl -sSL https://dokploy.com/install.sh | sh
 
 For detailed documentation, visit [docs.dokploy.com](https://docs.dokploy.com).
 
+## ♥️ Sponsors
+
+🙏 We're deeply grateful to all our sponsors who make Dokploy possible! Your support helps cover the costs of hosting, testing, and developing new features.
+
+[Dokploy Open Collective](https://opencollective.com/dokploy)
 
 [Github Sponsors](https://github.com/sponsors/Siumauricio)
 
+<!-- Hero Sponsors 🎖 -->
+
+<!-- Add Hero Sponsors here -->
+
+### 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>
+        <a href="https://www.lambdatest.com/?utm_source=dokploy&utm_medium=sponsor" target="_blank">
+            <img src="https://www.lambdatest.com/blue-logo.png"  width="450" height="100" />
+        </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>
+
+<!-- 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>
+
+### Supporting Members 🥉
+
+<div>
+
+  <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 🤝
+
+#### Organizations:
+
+[Sponsors on Open Collective](https://opencollective.com/dokploy)
+
+#### Individuals:
+
+[![Individual Contributors on Open Collective](https://opencollective.com/dokploy/individuals.svg?width=890)](https://opencollective.com/dokploy)
+
 ### Contributors 🤝
 
 <a href="https://github.com/dokploy/dokploy/graphs/contributors">

apps/api/package.json

@@ -13,8 +13,9 @@
 		"@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.11.7",
+		"hono": "^4.7.10",
 		"pino": "9.4.0",
 		"pino-pretty": "11.2.2",
 		"react": "18.2.0",
@@ -23,7 +24,7 @@
 		"zod": "^3.25.32"
 	},
 	"devDependencies": {
-		"@types/node": "^20.16.0",
+		"@types/node": "^20.17.51",
 		"@types/react": "^18.2.37",
 		"@types/react-dom": "^18.2.15",
 		"tsx": "^4.16.2",

apps/api/src/schema.ts

@@ -25,7 +25,7 @@ export const deployJobSchema = z.discriminatedUnion("applicationType", [
 		titleLog: z.string().optional(),
 		descriptionLog: z.string().optional(),
 		server: z.boolean().optional(),
-		type: z.enum(["deploy", "redeploy"]),
+		type: z.enum(["deploy"]),
 		applicationType: z.literal("application-preview"),
 		serverId: z.string().min(1),
 	}),

apps/api/src/utils.ts

@@ -4,7 +4,6 @@ import {
 	deployPreviewApplication,
 	rebuildApplication,
 	rebuildCompose,
-	rebuildPreviewApplication,
 	updateApplicationStatus,
 	updateCompose,
 	updatePreviewDeployment,
@@ -55,14 +54,7 @@ export const deploy = async (job: DeployJob) => {
 				previewStatus: "running",
 			});
 			if (job.server) {
-				if (job.type === "redeploy") {
-					await rebuildPreviewApplication({
-						applicationId: job.applicationId,
-						titleLog: job.titleLog || "Rebuild Preview Deployment",
-						descriptionLog: job.descriptionLog || "",
-						previewDeploymentId: job.previewDeploymentId,
-					});
-				} else if (job.type === "deploy") {
+				if (job.type === "deploy") {
 					await deployPreviewApplication({
 						applicationId: job.applicationId,
 						titleLog: job.titleLog || "Preview Deployment",

apps/dokploy/.env.example

@@ -1,3 +1,3 @@
 DATABASE_URL="postgres://dokploy:amukds4wi9001583845717ad2@localhost:5432/dokploy"
 PORT=3000
-NODE_ENV=development
+NODE_ENV=development

apps/dokploy/.env.production.example

@@ -1,2 +1,3 @@
+DATABASE_URL="postgres://dokploy:amukds4wi9001583845717ad2@dokploy-postgres:5432/dokploy"
 PORT=3000
 NODE_ENV=production

apps/dokploy/__test__/cluster/upload.test.ts

@@ -1,243 +0,0 @@
-import type { Registry } from "@dokploy/server";
-import { getRegistryTag } from "@dokploy/server";
-import { describe, expect, it } from "vitest";
-
-describe("getRegistryTag", () => {
-	// Helper to create a mock registry
-	const createMockRegistry = (overrides: Partial<Registry> = {}): Registry => {
-		return {
-			registryId: "test-registry-id",
-			registryName: "Test Registry",
-			username: "myuser",
-			password: "test-password",
-			registryUrl: "docker.io",
-			registryType: "cloud",
-			imagePrefix: null,
-			createdAt: new Date().toISOString(),
-			organizationId: "test-org-id",
-			...overrides,
-		};
-	};
-
-	describe("with username (no imagePrefix)", () => {
-		it("should handle simple image name without tag", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("docker.io/myuser/nginx");
-		});
-
-		it("should handle image name with tag", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "nginx:latest");
-			expect(result).toBe("docker.io/myuser/nginx:latest");
-		});
-
-		it("should handle image name with username already present (no duplication)", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "myuser/myprivaterepo");
-			// Should not duplicate username
-			expect(result).toBe("docker.io/myuser/myprivaterepo");
-		});
-
-		it("should handle image name with username and tag already present", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "myuser/myprivaterepo:latest");
-			// Should not duplicate username
-			expect(result).toBe("docker.io/myuser/myprivaterepo:latest");
-		});
-
-		it("should handle complex image name with username", () => {
-			const registry = createMockRegistry({ username: "siumauricio" });
-			const result = getRegistryTag(
-				registry,
-				"siumauricio/app-parse-multi-byte-port-e32uh7",
-			);
-			// Should not duplicate username
-			expect(result).toBe(
-				"docker.io/siumauricio/app-parse-multi-byte-port-e32uh7",
-			);
-		});
-
-		it("should handle image name with different username (should not duplicate)", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "otheruser/myprivaterepo");
-			expect(result).toBe("docker.io/myuser/myprivaterepo");
-		});
-
-		it("should handle image name with full registry URL (no username)", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "docker.io/nginx");
-			// Should add username since imageName doesn't have one
-			expect(result).toBe("docker.io/myuser/nginx");
-		});
-
-		it("should handle image name with custom registry URL and username", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "ghcr.io/myuser/repo");
-			// Should not duplicate username even if registry URL is different
-			expect(result).toBe("docker.io/myuser/repo");
-		});
-
-		it("should handle image name with custom registry URL (different username)", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "ghcr.io/otheruser/repo");
-			// Should use registry username, not the one in imageName
-			expect(result).toBe("docker.io/myuser/repo");
-		});
-	});
-
-	describe("with imagePrefix", () => {
-		it("should use imagePrefix instead of username", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("docker.io/myorg/nginx");
-		});
-
-		it("should use imagePrefix with image tag", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-			});
-			const result = getRegistryTag(registry, "nginx:latest");
-			expect(result).toBe("docker.io/myorg/nginx:latest");
-		});
-
-		it("should handle imagePrefix with username already in image name", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-			});
-			const result = getRegistryTag(registry, "myuser/myprivaterepo");
-			expect(result).toBe("docker.io/myorg/myprivaterepo");
-		});
-
-		it("should handle imagePrefix matching image name prefix", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-			});
-			const result = getRegistryTag(registry, "myorg/myprivaterepo");
-			// Should not duplicate prefix
-			expect(result).toBe("docker.io/myorg/myprivaterepo");
-		});
-	});
-
-	describe("without registryUrl", () => {
-		it("should work without registryUrl", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				registryUrl: "",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("myuser/nginx");
-		});
-
-		it("should work without registryUrl with imagePrefix", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-				registryUrl: "",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("myorg/nginx");
-		});
-
-		it("should handle username already present without registryUrl", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				registryUrl: "",
-			});
-			const result = getRegistryTag(registry, "myuser/myprivaterepo");
-			// Should not duplicate username
-			expect(result).toBe("myuser/myprivaterepo");
-		});
-	});
-
-	describe("with custom registryUrl", () => {
-		it("should handle custom registry URL", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				registryUrl: "ghcr.io",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("ghcr.io/myuser/nginx");
-		});
-
-		it("should handle custom registry URL with imagePrefix", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				imagePrefix: "myorg",
-				registryUrl: "ghcr.io",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("ghcr.io/myorg/nginx");
-		});
-
-		it("should handle custom registry URL with username already present", () => {
-			const registry = createMockRegistry({
-				username: "myuser",
-				registryUrl: "ghcr.io",
-			});
-			const result = getRegistryTag(registry, "myuser/myprivaterepo");
-			// Should not duplicate username
-			expect(result).toBe("ghcr.io/myuser/myprivaterepo");
-		});
-	});
-
-	describe("edge cases", () => {
-		it("should handle empty image name", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "");
-			expect(result).toBe("docker.io/myuser/");
-		});
-
-		it("should handle image name with multiple slashes", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "org/suborg/repo");
-			expect(result).toBe("docker.io/myuser/repo");
-		});
-
-		it("should handle image name with username at different position", () => {
-			const registry = createMockRegistry({ username: "myuser" });
-			const result = getRegistryTag(registry, "org/myuser/repo");
-			expect(result).toBe("docker.io/myuser/repo");
-		});
-	});
-
-	describe("special characters in username", () => {
-		it("should handle Harbor robot account username with $ (e.g. robot$library+dokploy)", () => {
-			const registry = createMockRegistry({
-				username: "robot$library+dokploy",
-			});
-			const result = getRegistryTag(registry, "nginx");
-			expect(result).toBe("docker.io/robot$library+dokploy/nginx");
-		});
-
-		it("should handle username with $ and other special characters", () => {
-			const registry = createMockRegistry({
-				username: "robot$test+app",
-			});
-			const result = getRegistryTag(registry, "myapp:latest");
-			expect(result).toBe("docker.io/robot$test+app/myapp:latest");
-		});
-
-		it("should handle username with multiple $ symbols", () => {
-			const registry = createMockRegistry({
-				username: "user$name$test",
-			});
-			const result = getRegistryTag(registry, "app");
-			expect(result).toBe("docker.io/user$name$test/app");
-		});
-
-		it("should handle username with + and - symbols", () => {
-			const registry = createMockRegistry({
-				username: "robot+test-user",
-			});
-			const result = getRegistryTag(registry, "nginx:latest");
-			expect(result).toBe("docker.io/robot+test-user/nginx:latest");
-		});
-	});
-});

apps/dokploy/__test__/compose/domain/host-rule-format.test.ts

@@ -1,215 +0,0 @@
-import type { Domain } from "@dokploy/server";
-import { createDomainLabels } from "@dokploy/server";
-import { describe, expect, it } from "vitest";
-import { parse, stringify } from "yaml";
-
-/**
- * Regression tests for Traefik Host rule label format.
- *
- * These tests verify that the Host rule is generated with the correct format:
- * - Host(`domain.com`) - with opening and closing parentheses
- * - Host(`domain.com`) && PathPrefix(`/path`) - for path-based routing
- *
- * Issue: https://github.com/Dokploy/dokploy/issues/3161
- * The bug caused Host rules to be malformed as Host`domain.com`)
- * (missing opening parenthesis) which broke all domain routing.
- */
-describe("Host rule format regression tests", () => {
-	const baseDomain: Domain = {
-		host: "example.com",
-		port: 8080,
-		https: false,
-		uniqueConfigKey: 1,
-		customCertResolver: null,
-		certificateType: "none",
-		applicationId: "",
-		composeId: "",
-		domainType: "compose",
-		serviceName: "test-app",
-		domainId: "",
-		path: "/",
-		createdAt: "",
-		previewDeploymentId: "",
-		internalPath: "/",
-		stripPath: false,
-	};
-
-	describe("Host rule format validation", () => {
-		it("should generate Host rule with correct parentheses format", async () => {
-			const labels = await createDomainLabels("test-app", baseDomain, "web");
-			const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-			expect(ruleLabel).toBeDefined();
-			// Verify exact format: Host(`domain`)
-			expect(ruleLabel).toMatch(/Host\(`[^`]+`\)/);
-			// Ensure opening parenthesis is present after Host
-			expect(ruleLabel).toContain("Host(`example.com`)");
-			// Ensure it does NOT have the malformed format
-			expect(ruleLabel).not.toMatch(/Host`[^`]+`\)/);
-		});
-
-		it("should generate PathPrefix with correct parentheses format", async () => {
-			const labels = await createDomainLabels(
-				"test-app",
-				{ ...baseDomain, path: "/api" },
-				"web",
-			);
-			const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-			expect(ruleLabel).toBeDefined();
-			// Verify PathPrefix format
-			expect(ruleLabel).toMatch(/PathPrefix\(`[^`]+`\)/);
-			expect(ruleLabel).toContain("PathPrefix(`/api`)");
-			// Ensure opening parenthesis is present
-			expect(ruleLabel).not.toMatch(/PathPrefix`[^`]+`\)/);
-		});
-
-		it("should generate combined Host and PathPrefix with correct format", async () => {
-			const labels = await createDomainLabels(
-				"test-app",
-				{ ...baseDomain, path: "/api/v1" },
-				"websecure",
-			);
-			const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-			expect(ruleLabel).toBeDefined();
-			expect(ruleLabel).toBe(
-				"traefik.http.routers.test-app-1-websecure.rule=Host(`example.com`) && PathPrefix(`/api/v1`)",
-			);
-		});
-	});
-
-	describe("YAML serialization preserves Host rule format", () => {
-		it("should preserve Host rule format through YAML stringify/parse", async () => {
-			const labels = await createDomainLabels("test-app", baseDomain, "web");
-			const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-			// Simulate compose file structure
-			const composeSpec = {
-				services: {
-					myapp: {
-						image: "nginx",
-						labels: labels,
-					},
-				},
-			};
-
-			// Stringify to YAML
-			const yamlOutput = stringify(composeSpec, { lineWidth: 1000 });
-
-			// Parse back
-			const parsed = parse(yamlOutput) as typeof composeSpec;
-			const parsedRuleLabel = parsed.services.myapp.labels.find((l: string) =>
-				l.includes(".rule="),
-			);
-
-			// Verify format is preserved
-			expect(parsedRuleLabel).toBe(ruleLabel);
-			expect(parsedRuleLabel).toContain("Host(`example.com`)");
-			expect(parsedRuleLabel).not.toMatch(/Host`[^`]+`\)/);
-		});
-
-		it("should preserve complex rule format through YAML serialization", async () => {
-			const labels = await createDomainLabels(
-				"test-app",
-				{ ...baseDomain, path: "/api", https: true },
-				"websecure",
-			);
-
-			const composeSpec = {
-				services: {
-					myapp: {
-						labels: labels,
-					},
-				},
-			};
-
-			const yamlOutput = stringify(composeSpec, { lineWidth: 1000 });
-			const parsed = parse(yamlOutput) as typeof composeSpec;
-			const parsedRuleLabel = parsed.services.myapp.labels.find((l: string) =>
-				l.includes(".rule="),
-			);
-
-			expect(parsedRuleLabel).toContain(
-				"Host(`example.com`) && PathPrefix(`/api`)",
-			);
-		});
-	});
-
-	describe("Edge cases for domain names", () => {
-		const domainCases = [
-			{ name: "simple domain", host: "example.com" },
-			{ name: "subdomain", host: "app.example.com" },
-			{ name: "deep subdomain", host: "api.v1.app.example.com" },
-			{ name: "numeric domain", host: "123.example.com" },
-			{ name: "hyphenated domain", host: "my-app.example-host.com" },
-			{ name: "localhost", host: "localhost" },
-			{ name: "IP address style", host: "192.168.1.100" },
-		];
-
-		for (const { name, host } of domainCases) {
-			it(`should generate correct Host rule for ${name}: ${host}`, async () => {
-				const labels = await createDomainLabels(
-					"test-app",
-					{ ...baseDomain, host },
-					"web",
-				);
-				const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-				expect(ruleLabel).toBeDefined();
-				expect(ruleLabel).toContain(`Host(\`${host}\`)`);
-				// Verify parenthesis is present
-				expect(ruleLabel).toMatch(
-					new RegExp(`Host\\(\\\`${host.replace(/\./g, "\\.")}\\\`\\)`),
-				);
-			});
-		}
-	});
-
-	describe("Multiple domains scenario", () => {
-		it("should generate correct format for both web and websecure entrypoints", async () => {
-			const webLabels = await createDomainLabels("test-app", baseDomain, "web");
-			const websecureLabels = await createDomainLabels(
-				"test-app",
-				baseDomain,
-				"websecure",
-			);
-
-			const webRule = webLabels.find((l) => l.includes(".rule="));
-			const websecureRule = websecureLabels.find((l) => l.includes(".rule="));
-
-			// Both should have correct format
-			expect(webRule).toContain("Host(`example.com`)");
-			expect(websecureRule).toContain("Host(`example.com`)");
-
-			// Neither should have malformed format
-			expect(webRule).not.toMatch(/Host`[^`]+`\)/);
-			expect(websecureRule).not.toMatch(/Host`[^`]+`\)/);
-		});
-	});
-
-	describe("Special characters in paths", () => {
-		const pathCases = [
-			{ name: "simple path", path: "/api" },
-			{ name: "nested path", path: "/api/v1/users" },
-			{ name: "path with hyphen", path: "/api-v1" },
-			{ name: "path with underscore", path: "/api_v1" },
-		];
-
-		for (const { name, path } of pathCases) {
-			it(`should generate correct PathPrefix for ${name}: ${path}`, async () => {
-				const labels = await createDomainLabels(
-					"test-app",
-					{ ...baseDomain, path },
-					"web",
-				);
-				const ruleLabel = labels.find((l) => l.includes(".rule="));
-
-				expect(ruleLabel).toBeDefined();
-				expect(ruleLabel).toContain(`PathPrefix(\`${path}\`)`);
-				// Verify parenthesis is present
-				expect(ruleLabel).not.toMatch(/PathPrefix`[^`]+`\)/);
-			});
-		}
-	});
-});

apps/dokploy/__test__/compose/domain/network-service.test.ts

@@ -4,30 +4,21 @@ import { describe, expect, it } from "vitest";
 describe("addDokployNetworkToService", () => {
 	it("should add network to an empty array", () => {
 		const result = addDokployNetworkToService([]);
-		expect(result).toEqual(["dokploy-network", "default"]);
+		expect(result).toEqual(["dokploy-network"]);
 	});
 
 	it("should not add duplicate network to an array", () => {
 		const result = addDokployNetworkToService(["dokploy-network"]);
-		expect(result).toEqual(["dokploy-network", "default"]);
+		expect(result).toEqual(["dokploy-network"]);
 	});
 
 	it("should add network to an existing array with other networks", () => {
 		const result = addDokployNetworkToService(["other-network"]);
-		expect(result).toEqual(["other-network", "dokploy-network", "default"]);
+		expect(result).toEqual(["other-network", "dokploy-network"]);
 	});
 
 	it("should add network to an object if networks is an object", () => {
 		const result = addDokployNetworkToService({ "other-network": {} });
-		expect(result).toEqual({
-			"other-network": {},
-			"dokploy-network": {},
-			default: {},
-		});
-	});
-
-	it("should not duplicate default network when already present", () => {
-		const result = addDokployNetworkToService(["default", "dokploy-network"]);
-		expect(result).toEqual(["default", "dokploy-network"]);
+		expect(result).toEqual({ "other-network": {}, "dokploy-network": {} });
 	});
 });

apps/dokploy/__test__/deploy/application.command.test.ts

@@ -1,276 +0,0 @@
-import * as adminService from "@dokploy/server/services/admin";
-import * as applicationService from "@dokploy/server/services/application";
-import { deployApplication } from "@dokploy/server/services/application";
-import * as deploymentService from "@dokploy/server/services/deployment";
-import * as builders from "@dokploy/server/utils/builders";
-import * as notifications from "@dokploy/server/utils/notifications/build-success";
-import * as execProcess from "@dokploy/server/utils/process/execAsync";
-import * as gitProvider from "@dokploy/server/utils/providers/git";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-vi.mock("@dokploy/server/db", () => {
-	const createChainableMock = (): any => {
-		const chain = {
-			set: vi.fn(() => chain),
-			where: vi.fn(() => chain),
-			returning: vi.fn().mockResolvedValue([{}] as any),
-		} as any;
-		return chain;
-	};
-
-	return {
-		db: {
-			select: vi.fn(),
-			insert: vi.fn(),
-			update: vi.fn(() => createChainableMock()),
-			delete: vi.fn(),
-			query: {
-				applications: {
-					findFirst: vi.fn(),
-				},
-			},
-		},
-	};
-});
-
-vi.mock("@dokploy/server/services/application", async () => {
-	const actual = await vi.importActual<
-		typeof import("@dokploy/server/services/application")
-	>("@dokploy/server/services/application");
-	return {
-		...actual,
-		findApplicationById: vi.fn(),
-		updateApplicationStatus: vi.fn(),
-	};
-});
-
-vi.mock("@dokploy/server/services/admin", () => ({
-	getDokployUrl: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/services/deployment", () => ({
-	createDeployment: vi.fn(),
-	updateDeploymentStatus: vi.fn(),
-	updateDeployment: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/utils/providers/git", async () => {
-	const actual = await vi.importActual<
-		typeof import("@dokploy/server/utils/providers/git")
-	>("@dokploy/server/utils/providers/git");
-	return {
-		...actual,
-		getGitCommitInfo: vi.fn(),
-	};
-});
-
-vi.mock("@dokploy/server/utils/process/execAsync", () => ({
-	execAsync: vi.fn(),
-	ExecError: class ExecError extends Error {},
-}));
-
-vi.mock("@dokploy/server/utils/builders", async () => {
-	const actual = await vi.importActual<
-		typeof import("@dokploy/server/utils/builders")
-	>("@dokploy/server/utils/builders");
-	return {
-		...actual,
-		mechanizeDockerContainer: vi.fn(),
-		getBuildCommand: vi.fn(),
-	};
-});
-
-vi.mock("@dokploy/server/utils/notifications/build-success", () => ({
-	sendBuildSuccessNotifications: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/utils/notifications/build-error", () => ({
-	sendBuildErrorNotifications: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/services/rollbacks", () => ({
-	createRollback: vi.fn(),
-}));
-
-import { db } from "@dokploy/server/db";
-import { cloneGitRepository } from "@dokploy/server/utils/providers/git";
-
-const createMockApplication = (overrides = {}) => ({
-	applicationId: "test-app-id",
-	name: "Test App",
-	appName: "test-app",
-	sourceType: "git" as const,
-	customGitUrl: "https://github.com/Dokploy/examples.git",
-	customGitBranch: "main",
-	customGitSSHKeyId: null,
-	buildType: "nixpacks" as const,
-	buildPath: "/astro",
-	env: "NODE_ENV=production",
-	serverId: null,
-	rollbackActive: false,
-	enableSubmodules: false,
-	environmentId: "env-id",
-	environment: {
-		projectId: "project-id",
-		env: "",
-		name: "production",
-		project: {
-			name: "Test Project",
-			organizationId: "org-id",
-			env: "",
-		},
-	},
-	domains: [],
-	...overrides,
-});
-
-const createMockDeployment = () => ({
-	deploymentId: "deployment-id",
-	logPath: "/tmp/test-deployment.log",
-});
-
-describe("deployApplication - Command Generation Tests", () => {
-	beforeEach(() => {
-		vi.clearAllMocks();
-		vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-			createMockApplication() as any,
-		);
-		vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-			createMockApplication() as any,
-		);
-		vi.mocked(adminService.getDokployUrl).mockResolvedValue(
-			"http://localhost:3000",
-		);
-		vi.mocked(deploymentService.createDeployment).mockResolvedValue(
-			createMockDeployment() as any,
-		);
-		vi.mocked(execProcess.execAsync).mockResolvedValue({
-			stdout: "",
-			stderr: "",
-		} as any);
-		vi.mocked(builders.mechanizeDockerContainer).mockResolvedValue(
-			undefined as any,
-		);
-		vi.mocked(deploymentService.updateDeploymentStatus).mockResolvedValue(
-			undefined as any,
-		);
-		vi.mocked(applicationService.updateApplicationStatus).mockResolvedValue(
-			{} as any,
-		);
-		vi.mocked(notifications.sendBuildSuccessNotifications).mockResolvedValue(
-			undefined as any,
-		);
-		vi.mocked(gitProvider.getGitCommitInfo).mockResolvedValue({
-			message: "test commit",
-			hash: "abc123",
-		});
-		vi.mocked(deploymentService.updateDeployment).mockResolvedValue({} as any);
-	});
-
-	it("should generate correct git clone command for astro example", async () => {
-		const app = createMockApplication();
-		const command = await cloneGitRepository(app);
-		console.log(command);
-
-		expect(command).toContain("https://github.com/Dokploy/examples.git");
-		expect(command).not.toContain("--recurse-submodules");
-		expect(command).toContain("--branch main");
-		expect(command).toContain("--depth 1");
-		expect(command).toContain("git clone");
-	});
-
-	it("should generate git clone with submodules when enabled", async () => {
-		const app = createMockApplication({ enableSubmodules: true });
-		const command = await cloneGitRepository(app);
-
-		expect(command).toContain("--recurse-submodules");
-		expect(command).toContain("https://github.com/Dokploy/examples.git");
-	});
-
-	it("should verify nixpacks command is called with correct app", async () => {
-		const mockNixpacksCommand = "nixpacks build /path/to/app --name test-app";
-		vi.mocked(builders.getBuildCommand).mockResolvedValue(mockNixpacksCommand);
-
-		await deployApplication({
-			applicationId: "test-app-id",
-			titleLog: "Test deployment",
-			descriptionLog: "",
-		});
-
-		expect(builders.getBuildCommand).toHaveBeenCalledWith(
-			expect.objectContaining({
-				buildType: "nixpacks",
-				customGitUrl: "https://github.com/Dokploy/examples.git",
-				buildPath: "/astro",
-			}),
-		);
-
-		expect(execProcess.execAsync).toHaveBeenCalledWith(
-			expect.stringContaining("nixpacks build"),
-		);
-	});
-
-	it("should verify railpack command includes correct parameters", async () => {
-		const mockApp = createMockApplication({ buildType: "railpack" });
-		vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-			mockApp as any,
-		);
-		vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-			mockApp as any,
-		);
-
-		const mockRailpackCommand = "railpack prepare /path/to/app";
-		vi.mocked(builders.getBuildCommand).mockResolvedValue(mockRailpackCommand);
-
-		await deployApplication({
-			applicationId: "test-app-id",
-			titleLog: "Railpack test",
-			descriptionLog: "",
-		});
-
-		expect(builders.getBuildCommand).toHaveBeenCalledWith(
-			expect.objectContaining({
-				buildType: "railpack",
-			}),
-		);
-
-		expect(execProcess.execAsync).toHaveBeenCalledWith(
-			expect.stringContaining("railpack prepare"),
-		);
-	});
-
-	it("should execute commands in correct order", async () => {
-		const mockNixpacksCommand = "nixpacks build";
-		vi.mocked(builders.getBuildCommand).mockResolvedValue(mockNixpacksCommand);
-
-		await deployApplication({
-			applicationId: "test-app-id",
-			titleLog: "Test",
-			descriptionLog: "",
-		});
-
-		const execCalls = vi.mocked(execProcess.execAsync).mock.calls;
-		expect(execCalls.length).toBeGreaterThan(0);
-
-		const fullCommand = execCalls[0]?.[0];
-		expect(fullCommand).toContain("set -e");
-		expect(fullCommand).toContain("git clone");
-		expect(fullCommand).toContain("nixpacks build");
-	});
-
-	it("should include log redirection in command", async () => {
-		const mockCommand = "nixpacks build";
-		vi.mocked(builders.getBuildCommand).mockResolvedValue(mockCommand);
-
-		await deployApplication({
-			applicationId: "test-app-id",
-			titleLog: "Test",
-			descriptionLog: "",
-		});
-
-		const execCalls = vi.mocked(execProcess.execAsync).mock.calls;
-		const fullCommand = execCalls[0]?.[0];
-
-		expect(fullCommand).toContain(">> /tmp/test-deployment.log 2>&1");
-	});
-});

apps/dokploy/__test__/deploy/application.real.test.ts

@@ -1,479 +0,0 @@
-import { existsSync } from "node:fs";
-import path from "node:path";
-import type { ApplicationNested } from "@dokploy/server";
-import { paths } from "@dokploy/server/constants";
-import { execAsync } from "@dokploy/server/utils/process/execAsync";
-import { format } from "date-fns";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-const REAL_TEST_TIMEOUT = 180000; // 3 minutes
-
-// Mock ONLY database and notifications
-vi.mock("@dokploy/server/db", () => {
-	const createChainableMock = (): any => {
-		const chain: any = {
-			set: vi.fn(() => chain),
-			where: vi.fn(() => chain),
-			returning: vi.fn().mockResolvedValue([{}]),
-		};
-		return chain;
-	};
-
-	return {
-		db: {
-			select: vi.fn(),
-			insert: vi.fn(),
-			update: vi.fn(() => createChainableMock()),
-			delete: vi.fn(),
-			query: {
-				applications: {
-					findFirst: vi.fn(),
-				},
-			},
-		},
-	};
-});
-
-vi.mock("@dokploy/server/services/application", async () => {
-	const actual = await vi.importActual<
-		typeof import("@dokploy/server/services/application")
-	>("@dokploy/server/services/application");
-	return {
-		...actual,
-		findApplicationById: vi.fn(),
-		updateApplicationStatus: vi.fn(),
-	};
-});
-
-vi.mock("@dokploy/server/services/admin", () => ({
-	getDokployUrl: vi.fn().mockResolvedValue("http://localhost:3000"),
-}));
-
-vi.mock("@dokploy/server/services/deployment", () => ({
-	createDeployment: vi.fn(),
-	updateDeploymentStatus: vi.fn(),
-	updateDeployment: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/utils/notifications/build-success", () => ({
-	sendBuildSuccessNotifications: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/utils/notifications/build-error", () => ({
-	sendBuildErrorNotifications: vi.fn(),
-}));
-
-vi.mock("@dokploy/server/services/rollbacks", () => ({
-	createRollback: vi.fn(),
-}));
-
-// NOT mocked (executed for real):
-// - execAsync
-// - cloneGitRepository
-// - getBuildCommand
-// - mechanizeDockerContainer (requires Docker Swarm)
-
-import { db } from "@dokploy/server/db";
-import * as adminService from "@dokploy/server/services/admin";
-import * as applicationService from "@dokploy/server/services/application";
-import { deployApplication } from "@dokploy/server/services/application";
-import * as deploymentService from "@dokploy/server/services/deployment";
-
-const createMockApplication = (
-	overrides: Partial<ApplicationNested> = {},
-): ApplicationNested =>
-	({
-		applicationId: "test-app-id",
-		name: "Real Test App",
-		appName: `real-test-${Date.now()}`,
-		sourceType: "git" as const,
-		customGitUrl: "https://github.com/Dokploy/examples.git",
-		customGitBranch: "main",
-		customGitSSHKeyId: null,
-		customGitBuildPath: "/astro",
-		buildType: "nixpacks" as const,
-		env: "NODE_ENV=production",
-		serverId: null,
-		rollbackActive: false,
-		enableSubmodules: false,
-		environmentId: "env-id",
-		environment: {
-			projectId: "project-id",
-			env: "",
-			name: "production",
-			project: {
-				name: "Test Project",
-				organizationId: "org-id",
-				env: "",
-			},
-		},
-		domains: [],
-		mounts: [],
-		security: [],
-		redirects: [],
-		ports: [],
-		registry: null,
-		...overrides,
-	}) as ApplicationNested;
-
-const createMockDeployment = async (appName: string) => {
-	const { LOGS_PATH } = paths(false); // false = local, no remote server
-	const formattedDateTime = format(new Date(), "yyyy-MM-dd:HH:mm:ss");
-	const fileName = `${appName}-${formattedDateTime}.log`;
-	const logFilePath = path.join(LOGS_PATH, appName, fileName);
-
-	// Actually create the log directory
-	await execAsync(`mkdir -p ${path.dirname(logFilePath)}`);
-	await execAsync(`echo "Initializing deployment" > ${logFilePath}`);
-
-	return {
-		deploymentId: "deployment-id",
-		logPath: logFilePath,
-	};
-};
-
-async function cleanupDocker(appName: string) {
-	try {
-		await execAsync(`docker stop ${appName} 2>/dev/null || true`);
-		await execAsync(`docker rm ${appName} 2>/dev/null || true`);
-		await execAsync(`docker rmi ${appName} 2>/dev/null || true`);
-	} catch (error) {
-		console.log("Docker cleanup completed");
-	}
-}
-
-async function cleanupFiles(appName: string) {
-	try {
-		const { LOGS_PATH, APPLICATIONS_PATH } = paths(false);
-
-		// Clean cloned code directories
-		const appPath = path.join(APPLICATIONS_PATH, appName);
-		await execAsync(`rm -rf ${appPath} 2>/dev/null || true`);
-
-		// Clean logs for appName - removes entire folder
-		const logPath = path.join(LOGS_PATH, appName);
-		await execAsync(`rm -rf ${logPath} 2>/dev/null || true`);
-
-		console.log(`✅ Cleaned up files and logs for ${appName}`);
-	} catch (error) {
-		console.error(`⚠️ Error during cleanup for ${appName}:`, error);
-	}
-}
-
-describe(
-	"deployApplication - REAL Execution Tests",
-	() => {
-		let currentAppName: string;
-		let currentDeployment: any;
-		const allTestAppNames: string[] = [];
-
-		beforeEach(async () => {
-			vi.clearAllMocks();
-			currentAppName = `real-test-${Date.now()}`;
-			currentDeployment = await createMockDeployment(currentAppName);
-			allTestAppNames.push(currentAppName);
-
-			const mockApp = createMockApplication({ appName: currentAppName });
-
-			vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-				mockApp as any,
-			);
-			vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-				mockApp as any,
-			);
-			vi.mocked(adminService.getDokployUrl).mockResolvedValue(
-				"http://localhost:3000",
-			);
-			vi.mocked(deploymentService.createDeployment).mockResolvedValue(
-				currentDeployment as any,
-			);
-			vi.mocked(deploymentService.updateDeploymentStatus).mockResolvedValue(
-				undefined as any,
-			);
-			vi.mocked(applicationService.updateApplicationStatus).mockResolvedValue(
-				{} as any,
-			);
-			vi.mocked(deploymentService.updateDeployment).mockResolvedValue(
-				{} as any,
-			);
-		});
-
-		afterEach(async () => {
-			// ALWAYS cleanup, even if test failed or passed
-			console.log(`\n🧹 Cleaning up test: ${currentAppName}`);
-
-			// Clean current appName
-			try {
-				await cleanupDocker(currentAppName);
-				await cleanupFiles(currentAppName);
-			} catch (error) {
-				console.error("⚠️ Error cleaning current app:", error);
-			}
-
-			// Clean ALL test folders just in case
-			try {
-				const { LOGS_PATH, APPLICATIONS_PATH } = paths(false);
-				await execAsync(`rm -rf ${LOGS_PATH}/real-* 2>/dev/null || true`);
-				await execAsync(
-					`rm -rf ${APPLICATIONS_PATH}/real-* 2>/dev/null || true`,
-				);
-				console.log("✅ Cleaned up all test artifacts");
-			} catch (error) {
-				console.error("⚠️ Error cleaning all artifacts:", error);
-			}
-
-			console.log("✅ Cleanup completed\n");
-		});
-
-		it(
-			"should REALLY clone git repo and build with nixpacks",
-			async () => {
-				console.log(`\n🚀 Testing real deployment with app: ${currentAppName}`);
-
-				const result = await deployApplication({
-					applicationId: "test-app-id",
-					titleLog: "Real Nixpacks Test",
-					descriptionLog: "Testing real execution",
-				});
-
-				expect(result).toBe(true);
-
-				// Verify that Docker image was actually created
-				const { stdout: dockerImages } = await execAsync(
-					`docker images ${currentAppName} --format "{{.Repository}}"`,
-				);
-				console.log("dockerImages", dockerImages);
-				expect(dockerImages.trim()).toBe(currentAppName);
-				console.log(`✅ Docker image created: ${currentAppName}`);
-
-				// Verify log exists and has content
-				expect(existsSync(currentDeployment.logPath)).toBe(true);
-				const { stdout: logContent } = await execAsync(
-					`cat ${currentDeployment.logPath}`,
-				);
-				expect(logContent).toContain("Cloning");
-				expect(logContent).toContain("nixpacks");
-				console.log(`✅ Build log created with ${logContent.length} chars`);
-
-				// Verify update functions were called
-				expect(deploymentService.updateDeploymentStatus).toHaveBeenCalledWith(
-					"deployment-id",
-					"done",
-				);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it.skip(
-			"should REALLY build with railpack (SKIPPED: requires special permissions)",
-			async () => {
-				const railpackAppName = `real-railpack-${Date.now()}`;
-				const railpackApp = createMockApplication({
-					appName: railpackAppName,
-					buildType: "railpack",
-					railpackVersion: "3",
-				});
-				currentAppName = railpackAppName;
-				allTestAppNames.push(railpackAppName);
-
-				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-					railpackApp as any,
-				);
-				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-					railpackApp as any,
-				);
-
-				console.log(`\n🚀 Testing real railpack deployment: ${currentAppName}`);
-
-				const result = await deployApplication({
-					applicationId: "test-app-id",
-					titleLog: "Real Railpack Test",
-					descriptionLog: "",
-				});
-
-				expect(result).toBe(true);
-
-				const { stdout: dockerImages } = await execAsync(
-					`docker images ${currentAppName} --format "{{.Repository}}"`,
-				);
-				expect(dockerImages.trim()).toBe(currentAppName);
-				console.log(`✅ Railpack image created: ${currentAppName}`);
-
-				const { stdout: logContent } = await execAsync(
-					`cat ${currentDeployment.logPath}`,
-				);
-				expect(logContent).toContain("railpack");
-				console.log("✅ Railpack build completed");
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"should handle REAL git clone errors",
-			async () => {
-				const errorAppName = `real-error-${Date.now()}`;
-				const errorApp = createMockApplication({
-					appName: errorAppName,
-					customGitUrl:
-						"https://github.com/invalid/nonexistent-repo-123456.git",
-				});
-				currentAppName = errorAppName;
-				allTestAppNames.push(errorAppName);
-
-				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-					errorApp as any,
-				);
-				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-					errorApp as any,
-				);
-
-				console.log(`\n🚀 Testing real error handling: ${currentAppName}`);
-
-				await expect(
-					deployApplication({
-						applicationId: "test-app-id",
-						titleLog: "Real Error Test",
-						descriptionLog: "",
-					}),
-				).rejects.toThrow();
-
-				// Verify error status was called
-				expect(deploymentService.updateDeploymentStatus).toHaveBeenCalledWith(
-					"deployment-id",
-					"error",
-				);
-
-				// Verify log contains error
-				const { stdout: logContent } = await execAsync(
-					`cat ${currentDeployment.logPath}`,
-				);
-				expect(logContent.toLowerCase()).toContain("error");
-				console.log("✅ Error handling verified");
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"should REALLY clone with submodules when enabled",
-			async () => {
-				const submodulesAppName = `real-submodules-${Date.now()}`;
-				const submodulesApp = createMockApplication({
-					appName: submodulesAppName,
-					enableSubmodules: true,
-				});
-				currentAppName = submodulesAppName;
-				allTestAppNames.push(submodulesAppName);
-
-				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-					submodulesApp as any,
-				);
-				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-					submodulesApp as any,
-				);
-
-				console.log(`\n🚀 Testing real submodules support: ${currentAppName}`);
-
-				const result = await deployApplication({
-					applicationId: "test-app-id",
-					titleLog: "Real Submodules Test",
-					descriptionLog: "",
-				});
-
-				expect(result).toBe(true);
-
-				// Verify deployment completed successfully
-				const { stdout: logContent } = await execAsync(
-					`cat ${currentDeployment.logPath}`,
-				);
-				expect(logContent).toContain("Cloning");
-				expect(logContent.length).toBeGreaterThan(100);
-				console.log("✅ Submodules deployment completed");
-
-				// Verify image
-				const { stdout: dockerImages } = await execAsync(
-					`docker images ${currentAppName} --format "{{.Repository}}"`,
-				);
-				expect(dockerImages.trim()).toBe(currentAppName);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"should verify REAL commit info extraction",
-			async () => {
-				console.log(`\n🚀 Testing real commit info: ${currentAppName}`);
-
-				await deployApplication({
-					applicationId: "test-app-id",
-					titleLog: "Real Commit Test",
-					descriptionLog: "",
-				});
-
-				// Verify updateDeployment was called with commit info
-				expect(deploymentService.updateDeployment).toHaveBeenCalled();
-				const updateCall = vi.mocked(deploymentService.updateDeployment).mock
-					.calls[0];
-
-				// Real commit info should have title and hash
-				expect(updateCall?.[1]).toHaveProperty("title");
-				expect(updateCall?.[1]).toHaveProperty("description");
-				expect(updateCall?.[1]?.description).toContain("Commit:");
-
-				console.log(
-					`✅ Real commit extracted: ${updateCall?.[1]?.title?.substring(0, 50)}...`,
-				);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-
-		it(
-			"should REALLY build with Dockerfile",
-			async () => {
-				const dockerfileAppName = `real-dockerfile-${Date.now()}`;
-				const dockerfileApp = createMockApplication({
-					appName: dockerfileAppName,
-					buildType: "dockerfile",
-					customGitBuildPath: "/deno",
-					dockerfile: "Dockerfile",
-				});
-				currentAppName = dockerfileAppName;
-				allTestAppNames.push(dockerfileAppName);
-
-				vi.mocked(db.query.applications.findFirst).mockResolvedValue(
-					dockerfileApp as any,
-				);
-				vi.mocked(applicationService.findApplicationById).mockResolvedValue(
-					dockerfileApp as any,
-				);
-
-				console.log(`\n🚀 Testing real Dockerfile build: ${currentAppName}`);
-
-				const result = await deployApplication({
-					applicationId: "test-app-id",
-					titleLog: "Real Dockerfile Test",
-					descriptionLog: "",
-				});
-
-				expect(result).toBe(true);
-
-				// Verify log
-				const { stdout: logContent } = await execAsync(
-					`cat ${currentDeployment.logPath}`,
-				);
-				expect(logContent).toContain("Building");
-				expect(logContent).toContain(dockerfileAppName);
-				console.log("✅ Dockerfile build log verified");
-
-				// Verify image
-				const { stdout: dockerImages } = await execAsync(
-					`docker images ${currentAppName} --format "{{.Repository}}"`,
-				);
-				console.log("dockerImages", dockerImages);
-				expect(dockerImages.trim()).toBe(currentAppName);
-				console.log(`✅ Docker image created: ${currentAppName}`);
-			},
-			REAL_TEST_TIMEOUT,
-		);
-	},
-	REAL_TEST_TIMEOUT,
-);

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

@@ -25,17 +25,11 @@ if (typeof window === "undefined") {
 }
 
 const baseApp: ApplicationNested = {
-	railpackVersion: "0.15.4",
+	railpackVersion: "0.2.2",
 	applicationId: "",
 	previewLabels: [],
-	createEnvFile: true,
-	bitbucketRepositorySlug: "",
 	herokuVersion: "",
 	giteaBranch: "",
-	buildServerId: "",
-	buildRegistryId: "",
-	buildRegistry: null,
-	args: [],
 	giteaBuildPath: "",
 	previewRequireCollaboratorPermissions: false,
 	giteaId: "",
@@ -43,9 +37,6 @@ const baseApp: ApplicationNested = {
 	giteaRepository: "",
 	cleanCache: false,
 	watchPaths: [],
-	rollbackRegistryId: "",
-	rollbackRegistry: null,
-	deployments: [],
 	enableSubmodules: false,
 	applicationStatus: "done",
 	triggerType: "push",
@@ -69,7 +60,6 @@ const baseApp: ApplicationNested = {
 	previewWildcard: "",
 	environment: {
 		env: "",
-		isDefault: false,
 		environmentId: "",
 		name: "",
 		createdAt: "",

apps/dokploy/__test__/env/environment-access-fallback.test.ts

@@ -1,294 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-// Type definitions matching the project structure
-type Environment = {
-	environmentId: string;
-	name: string;
-	isDefault: boolean;
-};
-
-type Project = {
-	projectId: string;
-	name: string;
-	environments: Environment[];
-};
-
-/**
- * Helper function that selects the appropriate environment for a user
- * This matches the logic used in search-command.tsx and show.tsx
- */
-function selectAccessibleEnvironment(
-	project: Project | null | undefined,
-): Environment | null {
-	if (!project || !project.environments || project.environments.length === 0) {
-		return null;
-	}
-
-	// Find default environment from accessible environments, or fall back to first accessible environment
-	const defaultEnvironment =
-		project.environments.find((environment) => environment.isDefault) ||
-		project.environments[0];
-
-	return defaultEnvironment || null;
-}
-
-describe("Environment Access Fallback", () => {
-	describe("selectAccessibleEnvironment", () => {
-		it("should return default environment when user has access to it", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-prod",
-						name: "production",
-						isDefault: true,
-					},
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-prod");
-			expect(result?.isDefault).toBe(true);
-		});
-
-		it("should return first accessible environment when user doesn't have access to default", () => {
-			// Simulating filtered environments (user only has access to development)
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					// Note: production is not in the list because user doesn't have access
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-					{
-						environmentId: "env-staging",
-						name: "staging",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-dev");
-			expect(result?.name).toBe("development");
-		});
-
-		it("should return first environment when no default is marked but environments exist", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-					{
-						environmentId: "env-staging",
-						name: "staging",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-dev");
-		});
-
-		it("should return null when project has no accessible environments", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).toBeNull();
-		});
-
-		it("should return null when project is null", () => {
-			const result = selectAccessibleEnvironment(null);
-
-			expect(result).toBeNull();
-		});
-
-		it("should return null when project is undefined", () => {
-			const result = selectAccessibleEnvironment(undefined);
-
-			expect(result).toBeNull();
-		});
-
-		it("should handle project with single accessible environment", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-dev");
-		});
-
-		it("should prioritize default environment even when it's not first in the array", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-					{
-						environmentId: "env-staging",
-						name: "staging",
-						isDefault: false,
-					},
-					{
-						environmentId: "env-prod",
-						name: "production",
-						isDefault: true,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-prod");
-			expect(result?.isDefault).toBe(true);
-		});
-
-		it("should handle multiple default environments by returning the first one found", () => {
-			// Edge case: multiple environments marked as default (shouldn't happen, but test it)
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-prod-1",
-						name: "production-1",
-						isDefault: true,
-					},
-					{
-						environmentId: "env-prod-2",
-						name: "production-2",
-						isDefault: true,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.isDefault).toBe(true);
-			// Should return the first default found
-			expect(result?.environmentId).toBe("env-prod-1");
-		});
-
-		it("should work correctly when user has access to multiple environments including default", () => {
-			const project: Project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: [
-					{
-						environmentId: "env-prod",
-						name: "production",
-						isDefault: true,
-					},
-					{
-						environmentId: "env-dev",
-						name: "development",
-						isDefault: false,
-					},
-					{
-						environmentId: "env-staging",
-						name: "staging",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-prod");
-			expect(result?.isDefault).toBe(true);
-		});
-
-		it("should handle real-world scenario: user with only development access", () => {
-			// This simulates the exact bug we're fixing:
-			// User has access to development but not production (default)
-			// The filtered environments array only contains development
-			const project: Project = {
-				projectId: "proj-1",
-				name: "My Project",
-				environments: [
-					// Only development is accessible (production was filtered out)
-					{
-						environmentId: "env-dev-123",
-						name: "development",
-						isDefault: false,
-					},
-				],
-			};
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).not.toBeNull();
-			expect(result?.environmentId).toBe("env-dev-123");
-			expect(result?.name).toBe("development");
-			// Should not be null even though it's not the default
-		});
-	});
-
-	describe("Environment selection edge cases", () => {
-		it("should handle project with environments property as undefined", () => {
-			const project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: undefined,
-			} as unknown as Project;
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).toBeNull();
-		});
-
-		it("should handle project with null environments array", () => {
-			const project = {
-				projectId: "proj-1",
-				name: "Test Project",
-				environments: null,
-			} as unknown as Project;
-
-			const result = selectAccessibleEnvironment(project);
-
-			expect(result).toBeNull();
-		});
-	});
-});

apps/dokploy/__test__/env/environment.test.ts

@@ -1,7 +1,4 @@
-import {
-	prepareEnvironmentVariables,
-	prepareEnvironmentVariablesForShell,
-} from "@dokploy/server/index";
+import { prepareEnvironmentVariables } from "@dokploy/server/index";
 import { describe, expect, it } from "vitest";
 
 const projectEnv = `
@@ -335,310 +332,4 @@ IS_DEV=\${{environment.DEVELOPMENT}}
 			"IS_DEV=0",
 		]);
 	});
-
-	it("handles environment variables with single quotes in values", () => {
-		const envWithSingleQuotes = `
-ENV_VARIABLE='ENVITONME'NT'
-ANOTHER_VAR='value with 'quotes' inside'
-SIMPLE_VAR=no-quotes
-`;
-
-		const serviceWithSingleQuotes = `
-TEST_VAR=\${{environment.ENV_VARIABLE}}
-ANOTHER_TEST=\${{environment.ANOTHER_VAR}}
-SIMPLE=\${{environment.SIMPLE_VAR}}
-`;
-
-		const resolved = prepareEnvironmentVariables(
-			serviceWithSingleQuotes,
-			"",
-			envWithSingleQuotes,
-		);
-
-		expect(resolved).toEqual([
-			"TEST_VAR=ENVITONME'NT",
-			"ANOTHER_TEST=value with 'quotes' inside",
-			"SIMPLE=no-quotes",
-		]);
-	});
-});
-
-describe("prepareEnvironmentVariablesForShell (shell escaping)", () => {
-	it("escapes single quotes in environment variable values", () => {
-		const serviceEnv = `
-ENV_VARIABLE='ENVITONME'NT'
-ANOTHER_VAR='value with 'quotes' inside'
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// shell-quote should wrap these in double quotes
-		expect(resolved).toEqual([
-			`"ENV_VARIABLE=ENVITONME'NT"`,
-			`"ANOTHER_VAR=value with 'quotes' inside"`,
-		]);
-	});
-
-	it("escapes double quotes in environment variable values", () => {
-		const serviceEnv = `
-MESSAGE="Hello "World""
-QUOTED_PATH="/path/to/"file""
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// shell-quote wraps in single quotes when there are double quotes inside
-		expect(resolved).toEqual([
-			`'MESSAGE=Hello "World"'`,
-			`'QUOTED_PATH=/path/to/"file"'`,
-		]);
-	});
-
-	it("escapes dollar signs in environment variable values", () => {
-		const serviceEnv = `
-PRICE=$100
-VARIABLE=$HOME/path
-TEMPLATE=Hello $USER
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// Dollar signs should be escaped to prevent variable expansion
-		for (const env of resolved) {
-			expect(env).toContain("$");
-		}
-	});
-
-	it("escapes backticks in environment variable values", () => {
-		const serviceEnv = `
-COMMAND=\`echo "test"\`
-NESTED=value with \`backticks\` inside
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// Backticks are escaped/removed by dotenv parsing, but values should be safely quoted
-		expect(resolved.length).toBe(2);
-		expect(resolved[0]).toContain("COMMAND");
-		expect(resolved[1]).toContain("NESTED");
-	});
-
-	it("handles environment variables with spaces", () => {
-		const serviceEnv = `
-FULL_NAME="John Doe"
-MESSAGE='Hello World'
-SENTENCE=This is a test
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// shell-quote uses single quotes for strings with spaces
-		expect(resolved).toEqual([
-			`'FULL_NAME=John Doe'`,
-			`'MESSAGE=Hello World'`,
-			`'SENTENCE=This is a test'`,
-		]);
-	});
-
-	it("handles environment variables with backslashes", () => {
-		const serviceEnv = `
-WINDOWS_PATH=C:\\Users\\Documents
-ESCAPED=value\\with\\backslashes
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// Backslashes should be properly escaped
-		expect(resolved.length).toBe(2);
-		for (const env of resolved) {
-			expect(env).toContain("\\");
-		}
-	});
-
-	it("handles simple environment variables without special characters", () => {
-		const serviceEnv = `
-NODE_ENV=production
-PORT=3000
-DEBUG=true
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// shell-quote escapes the = sign in some cases
-		expect(resolved).toEqual([
-			"NODE_ENV\\=production",
-			"PORT\\=3000",
-			"DEBUG\\=true",
-		]);
-	});
-
-	it("handles environment variables with mixed special characters", () => {
-		const serviceEnv = `
-COMPLEX='value with "double" and 'single' quotes'
-BASH_COMMAND=echo "$HOME" && echo 'test'
-WEIRD=\`echo "$VAR"\` with 'quotes' and "more"
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// All should be escaped, none should throw errors
-		expect(resolved.length).toBe(3);
-		// Verify each can be safely used in shell
-		for (const env of resolved) {
-			expect(typeof env).toBe("string");
-			expect(env.length).toBeGreaterThan(0);
-		}
-	});
-
-	it("handles environment variables with newlines", () => {
-		const serviceEnv = `
-MULTILINE="line1
-line2
-line3"
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(1);
-		expect(resolved[0]).toContain("MULTILINE");
-	});
-
-	it("handles empty environment variable values", () => {
-		const serviceEnv = `
-EMPTY=
-EMPTY_QUOTED=""
-EMPTY_SINGLE=''
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		// shell-quote escapes the = sign for empty values
-		expect(resolved).toEqual([
-			"EMPTY\\=",
-			"EMPTY_QUOTED\\=",
-			"EMPTY_SINGLE\\=",
-		]);
-	});
-
-	it("handles environment variables with equals signs in values", () => {
-		const serviceEnv = `
-EQUATION=a=b+c
-CONNECTION_STRING=user=admin;password=test
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(2);
-		expect(resolved[0]).toContain("EQUATION");
-		expect(resolved[1]).toContain("CONNECTION_STRING");
-	});
-
-	it("resolves and escapes environment variables together", () => {
-		const projectEnv = `
-BASE_URL=https://example.com
-API_KEY='secret-key-with-quotes'
-`;
-
-		const environmentEnv = `
-ENV_NAME=production
-DB_PASS='pa$$word'
-`;
-
-		const serviceEnv = `
-FULL_URL=\${{project.BASE_URL}}/api
-AUTH_KEY=\${{project.API_KEY}}
-ENVIRONMENT=\${{environment.ENV_NAME}}
-DB_PASSWORD=\${{environment.DB_PASS}}
-CUSTOM='value with 'quotes' inside'
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(
-			serviceEnv,
-			projectEnv,
-			environmentEnv,
-		);
-
-		expect(resolved.length).toBe(5);
-		// All resolved values should be properly escaped
-		for (const env of resolved) {
-			expect(typeof env).toBe("string");
-		}
-	});
-
-	it("handles environment variables with semicolons and ampersands", () => {
-		const serviceEnv = `
-COMMAND=echo "test" && echo "test2"
-MULTIPLE=cmd1; cmd2; cmd3
-URL_WITH_PARAMS=https://example.com?a=1&b=2&c=3
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(3);
-		// These should be safely escaped to prevent command injection
-		for (const env of resolved) {
-			expect(typeof env).toBe("string");
-			expect(env.length).toBeGreaterThan(0);
-		}
-	});
-
-	it("handles environment variables with pipes and redirects", () => {
-		const serviceEnv = `
-PIPE_COMMAND=cat file | grep test
-REDIRECT=echo "test" > output.txt
-BOTH=cat input.txt | grep pattern > output.txt
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(3);
-		// Pipes and redirects should be safely quoted
-		expect(resolved[0]).toContain("PIPE_COMMAND");
-		expect(resolved[1]).toContain("REDIRECT");
-		expect(resolved[2]).toContain("BOTH");
-		// At least one should contain a pipe
-		const hasPipe = resolved.some((env) => env.includes("|"));
-		expect(hasPipe).toBe(true);
-	});
-
-	it("handles environment variables with parentheses and brackets", () => {
-		const serviceEnv = `
-MATH=(a+b)*c
-ARRAY=[1,2,3]
-JSON={"key":"value"}
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(3);
-		expect(resolved[0]).toContain("(");
-		expect(resolved[1]).toContain("[");
-		expect(resolved[2]).toContain("{");
-	});
-
-	it("handles very long environment variable values", () => {
-		const longValue = "a".repeat(10000);
-		const serviceEnv = `LONG_VAR=${longValue}`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(1);
-		expect(resolved[0]).toContain("LONG_VAR");
-		expect(resolved[0]?.length).toBeGreaterThan(10000);
-	});
-
-	it("handles special unicode characters in environment variables", () => {
-		const serviceEnv = `
-EMOJI=Hello 🌍 World 🚀
-CHINESE=你好世界
-SPECIAL=café résumé naïve
-`;
-
-		const resolved = prepareEnvironmentVariablesForShell(serviceEnv, "", "");
-
-		expect(resolved.length).toBe(3);
-		expect(resolved[0]).toContain("🌍");
-		expect(resolved[1]).toContain("你好");
-		expect(resolved[2]).toContain("café");
-	});
 });

apps/dokploy/__test__/env/stack-environment.test.ts

@@ -1,184 +0,0 @@
-import { getEnviromentVariablesObject } from "@dokploy/server/index";
-import { describe, expect, it } from "vitest";
-
-const projectEnv = `
-ENVIRONMENT=staging
-DATABASE_URL=postgres://postgres:postgres@localhost:5432/project_db
-PORT=3000
-`;
-
-const environmentEnv = `
-NODE_ENV=development
-API_URL=https://api.dev.example.com
-REDIS_URL=redis://localhost:6379
-DATABASE_NAME=dev_database
-SECRET_KEY=env-secret-123
-`;
-
-describe("getEnviromentVariablesObject with environment variables (Stack compose)", () => {
-	it("resolves environment variables correctly for Stack compose", () => {
-		const serviceEnv = `
-FOO=\${{environment.NODE_ENV}}
-BAR=\${{environment.API_URL}}
-BAZ=test
-`;
-
-		const result = getEnviromentVariablesObject(
-			serviceEnv,
-			projectEnv,
-			environmentEnv,
-		);
-
-		expect(result).toEqual({
-			FOO: "development",
-			BAR: "https://api.dev.example.com",
-			BAZ: "test",
-		});
-	});
-
-	it("resolves both project and environment variables for Stack compose", () => {
-		const serviceEnv = `
-ENVIRONMENT=\${{project.ENVIRONMENT}}
-NODE_ENV=\${{environment.NODE_ENV}}
-API_URL=\${{environment.API_URL}}
-DATABASE_URL=\${{project.DATABASE_URL}}
-SERVICE_PORT=4000
-`;
-
-		const result = getEnviromentVariablesObject(
-			serviceEnv,
-			projectEnv,
-			environmentEnv,
-		);
-
-		expect(result).toEqual({
-			ENVIRONMENT: "staging",
-			NODE_ENV: "development",
-			API_URL: "https://api.dev.example.com",
-			DATABASE_URL: "postgres://postgres:postgres@localhost:5432/project_db",
-			SERVICE_PORT: "4000",
-		});
-	});
-
-	it("handles multiple environment references in single value for Stack compose", () => {
-		const multiRefEnv = `
-HOST=localhost
-PORT=5432
-USERNAME=postgres
-PASSWORD=secret123
-`;
-
-		const serviceEnv = `
-DATABASE_URL=postgresql://\${{environment.USERNAME}}:\${{environment.PASSWORD}}@\${{environment.HOST}}:\${{environment.PORT}}/mydb
-`;
-
-		const result = getEnviromentVariablesObject(serviceEnv, "", multiRefEnv);
-
-		expect(result).toEqual({
-			DATABASE_URL: "postgresql://postgres:secret123@localhost:5432/mydb",
-		});
-	});
-
-	it("throws error for undefined environment variables in Stack compose", () => {
-		const serviceWithUndefined = `
-UNDEFINED_VAR=\${{environment.UNDEFINED_VAR}}
-`;
-
-		expect(() =>
-			getEnviromentVariablesObject(serviceWithUndefined, "", environmentEnv),
-		).toThrow("Invalid environment variable: environment.UNDEFINED_VAR");
-	});
-
-	it("allows service variables to override environment variables in Stack compose", () => {
-		const serviceOverrideEnv = `
-NODE_ENV=production
-API_URL=\${{environment.API_URL}}
-`;
-
-		const result = getEnviromentVariablesObject(
-			serviceOverrideEnv,
-			"",
-			environmentEnv,
-		);
-
-		expect(result).toEqual({
-			NODE_ENV: "production",
-			API_URL: "https://api.dev.example.com",
-		});
-	});
-
-	it("resolves complex references with project, environment, and service variables for Stack compose", () => {
-		const complexServiceEnv = `
-FULL_DATABASE_URL=\${{project.DATABASE_URL}}/\${{environment.DATABASE_NAME}}
-API_ENDPOINT=\${{environment.API_URL}}/\${{project.ENVIRONMENT}}/api
-SERVICE_NAME=my-service
-COMPLEX_VAR=\${{SERVICE_NAME}}-\${{environment.NODE_ENV}}-\${{project.ENVIRONMENT}}
-`;
-
-		const result = getEnviromentVariablesObject(
-			complexServiceEnv,
-			projectEnv,
-			environmentEnv,
-		);
-
-		expect(result).toEqual({
-			FULL_DATABASE_URL:
-				"postgres://postgres:postgres@localhost:5432/project_db/dev_database",
-			API_ENDPOINT: "https://api.dev.example.com/staging/api",
-			SERVICE_NAME: "my-service",
-			COMPLEX_VAR: "my-service-development-staging",
-		});
-	});
-
-	it("maintains precedence: service > environment > project in Stack compose", () => {
-		const conflictingProjectEnv = `
-NODE_ENV=production-project
-API_URL=https://project.api.com
-DATABASE_NAME=project_db
-`;
-
-		const conflictingEnvironmentEnv = `
-NODE_ENV=development-environment
-API_URL=https://environment.api.com
-DATABASE_NAME=env_db
-`;
-
-		const serviceWithConflicts = `
-NODE_ENV=service-override
-PROJECT_ENV=\${{project.NODE_ENV}}
-ENV_VAR=\${{environment.API_URL}}
-DB_NAME=\${{environment.DATABASE_NAME}}
-`;
-
-		const result = getEnviromentVariablesObject(
-			serviceWithConflicts,
-			conflictingProjectEnv,
-			conflictingEnvironmentEnv,
-		);
-
-		expect(result).toEqual({
-			NODE_ENV: "service-override",
-			PROJECT_ENV: "production-project",
-			ENV_VAR: "https://environment.api.com",
-			DB_NAME: "env_db",
-		});
-	});
-
-	it("handles empty environment variables in Stack compose", () => {
-		const serviceWithEmpty = `
-SERVICE_VAR=test
-PROJECT_VAR=\${{project.ENVIRONMENT}}
-`;
-
-		const result = getEnviromentVariablesObject(
-			serviceWithEmpty,
-			projectEnv,
-			"",
-		);
-
-		expect(result).toEqual({
-			SERVICE_VAR: "test",
-			PROJECT_VAR: "staging",
-		});
-	});
-});

apps/dokploy/__test__/queues/grouped-queue.test.ts

@@ -0,0 +1,809 @@
+import { describe, expect, it } from "vitest";
+import { GroupedQueue } from "../../server/queues/grouped-queue-wrapper";
+
+describe("GroupedQueue", () => {
+	describe("Basic functionality", () => {
+		it("should process a single job with concurrency 1", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			await queue.add("group1", { id: "job1" });
+
+			// Wait for processing to complete
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(processed).toEqual(["job1"]);
+			expect(queue.isIdle()).toBe(true);
+		});
+
+		it("should process jobs in FIFO order within a group", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 20));
+				processed.push(data.id);
+			});
+
+			// Add multiple jobs to the same group
+			await Promise.all([
+				queue.add("group1", { id: "job1" }),
+				queue.add("group1", { id: "job2" }),
+				queue.add("group1", { id: "job3" }),
+			]);
+
+			// Wait for all processing
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			expect(processed).toEqual(["job1", "job2", "job3"]);
+		});
+	});
+
+	describe("Concurrency 1 with multiple groups", () => {
+		it("should process one group at a time with concurrency 1", async () => {
+			const queue = new GroupedQueue<{ id: string; group: string }>(1);
+			const processed: string[] = [];
+			const activeGroups: string[] = [];
+
+			queue.setHandler(async (data) => {
+				activeGroups.push(data.group);
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+				activeGroups.pop();
+			});
+
+			// Add jobs to 3 different groups
+			const promises = [
+				queue.add("app1", { id: "job1", group: "app1" }),
+				queue.add("app2", { id: "job2", group: "app2" }),
+				queue.add("app3", { id: "job3", group: "app3" }),
+			];
+
+			// Check after 30ms - only one should be processing
+			await new Promise((resolve) => setTimeout(resolve, 30));
+			expect(activeGroups.length).toBeLessThanOrEqual(1);
+
+			// Wait for all to complete
+			await Promise.all(promises);
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			expect(processed).toHaveLength(3);
+			expect(queue.isIdle()).toBe(true);
+		});
+
+		it("should process groups sequentially with concurrency 1", async () => {
+			const queue = new GroupedQueue<{ id: string; group: string }>(1);
+			const processingOrder: string[] = [];
+			const startTimes: Map<string, number> = new Map();
+			const endTimes: Map<string, number> = new Map();
+
+			queue.setHandler(async (data) => {
+				startTimes.set(data.id, Date.now());
+				processingOrder.push(`start-${data.group}`);
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				endTimes.set(data.id, Date.now());
+				processingOrder.push(`end-${data.group}`);
+			});
+
+			await Promise.all([
+				queue.add("app1", { id: "job1", group: "app1" }),
+				queue.add("app2", { id: "job2", group: "app2" }),
+				queue.add("app3", { id: "job3", group: "app3" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 300));
+
+			// Verify sequential processing
+			expect(processingOrder).toEqual([
+				"start-app1",
+				"end-app1",
+				"start-app2",
+				"end-app2",
+				"start-app3",
+				"end-app3",
+			]);
+
+			// Verify jobs don't overlap
+			const job1End = endTimes.get("job1")!;
+			const job2Start = startTimes.get("job2")!;
+			const job2End = endTimes.get("job2")!;
+			const job3Start = startTimes.get("job3")!;
+
+			expect(job2Start).toBeGreaterThanOrEqual(job1End);
+			expect(job3Start).toBeGreaterThanOrEqual(job2End);
+		});
+	});
+
+	describe("Concurrency 3 with 4 groups", () => {
+		it("should process up to 3 groups simultaneously", async () => {
+			const queue = new GroupedQueue<{ id: string; group: string }>(3);
+			const activeGroups = new Set<string>();
+			const maxConcurrent = { value: 0 };
+
+			queue.setHandler(async (data) => {
+				activeGroups.add(data.group);
+				maxConcurrent.value = Math.max(maxConcurrent.value, activeGroups.size);
+
+				await new Promise((resolve) => setTimeout(resolve, 100));
+
+				activeGroups.delete(data.group);
+			});
+
+			// Add 4 jobs to different groups
+			await Promise.all([
+				queue.add("app1", { id: "job1", group: "app1" }),
+				queue.add("app2", { id: "job2", group: "app2" }),
+				queue.add("app3", { id: "job3", group: "app3" }),
+				queue.add("app4", { id: "job4", group: "app4" }),
+			]);
+
+			// Check during processing
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			// Should have processed 3 groups simultaneously
+			expect(maxConcurrent.value).toBe(3);
+			expect(activeGroups.size).toBeLessThanOrEqual(3);
+
+			// Wait for all to complete
+			await new Promise((resolve) => setTimeout(resolve, 200));
+			expect(queue.isIdle()).toBe(true);
+		});
+
+		it("should process 4th group after one of the first 3 completes", async () => {
+			const queue = new GroupedQueue<{ id: string; group: string }>(3);
+			const processingOrder: string[] = [];
+
+			queue.setHandler(async (data) => {
+				processingOrder.push(`start-${data.group}`);
+				await new Promise((resolve) => setTimeout(resolve, 100));
+				processingOrder.push(`end-${data.group}`);
+			});
+
+			await Promise.all([
+				queue.add("app1", { id: "job1", group: "app1" }),
+				queue.add("app2", { id: "job2", group: "app2" }),
+				queue.add("app3", { id: "job3", group: "app3" }),
+				queue.add("app4", { id: "job4", group: "app4" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 250));
+
+			// First 3 should start together
+			const firstThree = processingOrder.slice(0, 3);
+			expect(firstThree).toContain("start-app1");
+			expect(firstThree).toContain("start-app2");
+			expect(firstThree).toContain("start-app3");
+
+			// 4th should start after one completes
+			const app4StartIndex = processingOrder.indexOf("start-app4");
+			expect(app4StartIndex).toBeGreaterThan(0);
+			expect(app4StartIndex).toBeLessThan(processingOrder.length - 1);
+		});
+	});
+
+	describe("Multiple jobs per group", () => {
+		it("should process jobs sequentially within same group", async () => {
+			const queue = new GroupedQueue<{ id: string }>(3);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 30));
+				processed.push(data.id);
+			});
+
+			// Add 3 jobs to same group
+			await Promise.all([
+				queue.add("app1", { id: "job1" }),
+				queue.add("app1", { id: "job2" }),
+				queue.add("app1", { id: "job3" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			// Should process in order
+			expect(processed).toEqual(["job1", "job2", "job3"]);
+		});
+
+		it("should process multiple groups with multiple jobs each", async () => {
+			const queue = new GroupedQueue<{ id: string; group: string }>(2);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 20));
+				processed.push(`${data.group}-${data.id}`);
+			});
+
+			// Add jobs to 2 groups, 2 jobs each
+			await Promise.all([
+				queue.add("app1", { id: "job1", group: "app1" }),
+				queue.add("app1", { id: "job2", group: "app1" }),
+				queue.add("app2", { id: "job1", group: "app2" }),
+				queue.add("app2", { id: "job2", group: "app2" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			// Should process both groups, jobs within each group in order
+			expect(processed).toHaveLength(4);
+			expect(processed.filter((p) => p.startsWith("app1"))).toEqual([
+				"app1-job1",
+				"app1-job2",
+			]);
+			expect(processed.filter((p) => p.startsWith("app2"))).toEqual([
+				"app2-job1",
+				"app2-job2",
+			]);
+		});
+	});
+
+	describe("Error handling", () => {
+		it("should reject job on handler error", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+
+			queue.setHandler(async () => {
+				throw new Error("Test error");
+			});
+
+			await expect(queue.add("group1", { id: "job1" })).rejects.toThrow(
+				"Test error",
+			);
+		});
+
+		it("should continue processing other jobs after error", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				if (data.id === "job2") {
+					throw new Error("Job 2 error");
+				}
+				processed.push(data.id);
+			});
+
+			await expect(
+				queue.add("group1", { id: "job1" }),
+			).resolves.toBeUndefined();
+			await expect(queue.add("group1", { id: "job2" })).rejects.toThrow();
+			await expect(
+				queue.add("group1", { id: "job3" }),
+			).resolves.toBeUndefined();
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(processed).toEqual(["job1", "job3"]);
+		});
+	});
+
+	describe("Queue management", () => {
+		it("should clear group tasks", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			// Add jobs without awaiting - they'll start processing
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group1", { id: "job2" });
+
+			// Clear immediately - job1 might be processing, but job2 should be cleared
+			queue.clearGroup("group1");
+
+			// Use Promise.allSettled to handle both promises properly
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 might succeed or fail depending on timing
+			// job2 should be rejected
+			const job2Result = results[1];
+			if (job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe("Queue cleared");
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// Job1 might have processed, but job2 should not
+			expect(processed.length).toBeLessThanOrEqual(1);
+		});
+
+		it("should return correct group length", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+
+			queue.setHandler(async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+
+			// Add jobs without awaiting - check length immediately
+			const promises = [
+				queue.add("group1", { id: "job1" }),
+				queue.add("group1", { id: "job2" }),
+				queue.add("group1", { id: "job3" }),
+			];
+
+			// Check length immediately - at least some should be pending
+			// (job1 might be processing, but job2 and job3 should be pending)
+			const length = queue.getGroupLength("group1");
+			expect(length).toBeGreaterThanOrEqual(0);
+
+			// Wait for all to complete
+			await Promise.all(promises);
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			// After processing should be 0
+			expect(queue.getGroupLength("group1")).toBe(0);
+		});
+
+		it("should close queue and reject pending tasks", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+
+			queue.setHandler(async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+
+			// Add first job and wait a bit to ensure it starts processing
+			const job1Promise = queue.add("group1", { id: "job1" });
+			// Add second job without awaiting
+			const job2Promise = queue.add("group1", { id: "job2" });
+
+			// Wait a tiny bit to ensure job2 is queued
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Close queue - job2 should be rejected
+			await queue.close();
+
+			// Use Promise.allSettled to handle both promises properly
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 might succeed or fail depending on timing
+			// job2 should be rejected
+			const job2Result = results[1];
+			if (job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe("Queue closed");
+			}
+		});
+	});
+
+	describe("Concurrency edge cases", () => {
+		it("should handle concurrency 1 with 1 app correctly", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			await queue.add("app1", { id: "job1" });
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(processed).toEqual(["job1"]);
+			expect(queue.getActiveGroupsCount()).toBe(0);
+		});
+
+		it("should handle concurrency 1 with 3 apps correctly", async () => {
+			const queue = new GroupedQueue<{ id: string; app: string }>(1);
+			const processingTimes: Map<string, { start: number; end: number }> =
+				new Map();
+
+			queue.setHandler(async (data) => {
+				const start = Date.now();
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				const end = Date.now();
+				processingTimes.set(data.app, { start, end });
+			});
+
+			await Promise.all([
+				queue.add("app1", { id: "job1", app: "app1" }),
+				queue.add("app2", { id: "job2", app: "app2" }),
+				queue.add("app3", { id: "job3", app: "app3" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 300));
+
+			// Verify sequential processing
+			const app1 = processingTimes.get("app1")!;
+			const app2 = processingTimes.get("app2")!;
+			const app3 = processingTimes.get("app3")!;
+
+			expect(app2.start).toBeGreaterThanOrEqual(app1.end);
+			expect(app3.start).toBeGreaterThanOrEqual(app2.end);
+			expect(queue.getActiveGroupsCount()).toBe(0);
+		});
+
+		it("should handle 4 apps with concurrency 3 correctly", async () => {
+			const queue = new GroupedQueue<{ id: string; app: string }>(3);
+			const concurrentCounts: number[] = [];
+
+			queue.setHandler(async () => {
+				// Track concurrent processing
+				const interval = setInterval(() => {
+					concurrentCounts.push(queue.getActiveGroupsCount());
+				}, 10);
+
+				await new Promise((resolve) => setTimeout(resolve, 100));
+
+				clearInterval(interval);
+			});
+
+			await Promise.all([
+				queue.add("app1", { id: "job1", app: "app1" }),
+				queue.add("app2", { id: "job2", app: "app2" }),
+				queue.add("app3", { id: "job3", app: "app3" }),
+				queue.add("app4", { id: "job4", app: "app4" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			// Should never exceed concurrency of 3
+			const maxConcurrent = Math.max(...concurrentCounts);
+			expect(maxConcurrent).toBeLessThanOrEqual(3);
+			expect(queue.getActiveGroupsCount()).toBe(0);
+		});
+	});
+
+	describe("Idle state", () => {
+		it("should be idle when no jobs are processing", () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			expect(queue.isIdle()).toBe(true);
+		});
+
+		it("should not be idle while processing", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			let isIdleDuringProcessing = false;
+
+			queue.setHandler(async () => {
+				isIdleDuringProcessing = queue.isIdle();
+				await new Promise((resolve) => setTimeout(resolve, 50));
+			});
+
+			await queue.add("group1", { id: "job1" });
+
+			await new Promise((resolve) => setTimeout(resolve, 30));
+
+			expect(isIdleDuringProcessing).toBe(false);
+			expect(queue.isIdle()).toBe(true);
+		});
+	});
+
+	describe("Concurrency management", () => {
+		it("should get current concurrency", () => {
+			const queue1 = new GroupedQueue<{ id: string }>(1);
+			const queue2 = new GroupedQueue<{ id: string }>(5);
+			const queue3 = new GroupedQueue<{ id: string }>(10);
+
+			expect(queue1.getConcurrency()).toBe(1);
+			expect(queue2.getConcurrency()).toBe(5);
+			expect(queue3.getConcurrency()).toBe(10);
+		});
+
+		it("should set concurrency dynamically", () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			expect(queue.getConcurrency()).toBe(1);
+
+			queue.setConcurrency(3);
+			expect(queue.getConcurrency()).toBe(3);
+
+			queue.setConcurrency(5);
+			expect(queue.getConcurrency()).toBe(5);
+		});
+
+		it("should throw error when setting concurrency less than 1", () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			expect(() => queue.setConcurrency(0)).toThrow(
+				"Concurrency must be at least 1",
+			);
+			expect(() => queue.setConcurrency(-1)).toThrow(
+				"Concurrency must be at least 1",
+			);
+		});
+
+		it("should process next group when concurrency increases", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			// Add jobs to 3 different groups with concurrency 1
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group2", { id: "job2" });
+			const job3Promise = queue.add("group3", { id: "job3" });
+
+			// Wait a bit to ensure job1 starts processing
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Increase concurrency to 3 - should allow group2 and group3 to start
+			queue.setConcurrency(3);
+
+			// Wait for all to complete
+			await Promise.all([job1Promise, job2Promise, job3Promise]);
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(processed).toHaveLength(3);
+			expect(processed).toContain("job1");
+			expect(processed).toContain("job2");
+			expect(processed).toContain("job3");
+		});
+	});
+
+	describe("Clear all pending tasks", () => {
+		it("should clear all pending tasks across all groups", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+				processed.push(data.id);
+			});
+
+			// Add multiple jobs to different groups
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group1", { id: "job2" });
+			const job3Promise = queue.add("group2", { id: "job3" });
+			const job4Promise = queue.add("group2", { id: "job4" });
+			const job5Promise = queue.add("group3", { id: "job5" });
+
+			// Wait a bit to ensure job1 starts processing
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Clear all pending tasks
+			const clearedCount = queue.clearAllPendingTasks();
+
+			// Should have cleared 4 pending tasks (job2, job3, job4, job5)
+			// job1 is processing so it's not in the queue anymore
+			expect(clearedCount).toBe(4);
+
+			// Handle all promises
+			const results = await Promise.allSettled([
+				job1Promise,
+				job2Promise,
+				job3Promise,
+				job4Promise,
+				job5Promise,
+			]);
+
+			// job1 should succeed (it was processing)
+			const job1Result = results[0];
+			expect(job1Result.status).toBe("fulfilled");
+
+			// All pending jobs should be rejected
+			for (let i = 1; i < results.length; i++) {
+				const result = results[i];
+				if (result && result.status === "rejected") {
+					expect(result.reason.message).toBe(
+						"Concurrency changed - queue cleared",
+					);
+				}
+			}
+
+			// Wait for job1 to complete
+			await new Promise((resolve) => setTimeout(resolve, 150));
+
+			// Only job1 should have processed
+			expect(processed).toHaveLength(1);
+			expect(processed).toContain("job1");
+		});
+
+		it("should not clear tasks that are currently processing", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+				processed.push(data.id);
+			});
+
+			// Add jobs - first one will start processing immediately
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group1", { id: "job2" });
+
+			// Wait to ensure job1 is processing (it's been shifted from tasks)
+			await new Promise((resolve) => setTimeout(resolve, 20));
+
+			// Clear all pending - should only clear job2, not job1
+			// job1 is already executing (not in tasks array)
+			const clearedCount = queue.clearAllPendingTasks();
+
+			expect(clearedCount).toBe(1);
+
+			// Handle all promises
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 should succeed (it was processing)
+			const job1Result = results[0];
+			expect(job1Result.status).toBe("fulfilled");
+
+			// job2 should be rejected
+			const job2Result = results[1];
+			if (job2Result && job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			// Only job1 should have processed
+			expect(processed).toHaveLength(1);
+			expect(processed).toContain("job1");
+		});
+
+		it("should return 0 when no pending tasks", () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const clearedCount = queue.clearAllPendingTasks();
+			expect(clearedCount).toBe(0);
+		});
+
+		it("should clear tasks from multiple groups", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			// Add jobs to multiple groups
+			const promises = [
+				queue.add("group1", { id: "job1" }),
+				queue.add("group1", { id: "job2" }),
+				queue.add("group2", { id: "job3" }),
+				queue.add("group2", { id: "job4" }),
+				queue.add("group3", { id: "job5" }),
+			];
+
+			// Wait a bit for first job to start (it gets shifted from tasks)
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Clear all pending
+			const clearedCount = queue.clearAllPendingTasks();
+
+			// Should clear 4 tasks (job2, job3, job4, job5)
+			// job1 is processing so it's not in the queue anymore
+			expect(clearedCount).toBe(4);
+
+			// Handle all promises
+			const results = await Promise.allSettled(promises);
+
+			// job1 should succeed
+			const job1Result = results[0];
+			expect(job1Result?.status).toBe("fulfilled");
+
+			// Others should be rejected
+			for (let i = 1; i < results.length; i++) {
+				const result = results[i];
+				if (result && result.status === "rejected") {
+					expect(result.reason.message).toBe(
+						"Concurrency changed - queue cleared",
+					);
+				}
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// Only first job should process
+			expect(processed.length).toBeLessThanOrEqual(1);
+		});
+	});
+
+	describe("Concurrency change with pending tasks", () => {
+		it("should clear pending tasks when concurrency changes", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			// Add jobs with concurrency 1
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group1", { id: "job2" });
+			const job3Promise = queue.add("group2", { id: "job3" });
+
+			// Wait for job1 to start processing (it gets shifted from tasks)
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Change concurrency - should clear pending tasks via clearAllPendingTasks
+			queue.setConcurrency(3);
+
+			// Handle all promises
+			const results = await Promise.allSettled([
+				job1Promise,
+				job2Promise,
+				job3Promise,
+			]);
+
+			// job1 should succeed (it was processing)
+			const job1Result = results[0];
+			expect(job1Result.status).toBe("fulfilled");
+
+			// Pending jobs should be rejected (job2 and job3 were in queue when cleared)
+			const job2Result = results[1];
+			const job3Result = results[2];
+
+			// At least one of the pending jobs should be rejected
+			const rejectedCount = [job2Result, job3Result].filter(
+				(r) => r && r.status === "rejected",
+			).length;
+			expect(rejectedCount).toBeGreaterThan(0);
+
+			// Verify rejection messages
+			if (job2Result && job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+			if (job3Result && job3Result.status === "rejected") {
+				expect(job3Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// job1 should have processed, others may or may not depending on timing
+			expect(processed.length).toBeGreaterThanOrEqual(1);
+			expect(processed).toContain("job1");
+		});
+
+		it("should allow new jobs after concurrency change", async () => {
+			const queue = new GroupedQueue<{ id: string }>(1);
+			const processed: string[] = [];
+
+			queue.setHandler(async (data) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				processed.push(data.id);
+			});
+
+			// Add job with concurrency 1
+			const job1Promise = queue.add("group1", { id: "job1" });
+			const job2Promise = queue.add("group1", { id: "job2" });
+
+			// Wait for job1 to start (it gets shifted from tasks)
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Change concurrency to 3 - this calls clearAllPendingTasks internally
+			queue.setConcurrency(3);
+
+			// Handle all promises
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 should succeed (it was processing)
+			const job1Result = results[0];
+			expect(job1Result.status).toBe("fulfilled");
+
+			// job2 should be rejected (it was in queue when cleared)
+			const job2Result = results[1];
+			if (job2Result && job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			} else {
+				// If job2 wasn't rejected, it means it started processing before clear
+				// This is acceptable as it's a timing issue
+			}
+
+			// Add new jobs after concurrency change - they should work
+			await Promise.all([
+				queue.add("group2", { id: "job3" }),
+				queue.add("group3", { id: "job4" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// job1, job3, and job4 should have processed
+			expect(processed.length).toBeGreaterThanOrEqual(2);
+			expect(processed).toContain("job1");
+		});
+	});
+});

apps/dokploy/__test__/queues/queue-manager.test.ts

@@ -0,0 +1,313 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import { QueueManager } from "../../server/queues/queue-manager";
+
+describe("QueueManager", () => {
+	let manager: QueueManager;
+
+	beforeEach(() => {
+		manager = new QueueManager();
+	});
+
+	describe("Queue creation and retrieval", () => {
+		it("should create a queue with default concurrency 1", () => {
+			const queue = manager.getQueue("test-queue");
+			expect(queue.getConcurrency()).toBe(1);
+		});
+
+		it("should create a queue with custom concurrency", () => {
+			const queue = manager.getQueue("test-queue", 5);
+			expect(queue.getConcurrency()).toBe(5);
+		});
+
+		it("should return the same queue instance for the same name", () => {
+			const queue1 = manager.getQueue("test-queue", 3);
+			const queue2 = manager.getQueue("test-queue", 5);
+			expect(queue1).toBe(queue2);
+			// Concurrency should remain as first set
+			expect(queue1.getConcurrency()).toBe(3);
+		});
+
+		it("should create different queues for different names", () => {
+			const queue1 = manager.getQueue("queue1", 2);
+			const queue2 = manager.getQueue("queue2", 4);
+			expect(queue1).not.toBe(queue2);
+			expect(queue1.getConcurrency()).toBe(2);
+			expect(queue2.getConcurrency()).toBe(4);
+		});
+	});
+
+	describe("Handler management", () => {
+		it("should set handler for a queue", async () => {
+			const processed: string[] = [];
+
+			manager.setHandler("test-queue", async (data: { id: string }) => {
+				processed.push(data.id);
+			});
+
+			await manager.add("test-queue", "group1", { id: "job1" });
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			expect(processed).toEqual(["job1"]);
+		});
+
+		it("should handle different handlers for different queues", async () => {
+			const queue1Processed: string[] = [];
+			const queue2Processed: string[] = [];
+
+			manager.setHandler("queue1", async (data: { id: string }) => {
+				queue1Processed.push(data.id);
+			});
+
+			manager.setHandler("queue2", async (data: { id: string }) => {
+				queue2Processed.push(data.id);
+			});
+
+			await Promise.all([
+				manager.add("queue1", "group1", { id: "job1" }),
+				manager.add("queue2", "group1", { id: "job2" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			expect(queue1Processed).toEqual(["job1"]);
+			expect(queue2Processed).toEqual(["job2"]);
+		});
+	});
+
+	describe("Job management", () => {
+		it("should add jobs to correct queue and group", async () => {
+			const processed: string[] = [];
+
+			manager.setHandler("test-queue", async (data: { id: string }) => {
+				processed.push(data.id);
+			});
+
+			await manager.add("test-queue", "group1", { id: "job1" });
+			await manager.add("test-queue", "group2", { id: "job2" });
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			expect(processed).toContain("job1");
+			expect(processed).toContain("job2");
+		});
+
+		it("should create queue with concurrency when adding job", async () => {
+			const processed: string[] = [];
+
+			// Create queue with concurrency first (without handler)
+			manager.getQueue("new-queue", 3);
+
+			// Set handler
+			manager.setHandler("new-queue", async (data: { id: string }) => {
+				processed.push(data.id);
+			});
+
+			// Now add job - it should process
+			await manager.add("new-queue", "group1", { id: "job1" });
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const queue = manager.getQueue("new-queue");
+			expect(queue.getConcurrency()).toBe(3);
+			expect(processed).toEqual(["job1"]);
+		});
+	});
+
+	describe("Queue operations", () => {
+		it("should clear group in specific queue", async () => {
+			const processed: string[] = [];
+
+			manager.setHandler("test-queue", async (data: { id: string }) => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+				processed.push(data.id);
+			});
+
+			// Add jobs but don't await - they'll start processing
+			const job1Promise = manager.add("test-queue", "group1", { id: "job1" });
+			const job2Promise = manager.add("test-queue", "group1", { id: "job2" });
+
+			// Clear immediately - job1 might be processing, but job2 should be cleared
+			manager.clearGroup("test-queue", "group1");
+
+			// Use Promise.allSettled to handle both promises properly
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 might succeed or fail depending on timing
+			// job2 should be rejected
+			const job2Result = results[1];
+			if (job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe("Queue cleared");
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 150));
+
+			// Job1 might have processed, but job2 should not
+			expect(processed.length).toBeLessThanOrEqual(1);
+		});
+
+		it("should get group length for specific queue", async () => {
+			manager.setHandler("test-queue", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+
+			// Add jobs without awaiting - check length immediately
+			const job1Promise = manager.add("test-queue", "group1", { id: "job1" });
+			const job2Promise = manager.add("test-queue", "group1", { id: "job2" });
+
+			// Check length immediately - at least one should be pending
+			// (job1 might be processing, but job2 should be pending)
+			const length = manager.getGroupLength("test-queue", "group1");
+			expect(length).toBeGreaterThanOrEqual(0);
+
+			// Wait for both to complete
+			await Promise.all([job1Promise, job2Promise]);
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			expect(manager.getGroupLength("test-queue", "group1")).toBe(0);
+		});
+
+		it("should get total length for specific queue", async () => {
+			manager.setHandler("test-queue", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+			});
+
+			// Add jobs without awaiting - check length immediately
+			const promises = [
+				manager.add("test-queue", "group1", { id: "job1" }),
+				manager.add("test-queue", "group2", { id: "job2" }),
+				manager.add("test-queue", "group3", { id: "job3" }),
+			];
+
+			// Check length immediately - at least some should be pending
+			const length = manager.getTotalLength("test-queue");
+			expect(length).toBeGreaterThanOrEqual(0);
+
+			// Wait for all to complete
+			await Promise.all(promises);
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(manager.getTotalLength("test-queue")).toBe(0);
+		});
+
+		it("should check if queue is idle", async () => {
+			manager.setHandler("test-queue", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+			});
+
+			expect(manager.isIdle("test-queue")).toBe(true);
+
+			await manager.add("test-queue", "group1", { id: "job1" });
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			expect(manager.isIdle("test-queue")).toBe(true);
+		});
+	});
+
+	describe("Queue lifecycle", () => {
+		it("should close a specific queue", async () => {
+			manager.setHandler("test-queue", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+
+			// Add first job and wait a bit to ensure it starts processing
+			const job1Promise = manager.add("test-queue", "group1", { id: "job1" });
+			// Add second job without awaiting
+			const job2Promise = manager.add("test-queue", "group1", { id: "job2" });
+
+			// Wait a tiny bit to ensure job2 is queued
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Close queue - job2 should be rejected
+			await manager.closeQueue("test-queue");
+
+			// Use Promise.allSettled to handle both promises properly
+			const results = await Promise.allSettled([job1Promise, job2Promise]);
+
+			// job1 might succeed or fail depending on timing
+			// job2 should be rejected
+			const job2Result = results[1];
+			if (job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe("Queue closed");
+			}
+
+			expect(manager.getQueueNames()).not.toContain("test-queue");
+		});
+
+		it("should close all queues", async () => {
+			manager.setHandler("queue1", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+			manager.setHandler("queue2", async () => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+			});
+
+			await manager.add("queue1", "group1", { id: "job1" });
+			await manager.add("queue2", "group1", { id: "job2" });
+
+			await manager.closeAll();
+
+			expect(manager.getQueueNames()).toHaveLength(0);
+		});
+
+		it("should get all queue names", () => {
+			manager.getQueue("queue1");
+			manager.getQueue("queue2");
+			manager.getQueue("queue3");
+
+			const names = manager.getQueueNames();
+			expect(names).toContain("queue1");
+			expect(names).toContain("queue2");
+			expect(names).toContain("queue3");
+			expect(names).toHaveLength(3);
+		});
+	});
+
+	describe("Multiple queues with different concurrency", () => {
+		it("should handle multiple queues with different concurrency settings", async () => {
+			const queue1Processed: string[] = [];
+			const queue2Processed: string[] = [];
+
+			// Create queues with specific concurrency FIRST, before setting handlers
+			const queue1 = manager.getQueue("queue1", 1);
+			const queue2 = manager.getQueue("queue2", 3);
+
+			// Verify concurrency is set correctly before proceeding
+			expect(queue1.getConcurrency()).toBe(1);
+			expect(queue2.getConcurrency()).toBe(3);
+
+			manager.setHandler("queue1", async (data: { id: string }) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				queue1Processed.push(data.id);
+			});
+
+			manager.setHandler("queue2", async (data: { id: string }) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				queue2Processed.push(data.id);
+			});
+
+			// Queue1 with concurrency 1 (sequential)
+			await Promise.all([
+				manager.add("queue1", "app1", { id: "job1" }),
+				manager.add("queue1", "app2", { id: "job2" }),
+			]);
+
+			// Queue2 with concurrency 3 (parallel)
+			await Promise.all([
+				manager.add("queue2", "app1", { id: "job1" }),
+				manager.add("queue2", "app2", { id: "job2" }),
+				manager.add("queue2", "app3", { id: "job3" }),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			expect(queue1Processed).toHaveLength(2);
+			expect(queue2Processed).toHaveLength(3);
+
+			// Verify concurrency settings are still correct
+			expect(manager.getQueue("queue1").getConcurrency()).toBe(1);
+			expect(manager.getQueue("queue2").getConcurrency()).toBe(3);
+		});
+	});
+});

apps/dokploy/__test__/queues/queue-setup.test.ts

@@ -0,0 +1,250 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import type { DeploymentJob } from "../../server/queues/queue-types";
+import {
+	getConcurrency,
+	myQueue,
+	setConcurrency,
+} from "../../server/queues/queueSetup";
+
+describe("queueSetup", () => {
+	beforeEach(() => {
+		// Reset concurrency to default (1) before each test
+		setConcurrency(1);
+		// Clear all pending tasks
+		myQueue.clearAllPendingTasks();
+	});
+
+	describe("getConcurrency", () => {
+		it("should return default concurrency of 1", () => {
+			const concurrency = getConcurrency();
+			expect(concurrency).toBe(1);
+		});
+
+		it("should return current concurrency after setting it", () => {
+			setConcurrency(3);
+			expect(getConcurrency()).toBe(3);
+
+			setConcurrency(5);
+			expect(getConcurrency()).toBe(5);
+		});
+	});
+
+	describe("setConcurrency", () => {
+		it("should set concurrency successfully", () => {
+			const clearedCount = setConcurrency(3);
+			expect(getConcurrency()).toBe(3);
+			expect(clearedCount).toBe(0); // No pending tasks to clear
+		});
+
+		it("should throw error for concurrency less than 1", () => {
+			expect(() => setConcurrency(0)).toThrow("Concurrency must be at least 1");
+			expect(() => setConcurrency(-1)).toThrow(
+				"Concurrency must be at least 1",
+			);
+		});
+
+		it("should return 0 cleared builds when no pending tasks", () => {
+			const clearedCount = setConcurrency(2);
+			expect(clearedCount).toBe(0);
+			expect(getConcurrency()).toBe(2);
+		});
+
+		it("should clear pending builds when concurrency changes", async () => {
+			const processed: string[] = [];
+
+			// Set handler
+			myQueue.setHandler(async (job: DeploymentJob) => {
+				await new Promise((resolve) => setTimeout(resolve, 100));
+				if (job.applicationType === "application") {
+					processed.push(job.applicationId);
+				} else if (job.applicationType === "compose") {
+					processed.push(job.composeId);
+				} else if (job.applicationType === "application-preview") {
+					processed.push(job.previewDeploymentId);
+				}
+			});
+
+			// Add jobs to different groups
+			const job1: DeploymentJob = {
+				applicationId: "app1",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+			const job2: DeploymentJob = {
+				applicationId: "app2",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+			const job3: DeploymentJob = {
+				applicationId: "app3",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+
+			// Add jobs without awaiting
+			const promise1 = myQueue.add("application:app1", job1);
+			const promise2 = myQueue.add("application:app2", job2);
+			const promise3 = myQueue.add("application:app3", job3);
+
+			// Wait for first job to start processing
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Change concurrency - should clear pending builds
+			const clearedCount = setConcurrency(3);
+
+			// Should have cleared 2 pending builds (app2 and app3)
+			expect(clearedCount).toBe(2);
+			expect(getConcurrency()).toBe(3);
+
+			// Handle all promises - use allSettled to handle both resolved and rejected
+			const results = await Promise.allSettled([promise1, promise2, promise3]);
+
+			// job1 should succeed (it was processing), others should be rejected
+			const job1Result = results[0];
+			if (job1Result.status === "fulfilled") {
+				// Job1 completed successfully
+			}
+
+			// Pending jobs should be rejected
+			const job2Result = results[1];
+			const job3Result = results[2];
+			if (job2Result && job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+			if (job3Result && job3Result.status === "rejected") {
+				expect(job3Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 150));
+
+			// Only first job should have processed
+			expect(processed.length).toBeLessThanOrEqual(1);
+		});
+
+		it("should not clear builds when concurrency doesn't change", async () => {
+			// Set to 2
+			setConcurrency(2);
+			expect(getConcurrency()).toBe(2);
+
+			// Set to 2 again - should not clear anything
+			const clearedCount = setConcurrency(2);
+			expect(clearedCount).toBe(0);
+			expect(getConcurrency()).toBe(2);
+		});
+
+		it("should allow new jobs after concurrency change", async () => {
+			const processed: string[] = [];
+
+			myQueue.setHandler(async (job: DeploymentJob) => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+				if (job.applicationType === "application") {
+					processed.push(job.applicationId);
+				}
+			});
+
+			// Add job with concurrency 1
+			const job1: DeploymentJob = {
+				applicationId: "app1",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+			const job2: DeploymentJob = {
+				applicationId: "app2",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+
+			const promise1 = myQueue.add("application:app1", job1);
+			const promise2 = myQueue.add("application:app2", job2);
+
+			// Wait for first job to start
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Change concurrency to 3
+			const clearedCount = setConcurrency(3);
+			expect(clearedCount).toBe(1); // app2 should be cleared
+
+			// Handle all promises - use allSettled to handle both resolved and rejected
+			const results = await Promise.allSettled([promise1, promise2]);
+
+			// job1 should succeed (it was processing)
+			const job1Result = results[0];
+			if (job1Result.status === "fulfilled") {
+				// Job1 completed successfully
+			}
+
+			// app2 should be rejected
+			const job2Result = results[1];
+			if (job2Result.status === "rejected") {
+				expect(job2Result.reason.message).toBe(
+					"Concurrency changed - queue cleared",
+				);
+			}
+
+			// Add new jobs after concurrency change - they should work
+			const job3: DeploymentJob = {
+				applicationId: "app3",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+			const job4: DeploymentJob = {
+				applicationId: "app4",
+				titleLog: "Test",
+				descriptionLog: "Test",
+				type: "deploy",
+				applicationType: "application",
+				server: false,
+			};
+
+			await Promise.all([
+				myQueue.add("application:app3", job3),
+				myQueue.add("application:app4", job4),
+			]);
+
+			await new Promise((resolve) => setTimeout(resolve, 150));
+
+			// app1, app3, and app4 should have processed
+			expect(processed.length).toBeGreaterThanOrEqual(2);
+			expect(processed).toContain("app1");
+		});
+
+		it("should handle multiple concurrency changes correctly", () => {
+			// Start at 1
+			expect(getConcurrency()).toBe(1);
+
+			// Change to 3
+			setConcurrency(3);
+			expect(getConcurrency()).toBe(3);
+
+			// Change to 5
+			setConcurrency(5);
+			expect(getConcurrency()).toBe(5);
+
+			// Change back to 1
+			setConcurrency(1);
+			expect(getConcurrency()).toBe(1);
+		});
+	});
+});

apps/dokploy/__test__/requests/request.test.ts

@@ -54,22 +54,4 @@ describe("processLogs", () => {
 		const result = parseRawConfig(entryWithWhitespace);
 		expect(result.data).toHaveLength(2);
 	});
-
-	it("should filter out Dokploy dashboard requests", () => {
-		const dokployDashboardEntry = `{"ClientAddr":"172.71.187.131:9485","ClientHost":"172.71.187.131","ClientPort":"9485","ClientUsername":"-","DownstreamContentSize":14550,"DownstreamStatus":200,"Duration":57681682,"OriginContentSize":14550,"OriginDuration":57612242,"OriginStatus":200,"Overhead":69440,"RequestAddr":"hostinger.dokploy.com","RequestContentSize":0,"RequestCount":20142,"RequestHost":"hostinger.dokploy.com","RequestMethod":"GET","RequestPath":"/_next/data/cb_zzI4Rp9G7Q7djrFKh0/en/dashboard/traefik.json","RequestPort":"-","RequestProtocol":"HTTP/2.0","RequestScheme":"https","RetryAttempts":0,"RouterName":"dokploy-router-app-secure@file","ServiceAddr":"dokploy:3000","ServiceName":"dokploy-service-app@file","ServiceURL":"http://dokploy:3000","StartLocal":"2025-12-10T05:10:41.957755949Z","StartUTC":"2025-12-10T05:10:41.957755949Z","TLSCipher":"TLS_AES_128_GCM_SHA256","TLSVersion":"1.3","entryPointName":"websecure","level":"info","msg":"","time":"2025-12-10T05:10:42Z"}`;
-
-		// Test with only Dokploy dashboard entry - should be filtered out
-		const resultOnlyDokploy = parseRawConfig(dokployDashboardEntry);
-		expect(resultOnlyDokploy.data).toHaveLength(0);
-		expect(resultOnlyDokploy.totalCount).toBe(0);
-
-		// Test with mixed entries - Dokploy should be filtered, others should remain
-		const mixedEntries = `${dokployDashboardEntry}\n${sampleLogEntry}`;
-		const resultMixed = parseRawConfig(mixedEntries);
-		expect(resultMixed.data).toHaveLength(1);
-		expect(resultMixed.totalCount).toBe(1);
-		expect(resultMixed.data[0]?.ServiceName).not.toBe(
-			"dokploy-service-app@file",
-		);
-	});
 });

apps/dokploy/__test__/server/mechanizeDockerContainer.test.ts

@@ -1,23 +1,20 @@
-import type { ApplicationNested } from "@dokploy/server/utils/builders";
-import { mechanizeDockerContainer } from "@dokploy/server/utils/builders";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
+import type { ApplicationNested } from "@dokploy/server/utils/builders";
+import { mechanizeDockerContainer } from "@dokploy/server/utils/builders";
+
 type MockCreateServiceOptions = {
-	TaskTemplate?: {
-		ContainerSpec?: {
-			StopGracePeriod?: number;
-		};
-	};
+	StopGracePeriod?: number;
 	[key: string]: unknown;
 };
 
 const { inspectMock, getServiceMock, createServiceMock, getRemoteDockerMock } =
 	vi.hoisted(() => {
-		const inspect = vi.fn<() => Promise<never>>();
+		const inspect = vi.fn<[], Promise<never>>();
 		const getService = vi.fn(() => ({ inspect }));
-		const createService = vi.fn<
-			(opts: MockCreateServiceOptions) => Promise<void>
-		>(async () => undefined);
+		const createService = vi.fn<[MockCreateServiceOptions], Promise<void>>(
+			async () => undefined,
+		);
 		const getRemoteDocker = vi.fn(async () => ({
 			getService,
 			createService,
@@ -80,17 +77,13 @@ describe("mechanizeDockerContainer", () => {
 		await mechanizeDockerContainer(application);
 
 		expect(createServiceMock).toHaveBeenCalledTimes(1);
-		const call = createServiceMock.mock.calls[0] as
-			| [MockCreateServiceOptions]
-			| undefined;
+		const call = createServiceMock.mock.calls[0];
 		if (!call) {
 			throw new Error("createServiceMock should have been called once");
 		}
 		const [settings] = call;
-		expect(settings.TaskTemplate?.ContainerSpec?.StopGracePeriod).toBe(0);
-		expect(typeof settings.TaskTemplate?.ContainerSpec?.StopGracePeriod).toBe(
-			"number",
-		);
+		expect(settings.StopGracePeriod).toBe(0);
+		expect(typeof settings.StopGracePeriod).toBe("number");
 	});
 
 	it("omits StopGracePeriod when stopGracePeriodSwarm is null", async () => {
@@ -99,15 +92,11 @@ describe("mechanizeDockerContainer", () => {
 		await mechanizeDockerContainer(application);
 
 		expect(createServiceMock).toHaveBeenCalledTimes(1);
-		const call = createServiceMock.mock.calls[0] as
-			| [MockCreateServiceOptions]
-			| undefined;
+		const call = createServiceMock.mock.calls[0];
 		if (!call) {
 			throw new Error("createServiceMock should have been called once");
 		}
 		const [settings] = call;
-		expect(settings.TaskTemplate?.ContainerSpec).not.toHaveProperty(
-			"StopGracePeriod",
-		);
+		expect(settings).not.toHaveProperty("StopGracePeriod");
 	});
 });

apps/dokploy/__test__/setup.ts

@@ -1,40 +0,0 @@
-import { vi } from "vitest";
-
-/**
- * Mock the DB module so tests that import from @dokploy/server (barrel)
- * never open a real TCP connection to PostgreSQL (e.g. in CI where no DB runs).
- * Without this, loading the server barrel pulls in lib/auth and db, which
- * connect to localhost:5432 and cause ECONNREFUSED.
- */
-vi.mock("@dokploy/server/db", () => {
-	const chain = () => chain;
-	chain.set = () => chain;
-	chain.where = () => chain;
-	chain.values = () => chain;
-	chain.returning = () => Promise.resolve([{}]);
-	chain.then = undefined;
-
-	const tableMock = {
-		findFirst: vi.fn(() => Promise.resolve(undefined)),
-		findMany: vi.fn(() => Promise.resolve([])),
-		insert: vi.fn(() => Promise.resolve([{}])),
-		update: vi.fn(() => chain),
-		delete: vi.fn(() => chain),
-	};
-	const createQueryMock = () => tableMock;
-
-	return {
-		db: {
-			select: vi.fn(() => chain),
-			insert: vi.fn(() => ({
-				values: () => ({ returning: () => Promise.resolve([{}]) }),
-			})),
-			update: vi.fn(() => chain),
-			delete: vi.fn(() => chain),
-			query: new Proxy({} as Record<string, typeof tableMock>, {
-				get: () => tableMock,
-			}),
-		},
-		dbUrl: "postgres://mock:mock@localhost:5432/mock",
-	};
-});

apps/dokploy/__test__/templates/helpers.template.test.ts

@@ -161,50 +161,6 @@ describe("helpers functions", () => {
 		});
 	});
 
-	describe("Empty string variables", () => {
-		it("should replace variables with empty string values correctly", () => {
-			const variables = {
-				smtp_username: "",
-				smtp_password: "",
-				non_empty: "value",
-			};
-
-			const result1 = processValue("${smtp_username}", variables, mockSchema);
-			expect(result1).toBe("");
-
-			const result2 = processValue("${smtp_password}", variables, mockSchema);
-			expect(result2).toBe("");
-
-			const result3 = processValue("${non_empty}", variables, mockSchema);
-			expect(result3).toBe("value");
-		});
-
-		it("should not replace undefined variables", () => {
-			const variables = {
-				defined_var: "",
-			};
-
-			const result = processValue("${undefined_var}", variables, mockSchema);
-			expect(result).toBe("${undefined_var}");
-		});
-
-		it("should handle mixed empty and non-empty variables in template", () => {
-			const variables = {
-				smtp_address: "smtp.example.com",
-				smtp_port: "2525",
-				smtp_username: "",
-				smtp_password: "",
-			};
-
-			const template =
-				"SMTP_ADDRESS=${smtp_address} SMTP_PORT=${smtp_port} SMTP_USERNAME=${smtp_username} SMTP_PASSWORD=${smtp_password}";
-			const result = processValue(template, variables, mockSchema);
-			expect(result).toBe(
-				"SMTP_ADDRESS=smtp.example.com SMTP_PORT=2525 SMTP_USERNAME= SMTP_PASSWORD=",
-			);
-		});
-	});
-
 	describe("${jwt}", () => {
 		it("should generate a JWT string", () => {
 			const jwt = processValue("${jwt}", {}, mockSchema);

apps/dokploy/__test__/traefik/server/update-server-config.test.ts

@@ -5,27 +5,19 @@ vi.mock("node:fs", () => ({
 	default: fs,
 }));
 
-import type { FileConfig } from "@dokploy/server";
+import type { FileConfig, User } from "@dokploy/server";
 import {
 	createDefaultServerTraefikConfig,
 	loadOrCreateConfig,
 	updateServerTraefik,
 } from "@dokploy/server";
-import type { webServerSettings } from "@dokploy/server/db/schema";
 import { beforeEach, expect, test, vi } from "vitest";
 
-type WebServerSettings = typeof webServerSettings.$inferSelect;
-
-const baseSettings: WebServerSettings = {
-	id: "",
+const baseAdmin: User = {
 	https: false,
-	certificateType: "none",
-	host: null,
-	serverIp: null,
-	letsEncryptEmail: null,
-	sshPrivateKey: null,
-	enableDockerCleanup: false,
-	logCleanupCron: null,
+	enablePaidFeatures: false,
+	allowImpersonation: false,
+	role: "user",
 	metricsConfig: {
 		containers: {
 			refreshRate: 20,
@@ -51,8 +43,30 @@ const baseSettings: WebServerSettings = {
 	cleanupCacheApplications: false,
 	cleanupCacheOnCompose: false,
 	cleanupCacheOnPreviews: false,
-	createdAt: null,
+	createdAt: new Date(),
+	serverIp: null,
+	certificateType: "none",
+	host: null,
+	letsEncryptEmail: null,
+	sshPrivateKey: null,
+	enableDockerCleanup: false,
+	logCleanupCron: null,
+	serversQuantity: 0,
+	stripeCustomerId: "",
+	stripeSubscriptionId: "",
+	banExpires: new Date(),
+	banned: true,
+	banReason: "",
+	email: "",
+	expirationDate: "",
+	id: "",
+	isRegistered: false,
+	name: "",
+	createdAt2: new Date().toISOString(),
+	emailVerified: false,
+	image: "",
 	updatedAt: new Date(),
+	twoFactorEnabled: false,
 };
 
 beforeEach(() => {
@@ -70,7 +84,7 @@ test("Should read the configuration file", () => {
 test("Should apply redirect-to-https", () => {
 	updateServerTraefik(
 		{
-			...baseSettings,
+			...baseAdmin,
 			https: true,
 			certificateType: "letsencrypt",
 		},
@@ -85,7 +99,7 @@ test("Should apply redirect-to-https", () => {
 });
 
 test("Should change only host when no certificate", () => {
-	updateServerTraefik(baseSettings, "example.com");
+	updateServerTraefik(baseAdmin, "example.com");
 
 	const config: FileConfig = loadOrCreateConfig("dokploy");
 
@@ -95,7 +109,7 @@ test("Should change only host when no certificate", () => {
 test("Should not touch config without host", () => {
 	const originalConfig: FileConfig = loadOrCreateConfig("dokploy");
 
-	updateServerTraefik(baseSettings, null);
+	updateServerTraefik(baseAdmin, null);
 
 	const config: FileConfig = loadOrCreateConfig("dokploy");
 
@@ -104,14 +118,11 @@ test("Should not touch config without host", () => {
 
 test("Should remove websecure if https rollback to http", () => {
 	updateServerTraefik(
-		{ ...baseSettings, certificateType: "letsencrypt" },
+		{ ...baseAdmin, certificateType: "letsencrypt" },
 		"example.com",
 	);
 
-	updateServerTraefik(
-		{ ...baseSettings, certificateType: "none" },
-		"example.com",
-	);
+	updateServerTraefik({ ...baseAdmin, certificateType: "none" }, "example.com");
 
 	const config: FileConfig = loadOrCreateConfig("dokploy");
 

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

@@ -3,25 +3,16 @@ import { createRouterConfig } from "@dokploy/server";
 import { expect, test } from "vitest";
 
 const baseApp: ApplicationNested = {
-	railpackVersion: "0.15.4",
+	railpackVersion: "0.2.2",
 	rollbackActive: false,
 	applicationId: "",
 	previewLabels: [],
-	createEnvFile: true,
-	bitbucketRepositorySlug: "",
 	herokuVersion: "",
 	giteaRepository: "",
 	giteaOwner: "",
 	giteaBranch: "",
-	buildServerId: "",
-	buildRegistryId: "",
-	buildRegistry: null,
 	giteaBuildPath: "",
 	giteaId: "",
-	args: [],
-	rollbackRegistryId: "",
-	rollbackRegistry: null,
-	deployments: [],
 	cleanCache: false,
 	applicationStatus: "done",
 	endpointSpecSwarm: null,
@@ -51,7 +42,6 @@ const baseApp: ApplicationNested = {
 	environmentId: "",
 	environment: {
 		env: "",
-		isDefault: false,
 		environmentId: "",
 		name: "",
 		createdAt: "",

apps/dokploy/__test__/vitest.config.ts

@@ -7,22 +7,13 @@ export default defineConfig({
 		include: ["__test__/**/*.test.ts"], // Incluir solo los archivos de test en el directorio __test__
 		exclude: ["**/node_modules/**", "**/dist/**", "**/.docker/**"],
 		pool: "forks",
-		setupFiles: [path.resolve(__dirname, "setup.ts")],
 	},
 	define: {
 		"process.env": {
 			NODE: "test",
-			GITHUB_CLIENT_ID: "test",
-			GITHUB_CLIENT_SECRET: "test",
-			GOOGLE_CLIENT_ID: "test",
-			GOOGLE_CLIENT_SECRET: "test",
 		},
 	},
-	plugins: [
-		tsconfigPaths({
-			projects: [path.resolve(__dirname, "../tsconfig.json")],
-		}),
-	],
+	plugins: [tsconfigPaths()],
 	resolve: {
 		alias: {
 			"@dokploy/server": path.resolve(

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/endpoint-spec-form.tsx

@@ -1,154 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { api } from "@/utils/api";
-
-export const endpointSpecFormSchema = z.object({
-	Mode: z.string().optional(),
-});
-
-interface EndpointSpecFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const EndpointSpecForm = ({ id, type }: EndpointSpecFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(endpointSpecFormSchema),
-		defaultValues: {
-			Mode: undefined,
-		},
-	});
-
-	useEffect(() => {
-		if (data?.endpointSpecSwarm) {
-			const es = data.endpointSpecSwarm;
-			form.reset({
-				Mode: es.Mode,
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof endpointSpecFormSchema>) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue =
-				formData.Mode !== undefined &&
-				formData.Mode !== null &&
-				formData.Mode !== "";
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				endpointSpecSwarm: hasAnyValue ? formData : null,
-			});
-
-			toast.success("Endpoint spec updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating endpoint spec");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="Mode"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Mode</FormLabel>
-							<FormDescription>Endpoint mode (vip or dnsrr)</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select endpoint mode" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="vip">VIP (Virtual IP)</SelectItem>
-									<SelectItem value="dnsrr">DNS Round Robin</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Mode: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Endpoint Spec
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/health-check-form.tsx

@@ -1,270 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-export const healthCheckFormSchema = z.object({
-	Test: z.array(z.string()).optional(),
-	Interval: z.coerce.number().optional(),
-	Timeout: z.coerce.number().optional(),
-	StartPeriod: z.coerce.number().optional(),
-	Retries: z.coerce.number().optional(),
-});
-
-interface HealthCheckFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const HealthCheckForm = ({ id, type }: HealthCheckFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(healthCheckFormSchema),
-		defaultValues: {
-			Test: [],
-			Interval: undefined,
-			Timeout: undefined,
-			StartPeriod: undefined,
-			Retries: undefined,
-		},
-	});
-
-	const testCommands = form.watch("Test") || [];
-
-	useEffect(() => {
-		if (data?.healthCheckSwarm) {
-			const hc = data.healthCheckSwarm;
-			form.reset({
-				Test: hc.Test || [],
-				Interval: hc.Interval,
-				Timeout: hc.Timeout,
-				StartPeriod: hc.StartPeriod,
-				Retries: hc.Retries,
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof healthCheckFormSchema>) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue =
-				(formData.Test && formData.Test.length > 0) ||
-				formData.Interval !== undefined ||
-				formData.Timeout !== undefined ||
-				formData.StartPeriod !== undefined ||
-				formData.Retries !== undefined;
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				healthCheckSwarm: hasAnyValue ? formData : null,
-			});
-
-			toast.success("Health check updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating health check");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	const addTestCommand = () => {
-		form.setValue("Test", [...testCommands, ""]);
-	};
-
-	const updateTestCommand = (index: number, value: string) => {
-		const newCommands = [...testCommands];
-		newCommands[index] = value;
-		form.setValue("Test", newCommands);
-	};
-
-	const removeTestCommand = (index: number) => {
-		form.setValue(
-			"Test",
-			testCommands.filter((_: string, i: number) => i !== index),
-		);
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<div>
-					<FormLabel>Test Commands</FormLabel>
-					<FormDescription>
-						Command to run for health check (e.g., ["CMD-SHELL", "curl -f
-						http://localhost:3000/health"])
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{testCommands.map((cmd: string, index: number) => (
-							<div key={index} className="flex gap-2">
-								<Input
-									value={cmd}
-									onChange={(e) => updateTestCommand(index, e.target.value)}
-									placeholder={
-										index === 0
-											? "CMD-SHELL"
-											: "curl -f http://localhost:3000/health"
-									}
-								/>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => removeTestCommand(index)}
-								>
-									Remove
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={addTestCommand}
-						>
-							Add Command
-						</Button>
-					</div>
-				</div>
-
-				<FormField
-					control={form.control}
-					name="Interval"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Interval (nanoseconds)</FormLabel>
-							<FormDescription>
-								Time between health checks (e.g., 10000000000 for 10 seconds)
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Timeout"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Timeout (nanoseconds)</FormLabel>
-							<FormDescription>
-								Maximum time to wait for health check response
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="StartPeriod"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Start Period (nanoseconds)</FormLabel>
-							<FormDescription>
-								Initial grace period before health checks begin
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Retries"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Retries</FormLabel>
-							<FormDescription>
-								Number of consecutive failures needed to consider container
-								unhealthy
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="3" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Test: [],
-								Interval: undefined,
-								Timeout: undefined,
-								StartPeriod: undefined,
-								Retries: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Health Check
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/index.ts

@@ -1,11 +0,0 @@
-export { EndpointSpecForm } from "./endpoint-spec-form";
-export { HealthCheckForm } from "./health-check-form";
-export { LabelsForm } from "./labels-form";
-export { ModeForm } from "./mode-form";
-export { NetworkForm } from "./network-form";
-export { PlacementForm } from "./placement-form";
-export { RestartPolicyForm } from "./restart-policy-form";
-export { RollbackConfigForm } from "./rollback-config-form";
-export { StopGracePeriodForm } from "./stop-grace-period-form";
-export { UpdateConfigForm } from "./update-config-form";
-export { filterEmptyValues, hasValues } from "./utils";

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/labels-form.tsx

@@ -1,200 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useFieldArray, useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-export const labelsFormSchema = z.object({
-	labels: z
-		.array(
-			z.object({
-				key: z.string(),
-				value: z.string(),
-			}),
-		)
-		.optional(),
-});
-
-interface LabelsFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const LabelsForm = ({ id, type }: LabelsFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(labelsFormSchema),
-		defaultValues: {
-			labels: [],
-		},
-	});
-
-	const { fields, append, remove } = useFieldArray({
-		control: form.control,
-		name: "labels",
-	});
-
-	useEffect(() => {
-		if (data?.labelsSwarm && typeof data.labelsSwarm === "object") {
-			const labelEntries = Object.entries(data.labelsSwarm).map(
-				([key, value]) => ({
-					key,
-					value: value as string,
-				}),
-			);
-			form.reset({ labels: labelEntries });
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof labelsFormSchema>) => {
-		setIsLoading(true);
-		try {
-			const labelsObject =
-				formData.labels?.reduce(
-					(acc, { key, value }) => {
-						if (key && value) {
-							acc[key] = value;
-						}
-						return acc;
-					},
-					{} as Record<string, string>,
-				) || {};
-
-			// If no labels, send null to clear the database
-			const labelsToSend =
-				Object.keys(labelsObject).length > 0 ? labelsObject : null;
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				labelsSwarm: labelsToSend,
-			});
-
-			toast.success("Labels updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating labels");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<div>
-					<FormLabel>Labels</FormLabel>
-					<FormDescription>
-						Add key-value labels to your service
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{fields.map((field, index) => (
-							<div key={field.id} className="flex gap-2">
-								<FormField
-									control={form.control}
-									name={`labels.${index}.key`}
-									render={({ field }) => (
-										<FormItem className="flex-1">
-											<FormControl>
-												<Input {...field} placeholder="com.example.app.name" />
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<FormField
-									control={form.control}
-									name={`labels.${index}.value`}
-									render={({ field }) => (
-										<FormItem className="flex-1">
-											<FormControl>
-												<Input {...field} placeholder="my-app" />
-											</FormControl>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => remove(index)}
-								>
-									Remove
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={() => append({ key: "", value: "" })}
-						>
-							Add Label
-						</Button>
-					</div>
-				</div>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({ labels: [] });
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Labels
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/mode-form.tsx

@@ -1,195 +0,0 @@
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
-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 { api } from "@/utils/api";
-
-interface ModeFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const ModeForm = ({ id, type }: ModeFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		defaultValues: {
-			type: undefined,
-			Replicas: undefined,
-		},
-	});
-
-	const modeType = form.watch("type");
-
-	useEffect(() => {
-		if (data?.modeSwarm) {
-			const mode = data.modeSwarm;
-			if (mode.Replicated) {
-				form.reset({
-					type: "Replicated",
-					Replicas: mode.Replicated.Replicas,
-				});
-			} else if (mode.Global) {
-				form.reset({
-					type: "Global",
-					Replicas: undefined,
-				});
-			}
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: any) => {
-		setIsLoading(true);
-		try {
-			// If no type is selected, send null to clear the database
-			if (!formData.type) {
-				await mutateAsync({
-					applicationId: id || "",
-					postgresId: id || "",
-					redisId: id || "",
-					mysqlId: id || "",
-					mariadbId: id || "",
-					mongoId: id || "",
-					modeSwarm: null,
-				});
-				toast.success("Mode updated successfully");
-				refetch();
-				setIsLoading(false);
-				return;
-			}
-
-			const modeData =
-				formData.type === "Replicated"
-					? { Replicated: { Replicas: formData.Replicas } }
-					: { Global: {} };
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				modeSwarm: modeData,
-			});
-
-			toast.success("Mode updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating mode");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="type"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Mode Type</FormLabel>
-							<FormDescription>
-								Choose between replicated or global service mode
-							</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select mode type" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="Replicated">Replicated</SelectItem>
-									<SelectItem value="Global">Global</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				{modeType === "Replicated" && (
-					<FormField
-						control={form.control}
-						name="Replicas"
-						render={({ field }) => (
-							<FormItem>
-								<FormLabel>Replicas</FormLabel>
-								<FormDescription>Number of replicas to run</FormDescription>
-								<FormControl>
-									<Input type="number" placeholder="1" {...field} />
-								</FormControl>
-								<FormMessage />
-							</FormItem>
-						)}
-					/>
-				)}
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								type: undefined,
-								Replicas: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Mode
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/network-form.tsx

@@ -1,313 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useFieldArray, useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-const driverOptEntrySchema = z.object({
-	key: z.string(),
-	value: z.string(),
-});
-
-export const networkFormSchema = z.object({
-	networks: z
-		.array(
-			z.object({
-				Target: z.string().optional(),
-				Aliases: z.string().optional(),
-				DriverOptsEntries: z.array(driverOptEntrySchema).optional(),
-			}),
-		)
-		.optional(),
-});
-
-interface NetworkFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const NetworkForm = ({ id, type }: NetworkFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<z.infer<typeof networkFormSchema>>({
-		resolver: zodResolver(networkFormSchema),
-		defaultValues: {
-			networks: [],
-		},
-	});
-
-	const { fields, append, remove } = useFieldArray({
-		control: form.control,
-		name: "networks",
-	});
-
-	useEffect(() => {
-		if (data?.networkSwarm && Array.isArray(data.networkSwarm)) {
-			const networkEntries = data.networkSwarm.map((network) => ({
-				Target: network.Target || "",
-				Aliases: network.Aliases?.join(", ") || "",
-				DriverOptsEntries: network.DriverOpts
-					? Object.entries(network.DriverOpts).map(([key, value]) => ({
-							key,
-							value: value ?? "",
-						}))
-					: [],
-			}));
-			form.reset({ networks: networkEntries });
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof networkFormSchema>) => {
-		setIsLoading(true);
-		try {
-			const networksArray =
-				formData.networks
-					?.filter((network) => network.Target)
-					.map((network) => {
-						const entries = (network.DriverOptsEntries ?? []).filter(
-							(e) => e.key.trim() !== "",
-						);
-						const driverOpts =
-							entries.length > 0
-								? Object.fromEntries(
-										entries.map((e) => [e.key.trim(), e.value]),
-									)
-								: undefined;
-						return {
-							Target: network.Target,
-							Aliases: network.Aliases
-								? network.Aliases.split(",").map((alias) => alias.trim())
-								: undefined,
-							DriverOpts: driverOpts,
-						};
-					}) || [];
-
-			// If no networks, send null to clear the database
-			const networksToSend = networksArray.length > 0 ? networksArray : null;
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				networkSwarm: networksToSend,
-			});
-
-			toast.success("Network configuration updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating network configuration");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<div>
-					<FormLabel>Networks</FormLabel>
-					<FormDescription>
-						Configure network attachments for your service
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{fields.map((field, index) => (
-							<div key={field.id} className="space-y-2 p-3 border rounded">
-								<FormField
-									control={form.control}
-									name={`networks.${index}.Target`}
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Network Name</FormLabel>
-											<FormControl>
-												<Input {...field} placeholder="my-network" />
-											</FormControl>
-											<FormDescription>
-												The name of the network to attach to
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<FormField
-									control={form.control}
-									name={`networks.${index}.Aliases`}
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Aliases (optional)</FormLabel>
-											<FormControl>
-												<Input
-													{...field}
-													placeholder="alias1, alias2, alias3"
-												/>
-											</FormControl>
-											<FormDescription>
-												Comma-separated list of network aliases
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-								<div className="space-y-2">
-									<FormLabel>Driver options (optional)</FormLabel>
-									<FormDescription>
-										e.g. com.docker.network.driver.mtu,
-										com.docker.network.driver.host_binding
-									</FormDescription>
-									{(
-										form.watch(`networks.${index}.DriverOptsEntries`) ?? []
-									).map((_, optIndex) => (
-										<div
-											key={optIndex}
-											className="flex gap-2 items-end flex-wrap"
-										>
-											<FormField
-												control={form.control}
-												name={`networks.${index}.DriverOptsEntries.${optIndex}.key`}
-												render={({ field }) => (
-													<FormItem className="flex-1 min-w-[140px]">
-														<FormControl>
-															<Input
-																{...field}
-																placeholder="com.docker.network.driver.mtu"
-															/>
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-											<FormField
-												control={form.control}
-												name={`networks.${index}.DriverOptsEntries.${optIndex}.value`}
-												render={({ field }) => (
-													<FormItem className="flex-1 min-w-[100px]">
-														<FormControl>
-															<Input {...field} placeholder="1500" />
-														</FormControl>
-														<FormMessage />
-													</FormItem>
-												)}
-											/>
-											<Button
-												type="button"
-												variant="ghost"
-												size="sm"
-												onClick={() => {
-													const entries =
-														form.getValues(
-															`networks.${index}.DriverOptsEntries`,
-														) ?? [];
-													form.setValue(
-														`networks.${index}.DriverOptsEntries`,
-														entries.filter((_, i) => i !== optIndex),
-													);
-												}}
-											>
-												Remove
-											</Button>
-										</div>
-									))}
-									<Button
-										type="button"
-										variant="outline"
-										size="sm"
-										onClick={() => {
-											const entries =
-												form.getValues(`networks.${index}.DriverOptsEntries`) ??
-												[];
-											form.setValue(`networks.${index}.DriverOptsEntries`, [
-												...entries,
-												{ key: "", value: "" },
-											]);
-										}}
-									>
-										Add driver option
-									</Button>
-								</div>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => remove(index)}
-								>
-									Remove Network
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={() =>
-								append({
-									Target: "",
-									Aliases: "",
-									DriverOptsEntries: [],
-								})
-							}
-						>
-							Add Network
-						</Button>
-					</div>
-				</div>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({ networks: [] });
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Networks
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/placement-form.tsx

@@ -1,347 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-const PreferenceSchema = z.object({
-	SpreadDescriptor: z.string(),
-});
-
-const PlatformSchema = z.object({
-	Architecture: z.string(),
-	OS: z.string(),
-});
-
-export const placementFormSchema = z.object({
-	Constraints: z.array(z.string()).optional(),
-	Preferences: z.array(PreferenceSchema).optional(),
-	MaxReplicas: z.coerce.number().optional(),
-	Platforms: z.array(PlatformSchema).optional(),
-});
-
-interface PlacementFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const PlacementForm = ({ id, type }: PlacementFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(placementFormSchema),
-		defaultValues: {
-			Constraints: [],
-			Preferences: [],
-			MaxReplicas: undefined,
-			Platforms: [],
-		},
-	});
-
-	const constraints = form.watch("Constraints") || [];
-	const preferences = form.watch("Preferences") || [];
-	const platforms = form.watch("Platforms") || [];
-
-	useEffect(() => {
-		if (data?.placementSwarm) {
-			const placement = data.placementSwarm;
-			form.reset({
-				Constraints: placement.Constraints || [],
-				Preferences:
-					placement.Preferences?.map((p: any) => ({
-						SpreadDescriptor: p.Spread?.SpreadDescriptor || "",
-					})) || [],
-				MaxReplicas: placement.MaxReplicas,
-				Platforms: placement.Platforms || [],
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof placementFormSchema>) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue =
-				(formData.Constraints && formData.Constraints.length > 0) ||
-				(formData.Preferences && formData.Preferences.length > 0) ||
-				(formData.Platforms && formData.Platforms.length > 0) ||
-				formData.MaxReplicas !== undefined;
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				placementSwarm: hasAnyValue
-					? {
-							...formData,
-							Preferences: formData.Preferences?.map((p) => ({
-								Spread: { SpreadDescriptor: p.SpreadDescriptor },
-							})),
-						}
-					: null,
-			});
-
-			toast.success("Placement updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating placement");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	const addConstraint = () => {
-		form.setValue("Constraints", [...constraints, ""]);
-	};
-
-	const updateConstraint = (index: number, value: string) => {
-		const newConstraints = [...constraints];
-		newConstraints[index] = value;
-		form.setValue("Constraints", newConstraints);
-	};
-
-	const removeConstraint = (index: number) => {
-		form.setValue(
-			"Constraints",
-			constraints.filter((_: string, i: number) => i !== index),
-		);
-	};
-
-	const addPreference = () => {
-		form.setValue("Preferences", [...preferences, { SpreadDescriptor: "" }]);
-	};
-
-	const updatePreference = (index: number, value: string) => {
-		const newPreferences = [...preferences];
-		if (newPreferences[index]) {
-			newPreferences[index].SpreadDescriptor = value;
-			form.setValue("Preferences", newPreferences);
-		}
-	};
-
-	const removePreference = (index: number) => {
-		form.setValue(
-			"Preferences",
-			preferences.filter((_: any, i: number) => i !== index),
-		);
-	};
-
-	const addPlatform = () => {
-		form.setValue("Platforms", [...platforms, { Architecture: "", OS: "" }]);
-	};
-
-	const updatePlatform = (
-		index: number,
-		field: "Architecture" | "OS",
-		value: string,
-	) => {
-		const newPlatforms = [...platforms];
-		if (newPlatforms[index]) {
-			newPlatforms[index][field] = value;
-			form.setValue("Platforms", newPlatforms);
-		}
-	};
-
-	const removePlatform = (index: number) => {
-		form.setValue(
-			"Platforms",
-			platforms.filter((_: any, i: number) => i !== index),
-		);
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<div>
-					<FormLabel>Constraints</FormLabel>
-					<FormDescription>
-						Placement constraints (e.g., "node.role==manager")
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{constraints.map((constraint: string, index: number) => (
-							<div key={index} className="flex gap-2">
-								<Input
-									value={constraint}
-									onChange={(e) => updateConstraint(index, e.target.value)}
-									placeholder="node.role==manager"
-								/>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => removeConstraint(index)}
-								>
-									Remove
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={addConstraint}
-						>
-							Add Constraint
-						</Button>
-					</div>
-				</div>
-
-				<div>
-					<FormLabel>Preferences</FormLabel>
-					<FormDescription>
-						Spread preferences for task distribution (e.g.,
-						"node.labels.region")
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{preferences.map((pref: any, index: number) => (
-							<div key={index} className="flex gap-2">
-								<Input
-									value={pref.SpreadDescriptor}
-									onChange={(e) => updatePreference(index, e.target.value)}
-									placeholder="node.labels.region"
-								/>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => removePreference(index)}
-								>
-									Remove
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={addPreference}
-						>
-							Add Preference
-						</Button>
-					</div>
-				</div>
-
-				<FormField
-					control={form.control}
-					name="MaxReplicas"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Max Replicas</FormLabel>
-							<FormDescription>
-								Maximum number of replicas per node
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div>
-					<FormLabel>Platforms</FormLabel>
-					<FormDescription>
-						Target platforms for task scheduling
-					</FormDescription>
-					<div className="space-y-2 mt-2">
-						{platforms.map((platform: any, index: number) => (
-							<div key={index} className="flex gap-2">
-								<Input
-									value={platform.Architecture}
-									onChange={(e) =>
-										updatePlatform(index, "Architecture", e.target.value)
-									}
-									placeholder="amd64"
-								/>
-								<Input
-									value={platform.OS}
-									onChange={(e) => updatePlatform(index, "OS", e.target.value)}
-									placeholder="linux"
-								/>
-								<Button
-									type="button"
-									variant="destructive"
-									size="sm"
-									onClick={() => removePlatform(index)}
-								>
-									Remove
-								</Button>
-							</div>
-						))}
-						<Button
-							type="button"
-							variant="outline"
-							size="sm"
-							onClick={addPlatform}
-						>
-							Add Platform
-						</Button>
-					</div>
-				</div>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Constraints: [],
-								Preferences: [],
-								MaxReplicas: undefined,
-								Platforms: [],
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Placement
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/restart-policy-form.tsx

@@ -1,219 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-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 { api } from "@/utils/api";
-
-export const restartPolicyFormSchema = z.object({
-	Condition: z.string().optional(),
-	Delay: z.coerce.number().optional(),
-	MaxAttempts: z.coerce.number().optional(),
-	Window: z.coerce.number().optional(),
-});
-
-interface RestartPolicyFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const RestartPolicyForm = ({ id, type }: RestartPolicyFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(restartPolicyFormSchema),
-		defaultValues: {
-			Condition: undefined,
-			Delay: undefined,
-			MaxAttempts: undefined,
-			Window: undefined,
-		},
-	});
-
-	useEffect(() => {
-		if (data?.restartPolicySwarm) {
-			form.reset({
-				Condition: data.restartPolicySwarm.Condition,
-				Delay: data.restartPolicySwarm.Delay,
-				MaxAttempts: data.restartPolicySwarm.MaxAttempts,
-				Window: data.restartPolicySwarm.Window,
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (
-		formData: z.infer<typeof restartPolicyFormSchema>,
-	) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue = Object.values(formData).some(
-				(value) => value !== undefined && value !== null && value !== "",
-			);
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				restartPolicySwarm: hasAnyValue ? formData : null,
-			});
-
-			toast.success("Restart policy updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating restart policy");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="Condition"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Condition</FormLabel>
-							<FormDescription>When to restart the container</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select restart condition" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="none">None</SelectItem>
-									<SelectItem value="on-failure">On Failure</SelectItem>
-									<SelectItem value="any">Any</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Delay"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Delay (nanoseconds)</FormLabel>
-							<FormDescription>
-								Wait time between restart attempts
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="MaxAttempts"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Max Attempts</FormLabel>
-							<FormDescription>
-								Maximum number of restart attempts
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="3" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Window"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Window (nanoseconds)</FormLabel>
-							<FormDescription>
-								Time window to evaluate restart policy
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Condition: undefined,
-								Delay: undefined,
-								MaxAttempts: undefined,
-								Window: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Restart Policy
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/rollback-config-form.tsx

@@ -1,257 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-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 { api } from "@/utils/api";
-
-export const rollbackConfigFormSchema = z.object({
-	Parallelism: z.coerce.number().optional(),
-	Delay: z.coerce.number().optional(),
-	FailureAction: z.string().optional(),
-	Monitor: z.coerce.number().optional(),
-	MaxFailureRatio: z.coerce.number().optional(),
-	Order: z.string().optional(),
-});
-
-interface RollbackConfigFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const RollbackConfigForm = ({ id, type }: RollbackConfigFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(rollbackConfigFormSchema),
-		defaultValues: {
-			Parallelism: undefined,
-			Delay: undefined,
-			FailureAction: undefined,
-			Monitor: undefined,
-			MaxFailureRatio: undefined,
-			Order: undefined,
-		},
-	});
-
-	useEffect(() => {
-		if (data?.rollbackConfigSwarm) {
-			form.reset(data.rollbackConfigSwarm);
-		}
-	}, [data, form]);
-
-	const onSubmit = async (
-		formData: z.infer<typeof rollbackConfigFormSchema>,
-	) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue = Object.values(formData).some(
-				(value) => value !== undefined && value !== null && value !== "",
-			);
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				rollbackConfigSwarm: (hasAnyValue ? formData : null) as any,
-			});
-
-			toast.success("Rollback config updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating rollback config");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="Parallelism"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Parallelism</FormLabel>
-							<FormDescription>
-								Number of tasks to rollback simultaneously
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="1" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Delay"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Delay (nanoseconds)</FormLabel>
-							<FormDescription>Delay between task rollbacks</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="FailureAction"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Failure Action</FormLabel>
-							<FormDescription>Action on rollback failure</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select failure action" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="pause">Pause</SelectItem>
-									<SelectItem value="continue">Continue</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Monitor"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Monitor (nanoseconds)</FormLabel>
-							<FormDescription>
-								Duration to monitor for failure after rollback
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="MaxFailureRatio"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Max Failure Ratio</FormLabel>
-							<FormDescription>
-								Maximum failure ratio tolerated (0-1)
-							</FormDescription>
-							<FormControl>
-								<Input type="number" step="0.01" placeholder="0.1" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Order"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Order</FormLabel>
-							<FormDescription>Rollback order strategy</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select order" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="stop-first">Stop First</SelectItem>
-									<SelectItem value="start-first">Start First</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Parallelism: undefined,
-								Delay: undefined,
-								FailureAction: undefined,
-								Monitor: undefined,
-								MaxFailureRatio: undefined,
-								Order: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Rollback Config
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/stop-grace-period-form.tsx

@@ -1,158 +0,0 @@
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-
-const hasStopGracePeriodSwarm = (
-	value: unknown,
-): value is { stopGracePeriodSwarm: bigint | number | string | null } =>
-	typeof value === "object" &&
-	value !== null &&
-	"stopGracePeriodSwarm" in value;
-
-interface StopGracePeriodFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const StopGracePeriodForm = ({ id, type }: StopGracePeriodFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		defaultValues: {
-			value: null as bigint | null,
-		},
-	});
-
-	useEffect(() => {
-		if (hasStopGracePeriodSwarm(data)) {
-			const value = data.stopGracePeriodSwarm;
-			const normalizedValue =
-				value === null || value === undefined
-					? null
-					: typeof value === "bigint"
-						? value
-						: BigInt(value);
-			form.reset({
-				value: normalizedValue,
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: any) => {
-		setIsLoading(true);
-		try {
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				stopGracePeriodSwarm: formData.value,
-			});
-
-			toast.success("Stop grace period updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating stop grace period");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="value"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Stop Grace Period (nanoseconds)</FormLabel>
-							<FormDescription>
-								Time to wait before forcefully killing the container
-								<br />
-								Examples: 30000000000 (30s), 120000000000 (2m)
-							</FormDescription>
-							<FormControl>
-								<Input
-									type="number"
-									placeholder="30000000000"
-									{...field}
-									value={
-										field?.value !== null && field?.value !== undefined
-											? field.value.toString()
-											: ""
-									}
-									onChange={(e) =>
-										field.onChange(
-											e.target.value ? BigInt(e.target.value) : null,
-										)
-									}
-								/>
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								value: null,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Stop Grace Period
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/update-config-form.tsx

@@ -1,264 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { Button } from "@/components/ui/button";
-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 { api } from "@/utils/api";
-
-export const updateConfigFormSchema = z.object({
-	Parallelism: z.coerce.number().optional(),
-	Delay: z.coerce.number().optional(),
-	FailureAction: z.string().optional(),
-	Monitor: z.coerce.number().optional(),
-	MaxFailureRatio: z.coerce.number().optional(),
-	Order: z.string().optional(),
-});
-
-interface UpdateConfigFormProps {
-	id: string;
-	type: "postgres" | "mariadb" | "mongo" | "mysql" | "redis" | "application";
-}
-
-export const UpdateConfigForm = ({ id, type }: UpdateConfigFormProps) => {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const queryMap = {
-		postgres: () =>
-			api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
-		redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
-		mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
-		mariadb: () =>
-			api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
-		application: () =>
-			api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
-		mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
-	};
-	const { data, refetch } = queryMap[type]
-		? queryMap[type]()
-		: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
-
-	const mutationMap = {
-		postgres: () => api.postgres.update.useMutation(),
-		redis: () => api.redis.update.useMutation(),
-		mysql: () => api.mysql.update.useMutation(),
-		mariadb: () => api.mariadb.update.useMutation(),
-		application: () => api.application.update.useMutation(),
-		mongo: () => api.mongo.update.useMutation(),
-	};
-
-	const { mutateAsync } = mutationMap[type]
-		? mutationMap[type]()
-		: api.mongo.update.useMutation();
-
-	const form = useForm<any>({
-		resolver: zodResolver(updateConfigFormSchema),
-		defaultValues: {
-			Parallelism: undefined,
-			Delay: undefined,
-			FailureAction: undefined,
-			Monitor: undefined,
-			MaxFailureRatio: undefined,
-			Order: undefined,
-		},
-	});
-
-	useEffect(() => {
-		if (data?.updateConfigSwarm) {
-			const config = data.updateConfigSwarm;
-			form.reset({
-				Parallelism: config.Parallelism,
-				Delay: config.Delay,
-				FailureAction: config.FailureAction,
-				Monitor: config.Monitor,
-				MaxFailureRatio: config.MaxFailureRatio,
-				Order: config.Order,
-			});
-		}
-	}, [data, form]);
-
-	const onSubmit = async (formData: z.infer<typeof updateConfigFormSchema>) => {
-		setIsLoading(true);
-		try {
-			// Check if all values are empty, if so, send null to clear the database
-			const hasAnyValue = Object.values(formData).some(
-				(value) => value !== undefined && value !== null && value !== "",
-			);
-
-			await mutateAsync({
-				applicationId: id || "",
-				postgresId: id || "",
-				redisId: id || "",
-				mysqlId: id || "",
-				mariadbId: id || "",
-				mongoId: id || "",
-				updateConfigSwarm: (hasAnyValue ? formData : null) as any,
-			});
-
-			toast.success("Update config updated successfully");
-			refetch();
-		} catch {
-			toast.error("Error updating update config");
-		} finally {
-			setIsLoading(false);
-		}
-	};
-
-	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-				<FormField
-					control={form.control}
-					name="Parallelism"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Parallelism</FormLabel>
-							<FormDescription>
-								Number of tasks to update simultaneously
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="1" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Delay"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Delay (nanoseconds)</FormLabel>
-							<FormDescription>Delay between task updates</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="FailureAction"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Failure Action</FormLabel>
-							<FormDescription>Action on update failure</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select failure action" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="pause">Pause</SelectItem>
-									<SelectItem value="continue">Continue</SelectItem>
-									<SelectItem value="rollback">Rollback</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Monitor"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Monitor (nanoseconds)</FormLabel>
-							<FormDescription>
-								Duration to monitor for failure after update
-							</FormDescription>
-							<FormControl>
-								<Input type="number" placeholder="10000000000" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="MaxFailureRatio"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Max Failure Ratio</FormLabel>
-							<FormDescription>
-								Maximum failure ratio tolerated (0-1)
-							</FormDescription>
-							<FormControl>
-								<Input type="number" step="0.01" placeholder="0.1" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="Order"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Order</FormLabel>
-							<FormDescription>Update order strategy</FormDescription>
-							<Select onValueChange={field.onChange} value={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select order" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									<SelectItem value="stop-first">Stop First</SelectItem>
-									<SelectItem value="start-first">Start First</SelectItem>
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<div className="flex justify-end gap-2">
-					<Button
-						type="button"
-						variant="outline"
-						onClick={() => {
-							form.reset({
-								Parallelism: undefined,
-								Delay: undefined,
-								FailureAction: undefined,
-								Monitor: undefined,
-								MaxFailureRatio: undefined,
-								Order: undefined,
-							});
-						}}
-					>
-						Clear
-					</Button>
-					<Button type="submit" isLoading={isLoading}>
-						Save Update Config
-					</Button>
-				</div>
-			</form>
-		</Form>
-	);
-};

apps/dokploy/components/dashboard/application/advanced/cluster/swarm-forms/utils.ts

@@ -1,31 +0,0 @@
-/**
- * Filters out undefined, null, and empty string values from form data
- * Only returns fields that have actual values
- */
-export const filterEmptyValues = (
-	formData: Record<string, any>,
-): Record<string, any> => {
-	return Object.entries(formData).reduce(
-		(acc, [key, value]) => {
-			// Keep arrays even if empty (they might be intentionally cleared)
-			if (Array.isArray(value)) {
-				if (value.length > 0) {
-					acc[key] = value;
-				}
-			}
-			// For other values, filter out undefined, null, and empty strings
-			else if (value !== undefined && value !== null && value !== "") {
-				acc[key] = value;
-			}
-			return acc;
-		},
-		{} as Record<string, any>,
-	);
-};
-
-/**
- * Checks if filtered data has any values to save
- */
-export const hasValues = (data: Record<string, any>): boolean => {
-	return Object.keys(data).length > 0;
-};

apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx

@@ -1,7 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Plus, Trash2 } from "lucide-react";
 import { useEffect } from "react";
-import { useFieldArray, useForm } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { Button } from "@/components/ui/button";
@@ -29,13 +28,6 @@ interface Props {
 
 const AddRedirectSchema = z.object({
 	command: z.string(),
-	args: z
-		.array(
-			z.object({
-				value: z.string().min(1, "Argument cannot be empty"),
-			}),
-		)
-		.optional(),
 });
 
 type AddCommand = z.infer<typeof AddRedirectSchema>;
@@ -55,30 +47,22 @@ export const AddCommand = ({ applicationId }: Props) => {
 	const form = useForm<AddCommand>({
 		defaultValues: {
 			command: "",
-			args: [],
 		},
 		resolver: zodResolver(AddRedirectSchema),
 	});
 
-	const { fields, append, remove } = useFieldArray({
-		control: form.control,
-		name: "args",
-	});
-
 	useEffect(() => {
-		if (data) {
+		if (data?.command) {
 			form.reset({
 				command: data?.command || "",
-				args: data?.args?.map((arg) => ({ value: arg })) || [],
 			});
 		}
-	}, [data, form]);
+	}, [form, form.reset, form.formState.isSubmitSuccessful, data?.command]);
 
 	const onSubmit = async (data: AddCommand) => {
 		await mutateAsync({
 			applicationId,
 			command: data?.command,
-			args: data?.args?.map((arg) => arg.value).filter(Boolean),
 		})
 			.then(async () => {
 				toast.success("Command Updated");
@@ -116,65 +100,13 @@ export const AddCommand = ({ applicationId }: Props) => {
 									<FormItem>
 										<FormLabel>Command</FormLabel>
 										<FormControl>
-											<Input placeholder="/bin/sh" {...field} />
+											<Input placeholder="Custom command" {...field} />
 										</FormControl>
 
 										<FormMessage />
 									</FormItem>
 								)}
 							/>
-
-							<div className="space-y-2">
-								<div className="flex items-center justify-between">
-									<FormLabel>Arguments (Args)</FormLabel>
-									<Button
-										type="button"
-										variant="outline"
-										size="sm"
-										onClick={() => append({ value: "" })}
-									>
-										<Plus className="h-4 w-4 mr-1" />
-										Add Argument
-									</Button>
-								</div>
-
-								{fields.length === 0 && (
-									<p className="text-sm text-muted-foreground">
-										No arguments added yet. Click "Add Argument" to add one.
-									</p>
-								)}
-
-								{fields.map((field, index) => (
-									<FormField
-										key={field.id}
-										control={form.control}
-										name={`args.${index}.value`}
-										render={({ field }) => (
-											<FormItem>
-												<div className="flex gap-2">
-													<FormControl>
-														<Input
-															placeholder={
-																index === 0 ? "-c" : "echo Hello World"
-															}
-															{...field}
-														/>
-													</FormControl>
-													<Button
-														type="button"
-														variant="destructive"
-														size="icon"
-														onClick={() => remove(index)}
-													>
-														<Trash2 className="h-4 w-4" />
-													</Button>
-												</div>
-												<FormMessage />
-											</FormItem>
-										)}
-									/>
-								))}
-							</div>
 						</div>
 						<div className="flex justify-end">
 							<Button isLoading={isLoading} type="submit" className="w-fit">

apps/dokploy/components/dashboard/application/advanced/show-build-server.tsx

@@ -1,286 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { Server } from "lucide-react";
-import Link from "next/link";
-import { useEffect } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { Button } from "@/components/ui/button";
-import {
-	Card,
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-	FormMessage,
-} from "@/components/ui/form";
-import {
-	Select,
-	SelectContent,
-	SelectGroup,
-	SelectItem,
-	SelectLabel,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { api } from "@/utils/api";
-
-interface Props {
-	applicationId: string;
-}
-
-const schema = z
-	.object({
-		buildServerId: z.string().optional(),
-		buildRegistryId: z.string().optional(),
-	})
-	.refine(
-		(data) => {
-			// Both empty/none is valid
-			const buildServerIsNone =
-				!data.buildServerId || data.buildServerId === "none";
-			const buildRegistryIsNone =
-				!data.buildRegistryId || data.buildRegistryId === "none";
-
-			// Both should be either filled or empty
-			if (buildServerIsNone && buildRegistryIsNone) return true;
-			if (!buildServerIsNone && !buildRegistryIsNone) return true;
-
-			return false;
-		},
-		{
-			message:
-				"Both Build Server and Build Registry must be selected together, or both set to None",
-			path: ["buildServerId"], // Show error on buildServerId field
-		},
-	);
-
-type Schema = z.infer<typeof schema>;
-
-export const ShowBuildServer = ({ applicationId }: Props) => {
-	const { data, refetch } = api.application.one.useQuery(
-		{ applicationId },
-		{ enabled: !!applicationId },
-	);
-	const { data: buildServers } = api.server.buildServers.useQuery();
-	const { data: registries } = api.registry.all.useQuery();
-
-	const { mutateAsync, isLoading } = api.application.update.useMutation();
-
-	const form = useForm<Schema>({
-		defaultValues: {
-			buildServerId: data?.buildServerId || "",
-			buildRegistryId: data?.buildRegistryId || "",
-		},
-		resolver: zodResolver(schema),
-	});
-
-	useEffect(() => {
-		if (data) {
-			form.reset({
-				buildServerId: data?.buildServerId || "",
-				buildRegistryId: data?.buildRegistryId || "",
-			});
-		}
-	}, [form, form.reset, data]);
-
-	const onSubmit = async (formData: Schema) => {
-		await mutateAsync({
-			applicationId,
-			buildServerId:
-				formData?.buildServerId === "none" || !formData?.buildServerId
-					? null
-					: formData?.buildServerId,
-			buildRegistryId:
-				formData?.buildRegistryId === "none" || !formData?.buildRegistryId
-					? null
-					: formData?.buildRegistryId,
-		})
-			.then(async () => {
-				toast.success("Build Server Settings Updated");
-				await refetch();
-			})
-			.catch(() => {
-				toast.error("Error updating build server settings");
-			});
-	};
-
-	return (
-		<Card className="bg-background">
-			<CardHeader>
-				<div className="flex flex-row items-center gap-2">
-					<Server className="size-6 text-muted-foreground" />
-					<div>
-						<CardTitle className="text-xl">Build Server</CardTitle>
-						<CardDescription>
-							Configure a dedicated server for building your application.
-						</CardDescription>
-					</div>
-				</div>
-			</CardHeader>
-			<CardContent className="flex flex-col gap-4">
-				<AlertBlock type="info">
-					Build servers offload the build process from your deployment servers.
-					Select a build server and registry to use for building your
-					application.
-				</AlertBlock>
-
-				<AlertBlock type="info">
-					📊 <strong>Important:</strong> Once the build finishes, you'll need to
-					wait a few seconds for the deployment server to download the image.
-					These download logs will <strong>NOT</strong> appear in the build
-					deployment logs. Check the <strong>Logs</strong> tab to see when the
-					container starts running.
-				</AlertBlock>
-
-				<AlertBlock type="info">
-					<strong>Note:</strong> Build Server and Build Registry must be
-					configured together. You can either select both or set both to None.
-				</AlertBlock>
-
-				{!registries || registries.length === 0 ? (
-					<AlertBlock type="warning">
-						You need to add at least one registry to use build servers. Please
-						go to{" "}
-						<Link
-							href="/dashboard/settings/registry"
-							className="text-primary underline"
-						>
-							Settings
-						</Link>{" "}
-						to add a registry.
-					</AlertBlock>
-				) : null}
-
-				<Form {...form}>
-					<form
-						onSubmit={form.handleSubmit(onSubmit)}
-						className="grid w-full gap-4"
-					>
-						<FormField
-							control={form.control}
-							name="buildServerId"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Build Server</FormLabel>
-									<Select
-										onValueChange={(value) => {
-											field.onChange(value);
-											// If setting to "none", also reset build registry to "none"
-											if (value === "none") {
-												form.setValue("buildRegistryId", "none");
-											}
-										}}
-										value={field.value || "none"}
-									>
-										<FormControl>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a build server" />
-											</SelectTrigger>
-										</FormControl>
-										<SelectContent>
-											<SelectGroup>
-												<SelectItem value="none">
-													<span className="flex items-center gap-2">
-														<span>None</span>
-													</span>
-												</SelectItem>
-												{buildServers?.map((server) => (
-													<SelectItem
-														key={server.serverId}
-														value={server.serverId}
-													>
-														<span className="flex items-center gap-2 justify-between w-full">
-															<span>{server.name}</span>
-															<span className="text-muted-foreground text-xs">
-																{server.ipAddress}
-															</span>
-														</span>
-													</SelectItem>
-												))}
-												<SelectLabel>
-													Build Servers ({buildServers?.length || 0})
-												</SelectLabel>
-											</SelectGroup>
-										</SelectContent>
-									</Select>
-									<FormDescription>
-										Select a build server to handle the build process for this
-										application.
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<FormField
-							control={form.control}
-							name="buildRegistryId"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Build Registry</FormLabel>
-									<Select
-										onValueChange={(value) => {
-											field.onChange(value);
-											// If setting to "none", also reset build server to "none"
-											if (value === "none") {
-												form.setValue("buildServerId", "none");
-											}
-										}}
-										value={field.value || "none"}
-									>
-										<FormControl>
-											<SelectTrigger>
-												<SelectValue placeholder="Select a registry" />
-											</SelectTrigger>
-										</FormControl>
-										<SelectContent>
-											<SelectGroup>
-												<SelectItem value="none">
-													<span className="flex items-center gap-2">
-														<span>None</span>
-													</span>
-												</SelectItem>
-												{registries?.map((registry) => (
-													<SelectItem
-														key={registry.registryId}
-														value={registry.registryId}
-													>
-														{registry.registryName}
-													</SelectItem>
-												))}
-												<SelectLabel>
-													Registries ({registries?.length || 0})
-												</SelectLabel>
-											</SelectGroup>
-										</SelectContent>
-									</Select>
-									<FormDescription>
-										Select a registry to store the built images from the build
-										server.
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
-						<div className="flex w-full justify-end">
-							<Button isLoading={isLoading} type="submit">
-								Save
-							</Button>
-						</div>
-					</form>
-				</Form>
-			</CardContent>
-		</Card>
-	);
-};

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

@@ -21,10 +21,7 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import {
-	createConverter,
-	NumberInputWithSteps,
-} from "@/components/ui/number-input";
+import { Input } from "@/components/ui/input";
 import {
 	Tooltip,
 	TooltipContent,
@@ -33,23 +30,6 @@ import {
 } from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 
-const CPU_STEP = 0.25;
-const MEMORY_STEP_MB = 256;
-
-const formatNumber = (value: number, decimals = 2): string =>
-	Number.isInteger(value) ? String(value) : value.toFixed(decimals);
-
-const cpuConverter = createConverter(1_000_000_000, (cpu) =>
-	cpu <= 0 ? "" : `${formatNumber(cpu)} CPU`,
-);
-
-const memoryConverter = createConverter(1024 * 1024, (mb) => {
-	if (mb <= 0) return "";
-	return mb >= 1024
-		? `${formatNumber(mb / 1024)} GB`
-		: `${formatNumber(mb)} MB`;
-});
-
 const addResourcesSchema = z.object({
 	memoryReservation: z.string().optional(),
 	cpuLimit: z.string().optional(),
@@ -71,7 +51,6 @@ interface Props {
 }
 
 type AddResources = z.infer<typeof addResourcesSchema>;
-
 export const ShowResources = ({ id, type }: Props) => {
 	const queryMap = {
 		postgres: () =>
@@ -184,20 +163,16 @@ export const ShowResources = ({ id, type }: Props) => {
 														<TooltipContent>
 															<p>
 																Memory hard limit in bytes. Example: 1GB =
-																1073741824 bytes. Use +/- buttons to adjust by
-																256 MB.
+																1073741824 bytes
 															</p>
 														</TooltipContent>
 													</Tooltip>
 												</TooltipProvider>
 											</div>
 											<FormControl>
-												<NumberInputWithSteps
-													value={field.value}
-													onChange={field.onChange}
+												<Input
 													placeholder="1073741824 (1GB in bytes)"
-													step={MEMORY_STEP_MB}
-													converter={memoryConverter}
+													{...field}
 												/>
 											</FormControl>
 											<FormMessage />
@@ -223,20 +198,16 @@ export const ShowResources = ({ id, type }: Props) => {
 													<TooltipContent>
 														<p>
 															Memory soft limit in bytes. Example: 256MB =
-															268435456 bytes. Use +/- buttons to adjust by 256
-															MB.
+															268435456 bytes
 														</p>
 													</TooltipContent>
 												</Tooltip>
 											</TooltipProvider>
 										</div>
 										<FormControl>
-											<NumberInputWithSteps
-												value={field.value}
-												onChange={field.onChange}
+											<Input
 												placeholder="268435456 (256MB in bytes)"
-												step={MEMORY_STEP_MB}
-												converter={memoryConverter}
+												{...field}
 											/>
 										</FormControl>
 										<FormMessage />
@@ -263,20 +234,17 @@ export const ShowResources = ({ id, type }: Props) => {
 														<TooltipContent>
 															<p>
 																CPU quota in units of 10^-9 CPUs. Example: 2
-																CPUs = 2000000000. Use +/- buttons to adjust by
-																0.25 CPU.
+																CPUs = 2000000000
 															</p>
 														</TooltipContent>
 													</Tooltip>
 												</TooltipProvider>
 											</div>
 											<FormControl>
-												<NumberInputWithSteps
-													value={field.value}
-													onChange={field.onChange}
+												<Input
 													placeholder="2000000000 (2 CPUs)"
-													step={CPU_STEP}
-													converter={cpuConverter}
+													{...field}
+													value={field.value?.toString() || ""}
 												/>
 											</FormControl>
 											<FormMessage />
@@ -303,21 +271,14 @@ export const ShowResources = ({ id, type }: Props) => {
 														<TooltipContent>
 															<p>
 																CPU shares (relative weight). Example: 1 CPU =
-																1000000000. Use +/- buttons to adjust by 0.25
-																CPU.
+																1000000000
 															</p>
 														</TooltipContent>
 													</Tooltip>
 												</TooltipProvider>
 											</div>
 											<FormControl>
-												<NumberInputWithSteps
-													value={field.value}
-													onChange={field.onChange}
-													placeholder="1000000000 (1 CPU)"
-													step={CPU_STEP}
-													converter={cpuConverter}
-												/>
+												<Input placeholder="1000000000 (1 CPU)" {...field} />
 											</FormControl>
 											<FormMessage />
 										</FormItem>

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

@@ -24,8 +24,6 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { Checkbox } from "@/components/ui/checkbox";
-import { Label } from "@/components/ui/label";
 import { api } from "@/utils/api";
 
 const UpdateTraefikConfigSchema = z.object({
@@ -61,7 +59,6 @@ export const validateAndFormatYAML = (yamlText: string) => {
 
 export const UpdateTraefikConfig = ({ applicationId }: Props) => {
 	const [open, setOpen] = useState(false);
-	const [skipYamlValidation, setSkipYamlValidation] = useState(false);
 	const { data, refetch } = api.application.readTraefikConfig.useQuery(
 		{
 			applicationId,
@@ -88,15 +85,13 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => {
 	}, [data]);
 
 	const onSubmit = async (data: UpdateTraefikConfig) => {
-		if (!skipYamlValidation) {
-			const { valid, error } = validateAndFormatYAML(data.traefikConfig);
-			if (!valid) {
-				form.setError("traefikConfig", {
-					type: "manual",
-					message: (error as string) || "Invalid YAML",
-				});
-				return;
-			}
+		const { valid, error } = validateAndFormatYAML(data.traefikConfig);
+		if (!valid) {
+			form.setError("traefikConfig", {
+				type: "manual",
+				message: (error as string) || "Invalid YAML",
+			});
+			return;
 		}
 		form.clearErrors("traefikConfig");
 		await mutateAsync({
@@ -121,7 +116,6 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => {
 				setOpen(open);
 				if (!open) {
 					form.reset();
-					setSkipYamlValidation(false);
 				}
 			}}
 		>
@@ -175,28 +169,7 @@ routers:
 						</div>
 					</form>
 
-					<DialogFooter className="flex-col sm:flex-row gap-4">
-						<div className="flex flex-col gap-1 w-full sm:w-auto sm:mr-auto">
-							<div className="flex items-center space-x-2">
-								<Checkbox
-									id="skip-yaml-validation-app"
-									checked={skipYamlValidation}
-									onCheckedChange={(checked) =>
-										setSkipYamlValidation(checked === true)
-									}
-								/>
-								<Label
-									htmlFor="skip-yaml-validation-app"
-									className="text-sm font-normal cursor-pointer"
-								>
-									Skip YAML validation (for Go templating)
-								</Label>
-							</div>
-							<p className="text-sm text-muted-foreground">
-								Check to save configs with Go templating (e.g.{" "}
-								<code className="text-xs">{"{{range}}"}</code>).
-							</p>
-						</div>
+					<DialogFooter>
 						<Button
 							isLoading={isLoading}
 							form="hook-form-update-traefik-config"

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

@@ -1,6 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Cog } from "lucide-react";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -20,39 +20,8 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
 import { api } from "@/utils/api";
 
-// Railpack versions from https://github.com/railwayapp/railpack/releases
-export const RAILPACK_VERSIONS = [
-	"0.15.4",
-	"0.15.3",
-	"0.15.2",
-	"0.15.1",
-	"0.15.0",
-	"0.14.0",
-	"0.13.0",
-	"0.12.0",
-	"0.11.0",
-	"0.10.0",
-	"0.9.2",
-	"0.9.1",
-	"0.9.0",
-	"0.8.0",
-	"0.7.0",
-	"0.6.0",
-	"0.5.0",
-	"0.4.0",
-	"0.3.0",
-	"0.2.2",
-] as const;
-
 export enum BuildType {
 	dockerfile = "dockerfile",
 	heroku_buildpacks = "heroku_buildpacks",
@@ -96,7 +65,7 @@ const mySchema = z.discriminatedUnion("buildType", [
 	}),
 	z.object({
 		buildType: z.literal(BuildType.railpack),
-		railpackVersion: z.string().nullable().default("0.15.4"),
+		railpackVersion: z.string().nullable().default("0.2.2"),
 	}),
 	z.object({
 		buildType: z.literal(BuildType.static),
@@ -183,8 +152,6 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 	});
 
 	const buildType = form.watch("buildType");
-	const railpackVersion = form.watch("railpackVersion");
-	const [isManualRailpackVersion, setIsManualRailpackVersion] = useState(false);
 
 	useEffect(() => {
 		if (data) {
@@ -196,22 +163,9 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 			};
 
 			form.reset(resetData(typedData));
-
-			// Check if railpack version is manual (not in the predefined list)
-			if (
-				data.railpackVersion &&
-				!RAILPACK_VERSIONS.includes(data.railpackVersion as any)
-			) {
-				setIsManualRailpackVersion(true);
-			}
 		}
 	}, [data, form]);
 
-	// Hide builder section when Docker provider is selected
-	if (data?.sourceType === "docker") {
-		return null;
-	}
-
 	const onSubmit = async (data: AddTemplate) => {
 		await mutateAsync({
 			applicationId,
@@ -232,7 +186,7 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 				data.buildType === BuildType.static ? data.isStaticSpa : null,
 			railpackVersion:
 				data.buildType === BuildType.railpack
-					? data.railpackVersion || "0.15.4"
+					? data.railpackVersion || "0.2.2"
 					: null,
 		})
 			.then(async () => {
@@ -449,88 +403,23 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 							/>
 						)}
 						{buildType === BuildType.railpack && (
-							<>
-								<FormField
-									control={form.control}
-									name="railpackVersion"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Railpack Version</FormLabel>
-											<FormControl>
-												{isManualRailpackVersion ? (
-													<div className="space-y-2">
-														<Input
-															placeholder="Enter custom version (e.g., 0.15.4)"
-															{...field}
-															value={field.value ?? ""}
-														/>
-														<Button
-															type="button"
-															variant="outline"
-															size="sm"
-															onClick={() => {
-																setIsManualRailpackVersion(false);
-																field.onChange("0.15.4");
-															}}
-														>
-															Use predefined versions
-														</Button>
-													</div>
-												) : (
-													<Select
-														onValueChange={(value) => {
-															if (value === "manual") {
-																setIsManualRailpackVersion(true);
-																field.onChange("");
-															} else {
-																field.onChange(value);
-															}
-														}}
-														value={field.value ?? "0.15.4"}
-													>
-														<SelectTrigger>
-															<SelectValue placeholder="Select Railpack version" />
-														</SelectTrigger>
-														<SelectContent>
-															<SelectItem value="manual">
-																<span className="font-medium">
-																	✏️ Manual (Custom Version)
-																</span>
-															</SelectItem>
-															{RAILPACK_VERSIONS.map((version) => (
-																<SelectItem key={version} value={version}>
-																	v{version}
-																	{version === "0.15.4" && (
-																		<Badge
-																			variant="secondary"
-																			className="ml-2 px-1 text-xs"
-																		>
-																			Latest
-																		</Badge>
-																	)}
-																</SelectItem>
-															))}
-														</SelectContent>
-													</Select>
-												)}
-											</FormControl>
-											<FormDescription>
-												Select a Railpack version or choose manual to enter a
-												custom version.{" "}
-												<a
-													href="https://github.com/railwayapp/railpack/releases"
-													target="_blank"
-													rel="noreferrer"
-													className="text-primary underline underline-offset-4"
-												>
-													View releases
-												</a>
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-							</>
+							<FormField
+								control={form.control}
+								name="railpackVersion"
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>Railpack Version</FormLabel>
+										<FormControl>
+											<Input
+												placeholder="Railpack Version"
+												{...field}
+												value={field.value ?? ""}
+											/>
+										</FormControl>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
 						)}
 						<div className="flex w-full justify-end">
 							<Button isLoading={isLoading} type="submit">

apps/dokploy/components/dashboard/application/deployments/kill-build.tsx

@@ -1,65 +0,0 @@
-import { Scissors } from "lucide-react";
-import { toast } from "sonner";
-import {
-	AlertDialog,
-	AlertDialogAction,
-	AlertDialogCancel,
-	AlertDialogContent,
-	AlertDialogDescription,
-	AlertDialogFooter,
-	AlertDialogHeader,
-	AlertDialogTitle,
-	AlertDialogTrigger,
-} from "@/components/ui/alert-dialog";
-import { Button } from "@/components/ui/button";
-import { api } from "@/utils/api";
-
-interface Props {
-	id: string;
-	type: "application" | "compose";
-}
-
-export const KillBuild = ({ id, type }: Props) => {
-	const { mutateAsync, isLoading } =
-		type === "application"
-			? api.application.killBuild.useMutation()
-			: api.compose.killBuild.useMutation();
-
-	return (
-		<AlertDialog>
-			<AlertDialogTrigger asChild>
-				<Button variant="outline" className="w-fit" isLoading={isLoading}>
-					Kill Build
-					<Scissors className="size-4" />
-				</Button>
-			</AlertDialogTrigger>
-			<AlertDialogContent>
-				<AlertDialogHeader>
-					<AlertDialogTitle>Are you sure to kill the build?</AlertDialogTitle>
-					<AlertDialogDescription>
-						This will kill the build process
-					</AlertDialogDescription>
-				</AlertDialogHeader>
-				<AlertDialogFooter>
-					<AlertDialogCancel>Cancel</AlertDialogCancel>
-					<AlertDialogAction
-						onClick={async () => {
-							await mutateAsync({
-								applicationId: id || "",
-								composeId: id || "",
-							})
-								.then(() => {
-									toast.success("Build killed successfully");
-								})
-								.catch((err) => {
-									toast.error(err.message);
-								});
-						}}
-					>
-						Confirm
-					</AlertDialogAction>
-				</AlertDialogFooter>
-			</AlertDialogContent>
-		</AlertDialog>
-	);
-};

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

@@ -25,7 +25,6 @@ import {
 import { api, type RouterOutputs } from "@/utils/api";
 import { ShowRollbackSettings } from "../rollbacks/show-rollback-settings";
 import { CancelQueues } from "./cancel-queues";
-import { KillBuild } from "./kill-build";
 import { RefreshToken } from "./refresh-token";
 import { ShowDeployment } from "./show-deployment";
 
@@ -143,10 +142,7 @@ export const ShowDeployments = ({
 						See the last 10 deployments for this {type}
 					</CardDescription>
 				</div>
-				<div className="flex flex-row items-center flex-wrap gap-2">
-					{(type === "application" || type === "compose") && (
-						<KillBuild id={id} type={type} />
-					)}
+				<div className="flex flex-row items-center gap-2">
 					{(type === "application" || type === "compose") && (
 						<CancelQueues id={id} type={type} />
 					)}
@@ -256,9 +252,9 @@ export const ShowDeployments = ({
 							return (
 								<div
 									key={deployment.deploymentId}
-									className="flex flex-col gap-4 rounded-lg border p-4 sm:flex-row sm:items-center sm:justify-between"
+									className="flex items-center justify-between rounded-lg border p-4 gap-2"
 								>
-									<div className="flex flex-1 flex-col min-w-0">
+									<div className="flex flex-col">
 										<span className="flex items-center gap-4 font-medium capitalize text-foreground">
 											{index + 1}. {deployment.status}
 											<StatusTooltip
@@ -313,8 +309,8 @@ export const ShowDeployments = ({
 											)}
 										</div>
 									</div>
-									<div className="flex w-full flex-col items-start gap-2 sm:w-auto sm:max-w-[300px] sm:items-end sm:justify-start">
-										<div className="text-sm capitalize text-muted-foreground flex flex-wrap items-center gap-2">
+									<div className="flex flex-col items-end gap-2 max-w-[300px] w-full justify-start">
+										<div className="text-sm capitalize text-muted-foreground flex items-center gap-2">
 											<DateTooltip date={deployment.createdAt} />
 											{deployment.startedAt && deployment.finishedAt && (
 												<Badge
@@ -333,7 +329,7 @@ export const ShowDeployments = ({
 											)}
 										</div>
 
-										<div className="flex w-full flex-col gap-2 sm:w-auto sm:flex-row sm:items-center sm:justify-end">
+										<div className="flex flex-row items-center gap-2">
 											{deployment.pid && deployment.status === "running" && (
 												<DialogAction
 													title="Kill Process"
@@ -355,7 +351,6 @@ export const ShowDeployments = ({
 														variant="destructive"
 														size="sm"
 														isLoading={isKillingProcess}
-														className="w-full sm:w-auto"
 													>
 														Kill Process
 													</Button>
@@ -365,7 +360,6 @@ export const ShowDeployments = ({
 												onClick={() => {
 													setActiveLog(deployment);
 												}}
-												className="w-full sm:w-auto"
 											>
 												View
 											</Button>
@@ -375,19 +369,7 @@ export const ShowDeployments = ({
 												type === "application" && (
 													<DialogAction
 														title="Rollback to this deployment"
-														description={
-															<div className="flex flex-col gap-3">
-																<p>
-																	Are you sure you want to rollback to this
-																	deployment?
-																</p>
-																<AlertBlock type="info" className="text-sm">
-																	Please wait a few seconds while the image is
-																	pulled from the registry. Your application
-																	should be running shortly.
-																</AlertBlock>
-															</div>
-														}
+														description="Are you sure you want to rollback to this deployment?"
 														type="default"
 														onClick={async () => {
 															await rollback({
@@ -407,7 +389,6 @@ export const ShowDeployments = ({
 															variant="secondary"
 															size="sm"
 															isLoading={isRollingBack}
-															className="w-full sm:w-auto"
 														>
 															<RefreshCcw className="size-4 text-primary group-hover:text-red-500" />
 															Rollback
@@ -422,7 +403,7 @@ export const ShowDeployments = ({
 					</div>
 				)}
 				<ShowDeployment
-					serverId={activeLog?.buildServerId || serverId}
+					serverId={serverId}
 					open={Boolean(activeLog && activeLog.logPath !== null)}
 					onClose={() => setActiveLog(null)}
 					logPath={activeLog?.logPath || ""}

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

@@ -46,13 +46,7 @@ export type CacheType = "fetch" | "cache";
 
 export const domain = z
 	.object({
-		host: z
-			.string()
-			.min(1, { message: "Add a hostname" })
-			.refine((val) => val === val.trim(), {
-				message: "Domain name cannot have leading or trailing spaces",
-			})
-			.transform((val) => val.trim()),
+		host: z.string().min(1, { message: "Add a hostname" }),
 		path: z.string().min(1).optional(),
 		internalPath: z.string().optional(),
 		stripPath: z.boolean().optional(),
@@ -208,8 +202,6 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 	const certificateType = form.watch("certificateType");
 	const https = form.watch("https");
 	const domainType = form.watch("domainType");
-	const host = form.watch("host");
-	const isTraefikMeDomain = host?.includes("traefik.me") || false;
 
 	useEffect(() => {
 		if (data) {
@@ -307,13 +299,6 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 				</DialogHeader>
 				{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
 
-				{type === "compose" && (
-					<AlertBlock type="info" className="mb-4">
-						Whenever you make changes to domains, remember to redeploy your
-						compose to apply the changes.
-					</AlertBlock>
-				)}
-
 				<Form {...form}>
 					<form
 						id="hook-form"
@@ -504,13 +489,6 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
 														to make your traefik.me domain work.
 													</AlertBlock>
 												)}
-											{isTraefikMeDomain && (
-												<AlertBlock type="info">
-													<strong>Note:</strong> traefik.me is a public HTTP
-													service and does not support SSL/HTTPS. HTTPS and
-													certificate options will not have any effect.
-												</AlertBlock>
-											)}
 											<FormLabel>Host</FormLabel>
 											<div className="flex gap-2">
 												<FormControl>

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

@@ -5,23 +5,14 @@ import { toast } from "sonner";
 import { z } from "zod";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
-import {
-	Form,
-	FormControl,
-	FormDescription,
-	FormField,
-	FormItem,
-	FormLabel,
-} from "@/components/ui/form";
+import { Form } from "@/components/ui/form";
 import { Secrets } from "@/components/ui/secrets";
-import { Switch } from "@/components/ui/switch";
 import { api } from "@/utils/api";
 
 const addEnvironmentSchema = z.object({
 	env: z.string(),
 	buildArgs: z.string(),
 	buildSecrets: z.string(),
-	createEnvFile: z.boolean(),
 });
 
 type EnvironmentSchema = z.infer<typeof addEnvironmentSchema>;
@@ -48,7 +39,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 			env: "",
 			buildArgs: "",
 			buildSecrets: "",
-			createEnvFile: true,
 		},
 		resolver: zodResolver(addEnvironmentSchema),
 	});
@@ -57,12 +47,10 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 	const currentEnv = form.watch("env");
 	const currentBuildArgs = form.watch("buildArgs");
 	const currentBuildSecrets = form.watch("buildSecrets");
-	const currentCreateEnvFile = form.watch("createEnvFile");
 	const hasChanges =
 		currentEnv !== (data?.env || "") ||
 		currentBuildArgs !== (data?.buildArgs || "") ||
-		currentBuildSecrets !== (data?.buildSecrets || "") ||
-		currentCreateEnvFile !== (data?.createEnvFile ?? true);
+		currentBuildSecrets !== (data?.buildSecrets || "");
 
 	useEffect(() => {
 		if (data) {
@@ -70,7 +58,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 				env: data.env || "",
 				buildArgs: data.buildArgs || "",
 				buildSecrets: data.buildSecrets || "",
-				createEnvFile: data.createEnvFile ?? true,
 			});
 		}
 	}, [data, form]);
@@ -80,7 +67,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 			env: formData.env,
 			buildArgs: formData.buildArgs,
 			buildSecrets: formData.buildSecrets,
-			createEnvFile: formData.createEnvFile,
 			applicationId,
 		})
 			.then(async () => {
@@ -97,7 +83,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 			env: data?.env || "",
 			buildArgs: data?.buildArgs || "",
 			buildSecrets: data?.buildSecrets || "",
-			createEnvFile: data?.createEnvFile ?? true,
 		});
 	};
 
@@ -182,31 +167,6 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 							placeholder="NPM_TOKEN=xyz"
 						/>
 					)}
-					{data?.buildType === "dockerfile" && (
-						<FormField
-							control={form.control}
-							name="createEnvFile"
-							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>Create Environment File</FormLabel>
-										<FormDescription>
-											When enabled, an .env file will be created in the same
-											directory as your Dockerfile during the build process.
-											Disable this if you don't want to generate an environment
-											file.
-										</FormDescription>
-									</div>
-									<FormControl>
-										<Switch
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-								</FormItem>
-							)}
-						/>
-					)}
 					<div className="flex flex-row justify-end gap-2">
 						{hasChanges && (
 							<Button type="button" variant="outline" onClick={handleCancel}>

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

@@ -54,7 +54,6 @@ const BitbucketProviderSchema = z.object({
 		.object({
 			repo: z.string().min(1, "Repo is required"),
 			owner: z.string().min(1, "Owner is required"),
-			slug: z.string().optional(),
 		})
 		.required(),
 	branch: z.string().min(1, "Branch is required"),
@@ -83,7 +82,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 			repository: {
 				owner: "",
 				repo: "",
-				slug: "",
 			},
 			bitbucketId: "",
 			branch: "",
@@ -116,14 +114,11 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 	} = api.bitbucket.getBitbucketBranches.useQuery(
 		{
 			owner: repository?.owner,
-			repo: repository?.slug || repository?.repo || "",
+			repo: repository?.repo,
 			bitbucketId,
 		},
 		{
-			enabled:
-				!!repository?.owner &&
-				!!(repository?.slug || repository?.repo) &&
-				!!bitbucketId,
+			enabled: !!repository?.owner && !!repository?.repo && !!bitbucketId,
 		},
 	);
 
@@ -134,7 +129,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 				repository: {
 					repo: data.bitbucketRepository || "",
 					owner: data.bitbucketOwner || "",
-					slug: data.bitbucketRepositorySlug || "",
 				},
 				buildPath: data.bitbucketBuildPath || "/",
 				bitbucketId: data.bitbucketId || "",
@@ -148,7 +142,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 		await mutateAsync({
 			bitbucketBranch: data.branch,
 			bitbucketRepository: data.repository.repo,
-			bitbucketRepositorySlug: data.repository.slug || data.repository.repo,
 			bitbucketOwner: data.repository.owner,
 			bitbucketBuildPath: data.buildPath,
 			bitbucketId: data.bitbucketId,
@@ -188,7 +181,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 											form.setValue("repository", {
 												owner: "",
 												repo: "",
-												slug: "",
 											});
 											form.setValue("branch", "");
 										}}
@@ -225,7 +217,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 										<FormLabel>Repository</FormLabel>
 										{field.value.owner && field.value.repo && (
 											<Link
-												href={`https://bitbucket.org/${field.value.owner}/${field.value.slug || field.value.repo}`}
+												href={`https://bitbucket.org/${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"
@@ -279,7 +271,6 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 																	form.setValue("repository", {
 																		owner: repo.owner.username as string,
 																		repo: repo.name,
-																		slug: repo.slug,
 																	});
 																	form.setValue("branch", "");
 																}}

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

@@ -232,9 +232,9 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 								<FormItem className="md:col-span-2 flex flex-col">
 									<div className="flex items-center justify-between">
 										<FormLabel>Repository</FormLabel>
-										{field.value.gitlabPathNamespace && (
+										{field.value.owner && field.value.repo && (
 											<Link
-												href={`${gitlabUrl}/${field.value.gitlabPathNamespace}`}
+												href={`${gitlabUrl}/${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"

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

@@ -79,7 +79,7 @@ export const ShowGeneralApplication = ({ applicationId }: Props) => {
 						>
 							<Button
 								variant="default"
-								isLoading={data?.applicationStatus === "running"}
+								// isLoading={data?.applicationStatus === "running"}
 								className="flex items-center gap-1.5 group focus-visible:ring-2 focus-visible:ring-offset-2"
 							>
 								<Tooltip>

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

@@ -34,7 +34,6 @@ export const DockerLogs = dynamic(
 export const badgeStateColor = (state: string) => {
 	switch (state) {
 		case "running":
-		case "ready":
 			return "green";
 		case "exited":
 		case "shutdown":
@@ -143,7 +142,6 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => {
 											<Badge variant={badgeStateColor(container.state)}>
 												{container.state}
 											</Badge>
-											{container.status ? ` ${container.status}` : ""}
 										</SelectItem>
 									))}
 								</div>
@@ -159,9 +157,6 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => {
 											<Badge variant={badgeStateColor(container.state)}>
 												{container.state}
 											</Badge>
-											{container.currentState
-												? ` ${container.currentState}`
-												: ""}
 										</SelectItem>
 									))}
 								</>
@@ -171,13 +166,6 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => {
 						</SelectGroup>
 					</SelectContent>
 				</Select>
-				{option === "swarm" &&
-					services?.find((c) => c.containerId === containerId)?.error && (
-						<div className="rounded-md bg-destructive/10 border border-destructive/20 px-3 py-2 text-sm text-destructive">
-							<span className="font-medium">Error: </span>
-							{services?.find((c) => c.containerId === containerId)?.error}
-						</div>
-					)}
 				<DockerLogs
 					serverId={serverId || ""}
 					containerId={containerId || "select-a-container"}

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

@@ -86,9 +86,6 @@ export const AddPreviewDomain = ({
 		resolver: zodResolver(domain),
 	});
 
-	const host = form.watch("host");
-	const isTraefikMeDomain = host?.includes("traefik.me") || false;
-
 	useEffect(() => {
 		if (data) {
 			form.reset({
@@ -160,13 +157,6 @@ export const AddPreviewDomain = ({
 									name="host"
 									render={({ field }) => (
 										<FormItem>
-											{isTraefikMeDomain && (
-												<AlertBlock type="info">
-													<strong>Note:</strong> traefik.me is a public HTTP
-													service and does not support SSL/HTTPS. HTTPS and
-													certificate options will not have any effect.
-												</AlertBlock>
-											)}
 											<FormLabel>Host</FormLabel>
 											<div className="flex gap-2">
 												<FormControl>

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

@@ -1,9 +1,7 @@
-import * as TooltipPrimitive from "@radix-ui/react-tooltip";
 import {
 	ExternalLink,
 	FileText,
 	GitPullRequest,
-	Hammer,
 	Loader2,
 	PenSquare,
 	RocketIcon,
@@ -24,12 +22,6 @@ import {
 	CardTitle,
 } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
-import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
-} from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import { ShowModalLogs } from "../../settings/web-server/show-modal-logs";
 import { ShowDeploymentsModal } from "../deployments/show-deployments-modal";
@@ -46,9 +38,6 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
 	const { mutateAsync: deletePreviewDeployment, isLoading } =
 		api.previewDeployment.delete.useMutation();
 
-	const { mutateAsync: redeployPreviewDeployment } =
-		api.previewDeployment.redeploy.useMutation();
-
 	const {
 		data: previewDeployments,
 		refetch: refetchPreviewDeployments,
@@ -57,8 +46,6 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
 		{ applicationId },
 		{
 			enabled: !!applicationId,
-			refetchInterval: (data) =>
-				data?.some((d) => d.previewStatus === "running") ? 2000 : false,
 		},
 	);
 
@@ -195,68 +182,7 @@ export const ShowPreviewDeployments = ({ applicationId }: Props) => {
 															id={deployment.previewDeploymentId}
 															type="previewDeployment"
 															serverId={data?.serverId || ""}
-														>
-															<Button
-																variant="outline"
-																size="sm"
-																className="gap-2"
-															>
-																<RocketIcon className="size-4" />
-																Deployments
-															</Button>
-														</ShowDeploymentsModal>
-
-														<DialogAction
-															title="Rebuild Preview Deployment"
-															description="Are you sure you want to rebuild this preview deployment?"
-															type="default"
-															onClick={async () => {
-																await redeployPreviewDeployment({
-																	previewDeploymentId:
-																		deployment.previewDeploymentId,
-																})
-																	.then(() => {
-																		toast.success(
-																			"Preview deployment rebuild started",
-																		);
-																		refetchPreviewDeployments();
-																	})
-																	.catch(() => {
-																		toast.error(
-																			"Error rebuilding preview deployment",
-																		);
-																	});
-															}}
-														>
-															<Button
-																variant="outline"
-																size="sm"
-																isLoading={status === "running"}
-																className="gap-2"
-															>
-																<TooltipProvider>
-																	<Tooltip>
-																		<TooltipTrigger asChild>
-																			<div className="flex items-center gap-2">
-																				<Hammer className="size-4" />
-																				Rebuild
-																			</div>
-																		</TooltipTrigger>
-																		<TooltipPrimitive.Portal>
-																			<TooltipContent
-																				sideOffset={5}
-																				className="z-[60]"
-																			>
-																				<p>
-																					Rebuild the preview deployment without
-																					downloading new code
-																				</p>
-																			</TooltipContent>
-																		</TooltipPrimitive.Portal>
-																	</Tooltip>
-																</TooltipProvider>
-															</Button>
-														</DialogAction>
+														/>
 
 														<AddPreviewDomain
 															previewDeploymentId={`${deployment.previewDeploymentId}`}

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

@@ -4,7 +4,6 @@ import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
-import { AlertBlock } from "@/components/shared/alert-block";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -101,8 +100,6 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
 	});
 
 	const previewHttps = form.watch("previewHttps");
-	const wildcardDomain = form.watch("wildcardDomain");
-	const isTraefikMeDomain = wildcardDomain?.includes("traefik.me") || false;
 
 	useEffect(() => {
 		setIsEnabled(data?.isPreviewDeploymentsActive || false);
@@ -123,7 +120,7 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
 				previewCertificateType: data.previewCertificateType || "none",
 				previewCustomCertResolver: data.previewCustomCertResolver || "",
 				previewRequireCollaboratorPermissions:
-					data.previewRequireCollaboratorPermissions ?? true,
+					data.previewRequireCollaboratorPermissions || true,
 			});
 		}
 	}, [data]);
@@ -171,13 +168,6 @@ export const ShowPreviewSettings = ({ applicationId }: Props) => {
 						</DialogDescription>
 					</DialogHeader>
 					<div className="grid gap-4">
-						{isTraefikMeDomain && (
-							<AlertBlock type="info">
-								<strong>Note:</strong> traefik.me is a public HTTP service and
-								does not support SSL/HTTPS. HTTPS and certificate options will
-								not have any effect.
-							</AlertBlock>
-						)}
 						<Form {...form}>
 							<form
 								onSubmit={form.handleSubmit(onSubmit)}

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

@@ -1,6 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import Link from "next/link";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -21,37 +20,13 @@ import {
 	FormField,
 	FormItem,
 	FormLabel,
-	FormMessage,
 } from "@/components/ui/form";
-import {
-	Select,
-	SelectContent,
-	SelectGroup,
-	SelectItem,
-	SelectLabel,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
 import { Switch } from "@/components/ui/switch";
 import { api } from "@/utils/api";
 
-const formSchema = z
-	.object({
-		rollbackActive: z.boolean(),
-		rollbackRegistryId: z.string().optional(),
-	})
-	.superRefine((values, ctx) => {
-		if (
-			values.rollbackActive &&
-			(!values.rollbackRegistryId || values.rollbackRegistryId === "none")
-		) {
-			ctx.addIssue({
-				code: z.ZodIssueCode.custom,
-				path: ["rollbackRegistryId"],
-				message: "Registry is required when rollbacks are enabled",
-			});
-		}
-	});
+const formSchema = z.object({
+	rollbackActive: z.boolean(),
+});
 
 type FormValues = z.infer<typeof formSchema>;
 
@@ -74,33 +49,17 @@ export const ShowRollbackSettings = ({ applicationId, children }: Props) => {
 	const { mutateAsync: updateApplication, isLoading } =
 		api.application.update.useMutation();
 
-	const { data: registries } = api.registry.all.useQuery();
-
 	const form = useForm<FormValues>({
 		resolver: zodResolver(formSchema),
 		defaultValues: {
 			rollbackActive: application?.rollbackActive ?? false,
-			rollbackRegistryId: application?.rollbackRegistryId || "",
 		},
 	});
 
-	useEffect(() => {
-		if (application) {
-			form.reset({
-				rollbackActive: application.rollbackActive ?? false,
-				rollbackRegistryId: application.rollbackRegistryId || "",
-			});
-		}
-	}, [application, form]);
-
 	const onSubmit = async (data: FormValues) => {
 		await updateApplication({
 			applicationId,
 			rollbackActive: data.rollbackActive,
-			rollbackRegistryId:
-				data.rollbackRegistryId === "none" || !data.rollbackRegistryId
-					? null
-					: data.rollbackRegistryId,
 		})
 			.then(() => {
 				toast.success("Rollback settings updated");
@@ -153,65 +112,6 @@ export const ShowRollbackSettings = ({ applicationId, children }: Props) => {
 							)}
 						/>
 
-						{form.watch("rollbackActive") && (
-							<FormField
-								control={form.control}
-								name="rollbackRegistryId"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Rollback Registry</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											value={field.value || "none"}
-										>
-											<FormControl>
-												<SelectTrigger>
-													<SelectValue placeholder="Select a registry" />
-												</SelectTrigger>
-											</FormControl>
-											<SelectContent>
-												<SelectGroup>
-													<SelectItem value="none">
-														<span className="flex items-center gap-2">
-															<span>None</span>
-														</span>
-													</SelectItem>
-													{registries?.map((registry) => (
-														<SelectItem
-															key={registry.registryId}
-															value={registry.registryId}
-														>
-															{registry.registryName}
-														</SelectItem>
-													))}
-													<SelectLabel>
-														Registries ({registries?.length || 0})
-													</SelectLabel>
-												</SelectGroup>
-											</SelectContent>
-										</Select>
-										{!registries || registries.length === 0 ? (
-											<FormDescription className="text-amber-600 dark:text-amber-500">
-												No registries available. Please{" "}
-												<Link
-													href="/dashboard/settings/registry"
-													className="underline font-medium hover:text-amber-700 dark:hover:text-amber-400"
-												>
-													configure a registry
-												</Link>{" "}
-												first to enable rollbacks.
-											</FormDescription>
-										) : (
-											<FormDescription>
-												Select a registry where rollback images will be stored.
-											</FormDescription>
-										)}
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						)}
-
 						<Button type="submit" className="w-full" isLoading={isLoading}>
 							Save Settings
 						</Button>

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

@@ -1,7 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import {
-	CheckIcon,
-	ChevronsUpDown,
 	DatabaseZap,
 	Info,
 	PenBoxIcon,
@@ -15,14 +13,6 @@ import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { Button } from "@/components/ui/button";
-import {
-	Command,
-	CommandEmpty,
-	CommandGroup,
-	CommandInput,
-	CommandItem,
-	CommandList,
-} from "@/components/ui/command";
 import {
 	Dialog,
 	DialogContent,
@@ -41,12 +31,6 @@ import {
 	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 {
 	Select,
 	SelectContent,
@@ -64,7 +48,6 @@ import {
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import type { CacheType } from "../domains/handle-domain";
-import { getTimezoneLabel, TIMEZONES } from "./timezones";
 
 export const commonCronExpressions = [
 	{ label: "Every minute", value: "* * * * *" },
@@ -92,7 +75,6 @@ const formSchema = z
 			"dokploy-server",
 		]),
 		script: z.string(),
-		timezone: z.string().optional(),
 	})
 	.superRefine((data, ctx) => {
 		if (data.scheduleType === "compose" && !data.serviceName) {
@@ -231,7 +213,6 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 			serviceName: "",
 			scheduleType: scheduleType || "application",
 			script: "",
-			timezone: undefined,
 		},
 	});
 
@@ -270,7 +251,6 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 				serviceName: schedule.serviceName || "",
 				scheduleType: schedule.scheduleType,
 				script: schedule.script || "",
-				timezone: schedule.timezone || undefined,
 			});
 		}
 	}, [form, schedule, scheduleId]);
@@ -484,89 +464,6 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 							formControl={form.control}
 						/>
 
-						<FormField
-							control={form.control}
-							name="timezone"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel className="flex items-center gap-2">
-										Timezone
-										<TooltipProvider>
-											<Tooltip>
-												<TooltipTrigger asChild>
-													<Info className="w-4 h-4 text-muted-foreground cursor-help" />
-												</TooltipTrigger>
-												<TooltipContent>
-													<p>
-														Select a timezone for the schedule. If not
-														specified, UTC will be used.
-													</p>
-												</TooltipContent>
-											</Tooltip>
-										</TooltipProvider>
-									</FormLabel>
-									<Popover>
-										<PopoverTrigger asChild>
-											<FormControl>
-												<Button
-													variant="outline"
-													className={cn(
-														"w-full justify-between !bg-input",
-														!field.value && "text-muted-foreground",
-													)}
-												>
-													{getTimezoneLabel(field.value)}
-													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-												</Button>
-											</FormControl>
-										</PopoverTrigger>
-										<PopoverContent className="w-[400px] p-0" align="start">
-											<Command>
-												<CommandInput
-													placeholder="Search timezone..."
-													className="h-9"
-												/>
-												<CommandList>
-													<CommandEmpty>No timezone found.</CommandEmpty>
-													<ScrollArea className="h-72">
-														{Object.entries(TIMEZONES).map(
-															([region, zones]) => (
-																<CommandGroup key={region} heading={region}>
-																	{zones.map((tz) => (
-																		<CommandItem
-																			key={tz.value}
-																			value={`${region} ${tz.label} ${tz.value}`}
-																			onSelect={() => {
-																				field.onChange(tz.value);
-																			}}
-																		>
-																			{tz.value}
-																			<CheckIcon
-																				className={cn(
-																					"ml-auto h-4 w-4",
-																					field.value === tz.value
-																						? "opacity-100"
-																						: "opacity-0",
-																				)}
-																			/>
-																		</CommandItem>
-																	))}
-																</CommandGroup>
-															),
-														)}
-													</ScrollArea>
-												</CommandList>
-											</Command>
-										</PopoverContent>
-									</Popover>
-									<FormDescription>
-										Optional: Choose a timezone for the schedule execution time
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-
 						{(scheduleTypeForm === "application" ||
 							scheduleTypeForm === "compose") && (
 							<>

apps/dokploy/components/dashboard/application/schedules/timezones.ts

@@ -1,458 +0,0 @@
-// Complete list of IANA timezones grouped by region
-export const TIMEZONES: Record<
-	string,
-	Array<{ label: string; value: string }>
-> = {
-	Common: [{ label: "UTC (Coordinated Universal Time)", value: "UTC" }],
-	Africa: [
-		{ label: "Abidjan", value: "Africa/Abidjan" },
-		{ label: "Accra", value: "Africa/Accra" },
-		{ label: "Addis Ababa", value: "Africa/Addis_Ababa" },
-		{ label: "Algiers", value: "Africa/Algiers" },
-		{ label: "Asmara", value: "Africa/Asmara" },
-		{ label: "Bamako", value: "Africa/Bamako" },
-		{ label: "Bangui", value: "Africa/Bangui" },
-		{ label: "Banjul", value: "Africa/Banjul" },
-		{ label: "Bissau", value: "Africa/Bissau" },
-		{ label: "Blantyre", value: "Africa/Blantyre" },
-		{ label: "Brazzaville", value: "Africa/Brazzaville" },
-		{ label: "Bujumbura", value: "Africa/Bujumbura" },
-		{ label: "Cairo", value: "Africa/Cairo" },
-		{ label: "Casablanca", value: "Africa/Casablanca" },
-		{ label: "Ceuta", value: "Africa/Ceuta" },
-		{ label: "Conakry", value: "Africa/Conakry" },
-		{ label: "Dakar", value: "Africa/Dakar" },
-		{ label: "Dar es Salaam", value: "Africa/Dar_es_Salaam" },
-		{ label: "Djibouti", value: "Africa/Djibouti" },
-		{ label: "Douala", value: "Africa/Douala" },
-		{ label: "El Aaiun", value: "Africa/El_Aaiun" },
-		{ label: "Freetown", value: "Africa/Freetown" },
-		{ label: "Gaborone", value: "Africa/Gaborone" },
-		{ label: "Harare", value: "Africa/Harare" },
-		{ label: "Johannesburg", value: "Africa/Johannesburg" },
-		{ label: "Juba", value: "Africa/Juba" },
-		{ label: "Kampala", value: "Africa/Kampala" },
-		{ label: "Khartoum", value: "Africa/Khartoum" },
-		{ label: "Kigali", value: "Africa/Kigali" },
-		{ label: "Kinshasa", value: "Africa/Kinshasa" },
-		{ label: "Lagos", value: "Africa/Lagos" },
-		{ label: "Libreville", value: "Africa/Libreville" },
-		{ label: "Lome", value: "Africa/Lome" },
-		{ label: "Luanda", value: "Africa/Luanda" },
-		{ label: "Lubumbashi", value: "Africa/Lubumbashi" },
-		{ label: "Lusaka", value: "Africa/Lusaka" },
-		{ label: "Malabo", value: "Africa/Malabo" },
-		{ label: "Maputo", value: "Africa/Maputo" },
-		{ label: "Maseru", value: "Africa/Maseru" },
-		{ label: "Mbabane", value: "Africa/Mbabane" },
-		{ label: "Mogadishu", value: "Africa/Mogadishu" },
-		{ label: "Monrovia", value: "Africa/Monrovia" },
-		{ label: "Nairobi", value: "Africa/Nairobi" },
-		{ label: "Ndjamena", value: "Africa/Ndjamena" },
-		{ label: "Niamey", value: "Africa/Niamey" },
-		{ label: "Nouakchott", value: "Africa/Nouakchott" },
-		{ label: "Ouagadougou", value: "Africa/Ouagadougou" },
-		{ label: "Porto-Novo", value: "Africa/Porto-Novo" },
-		{ label: "Sao Tome", value: "Africa/Sao_Tome" },
-		{ label: "Tripoli", value: "Africa/Tripoli" },
-		{ label: "Tunis", value: "Africa/Tunis" },
-		{ label: "Windhoek", value: "Africa/Windhoek" },
-	],
-	America: [
-		{ label: "Adak", value: "America/Adak" },
-		{ label: "Anchorage", value: "America/Anchorage" },
-		{ label: "Anguilla", value: "America/Anguilla" },
-		{ label: "Antigua", value: "America/Antigua" },
-		{ label: "Araguaina", value: "America/Araguaina" },
-		{
-			label: "Argentina/Buenos Aires",
-			value: "America/Argentina/Buenos_Aires",
-		},
-		{ label: "Argentina/Catamarca", value: "America/Argentina/Catamarca" },
-		{ label: "Argentina/Cordoba", value: "America/Argentina/Cordoba" },
-		{ label: "Argentina/Jujuy", value: "America/Argentina/Jujuy" },
-		{ label: "Argentina/La Rioja", value: "America/Argentina/La_Rioja" },
-		{ label: "Argentina/Mendoza", value: "America/Argentina/Mendoza" },
-		{
-			label: "Argentina/Rio Gallegos",
-			value: "America/Argentina/Rio_Gallegos",
-		},
-		{ label: "Argentina/Salta", value: "America/Argentina/Salta" },
-		{ label: "Argentina/San Juan", value: "America/Argentina/San_Juan" },
-		{ label: "Argentina/San Luis", value: "America/Argentina/San_Luis" },
-		{ label: "Argentina/Tucuman", value: "America/Argentina/Tucuman" },
-		{ label: "Argentina/Ushuaia", value: "America/Argentina/Ushuaia" },
-		{ label: "Aruba", value: "America/Aruba" },
-		{ label: "Asuncion", value: "America/Asuncion" },
-		{ label: "Atikokan", value: "America/Atikokan" },
-		{ label: "Bahia", value: "America/Bahia" },
-		{ label: "Bahia Banderas", value: "America/Bahia_Banderas" },
-		{ label: "Barbados", value: "America/Barbados" },
-		{ label: "Belem", value: "America/Belem" },
-		{ label: "Belize", value: "America/Belize" },
-		{ label: "Blanc-Sablon", value: "America/Blanc-Sablon" },
-		{ label: "Boa Vista", value: "America/Boa_Vista" },
-		{ label: "Bogota", value: "America/Bogota" },
-		{ label: "Boise", value: "America/Boise" },
-		{ label: "Cambridge Bay", value: "America/Cambridge_Bay" },
-		{ label: "Campo Grande", value: "America/Campo_Grande" },
-		{ label: "Cancun", value: "America/Cancun" },
-		{ label: "Caracas", value: "America/Caracas" },
-		{ label: "Cayenne", value: "America/Cayenne" },
-		{ label: "Cayman", value: "America/Cayman" },
-		{ label: "Chicago (Central Time)", value: "America/Chicago" },
-		{ label: "Chihuahua", value: "America/Chihuahua" },
-		{ label: "Ciudad Juarez", value: "America/Ciudad_Juarez" },
-		{ label: "Costa Rica", value: "America/Costa_Rica" },
-		{ label: "Creston", value: "America/Creston" },
-		{ label: "Cuiaba", value: "America/Cuiaba" },
-		{ label: "Curacao", value: "America/Curacao" },
-		{ label: "Danmarkshavn", value: "America/Danmarkshavn" },
-		{ label: "Dawson", value: "America/Dawson" },
-		{ label: "Dawson Creek", value: "America/Dawson_Creek" },
-		{ label: "Denver (Mountain Time)", value: "America/Denver" },
-		{ label: "Detroit", value: "America/Detroit" },
-		{ label: "Dominica", value: "America/Dominica" },
-		{ label: "Edmonton", value: "America/Edmonton" },
-		{ label: "Eirunepe", value: "America/Eirunepe" },
-		{ label: "El Salvador", value: "America/El_Salvador" },
-		{ label: "Fort Nelson", value: "America/Fort_Nelson" },
-		{ label: "Fortaleza", value: "America/Fortaleza" },
-		{ label: "Glace Bay", value: "America/Glace_Bay" },
-		{ label: "Goose Bay", value: "America/Goose_Bay" },
-		{ label: "Grand Turk", value: "America/Grand_Turk" },
-		{ label: "Grenada", value: "America/Grenada" },
-		{ label: "Guadeloupe", value: "America/Guadeloupe" },
-		{ label: "Guatemala", value: "America/Guatemala" },
-		{ label: "Guayaquil", value: "America/Guayaquil" },
-		{ label: "Guyana", value: "America/Guyana" },
-		{ label: "Halifax", value: "America/Halifax" },
-		{ label: "Havana", value: "America/Havana" },
-		{ label: "Hermosillo", value: "America/Hermosillo" },
-		{ label: "Indiana/Indianapolis", value: "America/Indiana/Indianapolis" },
-		{ label: "Indiana/Knox", value: "America/Indiana/Knox" },
-		{ label: "Indiana/Marengo", value: "America/Indiana/Marengo" },
-		{ label: "Indiana/Petersburg", value: "America/Indiana/Petersburg" },
-		{ label: "Indiana/Tell City", value: "America/Indiana/Tell_City" },
-		{ label: "Indiana/Vevay", value: "America/Indiana/Vevay" },
-		{ label: "Indiana/Vincennes", value: "America/Indiana/Vincennes" },
-		{ label: "Indiana/Winamac", value: "America/Indiana/Winamac" },
-		{ label: "Inuvik", value: "America/Inuvik" },
-		{ label: "Iqaluit", value: "America/Iqaluit" },
-		{ label: "Jamaica", value: "America/Jamaica" },
-		{ label: "Juneau", value: "America/Juneau" },
-		{ label: "Kentucky/Louisville", value: "America/Kentucky/Louisville" },
-		{ label: "Kentucky/Monticello", value: "America/Kentucky/Monticello" },
-		{ label: "Kralendijk", value: "America/Kralendijk" },
-		{ label: "La Paz", value: "America/La_Paz" },
-		{ label: "Lima", value: "America/Lima" },
-		{ label: "Los Angeles (Pacific Time)", value: "America/Los_Angeles" },
-		{ label: "Lower Princes", value: "America/Lower_Princes" },
-		{ label: "Maceio", value: "America/Maceio" },
-		{ label: "Managua", value: "America/Managua" },
-		{ label: "Manaus", value: "America/Manaus" },
-		{ label: "Marigot", value: "America/Marigot" },
-		{ label: "Martinique", value: "America/Martinique" },
-		{ label: "Matamoros", value: "America/Matamoros" },
-		{ label: "Mazatlan", value: "America/Mazatlan" },
-		{ label: "Menominee", value: "America/Menominee" },
-		{ label: "Merida", value: "America/Merida" },
-		{ label: "Metlakatla", value: "America/Metlakatla" },
-		{ label: "Mexico City (Central Mexico)", value: "America/Mexico_City" },
-		{ label: "Miquelon", value: "America/Miquelon" },
-		{ label: "Moncton", value: "America/Moncton" },
-		{ label: "Monterrey", value: "America/Monterrey" },
-		{ label: "Montevideo", value: "America/Montevideo" },
-		{ label: "Montserrat", value: "America/Montserrat" },
-		{ label: "Nassau", value: "America/Nassau" },
-		{ label: "New York (Eastern Time)", value: "America/New_York" },
-		{ label: "Nome", value: "America/Nome" },
-		{ label: "Noronha", value: "America/Noronha" },
-		{ label: "North Dakota/Beulah", value: "America/North_Dakota/Beulah" },
-		{ label: "North Dakota/Center", value: "America/North_Dakota/Center" },
-		{
-			label: "North Dakota/New Salem",
-			value: "America/North_Dakota/New_Salem",
-		},
-		{ label: "Nuuk", value: "America/Nuuk" },
-		{ label: "Ojinaga", value: "America/Ojinaga" },
-		{ label: "Panama", value: "America/Panama" },
-		{ label: "Paramaribo", value: "America/Paramaribo" },
-		{ label: "Phoenix", value: "America/Phoenix" },
-		{ label: "Port-au-Prince", value: "America/Port-au-Prince" },
-		{ label: "Port of Spain", value: "America/Port_of_Spain" },
-		{ label: "Porto Velho", value: "America/Porto_Velho" },
-		{ label: "Puerto Rico", value: "America/Puerto_Rico" },
-		{ label: "Punta Arenas", value: "America/Punta_Arenas" },
-		{ label: "Rankin Inlet", value: "America/Rankin_Inlet" },
-		{ label: "Recife", value: "America/Recife" },
-		{ label: "Regina", value: "America/Regina" },
-		{ label: "Resolute", value: "America/Resolute" },
-		{ label: "Rio Branco", value: "America/Rio_Branco" },
-		{ label: "Santarem", value: "America/Santarem" },
-		{ label: "Santiago", value: "America/Santiago" },
-		{ label: "Santo Domingo", value: "America/Santo_Domingo" },
-		{ label: "Sao Paulo (Brasilia Time)", value: "America/Sao_Paulo" },
-		{ label: "Scoresbysund", value: "America/Scoresbysund" },
-		{ label: "Sitka", value: "America/Sitka" },
-		{ label: "St Barthelemy", value: "America/St_Barthelemy" },
-		{ label: "St Johns", value: "America/St_Johns" },
-		{ label: "St Kitts", value: "America/St_Kitts" },
-		{ label: "St Lucia", value: "America/St_Lucia" },
-		{ label: "St Thomas", value: "America/St_Thomas" },
-		{ label: "St Vincent", value: "America/St_Vincent" },
-		{ label: "Swift Current", value: "America/Swift_Current" },
-		{ label: "Tegucigalpa", value: "America/Tegucigalpa" },
-		{ label: "Thule", value: "America/Thule" },
-		{ label: "Tijuana", value: "America/Tijuana" },
-		{ label: "Toronto", value: "America/Toronto" },
-		{ label: "Tortola", value: "America/Tortola" },
-		{ label: "Vancouver", value: "America/Vancouver" },
-		{ label: "Whitehorse", value: "America/Whitehorse" },
-		{ label: "Winnipeg", value: "America/Winnipeg" },
-		{ label: "Yakutat", value: "America/Yakutat" },
-	],
-	Antarctica: [
-		{ label: "Casey", value: "Antarctica/Casey" },
-		{ label: "Davis", value: "Antarctica/Davis" },
-		{ label: "DumontDUrville", value: "Antarctica/DumontDUrville" },
-		{ label: "Macquarie", value: "Antarctica/Macquarie" },
-		{ label: "Mawson", value: "Antarctica/Mawson" },
-		{ label: "McMurdo", value: "Antarctica/McMurdo" },
-		{ label: "Palmer", value: "Antarctica/Palmer" },
-		{ label: "Rothera", value: "Antarctica/Rothera" },
-		{ label: "Syowa", value: "Antarctica/Syowa" },
-		{ label: "Troll", value: "Antarctica/Troll" },
-		{ label: "Vostok", value: "Antarctica/Vostok" },
-	],
-	Arctic: [{ label: "Longyearbyen", value: "Arctic/Longyearbyen" }],
-	Asia: [
-		{ label: "Aden", value: "Asia/Aden" },
-		{ label: "Almaty", value: "Asia/Almaty" },
-		{ label: "Amman", value: "Asia/Amman" },
-		{ label: "Anadyr", value: "Asia/Anadyr" },
-		{ label: "Aqtau", value: "Asia/Aqtau" },
-		{ label: "Aqtobe", value: "Asia/Aqtobe" },
-		{ label: "Ashgabat", value: "Asia/Ashgabat" },
-		{ label: "Atyrau", value: "Asia/Atyrau" },
-		{ label: "Baghdad", value: "Asia/Baghdad" },
-		{ label: "Bahrain", value: "Asia/Bahrain" },
-		{ label: "Baku", value: "Asia/Baku" },
-		{ label: "Bangkok", value: "Asia/Bangkok" },
-		{ label: "Barnaul", value: "Asia/Barnaul" },
-		{ label: "Beirut", value: "Asia/Beirut" },
-		{ label: "Bishkek", value: "Asia/Bishkek" },
-		{ label: "Brunei", value: "Asia/Brunei" },
-		{ label: "Chita", value: "Asia/Chita" },
-		{ label: "Choibalsan", value: "Asia/Choibalsan" },
-		{ label: "Colombo", value: "Asia/Colombo" },
-		{ label: "Damascus", value: "Asia/Damascus" },
-		{ label: "Dhaka", value: "Asia/Dhaka" },
-		{ label: "Dili", value: "Asia/Dili" },
-		{ label: "Dubai (Gulf Standard Time)", value: "Asia/Dubai" },
-		{ label: "Dushanbe", value: "Asia/Dushanbe" },
-		{ label: "Famagusta", value: "Asia/Famagusta" },
-		{ label: "Gaza", value: "Asia/Gaza" },
-		{ label: "Hebron", value: "Asia/Hebron" },
-		{ label: "Ho Chi Minh", value: "Asia/Ho_Chi_Minh" },
-		{ label: "Hong Kong", value: "Asia/Hong_Kong" },
-		{ label: "Hovd", value: "Asia/Hovd" },
-		{ label: "Irkutsk", value: "Asia/Irkutsk" },
-		{ label: "Jakarta", value: "Asia/Jakarta" },
-		{ label: "Jayapura", value: "Asia/Jayapura" },
-		{ label: "Jerusalem", value: "Asia/Jerusalem" },
-		{ label: "Kabul", value: "Asia/Kabul" },
-		{ label: "Kamchatka", value: "Asia/Kamchatka" },
-		{ label: "Karachi", value: "Asia/Karachi" },
-		{ label: "Kathmandu", value: "Asia/Kathmandu" },
-		{ label: "Khandyga", value: "Asia/Khandyga" },
-		{ label: "Kolkata (India Standard Time)", value: "Asia/Kolkata" },
-		{ label: "Krasnoyarsk", value: "Asia/Krasnoyarsk" },
-		{ label: "Kuala Lumpur", value: "Asia/Kuala_Lumpur" },
-		{ label: "Kuching", value: "Asia/Kuching" },
-		{ label: "Kuwait", value: "Asia/Kuwait" },
-		{ label: "Macau", value: "Asia/Macau" },
-		{ label: "Magadan", value: "Asia/Magadan" },
-		{ label: "Makassar", value: "Asia/Makassar" },
-		{ label: "Manila", value: "Asia/Manila" },
-		{ label: "Muscat", value: "Asia/Muscat" },
-		{ label: "Nicosia", value: "Asia/Nicosia" },
-		{ label: "Novokuznetsk", value: "Asia/Novokuznetsk" },
-		{ label: "Novosibirsk", value: "Asia/Novosibirsk" },
-		{ label: "Omsk", value: "Asia/Omsk" },
-		{ label: "Oral", value: "Asia/Oral" },
-		{ label: "Phnom Penh", value: "Asia/Phnom_Penh" },
-		{ label: "Pontianak", value: "Asia/Pontianak" },
-		{ label: "Pyongyang", value: "Asia/Pyongyang" },
-		{ label: "Qatar", value: "Asia/Qatar" },
-		{ label: "Qostanay", value: "Asia/Qostanay" },
-		{ label: "Qyzylorda", value: "Asia/Qyzylorda" },
-		{ label: "Riyadh", value: "Asia/Riyadh" },
-		{ label: "Sakhalin", value: "Asia/Sakhalin" },
-		{ label: "Samarkand", value: "Asia/Samarkand" },
-		{ label: "Seoul", value: "Asia/Seoul" },
-		{ label: "Shanghai (China Standard Time)", value: "Asia/Shanghai" },
-		{ label: "Singapore", value: "Asia/Singapore" },
-		{ label: "Srednekolymsk", value: "Asia/Srednekolymsk" },
-		{ label: "Taipei", value: "Asia/Taipei" },
-		{ label: "Tashkent", value: "Asia/Tashkent" },
-		{ label: "Tbilisi", value: "Asia/Tbilisi" },
-		{ label: "Tehran", value: "Asia/Tehran" },
-		{ label: "Thimphu", value: "Asia/Thimphu" },
-		{ label: "Tokyo (Japan Standard Time)", value: "Asia/Tokyo" },
-		{ label: "Tomsk", value: "Asia/Tomsk" },
-		{ label: "Ulaanbaatar", value: "Asia/Ulaanbaatar" },
-		{ label: "Urumqi", value: "Asia/Urumqi" },
-		{ label: "Ust-Nera", value: "Asia/Ust-Nera" },
-		{ label: "Vientiane", value: "Asia/Vientiane" },
-		{ label: "Vladivostok", value: "Asia/Vladivostok" },
-		{ label: "Yakutsk", value: "Asia/Yakutsk" },
-		{ label: "Yangon", value: "Asia/Yangon" },
-		{ label: "Yekaterinburg", value: "Asia/Yekaterinburg" },
-		{ label: "Yerevan", value: "Asia/Yerevan" },
-	],
-	Atlantic: [
-		{ label: "Azores", value: "Atlantic/Azores" },
-		{ label: "Bermuda", value: "Atlantic/Bermuda" },
-		{ label: "Canary", value: "Atlantic/Canary" },
-		{ label: "Cape Verde", value: "Atlantic/Cape_Verde" },
-		{ label: "Faroe", value: "Atlantic/Faroe" },
-		{ label: "Madeira", value: "Atlantic/Madeira" },
-		{ label: "Reykjavik", value: "Atlantic/Reykjavik" },
-		{ label: "South Georgia", value: "Atlantic/South_Georgia" },
-		{ label: "St Helena", value: "Atlantic/St_Helena" },
-		{ label: "Stanley", value: "Atlantic/Stanley" },
-	],
-	Australia: [
-		{ label: "Adelaide", value: "Australia/Adelaide" },
-		{ label: "Brisbane", value: "Australia/Brisbane" },
-		{ label: "Broken Hill", value: "Australia/Broken_Hill" },
-		{ label: "Darwin", value: "Australia/Darwin" },
-		{ label: "Eucla", value: "Australia/Eucla" },
-		{ label: "Hobart", value: "Australia/Hobart" },
-		{ label: "Lindeman", value: "Australia/Lindeman" },
-		{ label: "Lord Howe", value: "Australia/Lord_Howe" },
-		{ label: "Melbourne", value: "Australia/Melbourne" },
-		{ label: "Perth", value: "Australia/Perth" },
-		{ label: "Sydney (Australian Eastern Time)", value: "Australia/Sydney" },
-	],
-	Europe: [
-		{ label: "Amsterdam", value: "Europe/Amsterdam" },
-		{ label: "Andorra", value: "Europe/Andorra" },
-		{ label: "Astrakhan", value: "Europe/Astrakhan" },
-		{ label: "Athens", value: "Europe/Athens" },
-		{ label: "Belgrade", value: "Europe/Belgrade" },
-		{ label: "Berlin (Central European Time)", value: "Europe/Berlin" },
-		{ label: "Bratislava", value: "Europe/Bratislava" },
-		{ label: "Brussels", value: "Europe/Brussels" },
-		{ label: "Bucharest", value: "Europe/Bucharest" },
-		{ label: "Budapest", value: "Europe/Budapest" },
-		{ label: "Busingen", value: "Europe/Busingen" },
-		{ label: "Chisinau", value: "Europe/Chisinau" },
-		{ label: "Copenhagen", value: "Europe/Copenhagen" },
-		{ label: "Dublin", value: "Europe/Dublin" },
-		{ label: "Gibraltar", value: "Europe/Gibraltar" },
-		{ label: "Guernsey", value: "Europe/Guernsey" },
-		{ label: "Helsinki", value: "Europe/Helsinki" },
-		{ label: "Isle of Man", value: "Europe/Isle_of_Man" },
-		{ label: "Istanbul", value: "Europe/Istanbul" },
-		{ label: "Jersey", value: "Europe/Jersey" },
-		{ label: "Kaliningrad", value: "Europe/Kaliningrad" },
-		{ label: "Kirov", value: "Europe/Kirov" },
-		{ label: "Kyiv", value: "Europe/Kyiv" },
-		{ label: "Lisbon", value: "Europe/Lisbon" },
-		{ label: "Ljubljana", value: "Europe/Ljubljana" },
-		{ label: "London (Greenwich Mean Time)", value: "Europe/London" },
-		{ label: "Luxembourg", value: "Europe/Luxembourg" },
-		{ label: "Madrid", value: "Europe/Madrid" },
-		{ label: "Malta", value: "Europe/Malta" },
-		{ label: "Mariehamn", value: "Europe/Mariehamn" },
-		{ label: "Minsk", value: "Europe/Minsk" },
-		{ label: "Monaco", value: "Europe/Monaco" },
-		{ label: "Moscow", value: "Europe/Moscow" },
-		{ label: "Oslo", value: "Europe/Oslo" },
-		{ label: "Paris (Central European Time)", value: "Europe/Paris" },
-		{ label: "Podgorica", value: "Europe/Podgorica" },
-		{ label: "Prague", value: "Europe/Prague" },
-		{ label: "Riga", value: "Europe/Riga" },
-		{ label: "Rome", value: "Europe/Rome" },
-		{ label: "Samara", value: "Europe/Samara" },
-		{ label: "San Marino", value: "Europe/San_Marino" },
-		{ label: "Sarajevo", value: "Europe/Sarajevo" },
-		{ label: "Saratov", value: "Europe/Saratov" },
-		{ label: "Simferopol", value: "Europe/Simferopol" },
-		{ label: "Skopje", value: "Europe/Skopje" },
-		{ label: "Sofia", value: "Europe/Sofia" },
-		{ label: "Stockholm", value: "Europe/Stockholm" },
-		{ label: "Tallinn", value: "Europe/Tallinn" },
-		{ label: "Tirane", value: "Europe/Tirane" },
-		{ label: "Ulyanovsk", value: "Europe/Ulyanovsk" },
-		{ label: "Vaduz", value: "Europe/Vaduz" },
-		{ label: "Vatican", value: "Europe/Vatican" },
-		{ label: "Vienna", value: "Europe/Vienna" },
-		{ label: "Vilnius", value: "Europe/Vilnius" },
-		{ label: "Volgograd", value: "Europe/Volgograd" },
-		{ label: "Warsaw", value: "Europe/Warsaw" },
-		{ label: "Zagreb", value: "Europe/Zagreb" },
-		{ label: "Zurich", value: "Europe/Zurich" },
-	],
-	Indian: [
-		{ label: "Antananarivo", value: "Indian/Antananarivo" },
-		{ label: "Chagos", value: "Indian/Chagos" },
-		{ label: "Christmas", value: "Indian/Christmas" },
-		{ label: "Cocos", value: "Indian/Cocos" },
-		{ label: "Comoro", value: "Indian/Comoro" },
-		{ label: "Kerguelen", value: "Indian/Kerguelen" },
-		{ label: "Mahe", value: "Indian/Mahe" },
-		{ label: "Maldives", value: "Indian/Maldives" },
-		{ label: "Mauritius", value: "Indian/Mauritius" },
-		{ label: "Mayotte", value: "Indian/Mayotte" },
-		{ label: "Reunion", value: "Indian/Reunion" },
-	],
-	Pacific: [
-		{ label: "Apia", value: "Pacific/Apia" },
-		{ label: "Auckland", value: "Pacific/Auckland" },
-		{ label: "Bougainville", value: "Pacific/Bougainville" },
-		{ label: "Chatham", value: "Pacific/Chatham" },
-		{ label: "Chuuk", value: "Pacific/Chuuk" },
-		{ label: "Easter", value: "Pacific/Easter" },
-		{ label: "Efate", value: "Pacific/Efate" },
-		{ label: "Fakaofo", value: "Pacific/Fakaofo" },
-		{ label: "Fiji", value: "Pacific/Fiji" },
-		{ label: "Funafuti", value: "Pacific/Funafuti" },
-		{ label: "Galapagos", value: "Pacific/Galapagos" },
-		{ label: "Gambier", value: "Pacific/Gambier" },
-		{ label: "Guadalcanal", value: "Pacific/Guadalcanal" },
-		{ label: "Guam", value: "Pacific/Guam" },
-		{ label: "Honolulu", value: "Pacific/Honolulu" },
-		{ label: "Kanton", value: "Pacific/Kanton" },
-		{ label: "Kiritimati", value: "Pacific/Kiritimati" },
-		{ label: "Kosrae", value: "Pacific/Kosrae" },
-		{ label: "Kwajalein", value: "Pacific/Kwajalein" },
-		{ label: "Majuro", value: "Pacific/Majuro" },
-		{ label: "Marquesas", value: "Pacific/Marquesas" },
-		{ label: "Midway", value: "Pacific/Midway" },
-		{ label: "Nauru", value: "Pacific/Nauru" },
-		{ label: "Niue", value: "Pacific/Niue" },
-		{ label: "Norfolk", value: "Pacific/Norfolk" },
-		{ label: "Noumea", value: "Pacific/Noumea" },
-		{ label: "Pago Pago", value: "Pacific/Pago_Pago" },
-		{ label: "Palau", value: "Pacific/Palau" },
-		{ label: "Pitcairn", value: "Pacific/Pitcairn" },
-		{ label: "Pohnpei", value: "Pacific/Pohnpei" },
-		{ label: "Port Moresby", value: "Pacific/Port_Moresby" },
-		{ label: "Rarotonga", value: "Pacific/Rarotonga" },
-		{ label: "Saipan", value: "Pacific/Saipan" },
-		{ label: "Tahiti", value: "Pacific/Tahiti" },
-		{ label: "Tarawa", value: "Pacific/Tarawa" },
-		{ label: "Tongatapu", value: "Pacific/Tongatapu" },
-		{ label: "Wake", value: "Pacific/Wake" },
-		{ label: "Wallis", value: "Pacific/Wallis" },
-	],
-};
-
-// Helper to get display label for a timezone value
-export function getTimezoneLabel(value: string | undefined): string {
-	if (!value) return "UTC (default)";
-	return value;
-}

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

@@ -86,7 +86,7 @@ export const ShowVolumeBackups = ({
 						</CardTitle>
 						<CardDescription>
 							Schedule volume backups to run automatically at specified
-							intervals
+							intervals.
 						</CardDescription>
 					</div>
 					<div className="flex items-center gap-2 flex-wrap">

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

@@ -54,7 +54,6 @@ const BitbucketProviderSchema = z.object({
 		.object({
 			repo: z.string().min(1, "Repo is required"),
 			owner: z.string().min(1, "Owner is required"),
-			slug: z.string().optional(),
 		})
 		.required(),
 	branch: z.string().min(1, "Branch is required"),
@@ -83,7 +82,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 			repository: {
 				owner: "",
 				repo: "",
-				slug: "",
 			},
 			bitbucketId: "",
 			branch: "",
@@ -116,14 +114,11 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 	} = api.bitbucket.getBitbucketBranches.useQuery(
 		{
 			owner: repository?.owner,
-			repo: repository?.slug || repository?.repo || "",
+			repo: repository?.repo,
 			bitbucketId,
 		},
 		{
-			enabled:
-				!!repository?.owner &&
-				!!(repository?.slug || repository?.repo) &&
-				!!bitbucketId,
+			enabled: !!repository?.owner && !!repository?.repo && !!bitbucketId,
 		},
 	);
 
@@ -134,7 +129,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 				repository: {
 					repo: data.bitbucketRepository || "",
 					owner: data.bitbucketOwner || "",
-					slug: data.bitbucketRepositorySlug || "",
 				},
 				composePath: data.composePath,
 				bitbucketId: data.bitbucketId || "",
@@ -148,7 +142,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 		await mutateAsync({
 			bitbucketBranch: data.branch,
 			bitbucketRepository: data.repository.repo,
-			bitbucketRepositorySlug: data.repository.slug || data.repository.repo,
 			bitbucketOwner: data.repository.owner,
 			bitbucketId: data.bitbucketId,
 			composePath: data.composePath,
@@ -190,7 +183,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 											form.setValue("repository", {
 												owner: "",
 												repo: "",
-												slug: "",
 											});
 											form.setValue("branch", "");
 										}}
@@ -227,7 +219,7 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 										<FormLabel>Repository</FormLabel>
 										{field.value.owner && field.value.repo && (
 											<Link
-												href={`https://bitbucket.org/${field.value.owner}/${field.value.slug || field.value.repo}`}
+												href={`https://bitbucket.org/${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"
@@ -281,7 +273,6 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 																	form.setValue("repository", {
 																		owner: repo.owner.username as string,
 																		repo: repo.name,
-																		slug: repo.slug,
 																	});
 																	form.setValue("branch", "");
 																}}

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

@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { CheckIcon, ChevronsUpDown, 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";
@@ -97,16 +97,6 @@ export const SaveGitlabProviderCompose = ({ composeId }: 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,
@@ -234,9 +224,9 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 								<FormItem className="md:col-span-2 flex flex-col">
 									<div className="flex items-center justify-between">
 										<FormLabel>Repository</FormLabel>
-										{field.value.gitlabPathNamespace && (
+										{field.value.owner && field.value.repo && (
 											<Link
-												href={`${gitlabUrl}/${field.value.gitlabPathNamespace}`}
+												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"

apps/dokploy/components/dashboard/compose/logs/show-stack.tsx

@@ -128,7 +128,6 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => {
 											<Badge variant={badgeStateColor(container.state)}>
 												{container.state}
 											</Badge>
-											{container.status ? ` ${container.status}` : ""}
 										</SelectItem>
 									))}
 								</div>
@@ -144,9 +143,6 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => {
 											<Badge variant={badgeStateColor(container.state)}>
 												{container.state}
 											</Badge>
-											{container.currentState
-												? ` ${container.currentState}`
-												: ""}
 										</SelectItem>
 									))}
 								</>
@@ -156,13 +152,6 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => {
 						</SelectGroup>
 					</SelectContent>
 				</Select>
-				{option === "swarm" &&
-					services?.find((c) => c.containerId === containerId)?.error && (
-						<div className="rounded-md bg-destructive/10 border border-destructive/20 px-3 py-2 text-sm text-destructive">
-							<span className="font-medium">Error: </span>
-							{services.find((c) => c.containerId === containerId)?.error}
-						</div>
-					)}
 				<DockerLogs
 					serverId={serverId || ""}
 					containerId={containerId || "select-a-container"}

apps/dokploy/components/dashboard/compose/logs/show.tsx

@@ -1,8 +1,8 @@
 import { Loader2 } from "lucide-react";
-import { badgeStateColor } from "@/components/dashboard/application/logs/show";
-import { Badge } from "@/components/ui/badge";
 import dynamic from "next/dynamic";
 import { useEffect, useState } from "react";
+import { badgeStateColor } from "@/components/dashboard/application/logs/show";
+import { Badge } from "@/components/ui/badge";
 import {
 	Card,
 	CardContent,
@@ -93,7 +93,6 @@ export const ShowDockerLogsCompose = ({
 									<Badge variant={badgeStateColor(container.state)}>
 										{container.state}
 									</Badge>
-									{container.status ? ` ${container.status}` : ""}
 								</SelectItem>
 							))}
 							<SelectLabel>Containers ({data?.length})</SelectLabel>

apps/dokploy/components/dashboard/docker/logs/utils.ts

@@ -49,7 +49,7 @@ export function parseLogs(logString: string): LogLine[] {
 	// { timestamp: new Date("2024-12-10T10:00:00.000Z"),
 	// message: "The server is running on port 8080" }
 	const logRegex =
-		/^(?:(?<lineNumber>\d+)\s+)?(?<timestamp>(?:\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z|\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} UTC))?\s*(?<message>[\s\S]*)$/;
+		/^(?:(\d+)\s+)?(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z|\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} UTC)?\s*(.*)$/;
 
 	return logString
 		.split("\n")
@@ -59,7 +59,7 @@ export function parseLogs(logString: string): LogLine[] {
 			const match = line.match(logRegex);
 			if (!match) return null;
 
-			const { timestamp, message } = match.groups ?? {};
+			const [, , timestamp, message] = match;
 
 			if (!message?.trim()) return null;
 
@@ -108,8 +108,7 @@ export const getLogType = (message: string): LogStyle => {
 		/(?:might|may|could)\s+(?:not|cause|lead\s+to)/i.test(lowerMessage) ||
 		/(?:!+\s*(?:warning|caution|attention)\s*!+)/i.test(lowerMessage) ||
 		/\b(?:deprecated|obsolete)\b/i.test(lowerMessage) ||
-		/\b(?:unstable|experimental)\b/i.test(lowerMessage) ||
-		/⚠|⚠️/i.test(lowerMessage)
+		/\b(?:unstable|experimental)\b/i.test(lowerMessage)
 	) {
 		return LOG_STYLES.warning;
 	}

apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx

@@ -7,7 +7,6 @@ import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
 import {
 	Form,
 	FormControl,
@@ -17,7 +16,6 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { Label } from "@/components/ui/label";
 import { api } from "@/utils/api";
 import { validateAndFormatYAML } from "../application/advanced/traefik/update-traefik-config";
 
@@ -49,7 +47,6 @@ export const ShowTraefikFile = ({ path, serverId }: Props) => {
 		},
 	);
 	const [canEdit, setCanEdit] = useState(true);
-	const [skipYamlValidation, setSkipYamlValidation] = useState(false);
 
 	const { mutateAsync, isLoading, error, isError } =
 		api.settings.updateTraefikFile.useMutation();
@@ -69,15 +66,13 @@ export const ShowTraefikFile = ({ path, serverId }: Props) => {
 	}, [form, form.reset, data]);
 
 	const onSubmit = async (data: UpdateServerMiddlewareConfig) => {
-		if (!skipYamlValidation) {
-			const { valid, error } = validateAndFormatYAML(data.traefikConfig);
-			if (!valid) {
-				form.setError("traefikConfig", {
-					type: "manual",
-					message: error || "Invalid YAML",
-				});
-				return;
-			}
+		const { valid, error } = validateAndFormatYAML(data.traefikConfig);
+		if (!valid) {
+			form.setError("traefikConfig", {
+				type: "manual",
+				message: error || "Invalid YAML",
+			});
+			return;
 		}
 		form.clearErrors("traefikConfig");
 		await mutateAsync({
@@ -158,37 +153,14 @@ routers:
 							/>
 						)}
 					</div>
-					<div className="flex flex-col gap-4">
-						<div className="flex items-center space-x-2">
-							<Checkbox
-								id="skip-yaml-validation"
-								checked={skipYamlValidation}
-								onCheckedChange={(checked) =>
-									setSkipYamlValidation(checked === true)
-								}
-							/>
-							<Label
-								htmlFor="skip-yaml-validation"
-								className="text-sm font-normal cursor-pointer"
-							>
-								Skip YAML validation (for Go templating)
-							</Label>
-						</div>
-						<p className="text-sm text-muted-foreground -mt-2">
-							Traefik supports Go templating in dynamic configs (e.g.{" "}
-							<code className="text-xs">{"{{range}}"}</code>). Configs using
-							templates will fail standard YAML validation. Check this to save
-							without validation.
-						</p>
-						<div className="flex justify-end">
-							<Button
-								isLoading={isLoading}
-								disabled={canEdit || isLoading}
-								type="submit"
-							>
-								Update
-							</Button>
-						</div>
+					<div className="flex justify-end">
+						<Button
+							isLoading={isLoading}
+							disabled={canEdit || isLoading}
+							type="submit"
+						>
+							Update
+						</Button>
 					</div>
 				</form>
 			</Form>

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

@@ -103,7 +103,7 @@ export const ImpersonationBar = () => {
 			setOpen(false);
 
 			toast.success("Successfully impersonating user", {
-				description: `You are now viewing as ${`${selectedUser.name} ${selectedUser.lastName}`.trim() || selectedUser.email}`,
+				description: `You are now viewing as ${selectedUser.name || selectedUser.email}`,
 			});
 			window.location.reload();
 		} catch (error) {
@@ -195,8 +195,7 @@ export const ImpersonationBar = () => {
 													<UserIcon className="mr-2 h-4 w-4 flex-shrink-0" />
 													<span className="truncate flex flex-col items-start">
 														<span className="text-sm font-medium">
-															{`${selectedUser.name} ${selectedUser.lastName}`.trim() ||
-																""}
+															{selectedUser.name || ""}
 														</span>
 														<span className="text-xs text-muted-foreground">
 															{selectedUser.email}
@@ -243,8 +242,7 @@ export const ImpersonationBar = () => {
 																		<UserIcon className="h-4 w-4 flex-shrink-0" />
 																		<span className="flex flex-col items-start">
 																			<span className="text-sm font-medium">
-																				{`${user.name} ${user.lastName}`.trim() ||
-																					""}
+																				{user.name || ""}
 																			</span>
 																			<span className="text-xs text-muted-foreground">
 																				{user.email} • {user.role}
@@ -285,14 +283,10 @@ export const ImpersonationBar = () => {
 										<AvatarImage
 											className="object-cover"
 											src={data?.user?.image || ""}
-											alt={
-												`${data?.user?.firstName} ${data?.user?.lastName}`.trim() ||
-												""
-											}
+											alt={data?.user?.name || ""}
 										/>
 										<AvatarFallback>
-											{`${data?.user?.firstName?.[0] || ""}${data?.user?.lastName?.[0] || ""}`.toUpperCase() ||
-												"U"}
+											{data?.user?.name?.slice(0, 2).toUpperCase() || "U"}
 										</AvatarFallback>
 									</Avatar>
 									<div className="flex flex-col gap-1">
@@ -305,8 +299,7 @@ export const ImpersonationBar = () => {
 												Impersonating
 											</Badge>
 											<span className="font-medium">
-												{`${data?.user?.firstName} ${data?.user?.lastName}`.trim() ||
-													""}
+												{data?.user?.name || ""}
 											</span>
 										</div>
 										<div className="flex items-center gap-3 text-sm text-muted-foreground flex-wrap">

apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx

@@ -73,8 +73,8 @@ export const ShowExternalMariadbCredentials = ({ mariadbId }: Props) => {
 				toast.success("External Port updated");
 				await refetch();
 			})
-			.catch((error: Error) => {
-				toast.error(error?.message || "Error saving the external port");
+			.catch(() => {
+				toast.error("Error saving the external port");
 			});
 	};
 

apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx

@@ -73,8 +73,8 @@ export const ShowExternalMongoCredentials = ({ mongoId }: Props) => {
 				toast.success("External Port updated");
 				await refetch();
 			})
-			.catch((error: Error) => {
-				toast.error(error?.message || "Error saving the external port");
+			.catch(() => {
+				toast.error("Error saving the external port");
 			});
 	};
 

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

@@ -10,7 +10,7 @@ import { DockerNetworkChart } from "./docker-network-chart";
 
 const defaultData = {
 	cpu: {
-		value: "0%",
+		value: 0,
 		time: "",
 	},
 	memory: {
@@ -46,7 +46,7 @@ interface Props {
 }
 export interface DockerStats {
 	cpu: {
-		value: string;
+		value: number;
 		time: string;
 	};
 	memory: {
@@ -220,13 +220,7 @@ export const ContainerFreeMonitoring = ({
 							<span className="text-sm text-muted-foreground">
 								Used: {currentData.cpu.value}
 							</span>
-							<Progress
-								value={Number.parseInt(
-									currentData.cpu.value.replace("%", ""),
-									10,
-								)}
-								className="w-[100%]"
-							/>
+							<Progress value={currentData.cpu.value} className="w-[100%]" />
 							<DockerCpuChart acummulativeData={acummulativeData.cpu} />
 						</div>
 					</CardContent>

apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx

@@ -73,8 +73,8 @@ export const ShowExternalMysqlCredentials = ({ mysqlId }: Props) => {
 				toast.success("External Port updated");
 				await refetch();
 			})
-			.catch((error: Error) => {
-				toast.error(error?.message || "Error saving the external port");
+			.catch(() => {
+				toast.error("Error saving the external port");
 			});
 	};
 

apps/dokploy/components/dashboard/postgres/advanced/show-custom-command.tsx

@@ -1,7 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Plus, Trash2 } from "lucide-react";
 import { useEffect } from "react";
-import { useFieldArray, useForm } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { Button } from "@/components/ui/button";
@@ -21,13 +20,6 @@ import type { ServiceType } from "../../application/advanced/show-resources";
 const addDockerImage = z.object({
 	dockerImage: z.string().min(1, "Docker image is required"),
 	command: z.string(),
-	args: z
-		.array(
-			z.object({
-				value: z.string().min(1, "Argument cannot be empty"),
-			}),
-		)
-		.optional(),
 });
 
 interface Props {
@@ -69,25 +61,18 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 		defaultValues: {
 			dockerImage: "",
 			command: "",
-			args: [],
 		},
 		resolver: zodResolver(addDockerImage),
 	});
 
-	const { fields, append, remove } = useFieldArray({
-		control: form.control,
-		name: "args",
-	});
-
 	useEffect(() => {
 		if (data) {
 			form.reset({
 				dockerImage: data.dockerImage,
 				command: data.command || "",
-				args: data.args?.map((arg) => ({ value: arg })) || [],
 			});
 		}
-	}, [data, form]);
+	}, [data, form, form.reset]);
 
 	const onSubmit = async (formData: AddDockerImage) => {
 		await mutateAsync({
@@ -98,7 +83,6 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 			mariadbId: id || "",
 			dockerImage: formData?.dockerImage,
 			command: formData?.command,
-			args: formData?.args?.map((arg) => arg.value).filter(Boolean),
 		})
 			.then(async () => {
 				toast.success("Custom Command Updated");
@@ -129,7 +113,7 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 											<FormItem>
 												<FormLabel>Docker Image</FormLabel>
 												<FormControl>
-													<Input placeholder="postgres:18" {...field} />
+													<Input placeholder="postgres:15" {...field} />
 												</FormControl>
 
 												<FormMessage />
@@ -144,68 +128,13 @@ export const ShowCustomCommand = ({ id, type }: Props) => {
 										<FormItem>
 											<FormLabel>Command</FormLabel>
 											<FormControl>
-												<Input placeholder="/bin/sh" {...field} />
+												<Input placeholder="Custom command" {...field} />
 											</FormControl>
 
 											<FormMessage />
 										</FormItem>
 									)}
 								/>
-
-								<div className="space-y-2">
-									<div className="flex items-center justify-between">
-										<FormLabel>Arguments (Args)</FormLabel>
-										<Button
-											type="button"
-											variant="outline"
-											size="sm"
-											onClick={() => append({ value: "" })}
-										>
-											<Plus className="h-4 w-4 mr-1" />
-											Add Argument
-										</Button>
-									</div>
-
-									{fields.length === 0 && (
-										<p className="text-sm text-muted-foreground">
-											No arguments added yet. Click "Add Argument" to add one.
-										</p>
-									)}
-
-									{fields.map((field, index) => (
-										<FormField
-											key={field.id}
-											control={form.control}
-											name={`args.${index}.value`}
-											render={({ field }) => (
-												<FormItem>
-													<div className="flex gap-2">
-														<FormControl>
-															<Input
-																placeholder={
-																	index === 0
-																		? "-c"
-																		: "redis-server --port 6379"
-																}
-																{...field}
-															/>
-														</FormControl>
-														<Button
-															type="button"
-															variant="destructive"
-															size="icon"
-															onClick={() => remove(index)}
-														>
-															<Trash2 className="h-4 w-4" />
-														</Button>
-													</div>
-													<FormMessage />
-												</FormItem>
-											)}
-										/>
-									))}
-								</div>
-
 								<div className="flex w-full justify-end">
 									<Button isLoading={form.formState.isSubmitting} type="submit">
 										Save

apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx

@@ -75,8 +75,8 @@ export const ShowExternalPostgresCredentials = ({ postgresId }: Props) => {
 				toast.success("External Port updated");
 				await refetch();
 			})
-			.catch((error: Error) => {
-				toast.error(error?.message || "Error saving the external port");
+			.catch(() => {
+				toast.error("Error saving the external port");
 			});
 	};
 

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

@@ -150,8 +150,8 @@ export const AddApplication = ({ environmentId, projectName }: Props) => {
 											placeholder="Frontend"
 											{...field}
 											onChange={(e) => {
-												const val = e.target.value || "";
-												const serviceName = slugify(val.trim());
+												const val = e.target.value?.trim() || "";
+												const serviceName = slugify(val);
 												form.setValue("appName", `${slug}-${serviceName}`);
 												field.onChange(val);
 											}}

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

@@ -161,8 +161,8 @@ export const AddCompose = ({ environmentId, projectName }: Props) => {
 												placeholder="Frontend"
 												{...field}
 												onChange={(e) => {
-													const val = e.target.value || "";
-													const serviceName = slugify(val.trim());
+													const val = e.target.value?.trim() || "";
+													const serviceName = slugify(val);
 													form.setValue("appName", `${slug}-${serviceName}`);
 													field.onChange(val);
 												}}

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

@@ -58,7 +58,7 @@ const dockerImageDefaultPlaceholder: Record<DbType, string> = {
 	mongo: "mongo:7",
 	mariadb: "mariadb:11",
 	mysql: "mysql:8",
-	postgres: "postgres:18",
+	postgres: "postgres:15",
 	redis: "redis:7",
 };
 
@@ -395,8 +395,8 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
 													placeholder="Name"
 													{...field}
 													onChange={(e) => {
-														const val = e.target.value || "";
-														const serviceName = slugify(val.trim());
+														const val = e.target.value?.trim() || "";
+														const serviceName = slugify(val);
 														form.setValue("appName", `${slug}-${serviceName}`);
 														field.onChange(val);
 													}}
@@ -559,7 +559,6 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
 													type="password"
 													placeholder="******************"
 													autoComplete="one-time-code"
-													enablePasswordGenerator={true}
 													{...field}
 												/>
 											</FormControl>
@@ -579,7 +578,6 @@ export const AddDatabase = ({ environmentId, projectName }: Props) => {
 													<Input
 														type="password"
 														placeholder="******************"
-														enablePasswordGenerator={true}
 														{...field}
 													/>
 												</FormControl>

apps/dokploy/components/dashboard/project/advanced-environment-selector.tsx

@@ -1,8 +1,15 @@
 import type { findEnvironmentsByProjectId } from "@dokploy/server";
-import { ChevronDownIcon, PencilIcon, PlusIcon, TrashIcon } from "lucide-react";
+import {
+	ChevronDownIcon,
+	PencilIcon,
+	PlusIcon,
+	Terminal,
+	TrashIcon,
+} from "lucide-react";
 import { useRouter } from "next/router";
 import { useState } from "react";
 import { toast } from "sonner";
+import { EnvironmentVariables } from "@/components/dashboard/project/environment-variables";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
 import {
@@ -102,9 +109,7 @@ export const AdvancedEnvironmentSelector = ({
 			setName("");
 			setDescription("");
 		} catch (error) {
-			toast.error(
-				`Failed to create environment: ${error instanceof Error ? error.message : error}`,
-			);
+			toast.error("Failed to create environment");
 		}
 	};
 
@@ -125,9 +130,7 @@ export const AdvancedEnvironmentSelector = ({
 			setName("");
 			setDescription("");
 		} catch (error) {
-			toast.error(
-				`Failed to update environment: ${error instanceof Error ? error.message : error}`,
-			);
+			toast.error("Failed to update environment");
 		}
 	};
 
@@ -144,18 +147,15 @@ export const AdvancedEnvironmentSelector = ({
 			setIsDeleteDialogOpen(false);
 			setSelectedEnvironment(null);
 
-			// Redirect to first available environment if we deleted the current environment
+			// Redirect to production if we deleted the current environment
 			if (selectedEnvironment.environmentId === currentEnvironmentId) {
-				const firstEnv = environments?.find(
-					(env) => env.environmentId !== selectedEnvironment.environmentId,
+				const productionEnv = environments?.find(
+					(env) => env.name === "production",
 				);
-				if (firstEnv) {
+				if (productionEnv) {
 					router.push(
-						`/dashboard/project/${projectId}/environment/${firstEnv.environmentId}`,
+						`/dashboard/project/${projectId}/environment/${productionEnv.environmentId}`,
 					);
-				} else {
-					// No other environments, redirect to project page
-					router.push(`/dashboard/project/${projectId}`);
 				}
 			}
 		} catch (error) {
@@ -246,8 +246,22 @@ export const AdvancedEnvironmentSelector = ({
 										)}
 									</div>
 								</DropdownMenuItem>
-								<div className="flex items-center gap-1 px-2">
-									{!environment.isDefault && (
+
+								{/* Action buttons for non-production environments */}
+								{/* <EnvironmentVariables environmentId={environment.environmentId}>
+									<Button
+										variant="ghost"
+										size="sm"
+										className="h-6 w-6 p-0"
+										onClick={(e) => {
+											e.stopPropagation();
+										}}
+									>
+										<Terminal className="h-3 w-3" />
+									</Button>
+								</EnvironmentVariables> */}
+								{environment.name !== "production" && (
+									<div className="flex items-center gap-1 px-2">
 										<Button
 											variant="ghost"
 											size="sm"
@@ -259,21 +273,22 @@ export const AdvancedEnvironmentSelector = ({
 										>
 											<PencilIcon className="h-3 w-3" />
 										</Button>
-									)}
-									{canDeleteEnvironments && !environment.isDefault && (
-										<Button
-											variant="ghost"
-											size="sm"
-											className="h-6 w-6 p-0 text-red-600 hover:text-red-700"
-											onClick={(e) => {
-												e.stopPropagation();
-												openDeleteDialog(environment);
-											}}
-										>
-											<TrashIcon className="h-3 w-3" />
-										</Button>
-									)}
-								</div>
+
+										{canDeleteEnvironments && (
+											<Button
+												variant="ghost"
+												size="sm"
+												className="h-6 w-6 p-0 text-red-600 hover:text-red-700"
+												onClick={(e) => {
+													e.stopPropagation();
+													openDeleteDialog(environment);
+												}}
+											>
+												<TrashIcon className="h-3 w-3" />
+											</Button>
+										)}
+									</div>
+								)}
 							</div>
 						);
 					})}

apps/dokploy/components/dashboard/projects/show.tsx

@@ -10,7 +10,6 @@ import {
 	TrashIcon,
 } from "lucide-react";
 import Link from "next/link";
-import { useRouter } from "next/router";
 import { useEffect, useMemo, useState } from "react";
 import { toast } from "sonner";
 import { BreadcrumbSidebar } from "@/components/shared/breadcrumb-sidebar";
@@ -55,23 +54,16 @@ import {
 } from "@/components/ui/select";
 import { TimeBadge } from "@/components/ui/time-badge";
 import { api } from "@/utils/api";
-import { useDebounce } from "@/utils/hooks/use-debounce";
 import { HandleProject } from "./handle-project";
 import { ProjectEnvironment } from "./project-environment";
 
 export const ShowProjects = () => {
 	const utils = api.useUtils();
-	const router = useRouter();
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 	const { data, isLoading } = api.project.all.useQuery();
 	const { data: auth } = api.user.get.useQuery();
 	const { mutateAsync } = api.project.remove.useMutation();
-
-	const [searchQuery, setSearchQuery] = useState(
-		router.isReady && typeof router.query.q === "string" ? router.query.q : "",
-	);
-	const debouncedSearchQuery = useDebounce(searchQuery, 500);
-
+	const [searchQuery, setSearchQuery] = useState("");
 	const [sortBy, setSortBy] = useState<string>(() => {
 		if (typeof window !== "undefined") {
 			return localStorage.getItem("projectsSort") || "createdAt-desc";
@@ -83,41 +75,14 @@ export const ShowProjects = () => {
 		localStorage.setItem("projectsSort", sortBy);
 	}, [sortBy]);
 
-	useEffect(() => {
-		if (!router.isReady) return;
-		const urlQuery = typeof router.query.q === "string" ? router.query.q : "";
-		if (urlQuery !== searchQuery) {
-			setSearchQuery(urlQuery);
-		}
-	}, [router.isReady, router.query.q]);
-
-	useEffect(() => {
-		if (!router.isReady) return;
-		const urlQuery = typeof router.query.q === "string" ? router.query.q : "";
-		if (debouncedSearchQuery === urlQuery) return;
-
-		const newQuery = { ...router.query };
-		if (debouncedSearchQuery) {
-			newQuery.q = debouncedSearchQuery;
-		} else {
-			delete newQuery.q;
-		}
-		router.replace({ pathname: router.pathname, query: newQuery }, undefined, {
-			shallow: true,
-		});
-	}, [debouncedSearchQuery]);
-
 	const filteredProjects = useMemo(() => {
 		if (!data) return [];
 
+		// First filter by search query
 		const filtered = data.filter(
 			(project) =>
-				project.name
-					.toLowerCase()
-					.includes(debouncedSearchQuery.toLowerCase()) ||
-				project.description
-					?.toLowerCase()
-					.includes(debouncedSearchQuery.toLowerCase()),
+				project.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
+				project.description?.toLowerCase().includes(searchQuery.toLowerCase()),
 		);
 
 		// Then sort the filtered results
@@ -165,7 +130,7 @@ export const ShowProjects = () => {
 			}
 			return direction === "asc" ? comparison : -comparison;
 		});
-	}, [data, debouncedSearchQuery, sortBy]);
+	}, [data, searchQuery, sortBy]);
 
 	return (
 		<>
@@ -173,7 +138,7 @@ export const ShowProjects = () => {
 				list={[{ name: "Projects", href: "/dashboard/projects" }]}
 			/>
 			{!isCloud && (
-				<div className="absolute top-4 right-4">
+				<div className="absolute top-5 right-5">
 					<TimeBadge />
 				</div>
 			)}
@@ -190,9 +155,7 @@ export const ShowProjects = () => {
 									Create and manage your projects
 								</CardDescription>
 							</CardHeader>
-							{(auth?.role === "owner" ||
-								auth?.role === "admin" ||
-								auth?.canCreateProjects) && (
+							{(auth?.role === "owner" || auth?.canCreateProjects) && (
 								<div className="">
 									<HandleProject />
 								</div>
@@ -288,29 +251,13 @@ export const ShowProjects = () => {
 												)
 												.some(Boolean);
 
-											// Find default environment from accessible environments, or fall back to first accessible environment
-											const accessibleEnvironment =
-												project?.environments.find((env) => env.isDefault) ||
-												project?.environments?.[0];
-
-											const hasNoEnvironments = !accessibleEnvironment;
-
 											return (
 												<div
 													key={project.projectId}
 													className="w-full lg:max-w-md"
 												>
 													<Link
-														href={
-															hasNoEnvironments
-																? "#"
-																: `/dashboard/project/${project.projectId}/environment/${accessibleEnvironment?.environmentId}`
-														}
-														onClick={(e) => {
-															if (hasNoEnvironments) {
-																e.preventDefault();
-															}
-														}}
+														href={`/dashboard/project/${project.projectId}/environment/${project?.environments?.[0]?.environmentId}`}
 													>
 														<Card className="group relative w-full h-full bg-transparent transition-colors hover:bg-border">
 															{haveServicesWithDomains ? (
@@ -431,7 +378,7 @@ export const ShowProjects = () => {
 															) : null}
 															<CardHeader>
 																<CardTitle className="flex items-center justify-between gap-2">
-																	<span className="flex flex-col gap-1.5 ">
+																	<span className="flex flex-col gap-1.5">
 																		<div className="flex items-center gap-2">
 																			<BookIcon className="size-4 text-muted-foreground" />
 																			<span className="text-base font-medium leading-none">
@@ -439,19 +386,9 @@ export const ShowProjects = () => {
 																			</span>
 																		</div>
 
-																		<span className="text-sm font-medium text-muted-foreground break-all">
+																		<span className="text-sm font-medium text-muted-foreground">
 																			{project.description}
 																		</span>
-
-																		{hasNoEnvironments && (
-																			<div className="flex flex-row gap-2 items-center rounded-lg bg-yellow-50 p-2 mt-2 dark:bg-yellow-950">
-																				<AlertTriangle className="size-4 text-yellow-600 dark:text-yellow-400 shrink-0" />
-																				<span className="text-xs text-yellow-600 dark:text-yellow-400">
-																					You have access to this project but no
-																					environments are available
-																				</span>
-																			</div>
-																		)}
 																	</span>
 																	<div className="flex self-start space-x-1">
 																		<DropdownMenu>

apps/dokploy/components/dashboard/redis/general/show-external-redis-credentials.tsx

@@ -74,8 +74,8 @@ export const ShowExternalRedisCredentials = ({ redisId }: Props) => {
 				toast.success("External Port updated");
 				await refetch();
 			})
-			.catch((error: Error) => {
-				toast.error(error?.message || "Error saving the external port");
+			.catch(() => {
+				toast.error("Error saving the external port");
 			});
 	};
 

apps/dokploy/components/dashboard/requests/request-distribution-chart.tsx

@@ -49,65 +49,51 @@ export const RequestDistributionChart = ({
 	);
 
 	return (
-		<div className="w-full h-[200px] overflow-hidden">
-			<ResponsiveContainer
-				width="100%"
-				height="100%"
-				className="overflow-hidden"
-			>
-				<ChartContainer config={chartConfig}>
-					<AreaChart
-						accessibilityLayer
-						data={stats || []}
-						margin={{
-							top: 10,
-							left: 12,
-							right: 12,
-							bottom: 0,
-						}}
-					>
-						<CartesianGrid vertical={false} />
-						<XAxis
-							dataKey="hour"
-							tickLine={false}
-							axisLine={false}
-							tickMargin={8}
-							tickFormatter={(value) =>
-								new Date(value).toLocaleTimeString([], {
-									hour: "2-digit",
-									minute: "2-digit",
-								})
-							}
-						/>
-						<YAxis
-							tickLine={false}
-							axisLine={false}
-							tickMargin={8}
-							allowDataOverflow={false}
-							domain={[0, "auto"]}
-						/>
-						<ChartTooltip
-							cursor={false}
-							content={<ChartTooltipContent indicator="line" />}
-							labelFormatter={(value) =>
-								new Date(value).toLocaleString([], {
-									month: "short",
-									day: "numeric",
-									hour: "2-digit",
-									minute: "2-digit",
-								})
-							}
-						/>
-						<Area
-							dataKey="count"
-							type="monotone"
-							fill="hsl(var(--chart-1))"
-							fillOpacity={0.4}
-							stroke="hsl(var(--chart-1))"
-						/>
-					</AreaChart>
-				</ChartContainer>
-			</ResponsiveContainer>
-		</div>
+		<ResponsiveContainer width="100%" height={200}>
+			<ChartContainer config={chartConfig}>
+				<AreaChart
+					accessibilityLayer
+					data={stats || []}
+					margin={{
+						left: 12,
+						right: 12,
+					}}
+				>
+					<CartesianGrid vertical={false} />
+					<XAxis
+						dataKey="hour"
+						tickLine={false}
+						axisLine={false}
+						tickMargin={8}
+						tickFormatter={(value) =>
+							new Date(value).toLocaleTimeString([], {
+								hour: "2-digit",
+								minute: "2-digit",
+							})
+						}
+					/>
+					<YAxis tickLine={false} axisLine={false} tickMargin={8} />
+					<ChartTooltip
+						cursor={false}
+						content={<ChartTooltipContent indicator="line" />}
+						labelFormatter={(value) =>
+							new Date(value).toLocaleString([], {
+								month: "short",
+								day: "numeric",
+								hour: "2-digit",
+								minute: "2-digit",
+							})
+						}
+					/>
+					<Area
+						dataKey="count"
+						type="natural"
+						fill="hsl(var(--chart-1))"
+						fillOpacity={0.4}
+						stroke="hsl(var(--chart-1))"
+					/>
+				</AreaChart>
+			</ChartContainer>
+		</ResponsiveContainer>
 	);
 };

apps/dokploy/components/dashboard/requests/show-requests.tsx

@@ -51,38 +51,13 @@ export const ShowRequests = () => {
 	const { mutateAsync: updateLogCleanup } =
 		api.settings.updateLogCleanup.useMutation();
 	const [cronExpression, setCronExpression] = useState<string | null>(null);
-
-	// Set default date range to last 3 days
-	const getDefaultDateRange = () => {
-		const to = new Date();
-		const from = new Date();
-		from.setDate(from.getDate() - 3);
-		return { from, to };
-	};
-
 	const [dateRange, setDateRange] = useState<{
 		from: Date | undefined;
 		to: Date | undefined;
-	}>(getDefaultDateRange());
-
-	// Check if logs exist to determine if traefik has been reloaded
-	// Only fetch when active to minimize network calls
-	const { data: statsLogsCheck } = api.settings.readStatsLogs.useQuery(
-		{
-			page: {
-				pageIndex: 0,
-				pageSize: 1,
-			},
-		},
-		{
-			enabled: !!isActive,
-			refetchInterval: 5000, // Check every 5 seconds when active
-		},
-	);
-
-	// Determine if warning should be shown
-	// Show warning only if active but no logs exist yet
-	const shouldShowWarning = isActive && (statsLogsCheck?.totalCount ?? 0) === 0;
+	}>({
+		from: undefined,
+		to: undefined,
+	});
 
 	useEffect(() => {
 		if (logCleanupStatus) {
@@ -104,18 +79,16 @@ export const ShowRequests = () => {
 								See all the incoming requests that pass trough Traefik
 							</CardDescription>
 
-							{shouldShowWarning && (
-								<AlertBlock type="warning">
-									When you activate, you need to reload traefik to apply the
-									changes, you can reload traefik in{" "}
-									<Link
-										href="/dashboard/settings/server"
-										className="text-primary"
-									>
-										Settings
-									</Link>
-								</AlertBlock>
-							)}
+							<AlertBlock type="warning">
+								When you activate, you need to reload traefik to apply the
+								changes, you can reload traefik in{" "}
+								<Link
+									href="/dashboard/settings/server"
+									className="text-primary"
+								>
+									Settings
+								</Link>
+							</AlertBlock>
 						</CardHeader>
 						<CardContent className="space-y-2 py-8 border-t">
 							<div className="flex w-full gap-4 justify-end items-center">
@@ -196,13 +169,17 @@ export const ShowRequests = () => {
 							{isActive ? (
 								<>
 									<div className="flex justify-end mb-4 gap-2">
-										<Button
-											variant="outline"
-											onClick={() => setDateRange(getDefaultDateRange())}
-											className="px-3"
-										>
-											Reset to Last 3 Days
-										</Button>
+										{(dateRange.from || dateRange.to) && (
+											<Button
+												variant="outline"
+												onClick={() =>
+													setDateRange({ from: undefined, to: undefined })
+												}
+												className="px-3"
+											>
+												Clear dates
+											</Button>
+										)}
 										<Popover>
 											<PopoverTrigger asChild>
 												<Button

apps/dokploy/components/dashboard/search-command.tsx

@@ -89,26 +89,24 @@ export const SearchCommand = () => {
 					<CommandGroup heading={"Projects"}>
 						<CommandList>
 							{data?.map((project) => {
-								// Find default environment from accessible environments, or fall back to first accessible environment
-								const defaultEnvironment =
-									project.environments.find(
-										(environment) => environment.isDefault,
-									) || project?.environments?.[0];
+								const productionEnvironment = project.environments.find(
+									(environment) => environment.name === "production",
+								);
 
-								if (!defaultEnvironment) return null;
+								if (!productionEnvironment) return null;
 
 								return (
 									<CommandItem
 										key={project.projectId}
 										onSelect={() => {
 											router.push(
-												`/dashboard/project/${project.projectId}/environment/${defaultEnvironment.environmentId}`,
+												`/dashboard/project/${project.projectId}/environment/${productionEnvironment!.environmentId}`,
 											);
 											setOpen(false);
 										}}
 									>
 										<BookIcon className="size-4 text-muted-foreground mr-2" />
-										{project.name} / {defaultEnvironment.name}
+										{project.name} / {productionEnvironment!.name}
 									</CommandItem>
 								);
 							})}

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

@@ -1,74 +0,0 @@
-import { CreditCard, FileText } from "lucide-react";
-import Link from "next/link";
-import { useRouter } from "next/router";
-import {
-	Card,
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import { cn } from "@/lib/utils";
-import { ShowInvoices } from "./show-invoices";
-
-const navigationItems = [
-	{
-		name: "Subscription",
-		href: "/dashboard/settings/billing",
-		icon: CreditCard,
-	},
-	{
-		name: "Invoices",
-		href: "/dashboard/settings/invoices",
-		icon: FileText,
-	},
-];
-
-export const ShowBillingInvoices = () => {
-	const router = useRouter();
-
-	return (
-		<div className="w-full">
-			<Card className="bg-sidebar p-2.5 rounded-xl max-w-5xl mx-auto">
-				<div className="rounded-xl bg-background shadow-md">
-					<CardHeader>
-						<CardTitle className="text-xl flex flex-row gap-2">
-							<CreditCard className="size-6 text-muted-foreground self-center" />
-							Billing
-						</CardTitle>
-						<CardDescription>
-							Manage your subscription and invoices
-						</CardDescription>
-					</CardHeader>
-					<CardContent className="space-y-4 py-4 border-t">
-						<nav className="flex space-x-2 border-b">
-							{navigationItems.map((item) => {
-								const Icon = item.icon;
-								const isActive = router.pathname === item.href;
-								return (
-									<Link
-										key={item.name}
-										href={item.href}
-										className={cn(
-											"flex items-center gap-2 px-4 py-2 text-sm font-medium border-b-2 transition-colors",
-											isActive
-												? "border-primary text-primary"
-												: "border-transparent text-muted-foreground hover:text-primary hover:border-muted",
-										)}
-									>
-										<Icon className="h-4 w-4" />
-										{item.name}
-									</Link>
-								);
-							})}
-						</nav>
-
-						<div className="mt-6">
-							<ShowInvoices />
-						</div>
-					</CardContent>
-				</div>
-			</Card>
-		</div>
-	);
-};

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

@@ -4,13 +4,11 @@ import {
 	AlertTriangle,
 	CheckIcon,
 	CreditCard,
-	FileText,
 	Loader2,
 	MinusIcon,
 	PlusIcon,
 } from "lucide-react";
 import Link from "next/link";
-import { useRouter } from "next/router";
 import { useState } from "react";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -39,22 +37,7 @@ export const calculatePrice = (count: number, isAnnual = false) => {
 	if (count <= 1) return 4.5;
 	return count * 3.5;
 };
-
-const navigationItems = [
-	{
-		name: "Subscription",
-		href: "/dashboard/settings/billing",
-		icon: CreditCard,
-	},
-	{
-		name: "Invoices",
-		href: "/dashboard/settings/invoices",
-		icon: FileText,
-	},
-];
-
 export const ShowBilling = () => {
-	const router = useRouter();
 	const { data: servers } = api.server.count.useQuery();
 	const { data: admin } = api.user.get.useQuery();
 	const { data, isLoading } = api.stripe.getProducts.useQuery();
@@ -93,41 +76,17 @@ export const ShowBilling = () => {
 
 	return (
 		<div className="w-full">
-			<Card className="bg-sidebar p-2.5 rounded-xl max-w-5xl mx-auto">
-				<div className="rounded-xl bg-background shadow-md">
-					<CardHeader>
+			<Card className="h-full bg-sidebar  p-2.5 rounded-xl  max-w-5xl mx-auto">
+				<div className="rounded-xl bg-background shadow-md ">
+					<CardHeader className="">
 						<CardTitle className="text-xl flex flex-row gap-2">
 							<CreditCard className="size-6 text-muted-foreground self-center" />
 							Billing
 						</CardTitle>
-						<CardDescription>
-							Manage your subscription and invoices
-						</CardDescription>
+						<CardDescription>Manage your subscription</CardDescription>
 					</CardHeader>
-					<CardContent className="space-y-4 py-4 border-t">
-						<nav className="flex space-x-2 border-b">
-							{navigationItems.map((item) => {
-								const Icon = item.icon;
-								const isActive = router.pathname === item.href;
-								return (
-									<Link
-										key={item.name}
-										href={item.href}
-										className={cn(
-											"flex items-center gap-2 px-4 py-2 text-sm font-medium border-b-2 transition-colors",
-											isActive
-												? "border-primary text-primary"
-												: "border-transparent text-muted-foreground hover:text-primary hover:border-muted",
-										)}
-									>
-										<Icon className="h-4 w-4" />
-										{item.name}
-									</Link>
-								);
-							})}
-						</nav>
-
-						<div className="flex flex-col gap-4 w-full mt-6">
+					<CardContent className="space-y-2 py-8 border-t">
+						<div className="flex flex-col gap-4 w-full">
 							<Tabs
 								defaultValue="monthly"
 								value={isAnnual ? "annual" : "monthly"}

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

@@ -1,137 +0,0 @@
-import { Download, ExternalLink, FileText, Loader2 } from "lucide-react";
-import type Stripe from "stripe";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import {
-	Table,
-	TableBody,
-	TableCell,
-	TableHead,
-	TableHeader,
-	TableRow,
-} from "@/components/ui/table";
-import { api } from "@/utils/api";
-
-const formatDate = (timestamp: number | null) => {
-	if (!timestamp) return "-";
-	return new Date(timestamp * 1000).toLocaleDateString("en-US", {
-		year: "numeric",
-		month: "short",
-		day: "numeric",
-	});
-};
-
-const formatAmount = (amount: number, currency: string) => {
-	return new Intl.NumberFormat("en-US", {
-		style: "currency",
-		currency: currency.toUpperCase(),
-	}).format(amount / 100);
-};
-
-const getStatusBadge = (status: Stripe.Invoice.Status | null) => {
-	const statusConfig: Record<
-		Stripe.Invoice.Status,
-		{ label: string; variant: "default" | "secondary" | "destructive" }
-	> = {
-		paid: { label: "Paid", variant: "default" },
-		open: { label: "Open", variant: "secondary" },
-		draft: { label: "Draft", variant: "secondary" },
-		void: { label: "Void", variant: "destructive" },
-		uncollectible: { label: "Uncollectible", variant: "destructive" },
-	};
-
-	if (!status) {
-		return <Badge variant="secondary">Unknown</Badge>;
-	}
-
-	const config = statusConfig[status] || {
-		label: status,
-		variant: "secondary" as const,
-	};
-
-	return <Badge variant={config.variant}>{config.label}</Badge>;
-};
-
-export const ShowInvoices = () => {
-	const { data: invoices, isLoading } = api.stripe.getInvoices.useQuery();
-
-	return (
-		<div className="space-y-4">
-			{isLoading ? (
-				<div className="flex items-center justify-center min-h-[20vh]">
-					<span className="text-base text-muted-foreground flex flex-row gap-3 items-center">
-						Loading invoices...
-						<Loader2 className="animate-spin" />
-					</span>
-				</div>
-			) : invoices && invoices.length > 0 ? (
-				<div className="rounded-md border">
-					<Table>
-						<TableHeader>
-							<TableRow>
-								<TableHead>Invoice</TableHead>
-								<TableHead>Date</TableHead>
-								<TableHead>Due Date</TableHead>
-								<TableHead>Amount</TableHead>
-								<TableHead>Status</TableHead>
-								<TableHead className="text-right">Actions</TableHead>
-							</TableRow>
-						</TableHeader>
-						<TableBody>
-							{invoices.map((invoice) => (
-								<TableRow key={invoice.id}>
-									<TableCell className="font-medium">
-										{invoice.number || invoice.id.slice(0, 12)}
-									</TableCell>
-									<TableCell>{formatDate(invoice.created)}</TableCell>
-									<TableCell>{formatDate(invoice.dueDate)}</TableCell>
-									<TableCell>
-										{formatAmount(invoice.amountDue, invoice.currency)}
-									</TableCell>
-									<TableCell>{getStatusBadge(invoice.status)}</TableCell>
-									<TableCell className="text-right">
-										<div className="flex justify-end gap-2">
-											{invoice.hostedInvoiceUrl && (
-												<Button
-													variant="outline"
-													size="sm"
-													onClick={() =>
-														window.open(
-															invoice.hostedInvoiceUrl || "",
-															"_blank",
-														)
-													}
-												>
-													<ExternalLink className="h-4 w-4" />
-												</Button>
-											)}
-											{invoice.invoicePdf && (
-												<Button
-													variant="outline"
-													size="sm"
-													onClick={() =>
-														window.open(invoice.invoicePdf || "", "_blank")
-													}
-												>
-													<Download className="h-4 w-4" />
-												</Button>
-											)}
-										</div>
-									</TableCell>
-								</TableRow>
-							))}
-						</TableBody>
-					</Table>
-				</div>
-			) : (
-				<div className="flex flex-col items-center justify-center min-h-[20vh] gap-2">
-					<FileText className="size-12 text-muted-foreground" />
-					<p className="text-base text-muted-foreground">No invoices found</p>
-					<p className="text-sm text-muted-foreground">
-						Your invoices will appear here once you have a subscription
-					</p>
-				</div>
-			)}
-		</div>
-	);
-};

apps/dokploy/components/dashboard/settings/cluster/registry/handle-registry.tsx

@@ -42,38 +42,12 @@ const AddRegistrySchema = z.object({
 	username: z.string().min(1, {
 		message: "Username is required",
 	}),
-	password: z.string(),
-	registryUrl: z
-		.string()
-		.optional()
-		.refine(
-			(val) => {
-				// If empty or undefined, skip validation (field is optional)
-				if (!val || val.trim().length === 0) {
-					return true;
-				}
-				// Validate that it's a valid hostname (no protocol, no path, optional port)
-				// Valid formats: example.com, registry.example.com, [::1], example.com:5000
-				// Invalid: https://example.com, example.com/path
-				const trimmed = val.trim();
-				// Check for protocol or path - these are not allowed
-				if (/^https?:\/\//i.test(trimmed) || trimmed.includes("/")) {
-					return false;
-				}
-				// Basic hostname validation: allow alphanumeric, dots, hyphens, underscores, and IPv6 in brackets
-				// Allow optional port at the end
-				const hostnameRegex =
-					/^(?:\[[^\]]+\]|[a-zA-Z0-9](?:[a-zA-Z0-9._-]{0,253}[a-zA-Z0-9])?)(?::\d+)?$/;
-				return hostnameRegex.test(trimmed);
-			},
-			{
-				message:
-					"Invalid registry URL. Please enter only the hostname (e.g., example.com or registry.example.com). Do not include protocol (https://) or paths.",
-			},
-		),
+	password: z.string().min(1, {
+		message: "Password is required",
+	}),
+	registryUrl: z.string(),
 	imagePrefix: z.string(),
 	serverId: z.string().optional(),
-	isEditing: z.boolean().optional(),
 });
 
 type AddRegistry = z.infer<typeof AddRegistrySchema>;
@@ -100,21 +74,13 @@ export const HandleRegistry = ({ registryId }: Props) => {
 	const { mutateAsync, error, isError } = registryId
 		? api.registry.update.useMutation()
 		: api.registry.create.useMutation();
-	const { data: deployServers } = api.server.withSSHKey.useQuery();
-	const { data: buildServers } = api.server.buildServers.useQuery();
-	const servers = [...(deployServers || []), ...(buildServers || [])];
+	const { data: servers } = api.server.withSSHKey.useQuery();
 	const {
 		mutateAsync: testRegistry,
 		isLoading,
 		error: testRegistryError,
 		isError: testRegistryIsError,
 	} = api.registry.testRegistry.useMutation();
-	const {
-		mutateAsync: testRegistryById,
-		isLoading: isLoadingById,
-		error: testRegistryByIdError,
-		isError: testRegistryByIdIsError,
-	} = api.registry.testRegistryById.useMutation();
 	const form = useForm<AddRegistry>({
 		defaultValues: {
 			username: "",
@@ -123,26 +89,8 @@ export const HandleRegistry = ({ registryId }: Props) => {
 			imagePrefix: "",
 			registryName: "",
 			serverId: "",
-			isEditing: !!registryId,
 		},
-		resolver: zodResolver(
-			AddRegistrySchema.refine(
-				(data) => {
-					// When creating a new registry, password is required
-					if (
-						!data.isEditing &&
-						(!data.password || data.password.length === 0)
-					) {
-						return false;
-					}
-					return true;
-				},
-				{
-					message: "Password is required",
-					path: ["password"],
-				},
-			),
-		),
+		resolver: zodResolver(AddRegistrySchema),
 	});
 
 	const password = form.watch("password");
@@ -151,9 +99,6 @@ export const HandleRegistry = ({ registryId }: Props) => {
 	const registryName = form.watch("registryName");
 	const imagePrefix = form.watch("imagePrefix");
 	const serverId = form.watch("serverId");
-	const selectedServer = servers?.find(
-		(server) => server.serverId === serverId,
-	);
 
 	useEffect(() => {
 		if (registry) {
@@ -163,7 +108,6 @@ export const HandleRegistry = ({ registryId }: Props) => {
 				registryUrl: registry.registryUrl,
 				imagePrefix: registry.imagePrefix || "",
 				registryName: registry.registryName,
-				isEditing: true,
 			});
 		} else {
 			form.reset({
@@ -172,29 +116,21 @@ export const HandleRegistry = ({ registryId }: Props) => {
 				registryUrl: "",
 				imagePrefix: "",
 				serverId: "",
-				isEditing: false,
 			});
 		}
 	}, [form, form.reset, form.formState.isSubmitSuccessful, registry]);
 
 	const onSubmit = async (data: AddRegistry) => {
-		const payload: any = {
+		await mutateAsync({
+			password: data.password,
 			registryName: data.registryName,
 			username: data.username,
-			registryUrl: data.registryUrl || "",
+			registryUrl: data.registryUrl,
 			registryType: "cloud",
 			imagePrefix: data.imagePrefix,
 			serverId: data.serverId,
 			registryId: registryId || "",
-		};
-
-		// Only include password if it's been provided (not empty)
-		// When editing, empty password means "keep the existing password"
-		if (data.password && data.password.length > 0) {
-			payload.password = data.password;
-		}
-
-		await mutateAsync(payload)
+		})
 			.then(async (_data) => {
 				await utils.registry.all.invalidate();
 				toast.success(registryId ? "Registry updated" : "Registry added");
@@ -232,14 +168,11 @@ export const HandleRegistry = ({ registryId }: Props) => {
 						Fill the next fields to add a external registry.
 					</DialogDescription>
 				</DialogHeader>
-				{(isError || testRegistryIsError || testRegistryByIdIsError) && (
+				{(isError || testRegistryIsError) && (
 					<div className="flex flex-row gap-4 rounded-lg bg-red-50 p-2 dark:bg-red-950">
 						<AlertTriangle className="text-red-600 dark:text-red-400" />
 						<span className="text-sm text-red-600 dark:text-red-400">
-							{testRegistryError?.message ||
-								testRegistryByIdError?.message ||
-								error?.message ||
-								""}
+							{testRegistryError?.message || error?.message || ""}
 						</span>
 					</div>
 				)}
@@ -290,20 +223,10 @@ export const HandleRegistry = ({ registryId }: Props) => {
 								name="password"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Password{registryId && " (Optional)"}</FormLabel>
-										{registryId && (
-											<FormDescription>
-												Leave blank to keep existing password. Enter new
-												password to test or update it.
-											</FormDescription>
-										)}
+										<FormLabel>Password</FormLabel>
 										<FormControl>
 											<Input
-												placeholder={
-													registryId
-														? "Leave blank to keep existing"
-														: "Password"
-												}
+												placeholder="Password"
 												autoComplete="one-time-code"
 												{...field}
 												type="password"
@@ -338,10 +261,6 @@ export const HandleRegistry = ({ registryId }: Props) => {
 								render={({ field }) => (
 									<FormItem>
 										<FormLabel>Registry URL</FormLabel>
-										<FormDescription>
-											Enter only the hostname (e.g.,
-											aws_account_id.dkr.ecr.us-west-2.amazonaws.com).
-										</FormDescription>
 										<FormControl>
 											<Input
 												placeholder="aws_account_id.dkr.ecr.us-west-2.amazonaws.com"
@@ -363,40 +282,8 @@ export const HandleRegistry = ({ registryId }: Props) => {
 									<FormItem>
 										<FormLabel>Server {!isCloud && "(Optional)"}</FormLabel>
 										<FormDescription>
-											{!isCloud ? (
-												<>
-													{serverId && serverId !== "none" && selectedServer ? (
-														<>
-															Authentication will be performed on{" "}
-															<strong>{selectedServer.name}</strong>. This
-															registry will be available on this server.
-														</>
-													) : (
-														<>
-															Choose where to authenticate with the registry. By
-															default, authentication occurs on the Dokploy
-															server. Select a specific server to authenticate
-															from that server instead.
-														</>
-													)}
-												</>
-											) : (
-												<>
-													{serverId && serverId !== "none" && selectedServer ? (
-														<>
-															Authentication will be performed on{" "}
-															<strong>{selectedServer.name}</strong>. This
-															registry will be available on this server.
-														</>
-													) : (
-														<>
-															Select a server to authenticate with the registry.
-															The authentication will be performed from the
-															selected server.
-														</>
-													)}
-												</>
-											)}
+											Select a server to test the registry. this will run the
+											following command on the server
 										</FormDescription>
 										<FormControl>
 											<Select
@@ -407,33 +294,16 @@ export const HandleRegistry = ({ registryId }: Props) => {
 													<SelectValue placeholder="Select a server" />
 												</SelectTrigger>
 												<SelectContent>
-													{deployServers && deployServers.length > 0 && (
-														<SelectGroup>
-															<SelectLabel>Deploy Servers</SelectLabel>
-															{deployServers.map((server) => (
-																<SelectItem
-																	key={server.serverId}
-																	value={server.serverId}
-																>
-																	{server.name}
-																</SelectItem>
-															))}
-														</SelectGroup>
-													)}
-													{buildServers && buildServers.length > 0 && (
-														<SelectGroup>
-															<SelectLabel>Build Servers</SelectLabel>
-															{buildServers.map((server) => (
-																<SelectItem
-																	key={server.serverId}
-																	value={server.serverId}
-																>
-																	{server.name}
-																</SelectItem>
-															))}
-														</SelectGroup>
-													)}
 													<SelectGroup>
+														<SelectLabel>Servers</SelectLabel>
+														{servers?.map((server) => (
+															<SelectItem
+																key={server.serverId}
+																value={server.serverId}
+															>
+																{server.name}
+															</SelectItem>
+														))}
 														<SelectItem value={"none"}>None</SelectItem>
 													</SelectGroup>
 												</SelectContent>
@@ -451,37 +321,8 @@ export const HandleRegistry = ({ registryId }: Props) => {
 								<Button
 									type="button"
 									variant={"secondary"}
-									isLoading={isLoading || isLoadingById}
+									isLoading={isLoading}
 									onClick={async () => {
-										// When editing with empty password, use the existing password from DB
-										if (registryId && (!password || password.length === 0)) {
-											await testRegistryById({
-												registryId: registryId || "",
-												...(serverId && { serverId }),
-											})
-												.then((data) => {
-													if (data) {
-														toast.success("Registry Tested Successfully");
-													} else {
-														toast.error("Registry Test Failed");
-													}
-												})
-												.catch(() => {
-													toast.error("Error testing the registry");
-												});
-											return;
-										}
-
-										// When creating, password is required
-										if (!registryId && (!password || password.length === 0)) {
-											form.setError("password", {
-												type: "manual",
-												message: "Password is required",
-											});
-											return;
-										}
-
-										// When creating or editing with new password, validate and test with provided credentials
 										const validationResult = AddRegistrySchema.safeParse({
 											username,
 											password,
@@ -489,7 +330,6 @@ export const HandleRegistry = ({ registryId }: Props) => {
 											registryName: "Dokploy Registry",
 											imagePrefix,
 											serverId,
-											isEditing: !!registryId,
 										});
 
 										if (!validationResult.success) {
@@ -505,7 +345,7 @@ export const HandleRegistry = ({ registryId }: Props) => {
 										await testRegistry({
 											username: username,
 											password: password,
-											registryUrl: registryUrl || "",
+											registryUrl: registryUrl,
 											registryName: registryName,
 											registryType: "cloud",
 											imagePrefix: imagePrefix,

apps/dokploy/components/dashboard/settings/destination/handle-destinations.tsx

@@ -122,9 +122,6 @@ export const HandleDestinations = ({ destinationId }: Props) => {
 			.then(async () => {
 				toast.success(`Destination ${destinationId ? "Updated" : "Created"}`);
 				await utils.destination.all.invalidate();
-				if (destinationId) {
-					await utils.destination.one.invalidate({ destinationId });
-				}
 				setOpen(false);
 			})
 			.catch(() => {

apps/dokploy/components/dashboard/settings/git/gitea/add-gitea-provider.tsx

@@ -21,7 +21,6 @@ import {
 	FormControl,
 	FormField,
 	FormItem,
-	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
@@ -40,10 +39,6 @@ const Schema = z.object({
 	giteaUrl: z.string().min(1, {
 		message: "Gitea URL is required",
 	}),
-	giteaInternalUrl: z
-		.union([z.string().url(), z.literal("")])
-		.optional()
-		.transform((v) => (v === "" ? undefined : v)),
 	clientId: z.string().min(1, {
 		message: "Client ID is required",
 	}),
@@ -75,7 +70,6 @@ export const AddGiteaProvider = () => {
 			redirectUri: webhookUrl,
 			name: "",
 			giteaUrl: "https://gitea.com",
-			giteaInternalUrl: "",
 		},
 		resolver: zodResolver(Schema),
 	});
@@ -89,7 +83,6 @@ export const AddGiteaProvider = () => {
 			redirectUri: webhookUrl,
 			name: "",
 			giteaUrl: "https://gitea.com",
-			giteaInternalUrl: "",
 		});
 	}, [form, webhookUrl, isOpen]);
 
@@ -102,7 +95,6 @@ export const AddGiteaProvider = () => {
 				name: data.name,
 				redirectUri: data.redirectUri,
 				giteaUrl: data.giteaUrl,
-				giteaInternalUrl: data.giteaInternalUrl || undefined,
 				organizationName: data.organizationName,
 			})) as unknown as GiteaProviderResponse;
 
@@ -231,29 +223,6 @@ export const AddGiteaProvider = () => {
 									)}
 								/>
 
-								<FormField
-									control={form.control}
-									name="giteaInternalUrl"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Internal URL (Optional)</FormLabel>
-											<FormControl>
-												<Input
-													placeholder="http://gitea:3000"
-													{...field}
-													value={field.value ?? ""}
-												/>
-											</FormControl>
-											<FormDescription>
-												Use when Gitea runs on the same instance as Dokploy.
-												Used for OAuth token exchange to reach Gitea via
-												internal network (e.g. Docker service name).
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-
 								<FormField
 									control={form.control}
 									name="redirectUri"

apps/dokploy/components/dashboard/settings/git/gitea/edit-gitea-provider.tsx

@@ -19,7 +19,6 @@ import {
 	FormControl,
 	FormField,
 	FormItem,
-	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
@@ -31,10 +30,6 @@ import { useUrl } from "@/utils/hooks/use-url";
 const formSchema = z.object({
 	name: z.string().min(1, "Name is required"),
 	giteaUrl: z.string().min(1, "Gitea URL is required"),
-	giteaInternalUrl: z
-		.union([z.string().url(), z.literal("")])
-		.optional()
-		.transform((v) => (v === "" ? undefined : v)),
 	clientId: z.string().min(1, "Client ID is required"),
 	clientSecret: z.string().min(1, "Client Secret is required"),
 });
@@ -99,7 +94,6 @@ export const EditGiteaProvider = ({ giteaId }: Props) => {
 		defaultValues: {
 			name: "",
 			giteaUrl: "https://gitea.com",
-			giteaInternalUrl: "",
 			clientId: "",
 			clientSecret: "",
 		},
@@ -110,7 +104,6 @@ export const EditGiteaProvider = ({ giteaId }: Props) => {
 			form.reset({
 				name: gitea.gitProvider?.name || "",
 				giteaUrl: gitea.giteaUrl || "https://gitea.com",
-				giteaInternalUrl: gitea.giteaInternalUrl || "",
 				clientId: gitea.clientId || "",
 				clientSecret: gitea.clientSecret || "",
 			});
@@ -123,7 +116,6 @@ export const EditGiteaProvider = ({ giteaId }: Props) => {
 			gitProviderId: gitea?.gitProvider?.gitProviderId || "",
 			name: values.name,
 			giteaUrl: values.giteaUrl,
-			giteaInternalUrl: values.giteaInternalUrl ?? null,
 			clientId: values.clientId,
 			clientSecret: values.clientSecret,
 		})
@@ -232,28 +224,6 @@ export const EditGiteaProvider = ({ giteaId }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="giteaInternalUrl"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Internal URL (Optional)</FormLabel>
-									<FormControl>
-										<Input
-											placeholder="http://gitea:3000"
-											{...field}
-											value={field.value ?? ""}
-										/>
-									</FormControl>
-									<FormDescription>
-										Use when Gitea runs on the same instance as Dokploy. Used
-										for OAuth token exchange to reach Gitea via internal network
-										(e.g. Docker service name).
-									</FormDescription>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
 						<FormField
 							control={form.control}
 							name="clientId"

apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx

@@ -21,7 +21,6 @@ import {
 	FormControl,
 	FormField,
 	FormItem,
-	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
@@ -36,10 +35,6 @@ const Schema = z.object({
 	gitlabUrl: z.string().min(1, {
 		message: "GitLab URL is required",
 	}),
-	gitlabInternalUrl: z
-		.union([z.string().url(), z.literal("")])
-		.optional()
-		.transform((v) => (v === "" ? undefined : v)),
 	applicationId: z.string().min(1, {
 		message: "Application ID is required",
 	}),
@@ -71,7 +66,6 @@ export const AddGitlabProvider = () => {
 			redirectUri: webhookUrl,
 			name: "",
 			gitlabUrl: "https://gitlab.com",
-			gitlabInternalUrl: "",
 		},
 		resolver: zodResolver(Schema),
 	});
@@ -86,7 +80,6 @@ export const AddGitlabProvider = () => {
 			redirectUri: webhookUrl,
 			name: "",
 			gitlabUrl: "https://gitlab.com",
-			gitlabInternalUrl: "",
 		});
 	}, [form, isOpen]);
 
@@ -99,7 +92,6 @@ export const AddGitlabProvider = () => {
 			name: data.name || "",
 			redirectUri: data.redirectUri || "",
 			gitlabUrl: data.gitlabUrl || "https://gitlab.com",
-			gitlabInternalUrl: data.gitlabInternalUrl || undefined,
 		})
 			.then(async () => {
 				await utils.gitProvider.getAll.invalidate();
@@ -200,29 +192,6 @@ export const AddGitlabProvider = () => {
 									)}
 								/>
 
-								<FormField
-									control={form.control}
-									name="gitlabInternalUrl"
-									render={({ field }) => (
-										<FormItem>
-											<FormLabel>Internal URL (Optional)</FormLabel>
-											<FormControl>
-												<Input
-													placeholder="http://gitlab:80"
-													{...field}
-													value={field.value ?? ""}
-												/>
-											</FormControl>
-											<FormDescription>
-												Use when GitLab runs on the same instance as Dokploy.
-												Used for OAuth token exchange to reach GitLab via
-												internal network (e.g. Docker service name).
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									)}
-								/>
-
 								<FormField
 									control={form.control}
 									name="redirectUri"