Merge pull request #772 from Dokploy/canary

v0.13.0

.circleci/config.yml

@@ -0,0 +1,119 @@
+version: 2.1
+
+jobs:
+  build-amd64:
+    machine:
+      image: ubuntu-2004:current
+    steps:
+      - checkout
+      - run:
+          name: Prepare .env file
+          command: |
+            cp apps/dokploy/.env.production.example .env.production
+            cp apps/dokploy/.env.production.example apps/dokploy/.env.production
+
+      - run:
+          name: Build and push AMD64 image
+          command: |
+            docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_TOKEN
+            if [ "${CIRCLE_BRANCH}" == "main" ]; then
+              TAG="latest"
+            elif [ "${CIRCLE_BRANCH}" == "canary" ]; then
+              TAG="canary"
+            else
+              TAG="feature"
+            fi
+            docker build --platform linux/amd64 -t dokploy/dokploy:${TAG}-amd64 .
+            docker push dokploy/dokploy:${TAG}-amd64
+
+  build-arm64:
+    machine:
+      image: ubuntu-2004:current
+      resource_class: arm.large
+    steps:
+      - checkout
+      - run:
+          name: Prepare .env file
+          command: |
+            cp apps/dokploy/.env.production.example .env.production
+            cp apps/dokploy/.env.production.example apps/dokploy/.env.production
+      - run:
+          name: Build and push ARM64 image
+          command: |
+            docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_TOKEN
+            if [ "${CIRCLE_BRANCH}" == "main" ]; then
+              TAG="latest"
+            elif [ "${CIRCLE_BRANCH}" == "canary" ]; then
+              TAG="canary"
+            else
+              TAG="feature"
+            fi
+            docker build --platform linux/arm64 -t dokploy/dokploy:${TAG}-arm64 .
+            docker push dokploy/dokploy:${TAG}-arm64
+
+  combine-manifests:
+    docker:
+      - image: cimg/node:18.18.0
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Create and push multi-arch manifest
+          command: |
+            docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_TOKEN
+
+            if [ "${CIRCLE_BRANCH}" == "main" ]; then
+              VERSION=$(node -p "require('./apps/dokploy/package.json').version")
+              echo $VERSION
+              TAG="latest"
+
+              docker manifest create dokploy/dokploy:${TAG} \
+                dokploy/dokploy:${TAG}-amd64 \
+                dokploy/dokploy:${TAG}-arm64
+              docker manifest push dokploy/dokploy:${TAG}
+
+              docker manifest create dokploy/dokploy:${VERSION} \
+                dokploy/dokploy:${TAG}-amd64 \
+                dokploy/dokploy:${TAG}-arm64
+              docker manifest push dokploy/dokploy:${VERSION}
+            elif [ "${CIRCLE_BRANCH}" == "canary" ]; then
+              TAG="canary"
+              docker manifest create dokploy/dokploy:${TAG} \
+                dokploy/dokploy:${TAG}-amd64 \
+                dokploy/dokploy:${TAG}-arm64
+              docker manifest push dokploy/dokploy:${TAG}
+            else
+              TAG="feature"
+              docker manifest create dokploy/dokploy:${TAG} \
+                dokploy/dokploy:${TAG}-amd64 \
+                dokploy/dokploy:${TAG}-arm64
+              docker manifest push dokploy/dokploy:${TAG}
+            fi
+
+workflows:
+  build-all:
+    jobs:
+      - build-amd64:
+          filters:
+            branches:
+              only:
+                - main
+                - canary
+                - fix/build-i18n
+      - build-arm64:
+          filters:
+            branches:
+              only:
+                - main
+                - canary
+                - fix/build-i18n
+      - combine-manifests:
+          requires:
+            - build-amd64
+            - build-arm64
+          filters:
+            branches:
+              only:
+                - main
+                - canary
+                - fix/build-i18n

.config/.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+pnpm commitlint --edit $1

.config/.husky/install.mjs

@@ -0,0 +1,6 @@
+// Skip Husky install in production and CI
+if (process.env.NODE_ENV === "production" || process.env.CI === "true") {
+	process.exit(0);
+}
+const husky = (await import("husky")).default;
+console.log(husky());

.config/.husky/pre-commit

@@ -0,0 +1 @@
+pnpm lint-staged

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [siumauricio]
 patreon: #
 open_collective: dokploy
 ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,94 @@
+name: Bug Report
+description: Create a bug report
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before opening a new issue, please do a search of existing issues.
+
+        If you need help with your own project, you can start a discussion in the [Q&A Section](https://github.com/Dokploy/dokploy/discussions).
+  - type: textarea
+    attributes:
+      label: To Reproduce
+      description: |
+        A detailed, step-by-step description of how to reproduce the issue is required. 
+        Please ensure your report includes clear instructions using numbered lists. 
+
+        If possible, provide a link to a repository or project where the issue can be reproduced.
+      placeholder: |
+        1. Create a application
+        2. Click X
+        3. Y will happen
+
+        Make sure to:
+        - Use numbered lists to outline steps clearly.
+        - Include all relevant commands and configurations.
+        - Provide a link to a reproducible repository if applicable.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current vs. Expected behavior
+      description: A clear and concise description of what the bug is, and what you expected to happen.
+      placeholder: "Following the steps from the previous section, I expected A to happen, but I observed B instead"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Provide environment information
+      description: Please provide the following information about your environment.
+      render: bash
+      placeholder: |
+        Operating System:
+          OS: Ubuntu 20.04
+          Arch: arm64
+        Dokploy version: 0.2.2'
+        VPS Provider: DigitalOcean, Hetzner, Linode, etc.
+        What applications/services are you tying to deploy?
+         eg - Database, Nextjs App, laravel, etc.
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Which area(s) are affected? (Select all that apply)
+      multiple: true
+      options:
+        - "Installation"
+        - "Application"
+        - "Databases"
+        - "Docker Compose"
+        - "Traefik"
+        - "Docker"
+        - "Remote server"
+        - "Local Development"
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Are you deploying the applications where Dokploy is installed or on a remote server?
+      options:
+        - "Same server where Dokploy is installed"
+        - "Remote server"
+        - "Both"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: |
+        Any extra information that might help us investigate.
+      placeholder: |
+        I tested on a DigitalOcean VPS with Ubuntu 20.04 and Docker version 20.10.12.
+
+  - type: dropdown
+    attributes:
+      label: Will you send a PR to fix it?
+      description: Let us know if you are planning to submit a pull request to address this issue.
+
+      options:
+        - "Yes"
+        - "No"
+        - "Maybe, need help"
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Questions?
+    url: https://github.com/Dokploy/dokploy/discussions
+    about: Ask your questions here.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,44 @@
+name: Feature Request
+description: Suggest a new feature or improvement to the project
+labels: ["enhancement"]
+body:
+  - type: textarea
+    attributes:
+      label: What problem will this feature address?
+      description: A clear and concise description of what the problem is.
+      placeholder: |
+        I'm always frustrated when I can't do X
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+      placeholder: Add X to the core
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+      placeholder: |
+        Maybe use Y as a workaround?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
+
+  - type: dropdown
+    attributes:
+      label: Will you send a PR to implement it?
+      description: Let us know if you are planning to submit a pull request to implement this feature.
+      options:
+        - "Yes"
+        - "No"
+        - "Maybe, need help"
+    validations:
+      required: true

.github/workflows/deploy.yml

@@ -0,0 +1,80 @@
+name: Build Docker images
+
+on:
+  push:
+    branches: ["canary", "main"]
+
+jobs:
+  build-and-push-cloud-image:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.cloud
+          push: true
+          tags: |
+            siumauricio/cloud:${{ github.ref_name == 'main' && 'latest' || 'canary' }}
+          platforms: linux/amd64
+          build-args: |
+            NEXT_PUBLIC_UMAMI_HOST=${{ secrets.NEXT_PUBLIC_UMAMI_HOST }}
+            NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
+            NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=${{ secrets.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY }}
+
+  build-and-push-schedule-image:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.schedule
+          push: true
+          tags: |
+            siumauricio/schedule:${{ github.ref_name == 'main' && 'latest' || 'canary' }}
+          platforms: linux/amd64     
+
+
+  build-and-push-server-image:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile.server
+          push: true
+          tags: |
+            siumauricio/server:${{ github.ref_name == 'main' && 'latest' || 'canary' }}
+          platforms: linux/amd64  

.github/workflows/pull-request.yml

@@ -1,59 +1,50 @@
-name: Pull request
+name: Pull Request
+
 on:
   pull_request:
-    branches:
-      - main 
-      - canary
+    branches: [main, canary]
+
+env:
+  HUSKY: 0
 
-  push:
-    branches:
-      - main
-      - canary
 jobs:
-  build-app:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        node-version: [18.18.0]
-    steps:
-    - uses: actions/checkout@v3
-    - uses: pnpm/action-setup@v3
-      with:
-        version: 8
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'pnpm'
-    - name: Install dependencies
-      run: pnpm install
-    - name: Run Build
-      run: pnpm build
-    - name: Run Tests
-      run: pnpm run test
-
-  build-and-push-docker-on-push:
-    if: github.event_name == 'push'
+  lint-and-typecheck:
     runs-on: ubuntu-latest
     steps:
-      - name: Check out the code
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          node-version: 18.18.0
+          cache: "pnpm"
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm run server:build  
+      - run: pnpm biome ci
+      - run: pnpm typecheck
 
-      - name: Prepare .env file
-        run: |
-          cp .env.production.example .env.production
+  build-and-test:
+    needs: lint-and-typecheck
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18.18.0
+          cache: "pnpm"
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm run server:build
+      - run: pnpm build
 
-      - name: Build and push Docker image using custom script
-        run: |
-          chmod +x ./docker/push.sh
-          ./docker/push.sh ${{ github.ref_name == 'canary' && 'canary' || '' }}
+  parallel-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18.18.0
+          cache: "pnpm"
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm run server:build  
+      - run: pnpm test

.gitignore

@@ -1,57 +1,42 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
-# dependencies
-/node_modules
-/.pnp
+# Dependencies
+node_modules
+.pnp
 .pnp.js
-/redis-data
-traefik.yml
 .docker
-.env.production
 
-# testing
-/coverage
-/dist
-/production-server
-# database
-/prisma/db.sqlite
-/prisma/db.sqlite-journal
-/logs
+# Local env files
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
 
-# next.js
-/.next/
-/out/
-next-env.d.ts
-/dokploy
-/config
+# Testing
+coverage
 
-# production
-/build
+# Turbo
+.turbo
 
-# misc
-.DS_Store
-*.pem
+# Vercel
+.vercel
 
-# debug
+# Build Outputs
+.next/
+out/
+dist
+
+
+# Debug
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-.pnpm-debug.log*
 
-# local env files
-# do not commit any .env files to git, except for the .env.example file. https://create.t3.gg/en/usage/env-variables#using-environment-variables
-.env
-.env*.local
+# Editor
+.vscode
+.idea
 
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-
-# otros
-/.data
-/.main
-
-*.lockb
-*.rdb
+# Misc
+.DS_Store
+*.pem

.husky/commit-msg

@@ -0,0 +1 @@
+npx commitlint --edit "$1"

.husky/install.mjs

@@ -0,0 +1,6 @@
+// Skip Husky install in production and CI
+if (process.env.NODE_ENV === "production" || process.env.CI === "true") {
+	process.exit(0);
+}
+const husky = (await import("husky")).default;
+console.log(husky());

.husky/pre-commit

@@ -0,0 +1,2 @@
+pnpm run check
+git add .

.nvmrc

@@ -0,0 +1 @@
+18.18.0

CONTRIBUTING.md

@@ -1,10 +1,7 @@
-
-
 # Contributing
 
 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 comunity via github issues.
 
 We have a few guidelines to follow when contributing to this project:
@@ -17,9 +14,12 @@ We have a few guidelines to follow when contributing to this project:
 
 ## Commit Convention
 
-Before you craete a Pull Request, please make sure your commit message follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification.
+
+Before you create a Pull Request, please make sure your commit message follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification.
 
 ### Commit Message Format
+
+
 ```
 <type>[optional scope]: <description>
 
@@ -29,28 +29,27 @@ Before you craete a Pull Request, please make sure your commit message follows t
 ```
 
 #### Type
+
 Must be one of the following:
 
-* **feat**: A new feature
-* **fix**: A bug fix
-* **docs**: Documentation only changes
-* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
-* **refactor**: A code change that neither fixes a bug nor adds a feature
-* **perf**: A code change that improves performance
-* **test**: Adding missing tests or correcting existing tests
-* **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
-* **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
-* **chore**: Other changes that don't modify `src` or `test` files
-* **revert**: Reverts a previous commit
+- **feat**: A new feature
+- **fix**: A bug fix
+- **docs**: Documentation only changes
+- **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
+- **refactor**: A code change that neither fixes a bug nor adds a feature
+- **perf**: A code change that improves performance
+- **test**: Adding missing tests or correcting existing tests
+- **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
+- **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
+- **chore**: Other changes that don't modify `src` or `test` files
+- **revert**: Reverts a previous commit
 
 Example:
+
 ```
 feat: add new feature
 ```
 
-
-
-
 ## Setup
 
 Before you start, please make the clone based on the `canary` branch, since the `main` branch is the source of truth and should always reflect the latest stable release, also the PRs will be merged to the `canary` branch.
@@ -59,45 +58,50 @@ Before you start, please make the clone based on the `canary` branch, since the
 git clone https://github.com/dokploy/dokploy.git
 cd dokploy
 pnpm install
-cp .env.example .env
+cp apps/dokploy/.env.example apps/dokploy/.env
 ```
 
 ## Development
 
 Is required to have **Docker** installed on your machine.
 
-
 ### Setup
 
 Run the command that will spin up all the required services and files.
 
 ```bash
-pnpm run setup
+pnpm run dokploy:setup
+```
+
+Run this script 
+```bash
+pnpm run server:script 
 ```
 
 Now run the development server.
 
 ```bash
-pnpm run dev
+pnpm run dokploy:dev
 ```
 
-
 Go to http://localhost:3000 to see the development server
 
 ## Build
 
 ```bash
-pnpm run build
+pnpm run dokploy:build
 ```
 
 ## Docker
 
 To build the docker image
+
 ```bash
 pnpm run docker:build
 ```
 
 To push the docker image
+
 ```bash
 pnpm run docker:push
 ```
@@ -138,7 +142,6 @@ curl -sSL https://nixpacks.com/install.sh -o install.sh \
 curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.32.1/pack-v0.32.1-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
 ```
 
-
 ## Pull Request
 
 - The `main` branch is the source of truth and should always reflect the latest stable release.
@@ -152,10 +155,6 @@ curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.32.1/pack-v0.
 
 Thank you for your contribution!
 
-
-
-
-
 ## Templates
 
 To add a new template, go to `templates` folder and create a new folder with the name of the template.
@@ -170,42 +169,47 @@ Let's take the example of `plausible` template.
 ```typescript
 // EXAMPLE
 import {
-	generateHash,
-	generateRandomDomain,
-	type Template,
-	type Schema,
+  generateHash,
+  generateRandomDomain,
+  type Template,
+  type Schema,
+  type DomainSchema,
 } from "../utils";
 
-
 export function generate(schema: Schema): Template {
+  // do your stuff here, like create a new domain, generate random passwords, mounts.
+  const mainServiceHash = generateHash(schema.projectName);
+  const mainDomain = generateRandomDomain(schema);
+  const secretBase = generateBase64(64);
+  const toptKeyBase = generateBase64(32);
 
-	// do your stuff here, like create a new domain, generate random passwords, mounts.
-	const mainServiceHash = generateHash(schema.projectName);
-	const randomDomain = generateRandomDomain(schema);
-	const secretBase = generateBase64(64);
-	const toptKeyBase = generateBase64(32);
+  const domains: DomainSchema[] = [
+    {
+      host: mainDomain,
+      port: 8000,
+      serviceName: "plausible",
+    },
+  ];
 
-	const envs = [
-// If you want to show a domain in the UI, please add the prefix _HOST at the end of the variable name.
-		`PLAUSIBLE_HOST=${randomDomain}`,
-		"PLAUSIBLE_PORT=8000",
-		`BASE_URL=http://${randomDomain}`,
-		`SECRET_KEY_BASE=${secretBase}`,
-		`TOTP_VAULT_KEY=${toptKeyBase}`,
-		`HASH=${mainServiceHash}`,
-	];
+  const envs = [
+    `BASE_URL=http://${mainDomain}`,
+    `SECRET_KEY_BASE=${secretBase}`,
+    `TOTP_VAULT_KEY=${toptKeyBase}`,
+    `HASH=${mainServiceHash}`,
+  ];
 
-    const mounts: Template["mounts"] = [
-		{
-			mountPath: "./clickhouse/clickhouse-config.xml",
-			content: `some content......`,
-		},
-	];
+  const mounts: Template["mounts"] = [
+    {
+      mountPath: "./clickhouse/clickhouse-config.xml",
+      content: `some content......`,
+    },
+  ];
 
-	return {
-		envs,
-        mounts,
-	};
+  return {
+    envs,
+    mounts,
+    domains,
+  };
 }
 ```
 
@@ -233,10 +237,14 @@ export function generate(schema: Schema): Template {
 
 5. Add the logo or image of the template to `public/templates/plausible.svg`
 
+### Recommendations
 
-### Recomendations
 - Use the same name of the folder as the id of the template.
 - The logo should be in the public folder.
-- If you want to show a domain in the UI, please add the prefix _HOST at the end of the variable name.
+- If you want to show a domain in the UI, please add the prefix \_HOST at the end of the variable name.
 - Test first on a vps or a server to make sure the template works.
 
+## Docs & Website
+
+To contribute to the Dokploy docs or website, please go to this [repository](https://github.com/Dokploy/website).
+

Dockerfile

@@ -1,51 +1,51 @@
-# Etapa 1: Prepare image for building
 FROM node:18-slim AS base
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
+FROM base AS build
+COPY . /usr/src/app
+WORKDIR /usr/src/app
+
+RUN apt-get update && apt-get install -y python3 make g++ git && rm -rf /var/lib/apt/lists/*
 
 # Install dependencies
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable && apt-get update && apt-get install -y python3 make g++ git && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app
-
-# Copy package.json and pnpm-lock.yaml
-COPY package.json pnpm-lock.yaml ./
-
-# Install dependencies only for building
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 
-# Copy the rest of the source code
-COPY . .
+# Deploy only the dokploy app
 
-#  Build the application
-RUN pnpm run build
+ENV NODE_ENV=production
+RUN pnpm --filter=@dokploy/server build
+RUN pnpm --filter=./apps/dokploy run build
 
-# Stage 2: Prepare image for production
-FROM node:18-slim AS production
+RUN pnpm --filter=./apps/dokploy --prod deploy /prod/dokploy
 
-# Install dependencies only for production
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable && apt-get update && apt-get install -y curl && apt-get install -y apache2-utils && rm -rf /var/lib/apt/lists/*
+RUN cp -R /usr/src/app/apps/dokploy/.next /prod/dokploy/.next
+RUN cp -R /usr/src/app/apps/dokploy/dist /prod/dokploy/dist
 
+FROM base AS dokploy
 WORKDIR /app
 
-#  Copy the rest of the source code
-COPY --from=base /app/.next ./.next
-COPY --from=base /app/dist ./dist
-COPY --from=base /app/next.config.mjs ./next.config.mjs
-COPY --from=base /app/public ./public
-COPY --from=base /app/package.json ./package.json
-COPY --from=base /app/drizzle ./drizzle
-COPY --from=base /app/.env.production ./.env
-COPY --from=base /app/components.json ./components.json
+# Set production
+ENV NODE_ENV=production
+
+RUN apt-get update && apt-get install -y curl unzip apache2-utils && rm -rf /var/lib/apt/lists/*
+
+# Copy only the necessary files
+COPY --from=build /prod/dokploy/.next ./.next
+COPY --from=build /prod/dokploy/dist ./dist
+COPY --from=build /prod/dokploy/next.config.mjs ./next.config.mjs
+COPY --from=build /prod/dokploy/next-i18next.config.cjs ./next-i18next.config.cjs
+COPY --from=build /prod/dokploy/public ./public
+COPY --from=build /prod/dokploy/package.json ./package.json
+COPY --from=build /prod/dokploy/drizzle ./drizzle
+COPY .env.production ./.env
+COPY --from=build /prod/dokploy/components.json ./components.json
+COPY --from=build /prod/dokploy/node_modules ./node_modules
 
-#  Install dependencies only for production
-COPY package.json pnpm-lock.yaml ./
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile
 
 # Install docker
-RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && rm get-docker.sh
+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
@@ -54,11 +54,8 @@ RUN curl -sSL https://nixpacks.com/install.sh -o install.sh \
     && ./install.sh \
     && pnpm install -g tsx
 
-
 # Install buildpacks
-RUN curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.32.1/pack-v0.32.1-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
+COPY --from=buildpacksio/pack:0.35.0 /usr/local/bin/pack /usr/local/bin/pack
 
-# Expose port
 EXPOSE 3000
-
-CMD ["pnpm", "start"]
+CMD [ "pnpm", "start" ]

Dockerfile.cloud

@@ -0,0 +1,62 @@
+FROM node:18-slim AS base
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
+FROM base AS build
+COPY . /usr/src/app
+WORKDIR /usr/src/app
+
+RUN apt-get update && apt-get install -y python3 make g++ git && rm -rf /var/lib/apt/lists/*
+
+# Install dependencies
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server --filter=./apps/dokploy install --frozen-lockfile
+
+
+# Deploy only the dokploy app
+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_STRIPE_PUBLISHABLE_KEY
+ENV NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=$NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
+
+ENV NODE_ENV=production
+RUN pnpm --filter=@dokploy/server build
+RUN pnpm --filter=./apps/dokploy run build
+
+RUN pnpm --filter=./apps/dokploy --prod deploy /prod/dokploy
+
+RUN cp -R /usr/src/app/apps/dokploy/.next /prod/dokploy/.next
+RUN cp -R /usr/src/app/apps/dokploy/dist /prod/dokploy/dist
+
+FROM base AS dokploy
+WORKDIR /app
+
+# Set production
+ENV NODE_ENV=production
+
+RUN apt-get update && apt-get install -y curl unzip apache2-utils && rm -rf /var/lib/apt/lists/*
+
+# Copy only the necessary files
+COPY --from=build /prod/dokploy/.next ./.next
+COPY --from=build /prod/dokploy/dist ./dist
+COPY --from=build /prod/dokploy/next.config.mjs ./next.config.mjs
+COPY --from=build /prod/dokploy/next-i18next.config.cjs ./next-i18next.config.cjs
+COPY --from=build /prod/dokploy/public ./public
+COPY --from=build /prod/dokploy/package.json ./package.json
+COPY --from=build /prod/dokploy/drizzle ./drizzle
+COPY --from=build /prod/dokploy/components.json ./components.json
+COPY --from=build /prod/dokploy/node_modules ./node_modules
+
+
+# Install RCLONE
+RUN curl https://rclone.org/install.sh | bash
+
+# tsx
+RUN pnpm install -g tsx
+
+EXPOSE 3000
+CMD [ "pnpm", "start" ]

Dockerfile.schedule

@@ -0,0 +1,36 @@
+FROM node:18-slim AS base
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
+FROM base AS build
+COPY . /usr/src/app
+WORKDIR /usr/src/app
+
+RUN apt-get update && apt-get install -y python3 make g++ git && rm -rf /var/lib/apt/lists/*
+
+# Install dependencies
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server --filter=./apps/schedules install --frozen-lockfile
+
+# Deploy only the dokploy app
+
+ENV NODE_ENV=production
+RUN pnpm --filter=@dokploy/server build
+RUN pnpm --filter=./apps/schedules run build
+
+RUN pnpm --filter=./apps/schedules --prod deploy /prod/schedules
+
+RUN cp -R /usr/src/app/apps/schedules/dist /prod/schedules/dist
+
+FROM base AS dokploy
+WORKDIR /app
+
+# Set production
+ENV NODE_ENV=production
+
+# Copy only the necessary files
+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
+
+CMD HOSTNAME=0.0.0.0 && pnpm start

Dockerfile.server

@@ -0,0 +1,36 @@
+FROM node:18-slim AS base
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
+FROM base AS build
+COPY . /usr/src/app
+WORKDIR /usr/src/app
+
+RUN apt-get update && apt-get install -y python3 make g++ git && rm -rf /var/lib/apt/lists/*
+
+# Install dependencies
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server --filter=./apps/api install --frozen-lockfile
+
+# Deploy only the dokploy app
+
+ENV NODE_ENV=production
+RUN pnpm --filter=@dokploy/server build
+RUN pnpm --filter=./apps/api run build
+
+RUN pnpm --filter=./apps/api --prod deploy /prod/api
+
+RUN cp -R /usr/src/app/apps/api/dist /prod/api/dist
+
+FROM base AS dokploy
+WORKDIR /app
+
+# Set production
+ENV NODE_ENV=production
+
+# Copy only the necessary files
+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
+
+CMD HOSTNAME=0.0.0.0 && pnpm start

LICENSE.MD

@@ -17,10 +17,10 @@ See the License for the specific language governing permissions and limitations
 
 ## Additional Terms for Specific Features
 
-The following additional terms apply to the multi-node support and Docker Compose file support features of Dokploy. In the event of a conflict, these provisions shall take precedence over those in the Apache License:
+The following additional terms apply to the multi-node support, Docker Compose file 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 and Docker Compose file support, will always be free to use in the self-hosted version.
-- **Restriction on Resale**: The multi-node support and Docker Compose file support 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 and Docker Compose file support features must be distributed freely and cannot be sold or offered as a service.
+- **Self-Hosted Version Free**: All features of Dokploy, including multi-node support, Docker Compose file support 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 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 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.

README-de.md

@@ -1,50 +0,0 @@
-
-
-<div align="center">
-   <h1 align="center">Dokploy</h1>
-</div>
-
-<div align="center" style="width:100%;">
-<img src="https://raw.githubusercontent.com/Dokploy/dokploy/main/logo.png" alt="Reflex Logo"  style="width:60%;">
-</div>
-<hr>
-
-
-Dokploy ist eine kostenlose und self-hostable Platform as a Service (PaaS), welche das hosten und managen von deinen Projekten und Datenbanken vereinfacht, das geschieht mithilfe von Docker und Treafik. Es ist designt, um deine Leistung und die Sicherheit deiner Projekte zu verbessern. Dokploy erlaubt dir schnell und einfach auf jeder VPS deine Projekte zu verwirklichen.
-
-
-## Erklärung 
-[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md) | [Русский Язык](README-ru.md)
-
-
-
-
-## 🌟 Vorteile
-
-- **Projekte**: - **Projekte**: Hoste jegliche Art von Projekt (Node.js, PHP, Python, Go, Ruby, etc.) mit Einfachheit.
-- **Datenbanken**: Erstelle und manage Datenbanken, wie MySQL, PostgreSQL, MongoDB, MariaDB, Redis, und mehr.
-- **Docker Management**: Einfach Docker container hosten und managen.
-- **Traefik Integration**: Automatische Integration mit Traefik für routing und load balancing
-- **Real-time Monitoring**: Monitor von CPU, RAM, Speicher, und network Nutzung.
-- **Database Backups**: Automatische Backups mit Support für mehrere Speicher Systeme.
-
-
-## 🚀 Loslegen 
-
-Um anzufangen führe einfach den folgende command in einer VPS aus:
-
-```bash
-curl -sSL https://dokploy.com/install.sh | sh
-```
-
-Getestete Systems:
-
-- Ubuntu 20.04
-- Debian 11
-- Fedora 40
-- Centos 9
-
-## 📄 Dokumentation
-
-Für eine detaillierte Dokumentation, siehe [docs.dokploy.com/docs](https://docs.dokploy.com)
-

README-ru.md

@@ -1,49 +0,0 @@
-<div align="center">
-   <h1 align="center">Dokploy</h1>
-</div>
-
-<div align="center" style="width:100%;">
-<img src="https://raw.githubusercontent.com/Dokploy/dokploy/main/logo.png" alt="Логотип Dokploy"  style="width:60%;">
-</div>
-<hr>
-
-
-
-Dokploy - это бесплатная самоустанавливаемая Платформа как Сервис (PaaS), которая упрощает развертывание и управление приложениями и базами данных с использованием Docker и Traefik. Разработанный для повышения эффективности и безопасности, Dokploy позволяет развертывать ваши приложения на любом VPS.
-
-
-
-## Объяснение
-[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md)
-
-
-
-
-## 🌟 Особенности
-
-- **Приложения**: Легко развертывать любой тип приложения (Node.js, PHP, Python, Go, Ruby и др.).
-- **Базы данных**: Создавайте и управляйте базами данных с поддержкой MySQL, PostgreSQL, MongoDB, MariaDB, Redis и других.
-- **Управление Docker**: Легко развертывать и управляйте контейнерами Docker.
-- **Интеграция с Traefik**: Автоматически интегрируется с Traefik для маршрутизации и балансировки нагрузки.
-- **Мониторинг в реальном времени**: Отслеживайте использование CPU, памяти, хранилища и сети.
-- **Резервное копирование баз данных**: Автоматизируйте резервное копирование с поддержкой нескольких мест хранения.
-
-
-## 🚀 Начало работы
-
-Чтобы установить, выполните следующую команду на VPS:
-
-
-```bash
-curl -sSL https://dokploy.com/install.sh | sh
-```
-
-Проверенные системы:
-
-- Ubuntu 20.04
-- Debian 11
-- Fedora 40
-- Centos 9
-
-## 📄 Документация
-Для подробной документации посетите [docs.dokploy.com/docs](https://docs.dokploy.com).

README-zh.md

@@ -1,53 +0,0 @@
-
-
-<div align="center">
-   <h1 align="center">Dokploy</h1>
-</div>
-
-<div align="center" style="width:100%;">
-<img src="https://raw.githubusercontent.com/Dokploy/dokploy/main/logo.png" alt="Reflex Logo"  style="width:60%;">
-</div>
-<hr>
-
-
-
-Dokploy 是一个免费的自托管平台即服务 (PaaS)，它使用 Docker 和 Traefik 简化了应用程序和数据库的部署和管理。 Dokploy 旨在提高效率和安全性,允许您在任何 VPS 上部署应用程序。
-
-## 语言 
-[English](README.md) 
-
-[中文](README-zh.md)
-
-[Deutsch](README-de.md)
-
-[Русский Язык](README-ru.md)
-
-
-
-
-
-## 🌟 功能
-
-- **应用程序**: 轻松部署任何类型的应用程序(Node.js,PHP,Python,Go、Ruby 等)。数据库: 创建和管理数据库,支持 MySQL,PostgreSQL,MongoDB、MariaDB、Redis 等。
-- **Docker 管理**: 轻松部署和管理 Docker 容器。
-- **Traefik 集成**: 自动与 Traefik 集成,用于路由和负载均衡。
-- **实时监控**: 监控 CPU,内存,存储和网络使用情况。
-- **数据库备份**: 支持多种存储目的地自动备份。
-
-## 🚀 入门
-要开始使用 请在VPS 上运行以下命令:
-
-```bash
-curl -sSL https://dokploy.com/install.sh | sh
-```
-
-经过测试的系统:
-
-- Ubuntu 20.04
-- Debian 11
-- Fedora 40
-- Centos 9
-  
-## 📄 文档
-
-如需查看详细的文档资料 请访问[docs.dokploy.com/docs](https://docs.dokploy.com)

README.md

@@ -1,53 +1,138 @@
-
-
 <div align="center">
-   <h1 align="center">Dokploy</h1>
+   <div>
+    <a href="https://dokploy.com" target="_blank" rel="noopener">
+        <img style="object-fit: cover;" align="center" width="100%"src=".github/sponsors/logo.png" alt="Dokploy - Open Source Alternative to Vercel, Heroku and Netlify." />
+    </a>
 </div>
 
-<div align="center" style="width:100%;">
-<img src="https://raw.githubusercontent.com/Dokploy/dokploy/main/logo.png" alt="Reflex Logo"  style="width:60%;">
+</br>
+<div align="center">
+  <div>Join us on Discord for help, feedback, and discussions!</div>
+  </br>
+  <a href="https://discord.gg/2tBnJ3jDJc">
+    <img src="https://discordapp.com/api/guilds/1234073262418563112/widget.png?style=banner2" alt="Discord Shield"/>
+  </a>
 </div>
-<hr>
+</div>
+<br />
+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.
 
-Dokploy is a free self-hostable Platform as a Service (PaaS) that simplifies the deployment and management of applications and databases using Docker and Traefik. Designed to enhance efficiency and security, Dokploy allows you to deploy your applications on any VPS.
-
-
-
-## Explanation
-[English](README.md) | [中文](README-zh.md) | [Deutsch](README-de.md) | [Русский Язык](README-ru.md)
-
-
-
-
-## 🌟 Features
-
-- **Applications**: Deploy any type of application (Node.js, PHP, Python, Go, Ruby, etc.) with ease.
-- **Databases**: Create  and manage databases with support for MySQL, PostgreSQL, MongoDB, MariaDB, Redis, and more.
-- **Docker Management**: Easily deploy and manage Docker containers.
+- **Applications**: Deploy any type of application (Node.js, PHP, Python, Go, Ruby, etc.).
+- **Databases**: Create and manage databases with support for MySQL, PostgreSQL, MongoDB, MariaDB, and Redis.
+- **Backups**: Automate backups for databases to an external storage destination.
+- **Docker Compose**: Native support for Docker Compose to manage complex applications.
+- **Multi Node**: Scale applications to multiple nodes using Docker Swarm to manage the cluster.
+- **Templates**: Deploy open-source templates (Plausible, Pocketbase, Calcom, etc.) with a single click.
 - **Traefik Integration**: Automatically integrates with Traefik for routing and load balancing.
-- **Real-time Monitoring**: Monitor CPU, memory, storage, and network usage.
-- **Database Backups**: Automate backups with support for multiple storage destinations.
-
+- **Real-time Monitoring**: Monitor CPU, memory, storage, and network usage for every resource.
+- **Docker Management**: Easily deploy and manage Docker containers.
+- **CLI/API**: Manage your applications and databases using the command line or through the API.
+- **Notifications**: Get notified when your deployments succeed or fail (via Slack, Discord, Telegram, Email, etc.).
+- **Multi Server**: Deploy and manage your applications remotely to external servers.
+- **Self-Hosted**: Self-host Dokploy on your VPS.
 
 ## 🚀 Getting Started
 
-To get started run the following command in a VPS:
+To get started, run the following command on a VPS:
 
+Want to skip the installation process? [Try the Dokploy Cloud](https://app.dokploy.com).
 
 ```bash
 curl -sSL https://dokploy.com/install.sh | sh
 ```
 
-Tested Systems:
+For detailed documentation, visit [docs.dokploy.com](https://docs.dokploy.com).
 
-- Ubuntu 20.04
+## 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 style="display: flex; align-items: center; gap: 20px;">
+  <a href="https://www.hostinger.com/vps-hosting?ref=dokploy" target="_blank" style="display: inline-block; margin-right: 10px;">
+    <img src=".github/sponsors/hostinger.jpg" alt="Hostinger" height="50"/>
+  </a>
+  <a href="https://www.lxaer.com/?ref=dokploy" target="_blank" style="display: inline-block; margin-right: 10px;">
+    <img src=".github/sponsors/lxaer.png" alt="LX Aer" height="50"/>
+  </a>
+    <a href="https://mandarin3d.com/?ref=dokploy" target="_blank" style="display: inline-block;">
+    <img src=".github/sponsors/mandarin.png" alt="Mandarin" height="50"/>
+  </a>
+</div>
+
+### Premium Supporters 🥇
+
+<div style="display: flex; gap: 30px; flex-wrap: wrap;">
+<a href="https://supafort.com/?ref=dokploy" target="_blank"><img src="https://supafort.com/build/q-4Ht4rBZR.webp" alt="Supafort.com" width="190"/></a>
+</div>
+
+<!-- Elite Contributors 🥈 -->
+
+<!-- Add Elite Contributors here -->
+
+### Supporting Members 🥉
+
+<div style="display: flex; gap: 30px; flex-wrap: wrap;">
+<a href="https://lightspeed.run/?ref=dokploy"><img src="https://github.com/lightspeedrun.png" width="60px" alt="Lightspeed.run"/></a>
+<a href="https://cloudblast.io/?ref=dokploy "><img src="https://cloudblast.io/img/logo-icon.193cf13e.svg" width="250px" alt="Cloudblast.io"/></a>
+<a href="https://startupfa.me/?ref=dokploy "><img src=".github/sponsors/startupfame.png" width="65px" alt="Startupfame"/></a>
+</div>
+
+### Community Backers 🤝
+
+<div style="display: flex; gap: 30px; flex-wrap: wrap;">
+<a href="https://steamsets.com/?ref=dokploy"><img src="https://avatars.githubusercontent.com/u/111978405?s=200&v=4" width="60px" alt="Steamsets.com"/></a>
+<a href="https://rivo.gg/?ref=dokploy"><img src="https://avatars.githubusercontent.com/u/126797452?s=200&v=4" width="60px" alt="Rivo.gg"/></a>
+<a href="https://photoquest.wedding/?ref=dokploy"><img src="https://photoquest.wedding/favicon/android-chrome-512x512.png" width="60px" alt="Rivo.gg"/></a>
+
+</div>
+
+#### Organizations:
+
+[![Sponsors on Open Collective](https://opencollective.com/dokploy/organizations.svg?width=890)](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">
+  <img src="https://contrib.rocks/image?repo=dokploy/dokploy" />
+  </a>
+
+## Video Tutorial
+
+<a href="https://youtu.be/mznYKPvhcfw">
+  <img src="https://dokploy.com/banner.png" alt="Watch the video" width="400" style="border-radius:20px;"/>
+</a>
+
+<!-- ## Supported OS
+
+- Ubuntu 24.04 LTS
+- Ubuntu 23.10
+- Ubuntu 22.04 LTS
+- Ubuntu 20.04 LTS
+- Ubuntu 18.04 LTS
+- Debian 12
 - Debian 11
 - Fedora 40
 - Centos 9
+- Centos 8 -->
 
-## 📄 Documentation
-
-For detailed documentation, visit [docs.dokploy.com/docs](https://docs.dokploy.com).
+## Contributing
 
+Check out the [Contributing Guide](CONTRIBUTING.md) for more information.

__test__/compose/network/network-service.test.ts

@@ -1,181 +0,0 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToServiceNetworks } from "@/server/utils/docker/compose/network";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
-import { load } from "js-yaml";
-import { expect, test } from "vitest";
-
-const composeFile = `
-version: "3.8"
-
-services:
-  web:
-    image: nginx:latest
-    networks:
-      - frontend
-      - backend
-
-  api:
-    image: myapi:latest
-    networks:
-      - backend
-`;
-
-test("Add prefix to networks in services", () => {
-	const composeData = load(composeFile) as ComposeSpecification;
-
-	const prefix = generateRandomHash();
-
-	if (!composeData?.services) {
-		return;
-	}
-	const services = addPrefixToServiceNetworks(composeData.services, prefix);
-	const actualComposeData = { ...composeData, services };
-
-	expect(actualComposeData?.services?.web?.networks).toContain(
-		`frontend-${prefix}`,
-	);
-
-	expect(actualComposeData?.services?.api?.networks).toContain(
-		`backend-${prefix}`,
-	);
-
-	const apiNetworks = actualComposeData?.services?.api?.networks;
-
-	expect(apiNetworks).toBeDefined();
-	expect(actualComposeData?.services?.api?.networks).toContain(
-		`backend-${prefix}`,
-	);
-});
-
-// Caso 2: Objeto con aliases
-const composeFile2 = `
-version: "3.8"
-
-services:
-  api:
-    image: myapi:latest
-    networks:
-      frontend:
-        aliases:
-          - api
-
-networks:
-  frontend:
-    driver: bridge
-`;
-
-test("Add prefix to networks in services with aliases", () => {
-	const composeData = load(composeFile2) as ComposeSpecification;
-
-	const prefix = generateRandomHash();
-
-	if (!composeData?.services) {
-		return;
-	}
-	const services = addPrefixToServiceNetworks(composeData.services, prefix);
-	const actualComposeData = { ...composeData, services };
-
-	expect(actualComposeData.services?.api?.networks).toHaveProperty(
-		`frontend-${prefix}`,
-	);
-
-	const networkConfig =
-		actualComposeData?.services?.api?.networks[`frontend-${prefix}`];
-	expect(networkConfig).toBeDefined();
-	expect(networkConfig?.aliases).toContain("api");
-
-	expect(actualComposeData.services?.api?.networks).not.toHaveProperty(
-		"frontend-ash",
-	);
-});
-
-const composeFile3 = `
-version: "3.8"
-
-services:
-  redis:
-    image: redis:alpine
-    networks:
-      backend:
-
-networks:
-  backend:
-    driver: bridge
-`;
-
-test("Add prefix to networks in services (Object with simple networks)", () => {
-	const composeData = load(composeFile3) as ComposeSpecification;
-
-	const prefix = generateRandomHash();
-
-	if (!composeData?.services) {
-		return;
-	}
-	const services = addPrefixToServiceNetworks(composeData.services, prefix);
-	const actualComposeData = { ...composeData, services };
-
-	expect(actualComposeData.services?.redis?.networks).toHaveProperty(
-		`backend-${prefix}`,
-	);
-});
-
-const composeFileCombined = `
-version: "3.8"
-
-services:
-  web:
-    image: nginx:latest
-    networks:
-      - frontend
-      - backend
-
-  api:
-    image: myapi:latest
-    networks:
-      frontend:
-        aliases:
-          - api
-
-  redis:
-    image: redis:alpine
-    networks:
-      backend:
-
-networks:
-  frontend:
-    driver: bridge
-
-  backend:
-    driver: bridge
-`;
-
-test("Add prefix to networks in services (combined case)", () => {
-	const composeData = load(composeFileCombined) as ComposeSpecification;
-
-	const prefix = generateRandomHash();
-
-	if (!composeData?.services) {
-		return;
-	}
-	const services = addPrefixToServiceNetworks(composeData.services, prefix);
-	const actualComposeData = { ...composeData, services };
-
-	// Caso 1: ListOfStrings
-	expect(actualComposeData.services?.web?.networks).toContain(
-		`frontend-${prefix}`,
-	);
-	expect(actualComposeData.services?.web?.networks).toContain(
-		`backend-${prefix}`,
-	);
-
-	// Caso 2: Objeto con aliases
-	const apiNetworks = actualComposeData.services?.api?.networks;
-	expect(apiNetworks).toHaveProperty(`frontend-${prefix}`);
-	expect(apiNetworks[`frontend-${prefix}`]).toBeDefined();
-	expect(apiNetworks).not.toHaveProperty("frontend");
-
-	// Caso 3: Objeto con redes simples
-	const redisNetworks = actualComposeData.services?.redis?.networks;
-	expect(redisNetworks).toHaveProperty(`backend-${prefix}`);
-	expect(redisNetworks).not.toHaveProperty("backend");
-});

apps/api/.env.example

@@ -0,0 +1,2 @@
+LEMON_SQUEEZY_API_KEY=""
+LEMON_SQUEEZY_STORE_ID=""

apps/api/.gitignore

@@ -0,0 +1,28 @@
+# dev
+.yarn/
+!.yarn/releases
+.vscode/*
+!.vscode/launch.json
+!.vscode/*.code-snippets
+.idea/workspace.xml
+.idea/usage.statistics.xml
+.idea/shelf
+
+# deps
+node_modules/
+
+# env
+.env
+.env.production
+
+# logs
+logs/
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+# misc
+.DS_Store

apps/api/README.md

@@ -0,0 +1,8 @@
+```
+npm install
+npm run dev
+```
+
+```
+open http://localhost:3000
+```

apps/api/package.json

@@ -0,0 +1,33 @@
+{
+	"name": "@dokploy/api",
+	"version": "0.0.1",
+	"type": "module",
+	"scripts": {
+		"dev": "PORT=4000 tsx watch src/index.ts",
+		"build": "tsc --project tsconfig.json",
+		"start": "node --experimental-specifier-resolution=node dist/index.js",
+		"typecheck": "tsc --noEmit"
+	},
+	"dependencies": {
+		"pino": "9.4.0",
+		"pino-pretty": "11.2.2",
+		"@hono/zod-validator": "0.3.0",
+		"zod": "^3.23.4",
+		"react": "18.2.0",
+		"react-dom": "18.2.0",
+		"@dokploy/server": "workspace:*",
+		"@hono/node-server": "^1.12.1",
+		"hono": "^4.5.8",
+		"dotenv": "^16.3.1",
+		"redis": "4.7.0",
+		"@nerimity/mimiqueue": "1.2.3"
+	},
+	"devDependencies": {
+		"typescript": "^5.4.2",
+		"@types/react": "^18.2.37",
+		"@types/react-dom": "^18.2.15",
+		"@types/node": "^20.11.17",
+		"tsx": "^4.7.1"
+	},
+	"packageManager": "pnpm@9.5.0"
+}

apps/api/src/index.ts

@@ -0,0 +1,61 @@
+import { serve } from "@hono/node-server";
+import { Hono } from "hono";
+import "dotenv/config";
+import { zValidator } from "@hono/zod-validator";
+import { Queue } from "@nerimity/mimiqueue";
+import { createClient } from "redis";
+import { logger } from "./logger";
+import { type DeployJob, deployJobSchema } from "./schema";
+import { deploy } from "./utils";
+
+const app = new Hono();
+const redisClient = createClient({
+	url: process.env.REDIS_URL,
+});
+
+app.use(async (c, next) => {
+	if (c.req.path === "/health") {
+		return next();
+	}
+	const authHeader = c.req.header("X-API-Key");
+
+	if (process.env.API_KEY !== authHeader) {
+		return c.json({ message: "Invalid API Key" }, 403);
+	}
+
+	return next();
+});
+
+app.post("/deploy", zValidator("json", deployJobSchema), (c) => {
+	const data = c.req.valid("json");
+	const res = queue.add(data, { groupName: data.serverId });
+	return c.json(
+		{
+			message: "Deployment Added",
+		},
+		200,
+	);
+});
+
+app.get("/health", async (c) => {
+	return c.json({ status: "ok" });
+});
+
+const queue = new Queue({
+	name: "deployments",
+	process: async (job: DeployJob) => {
+		logger.info("Deploying job", job);
+		return await deploy(job);
+	},
+	redisClient,
+});
+
+(async () => {
+	await redisClient.connect();
+	await redisClient.flushAll();
+	logger.info("Redis Cleaned");
+})();
+
+const port = Number.parseInt(process.env.PORT || "3000");
+logger.info("Starting Deployments Server ✅", port);
+serve({ fetch: app.fetch, port });

apps/api/src/logger.ts

@@ -0,0 +1,10 @@
+import pino from "pino";
+
+export const logger = pino({
+	transport: {
+		target: "pino-pretty",
+		options: {
+			colorize: true,
+		},
+	},
+});

apps/api/src/schema.ts

@@ -0,0 +1,24 @@
+import { z } from "zod";
+
+export const deployJobSchema = z.discriminatedUnion("applicationType", [
+	z.object({
+		applicationId: z.string(),
+		titleLog: z.string(),
+		descriptionLog: z.string(),
+		server: z.boolean().optional(),
+		type: z.enum(["deploy", "redeploy"]),
+		applicationType: z.literal("application"),
+		serverId: z.string().min(1),
+	}),
+	z.object({
+		composeId: z.string(),
+		titleLog: z.string(),
+		descriptionLog: z.string(),
+		server: z.boolean().optional(),
+		type: z.enum(["deploy", "redeploy"]),
+		applicationType: z.literal("compose"),
+		serverId: z.string().min(1),
+	}),
+]);
+
+export type DeployJob = z.infer<typeof deployJobSchema>;

apps/api/src/utils.ts

@@ -0,0 +1,62 @@
+import {
+	deployRemoteApplication,
+	deployRemoteCompose,
+	rebuildRemoteApplication,
+	rebuildRemoteCompose,
+	updateApplicationStatus,
+	updateCompose,
+} from "@dokploy/server";
+import type { DeployJob } from "./schema";
+
+export const deploy = async (job: DeployJob) => {
+	try {
+		if (job.applicationType === "application") {
+			await updateApplicationStatus(job.applicationId, "running");
+			if (job.server) {
+				if (job.type === "redeploy") {
+					await rebuildRemoteApplication({
+						applicationId: job.applicationId,
+						titleLog: job.titleLog,
+						descriptionLog: job.descriptionLog,
+					});
+				} else if (job.type === "deploy") {
+					await deployRemoteApplication({
+						applicationId: job.applicationId,
+						titleLog: job.titleLog,
+						descriptionLog: job.descriptionLog,
+					});
+				}
+			}
+		} else if (job.applicationType === "compose") {
+			await updateCompose(job.composeId, {
+				composeStatus: "running",
+			});
+
+			if (job.server) {
+				if (job.type === "redeploy") {
+					await rebuildRemoteCompose({
+						composeId: job.composeId,
+						titleLog: job.titleLog,
+						descriptionLog: job.descriptionLog,
+					});
+				} else if (job.type === "deploy") {
+					await deployRemoteCompose({
+						composeId: job.composeId,
+						titleLog: job.titleLog,
+						descriptionLog: job.descriptionLog,
+					});
+				}
+			}
+		}
+	} catch (error) {
+		if (job.applicationType === "application") {
+			await updateApplicationStatus(job.applicationId, "error");
+		} else if (job.applicationType === "compose") {
+			await updateCompose(job.composeId, {
+				composeStatus: "error",
+			});
+		}
+	}
+
+	return true;
+};

apps/api/tsconfig.json

@@ -0,0 +1,18 @@
+{
+	"compilerOptions": {
+		"target": "ESNext",
+		"module": "ESNext",
+		"moduleResolution": "Node",
+		"strict": true,
+		"skipLibCheck": true,
+		"outDir": "dist",
+		"jsx": "react-jsx",
+		"jsxImportSource": "hono/jsx",
+		"baseUrl": ".",
+		"paths": {
+			"@/*": ["./*"],
+			"@dokploy/server/*": ["../../packages/server/src/*"]
+		}
+	},
+	"exclude": ["node_modules", "dist"]
+}

apps/dokploy/.dockerignore

@@ -0,0 +1,5 @@
+node_modules
+.git
+.gitignore
+*.md
+dist

apps/dokploy/.gitignore

@@ -0,0 +1,59 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+/redis-data
+traefik.yml
+.docker
+.env.production
+
+# testing
+/coverage
+/dist
+/production-server
+# database
+/prisma/db.sqlite
+/prisma/db.sqlite-journal
+/logs
+
+# next.js
+/.next/
+/out/
+next-env.d.ts
+/dokploy
+/config
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# local env files
+# do not commit any .env files to git, except for the .env.example file. https://create.t3.gg/en/usage/env-variables#using-environment-variables
+.env
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+
+# otros
+/.data
+/.main
+.vscode
+
+*.lockb
+*.rdb
+.idea

apps/dokploy/.nvmrc

@@ -0,0 +1 @@
+18.18.0

apps/dokploy/CONTRIBUTING.md

@@ -0,0 +1,242 @@
+
+
+# Contributing
+
+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 comunity via github issues.
+
+We have a few guidelines to follow when contributing to this project:
+
+- [Commit Convention](#commit-convention)
+- [Setup](#setup)
+- [Development](#development)
+- [Build](#build)
+- [Pull Request](#pull-request)
+
+## Commit Convention
+
+Before you craete a Pull Request, please make sure your commit message follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification.
+
+### Commit Message Format
+```
+<type>[optional scope]: <description>
+
+[optional body]
+
+[optional footer(s)]
+```
+
+#### Type
+Must be one of the following:
+
+* **feat**: A new feature
+* **fix**: A bug fix
+* **docs**: Documentation only changes
+* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
+* **refactor**: A code change that neither fixes a bug nor adds a feature
+* **perf**: A code change that improves performance
+* **test**: Adding missing tests or correcting existing tests
+* **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
+* **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
+* **chore**: Other changes that don't modify `src` or `test` files
+* **revert**: Reverts a previous commit
+
+Example:
+```
+feat: add new feature
+```
+
+
+
+
+## Setup
+
+Before you start, please make the clone based on the `canary` branch, since the `main` branch is the source of truth and should always reflect the latest stable release, also the PRs will be merged to the `canary` branch.
+
+```bash
+git clone https://github.com/dokploy/dokploy.git
+cd dokploy
+pnpm install
+cp .env.example .env
+```
+
+## Development
+
+Is required to have **Docker** installed on your machine.
+
+
+### Setup
+
+Run the command that will spin up all the required services and files.
+
+```bash
+pnpm run setup
+```
+
+Now run the development server.
+
+```bash
+pnpm run dev
+```
+
+
+Go to http://localhost:3000 to see the development server
+
+## Build
+
+```bash
+pnpm run build
+```
+
+## Docker
+
+To build the docker image
+```bash
+pnpm run docker:build
+```
+
+To push the docker image
+```bash
+pnpm run docker:push
+```
+
+## Password Reset
+
+In the case you lost your password, you can reset it using the following command
+
+```bash
+pnpm run reset-password
+```
+
+If you want to test the webhooks on development mode using localtunnel, make sure to install `localtunnel`
+
+```bash
+bunx lt --port 3000
+```
+
+If you run into permission issues of docker run the following command
+
+```bash
+sudo chown -R USERNAME dokploy or sudo chown -R $(whoami) ~/.docker
+```
+
+## Application deploy
+
+In case you want to deploy the application on your machine and you selected nixpacks or buildpacks, you need to install first.
+
+```bash
+# Install Nixpacks
+curl -sSL https://nixpacks.com/install.sh -o install.sh \
+    && chmod +x install.sh \
+    && ./install.sh
+```
+
+```bash
+# Install Buildpacks
+curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.32.1/pack-v0.32.1-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack
+```
+
+
+## Pull Request
+
+- The `main` branch is the source of truth and should always reflect the latest stable release.
+- Create a new branch for each feature or bug fix.
+- Make sure to add tests for your changes.
+- Make sure to update the documentation for any changes Go to the [docs.dokploy.com](https://docs.dokploy.com) website to see the changes.
+- When creating a pull request, please provide a clear and concise description of the changes made.
+- If you include a video or screenshot, would be awesome so we can see the changes in action.
+- 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.
+
+Thank you for your contribution!
+
+
+
+
+
+## Templates
+
+To add a new template, go to `templates` folder and create a new folder with the name of the template.
+
+Let's take the example of `plausible` template.
+
+1. create a folder in `templates/plausible`
+2. create a `docker-compose.yml` file inside the folder with the content of compose.
+3. create a `index.ts` file inside the folder with the following code as base:
+4. When creating a pull request, please provide a video of the template working in action.
+
+```typescript
+// EXAMPLE
+import {
+	generateHash,
+	generateRandomDomain,
+	type Template,
+	type Schema,
+} from "../utils";
+
+
+export function generate(schema: Schema): Template {
+
+	// do your stuff here, like create a new domain, generate random passwords, mounts.
+	const mainServiceHash = generateHash(schema.projectName);
+	const randomDomain = generateRandomDomain(schema);
+	const secretBase = generateBase64(64);
+	const toptKeyBase = generateBase64(32);
+
+	const envs = [
+// If you want to show a domain in the UI, please add the prefix _HOST at the end of the variable name.
+		`PLAUSIBLE_HOST=${randomDomain}`,
+		"PLAUSIBLE_PORT=8000",
+		`BASE_URL=http://${randomDomain}`,
+		`SECRET_KEY_BASE=${secretBase}`,
+		`TOTP_VAULT_KEY=${toptKeyBase}`,
+		`HASH=${mainServiceHash}`,
+	];
+
+    const mounts: Template["mounts"] = [
+		{
+			mountPath: "./clickhouse/clickhouse-config.xml",
+			content: `some content......`,
+		},
+	];
+
+	return {
+		envs,
+        mounts,
+	};
+}
+```
+
+4. Now you need to add the information about the template to the `templates/templates.ts` is a object with the following properties:
+
+**Make sure the id of the template is the same as the folder name and don't have any spaces, only slugified names and lowercase.**
+
+```typescript
+{
+	id: "plausible",
+	name: "Plausible",
+	version: "v2.1.0",
+	description:
+		"Plausible is a open source, self-hosted web analytics platform that lets you track website traffic and user behavior.",
+	logo: "plausible.svg", // we defined the name and the extension of the logo
+	links: {
+		github: "https://github.com/plausible/plausible",
+		website: "https://plausible.io/",
+		docs: "https://plausible.io/docs",
+	},
+	tags: ["analytics"],
+	load: () => import("./plausible/index").then((m) => m.generate),
+},
+```
+
+5. Add the logo or image of the template to `public/templates/plausible.svg`
+
+
+### Recomendations
+- Use the same name of the folder as the id of the template.
+- The logo should be in the public folder.
+- If you want to show a domain in the UI, please add the prefix _HOST at the end of the variable name.
+- Test first on a vps or a server to make sure the template works.
+

apps/dokploy/Dockerfile

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

apps/dokploy/LICENSE.MD

@@ -0,0 +1,26 @@
+# License
+
+## Core License (Apache License 2.0)
+
+Copyright 2024 Mauricio Siu.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.
+
+## Additional Terms for Specific Features
+
+The following additional terms apply to the multi-node support, Docker Compose file 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 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 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 and Multi Server features must be distributed freely and cannot be sold or offered as a service.
+
+For further inquiries or permissions, please contact us directly.

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

@@ -1,7 +1,7 @@
-import { expect, test } from "vitest";
+import { addSuffixToAllProperties } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
-import { addPrefixToAllProperties } from "@/server/utils/docker/compose";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { expect, test } from "vitest";
 
 const composeFile1 = `
 version: "3.8"
@@ -119,11 +119,11 @@ secrets:
     file: ./db_password.txt
 `) as ComposeSpecification;
 
-test("Add prefix to all properties in compose file 1", () => {
+test("Add suffix to all properties in compose file 1", () => {
 	const composeData = load(composeFile1) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllProperties(composeData, prefix);
+	const updatedComposeData = addSuffixToAllProperties(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFile1);
 });
@@ -242,11 +242,11 @@ secrets:
     file: ./db_password.txt
 `) as ComposeSpecification;
 
-test("Add prefix to all properties in compose file 2", () => {
+test("Add suffix to all properties in compose file 2", () => {
 	const composeData = load(composeFile2) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllProperties(composeData, prefix);
+	const updatedComposeData = addSuffixToAllProperties(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFile2);
 });
@@ -365,11 +365,11 @@ secrets:
     file: ./service_secret.txt
 `) as ComposeSpecification;
 
-test("Add prefix to all properties in compose file 3", () => {
+test("Add suffix to all properties in compose file 3", () => {
 	const composeData = load(composeFile3) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllProperties(composeData, prefix);
+	const updatedComposeData = addSuffixToAllProperties(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFile3);
 });
@@ -466,11 +466,11 @@ volumes:
     driver: local
 `) as ComposeSpecification;
 
-test("Add prefix to all properties in Plausible compose file", () => {
+test("Add suffix to all properties in Plausible compose file", () => {
 	const composeData = load(composeFile) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllProperties(composeData, prefix);
+	const updatedComposeData = addSuffixToAllProperties(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFile);
 });

apps/dokploy/__test__/compose/config/config-root.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToConfigsRoot } from "@/server/utils/docker/compose/configs";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToConfigsRoot } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -23,19 +23,19 @@ configs:
     file: ./web-config.yml
 `;
 
-test("Add prefix to configs in root property", () => {
+test("Add suffix to configs in root property", () => {
 	const composeData = load(composeFile) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.configs) {
 		return;
 	}
-	const configs = addPrefixToConfigsRoot(composeData.configs, prefix);
+	const configs = addSuffixToConfigsRoot(composeData.configs, suffix);
 
 	expect(configs).toBeDefined();
 	for (const configKey of Object.keys(configs)) {
-		expect(configKey).toContain(`-${prefix}`);
+		expect(configKey).toContain(`-${suffix}`);
 		expect(configs[configKey]).toBeDefined();
 	}
 });
@@ -59,23 +59,23 @@ configs:
     file: ./another-config.yml
 `;
 
-test("Add prefix to multiple configs in root property", () => {
+test("Add suffix to multiple configs in root property", () => {
 	const composeData = load(composeFileMultipleConfigs) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.configs) {
 		return;
 	}
-	const configs = addPrefixToConfigsRoot(composeData.configs, prefix);
+	const configs = addSuffixToConfigsRoot(composeData.configs, suffix);
 
 	expect(configs).toBeDefined();
 	for (const configKey of Object.keys(configs)) {
-		expect(configKey).toContain(`-${prefix}`);
+		expect(configKey).toContain(`-${suffix}`);
 		expect(configs[configKey]).toBeDefined();
 	}
-	expect(configs).toHaveProperty(`web-config-${prefix}`);
-	expect(configs).toHaveProperty(`another-config-${prefix}`);
+	expect(configs).toHaveProperty(`web-config-${suffix}`);
+	expect(configs).toHaveProperty(`another-config-${suffix}`);
 });
 
 const composeFileDifferentProperties = `
@@ -92,25 +92,25 @@ configs:
     external: true
 `;
 
-test("Add prefix to configs with different properties in root property", () => {
+test("Add suffix to configs with different properties in root property", () => {
 	const composeData = load(
 		composeFileDifferentProperties,
 	) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.configs) {
 		return;
 	}
-	const configs = addPrefixToConfigsRoot(composeData.configs, prefix);
+	const configs = addSuffixToConfigsRoot(composeData.configs, suffix);
 
 	expect(configs).toBeDefined();
 	for (const configKey of Object.keys(configs)) {
-		expect(configKey).toContain(`-${prefix}`);
+		expect(configKey).toContain(`-${suffix}`);
 		expect(configs[configKey]).toBeDefined();
 	}
-	expect(configs).toHaveProperty(`web-config-${prefix}`);
-	expect(configs).toHaveProperty(`special-config-${prefix}`);
+	expect(configs).toHaveProperty(`web-config-${suffix}`);
+	expect(configs).toHaveProperty(`special-config-${suffix}`);
 });
 
 const composeFileConfigRoot = `
@@ -162,15 +162,15 @@ configs:
     file: ./db-config.yml
 `) as ComposeSpecification;
 
-test("Add prefix to configs in root property", () => {
+test("Add suffix to configs in root property", () => {
 	const composeData = load(composeFileConfigRoot) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
 	if (!composeData?.configs) {
 		return;
 	}
-	const configs = addPrefixToConfigsRoot(composeData.configs, prefix);
+	const configs = addSuffixToConfigsRoot(composeData.configs, suffix);
 	const updatedComposeData = { ...composeData, configs };
 
 	// Verificar que el resultado coincide con el archivo esperado

apps/dokploy/__test__/compose/config/config-service.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToConfigsInServices } from "@/server/utils/docker/compose/configs";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToConfigsInServices } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -19,19 +19,19 @@ configs:
     file: ./web-config.yml
 `;
 
-test("Add prefix to configs in services", () => {
+test("Add suffix to configs in services", () => {
 	const composeData = load(composeFile) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.services) {
 		return;
 	}
-	const services = addPrefixToConfigsInServices(composeData.services, prefix);
+	const services = addSuffixToConfigsInServices(composeData.services, suffix);
 	const actualComposeData = { ...composeData, services };
 
 	expect(actualComposeData.services?.web?.configs).toContainEqual({
-		source: `web-config-${prefix}`,
+		source: `web-config-${suffix}`,
 		target: "/etc/nginx/nginx.conf",
 	});
 });
@@ -51,17 +51,17 @@ configs:
     file: ./web-config.yml
 `;
 
-test("Add prefix to configs in services with single config", () => {
+test("Add suffix to configs in services with single config", () => {
 	const composeData = load(
 		composeFileSingleServiceConfig,
 	) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.services) {
 		return;
 	}
-	const services = addPrefixToConfigsInServices(composeData.services, prefix);
+	const services = addSuffixToConfigsInServices(composeData.services, suffix);
 
 	expect(services).toBeDefined();
 	for (const serviceKey of Object.keys(services)) {
@@ -69,7 +69,7 @@ test("Add prefix to configs in services with single config", () => {
 		if (serviceConfigs) {
 			for (const config of serviceConfigs) {
 				if (typeof config === "object") {
-					expect(config.source).toContain(`-${prefix}`);
+					expect(config.source).toContain(`-${suffix}`);
 				}
 			}
 		}
@@ -105,17 +105,17 @@ configs:
     file: ./common-config.yml
 `;
 
-test("Add prefix to configs in services with multiple configs", () => {
+test("Add suffix to configs in services with multiple configs", () => {
 	const composeData = load(
 		composeFileMultipleServicesConfigs,
 	) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.services) {
 		return;
 	}
-	const services = addPrefixToConfigsInServices(composeData.services, prefix);
+	const services = addSuffixToConfigsInServices(composeData.services, suffix);
 
 	expect(services).toBeDefined();
 	for (const serviceKey of Object.keys(services)) {
@@ -123,7 +123,7 @@ test("Add prefix to configs in services with multiple configs", () => {
 		if (serviceConfigs) {
 			for (const config of serviceConfigs) {
 				if (typeof config === "object") {
-					expect(config.source).toContain(`-${prefix}`);
+					expect(config.source).toContain(`-${suffix}`);
 				}
 			}
 		}
@@ -179,17 +179,17 @@ services:
 
 `) as ComposeSpecification;
 
-test("Add prefix to configs in services", () => {
+test("Add suffix to configs in services", () => {
 	const composeData = load(composeFileConfigServices) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
 	if (!composeData?.services) {
 		return;
 	}
-	const updatedComposeData = addPrefixToConfigsInServices(
+	const updatedComposeData = addSuffixToConfigsInServices(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 

apps/dokploy/__test__/compose/config/config.test.ts

@@ -1,9 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import {
-	addPrefixToAllConfigs,
-	addPrefixToConfigsRoot,
-} from "@/server/utils/docker/compose/configs";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToAllConfigs, addSuffixToConfigsRoot } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -80,12 +77,12 @@ configs:
     file: ./db-config.yml
 `) as ComposeSpecification;
 
-test("Add prefix to all configs in root and services", () => {
+test("Add suffix to all configs in root and services", () => {
 	const composeData = load(composeFileCombinedConfigs) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllConfigs(composeData, prefix);
+	const updatedComposeData = addSuffixToAllConfigs(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFileCombinedConfigs);
 });
@@ -162,14 +159,14 @@ configs:
     file: ./db-config.yml
 `) as ComposeSpecification;
 
-test("Add prefix to configs with environment and external", () => {
+test("Add suffix to configs with environment and external", () => {
 	const composeData = load(
 		composeFileWithEnvAndExternal,
 	) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllConfigs(composeData, prefix);
+	const updatedComposeData = addSuffixToAllConfigs(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFileWithEnvAndExternal);
 });
@@ -234,14 +231,14 @@ configs:
     file: ./db-config.yml
 `) as ComposeSpecification;
 
-test("Add prefix to configs with template driver and labels", () => {
+test("Add suffix to configs with template driver and labels", () => {
 	const composeData = load(
 		composeFileWithTemplateDriverAndLabels,
 	) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllConfigs(composeData, prefix);
+	const updatedComposeData = addSuffixToAllConfigs(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(
 		expectedComposeFileWithTemplateDriverAndLabels,

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

@@ -0,0 +1,107 @@
+import type { Domain } from "@dokploy/server";
+import { createDomainLabels } from "@dokploy/server";
+import { describe, expect, it } from "vitest";
+
+describe("createDomainLabels", () => {
+	const appName = "test-app";
+	const baseDomain: Domain = {
+		host: "example.com",
+		port: 8080,
+		https: false,
+		uniqueConfigKey: 1,
+		certificateType: "none",
+		applicationId: "",
+		composeId: "",
+		domainType: "compose",
+		serviceName: "test-app",
+		domainId: "",
+		path: "/",
+		createdAt: "",
+	};
+
+	it("should create basic labels for web entrypoint", async () => {
+		const labels = await createDomainLabels(appName, baseDomain, "web");
+		expect(labels).toEqual([
+			"traefik.http.routers.test-app-1-web.rule=Host(`example.com`)",
+			"traefik.http.routers.test-app-1-web.entrypoints=web",
+			"traefik.http.services.test-app-1-web.loadbalancer.server.port=8080",
+			"traefik.http.routers.test-app-1-web.service=test-app-1-web",
+		]);
+	});
+
+	it("should create labels for websecure entrypoint", async () => {
+		const labels = await createDomainLabels(appName, baseDomain, "websecure");
+		expect(labels).toEqual([
+			"traefik.http.routers.test-app-1-websecure.rule=Host(`example.com`)",
+			"traefik.http.routers.test-app-1-websecure.entrypoints=websecure",
+			"traefik.http.services.test-app-1-websecure.loadbalancer.server.port=8080",
+			"traefik.http.routers.test-app-1-websecure.service=test-app-1-websecure",
+		]);
+	});
+
+	it("should add the path prefix if is different than / empty", async () => {
+		const labels = await createDomainLabels(
+			appName,
+			{
+				...baseDomain,
+				path: "/hello",
+			},
+			"websecure",
+		);
+
+		expect(labels).toEqual([
+			"traefik.http.routers.test-app-1-websecure.rule=Host(`example.com`) && PathPrefix(`/hello`)",
+			"traefik.http.routers.test-app-1-websecure.entrypoints=websecure",
+			"traefik.http.services.test-app-1-websecure.loadbalancer.server.port=8080",
+			"traefik.http.routers.test-app-1-websecure.service=test-app-1-websecure",
+		]);
+	});
+
+	it("should add redirect middleware for https on web entrypoint", async () => {
+		const httpsBaseDomain = { ...baseDomain, https: true };
+		const labels = await createDomainLabels(appName, httpsBaseDomain, "web");
+		expect(labels).toContain(
+			"traefik.http.routers.test-app-1-web.middlewares=redirect-to-https@file",
+		);
+	});
+
+	it("should add Let's Encrypt configuration for websecure with letsencrypt certificate", async () => {
+		const letsencryptDomain = {
+			...baseDomain,
+			https: true,
+			certificateType: "letsencrypt" as const,
+		};
+		const labels = await createDomainLabels(
+			appName,
+			letsencryptDomain,
+			"websecure",
+		);
+		expect(labels).toContain(
+			"traefik.http.routers.test-app-1-websecure.tls.certresolver=letsencrypt",
+		);
+	});
+
+	it("should not add Let's Encrypt configuration for non-letsencrypt certificate", async () => {
+		const nonLetsencryptDomain = {
+			...baseDomain,
+			https: true,
+			certificateType: "none" as const,
+		};
+		const labels = await createDomainLabels(
+			appName,
+			nonLetsencryptDomain,
+			"websecure",
+		);
+		expect(labels).not.toContain(
+			"traefik.http.routers.test-app-1-websecure.tls.certresolver=letsencrypt",
+		);
+	});
+
+	it("should handle different ports correctly", async () => {
+		const customPortDomain = { ...baseDomain, port: 3000 };
+		const labels = await createDomainLabels(appName, customPortDomain, "web");
+		expect(labels).toContain(
+			"traefik.http.services.test-app-1-web.loadbalancer.server.port=3000",
+		);
+	});
+});

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

@@ -0,0 +1,29 @@
+import { addDokployNetworkToRoot } from "@dokploy/server";
+import { describe, expect, it } from "vitest";
+
+describe("addDokployNetworkToRoot", () => {
+	it("should create network object if networks is undefined", () => {
+		const result = addDokployNetworkToRoot(undefined);
+		expect(result).toEqual({ "dokploy-network": { external: true } });
+	});
+
+	it("should add network to an empty object", () => {
+		const result = addDokployNetworkToRoot({});
+		expect(result).toEqual({ "dokploy-network": { external: true } });
+	});
+
+	it("should not modify existing network configuration", () => {
+		const existing = { "dokploy-network": { external: false } };
+		const result = addDokployNetworkToRoot(existing);
+		expect(result).toEqual({ "dokploy-network": { external: true } });
+	});
+
+	it("should add network alongside existing networks", () => {
+		const existing = { "other-network": { external: true } };
+		const result = addDokployNetworkToRoot(existing);
+		expect(result).toEqual({
+			"other-network": { external: true },
+			"dokploy-network": { external: true },
+		});
+	});
+});

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

@@ -0,0 +1,24 @@
+import { addDokployNetworkToService } from "@dokploy/server";
+import { describe, expect, it } from "vitest";
+
+describe("addDokployNetworkToService", () => {
+	it("should add network to an empty array", () => {
+		const result = addDokployNetworkToService([]);
+		expect(result).toEqual(["dokploy-network"]);
+	});
+
+	it("should not add duplicate network to an array", () => {
+		const result = addDokployNetworkToService(["dokploy-network"]);
+		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"]);
+	});
+
+	it("should add network to an object if networks is an object", () => {
+		const result = addDokployNetworkToService({ "other-network": {} });
+		expect(result).toEqual({ "other-network": {}, "dokploy-network": {} });
+	});
+});

apps/dokploy/__test__/compose/network/network-root.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToNetworksRoot } from "@/server/utils/docker/compose/network";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToNetworksRoot } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -35,19 +35,19 @@ test("Generate random hash with 8 characters", () => {
 	expect(hash.length).toBe(8);
 });
 
-test("Add prefix to networks root property", () => {
+test("Add suffix to networks root property", () => {
 	const composeData = load(composeFile) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.networks) {
 		return;
 	}
-	const networks = addPrefixToNetworksRoot(composeData.networks, prefix);
+	const networks = addSuffixToNetworksRoot(composeData.networks, suffix);
 
 	expect(networks).toBeDefined();
 	for (const volumeKey of Object.keys(networks)) {
-		expect(volumeKey).toContain(`-${prefix}`);
+		expect(volumeKey).toContain(`-${suffix}`);
 	}
 });
 
@@ -79,19 +79,19 @@ networks:
     internal: true
 `;
 
-test("Add prefix to advanced networks root property (2 TRY)", () => {
+test("Add suffix to advanced networks root property (2 TRY)", () => {
 	const composeData = load(composeFile2) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.networks) {
 		return;
 	}
-	const networks = addPrefixToNetworksRoot(composeData.networks, prefix);
+	const networks = addSuffixToNetworksRoot(composeData.networks, suffix);
 
 	expect(networks).toBeDefined();
 	for (const networkKey of Object.keys(networks)) {
-		expect(networkKey).toContain(`-${prefix}`);
+		expect(networkKey).toContain(`-${suffix}`);
 	}
 });
 
@@ -120,19 +120,19 @@ networks:
     external: true
 `;
 
-test("Add prefix to networks with external properties", () => {
+test("Add suffix to networks with external properties", () => {
 	const composeData = load(composeFile3) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.networks) {
 		return;
 	}
-	const networks = addPrefixToNetworksRoot(composeData.networks, prefix);
+	const networks = addSuffixToNetworksRoot(composeData.networks, suffix);
 
 	expect(networks).toBeDefined();
 	for (const networkKey of Object.keys(networks)) {
-		expect(networkKey).toContain(`-${prefix}`);
+		expect(networkKey).toContain(`-${suffix}`);
 	}
 });
 
@@ -160,19 +160,19 @@ networks:
     external: true
 `;
 
-test("Add prefix to networks with IPAM configurations", () => {
+test("Add suffix to networks with IPAM configurations", () => {
 	const composeData = load(composeFile4) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.networks) {
 		return;
 	}
-	const networks = addPrefixToNetworksRoot(composeData.networks, prefix);
+	const networks = addSuffixToNetworksRoot(composeData.networks, suffix);
 
 	expect(networks).toBeDefined();
 	for (const networkKey of Object.keys(networks)) {
-		expect(networkKey).toContain(`-${prefix}`);
+		expect(networkKey).toContain(`-${suffix}`);
 	}
 });
 
@@ -201,19 +201,19 @@ networks:
     external: true
 `;
 
-test("Add prefix to networks with custom options", () => {
+test("Add suffix to networks with custom options", () => {
 	const composeData = load(composeFile5) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.networks) {
 		return;
 	}
-	const networks = addPrefixToNetworksRoot(composeData.networks, prefix);
+	const networks = addSuffixToNetworksRoot(composeData.networks, suffix);
 
 	expect(networks).toBeDefined();
 	for (const networkKey of Object.keys(networks)) {
-		expect(networkKey).toContain(`-${prefix}`);
+		expect(networkKey).toContain(`-${suffix}`);
 	}
 });
 
@@ -240,7 +240,7 @@ networks:
     external: true
 `;
 
-// Expected compose file with static prefix `testhash`
+// Expected compose file with static suffix `testhash`
 const expectedComposeFile6 = `
 version: "3.8"
 
@@ -264,18 +264,70 @@ networks:
     external: true
 `;
 
-test("Add prefix to networks with static prefix", () => {
+test("Add suffix to networks with static suffix", () => {
 	const composeData = load(composeFile6) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
 	if (!composeData?.networks) {
 		return;
 	}
-	const networks = addPrefixToNetworksRoot(composeData.networks, prefix);
+	const networks = addSuffixToNetworksRoot(composeData.networks, suffix);
 
 	const expectedComposeData = load(
 		expectedComposeFile6,
 	) as ComposeSpecification;
 	expect(networks).toStrictEqual(expectedComposeData.networks);
 });
+
+const composeFile7 = `
+version: "3.8"
+
+services:
+  web:
+    image: nginx:latest
+    networks:
+      - dokploy-network
+
+networks:
+  dokploy-network:
+`;
+
+const expectedComposeFile7 = `
+version: "3.8"
+
+services:
+  web:
+    image: nginx:latest
+    networks:
+      - dokploy-network
+
+networks:
+  dokploy-network:
+    driver: bridge
+    driver_opts:
+      com.docker.network.driver.mtu: 1200
+
+  backend:
+    driver: bridge
+    attachable: true
+
+  external_network:
+    external: true
+    name: dokploy-network
+`;
+test("It shoudn't add suffix to dokploy-network", () => {
+	const composeData = load(composeFile7) as ComposeSpecification;
+
+	const suffix = generateRandomHash();
+
+	if (!composeData?.networks) {
+		return;
+	}
+	const networks = addSuffixToNetworksRoot(composeData.networks, suffix);
+
+	expect(networks).toBeDefined();
+	for (const networkKey of Object.keys(networks)) {
+		expect(networkKey).toContain("dokploy-network");
+	}
+});

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

@@ -0,0 +1,273 @@
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToServiceNetworks } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
+import { load } from "js-yaml";
+import { expect, test } from "vitest";
+
+const composeFile = `
+version: "3.8"
+
+services:
+  web:
+    image: nginx:latest
+    networks:
+      - frontend
+      - backend
+
+  api:
+    image: myapi:latest
+    networks:
+      - backend
+`;
+
+test("Add suffix to networks in services", () => {
+	const composeData = load(composeFile) as ComposeSpecification;
+
+	const suffix = generateRandomHash();
+
+	if (!composeData?.services) {
+		return;
+	}
+	const services = addSuffixToServiceNetworks(composeData.services, suffix);
+	const actualComposeData = { ...composeData, services };
+
+	expect(actualComposeData?.services?.web?.networks).toContain(
+		`frontend-${suffix}`,
+	);
+
+	expect(actualComposeData?.services?.api?.networks).toContain(
+		`backend-${suffix}`,
+	);
+
+	const apiNetworks = actualComposeData?.services?.api?.networks;
+
+	expect(apiNetworks).toBeDefined();
+	expect(actualComposeData?.services?.api?.networks).toContain(
+		`backend-${suffix}`,
+	);
+});
+
+// Caso 2: Objeto con aliases
+const composeFile2 = `
+version: "3.8"
+
+services:
+  api:
+    image: myapi:latest
+    networks:
+      frontend:
+        aliases:
+          - api
+
+networks:
+  frontend:
+    driver: bridge
+`;
+
+test("Add suffix to networks in services with aliases", () => {
+	const composeData = load(composeFile2) as ComposeSpecification;
+
+	const suffix = generateRandomHash();
+
+	if (!composeData?.services) {
+		return;
+	}
+	const services = addSuffixToServiceNetworks(composeData.services, suffix);
+	const actualComposeData = { ...composeData, services };
+
+	expect(actualComposeData.services?.api?.networks).toHaveProperty(
+		`frontend-${suffix}`,
+	);
+
+	const networkConfig = actualComposeData?.services?.api?.networks as {
+		[key: string]: { aliases?: string[] };
+	};
+	expect(networkConfig[`frontend-${suffix}`]).toBeDefined();
+	expect(networkConfig[`frontend-${suffix}`]?.aliases).toContain("api");
+
+	expect(actualComposeData.services?.api?.networks).not.toHaveProperty(
+		"frontend-ash",
+	);
+});
+
+const composeFile3 = `
+version: "3.8"
+
+services:
+  redis:
+    image: redis:alpine
+    networks:
+      backend:
+
+networks:
+  backend:
+    driver: bridge
+`;
+
+test("Add suffix to networks in services (Object with simple networks)", () => {
+	const composeData = load(composeFile3) as ComposeSpecification;
+
+	const suffix = generateRandomHash();
+
+	if (!composeData?.services) {
+		return;
+	}
+	const services = addSuffixToServiceNetworks(composeData.services, suffix);
+	const actualComposeData = { ...composeData, services };
+
+	expect(actualComposeData.services?.redis?.networks).toHaveProperty(
+		`backend-${suffix}`,
+	);
+});
+
+const composeFileCombined = `
+version: "3.8"
+
+services:
+  web:
+    image: nginx:latest
+    networks:
+      - frontend
+      - backend
+
+  api:
+    image: myapi:latest
+    networks:
+      frontend:
+        aliases:
+          - api
+
+  redis:
+    image: redis:alpine
+    networks:
+      backend:
+
+networks:
+  frontend:
+    driver: bridge
+
+  backend:
+    driver: bridge
+`;
+
+test("Add suffix to networks in services (combined case)", () => {
+	const composeData = load(composeFileCombined) as ComposeSpecification;
+
+	const suffix = generateRandomHash();
+
+	if (!composeData?.services) {
+		return;
+	}
+	const services = addSuffixToServiceNetworks(composeData.services, suffix);
+	const actualComposeData = { ...composeData, services };
+
+	// Caso 1: ListOfStrings
+	expect(actualComposeData.services?.web?.networks).toContain(
+		`frontend-${suffix}`,
+	);
+	expect(actualComposeData.services?.web?.networks).toContain(
+		`backend-${suffix}`,
+	);
+
+	// Caso 2: Objeto con aliases
+	const apiNetworks = actualComposeData.services?.api?.networks as {
+		[key: string]: unknown;
+	};
+	expect(apiNetworks).toHaveProperty(`frontend-${suffix}`);
+	expect(apiNetworks[`frontend-${suffix}`]).toBeDefined();
+	expect(apiNetworks).not.toHaveProperty("frontend");
+
+	// Caso 3: Objeto con redes simples
+	const redisNetworks = actualComposeData.services?.redis?.networks;
+	expect(redisNetworks).toHaveProperty(`backend-${suffix}`);
+	expect(redisNetworks).not.toHaveProperty("backend");
+});
+
+const composeFile7 = `
+version: "3.8"
+
+services:
+  web:
+    image: nginx:latest
+    networks:
+      - dokploy-network
+`;
+
+test("It shoudn't add suffix to dokploy-network in services", () => {
+	const composeData = load(composeFile7) as ComposeSpecification;
+
+	const suffix = generateRandomHash();
+
+	if (!composeData?.services) {
+		return;
+	}
+	const networks = addSuffixToServiceNetworks(composeData.services, suffix);
+	const service = networks.web;
+
+	expect(service).toBeDefined();
+	expect(service?.networks).toContain("dokploy-network");
+});
+
+const composeFile8 = `
+version: "3.8"
+
+services:
+  web:
+    image: nginx:latest
+    networks:
+      - frontend
+      - backend
+      - dokploy-network
+
+
+  api:
+    image: myapi:latest
+    networks:
+      frontend:
+        aliases:
+          - api
+      dokploy-network:
+        aliases:
+          - api
+  redis:
+    image: redis:alpine
+    networks:
+      dokploy-network:
+  db:
+    image: myapi:latest
+    networks:
+      dokploy-network:
+        aliases:
+          - apid
+	
+`;
+
+test("It shoudn't add suffix to dokploy-network in services multiples cases", () => {
+	const composeData = load(composeFile8) as ComposeSpecification;
+
+	const suffix = generateRandomHash();
+
+	if (!composeData?.services) {
+		return;
+	}
+	const networks = addSuffixToServiceNetworks(composeData.services, suffix);
+	const service = networks.web;
+	const api = networks.api;
+	const redis = networks.redis;
+	const db = networks.db;
+
+	const dbNetworks = db?.networks as {
+		[key: string]: unknown;
+	};
+
+	const apiNetworks = api?.networks as {
+		[key: string]: unknown;
+	};
+
+	expect(service).toBeDefined();
+	expect(service?.networks).toContain("dokploy-network");
+
+	expect(redis?.networks).toHaveProperty("dokploy-network");
+	expect(dbNetworks["dokploy-network"]).toBeDefined();
+	expect(apiNetworks["dokploy-network"]).toBeDefined();
+});

apps/dokploy/__test__/compose/network/network.test.ts

@@ -1,10 +1,10 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
+import { generateRandomHash } from "@dokploy/server";
 import {
-	addPrefixToAllNetworks,
-	addPrefixToServiceNetworks,
-} from "@/server/utils/docker/compose/network";
-import { addPrefixToNetworksRoot } from "@/server/utils/docker/compose/network";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+	addSuffixToAllNetworks,
+	addSuffixToServiceNetworks,
+} from "@dokploy/server";
+import { addSuffixToNetworksRoot } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -38,52 +38,54 @@ networks:
     driver: bridge
 `;
 
-test("Add prefix to networks in services and root (combined case)", () => {
+test("Add suffix to networks in services and root (combined case)", () => {
 	const composeData = load(composeFileCombined) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	// Prefijo para redes definidas en el root
 	if (composeData.networks) {
-		composeData.networks = addPrefixToNetworksRoot(
+		composeData.networks = addSuffixToNetworksRoot(
 			composeData.networks,
-			prefix,
+			suffix,
 		);
 	}
 
 	// Prefijo para redes definidas en los servicios
 	if (composeData.services) {
-		composeData.services = addPrefixToServiceNetworks(
+		composeData.services = addSuffixToServiceNetworks(
 			composeData.services,
-			prefix,
+			suffix,
 		);
 	}
 
 	const actualComposeData = { ...composeData };
 
 	// Verificar redes en root
-	expect(actualComposeData.networks).toHaveProperty(`frontend-${prefix}`);
-	expect(actualComposeData.networks).toHaveProperty(`backend-${prefix}`);
+	expect(actualComposeData.networks).toHaveProperty(`frontend-${suffix}`);
+	expect(actualComposeData.networks).toHaveProperty(`backend-${suffix}`);
 	expect(actualComposeData.networks).not.toHaveProperty("frontend");
 	expect(actualComposeData.networks).not.toHaveProperty("backend");
 
 	// Caso 1: ListOfStrings
 	expect(actualComposeData.services?.web?.networks).toContain(
-		`frontend-${prefix}`,
+		`frontend-${suffix}`,
 	);
 	expect(actualComposeData.services?.web?.networks).toContain(
-		`backend-${prefix}`,
+		`backend-${suffix}`,
 	);
 
 	// Caso 2: Objeto con aliases
-	const apiNetworks = actualComposeData.services?.api?.networks;
-	expect(apiNetworks).toHaveProperty(`frontend-${prefix}`);
-	expect(apiNetworks[`frontend-${prefix}`]?.aliases).toContain("api");
+	const apiNetworks = actualComposeData.services?.api?.networks as {
+		[key: string]: { aliases?: string[] };
+	};
+	expect(apiNetworks).toHaveProperty(`frontend-${suffix}`);
+	expect(apiNetworks?.[`frontend-${suffix}`]?.aliases).toContain("api");
 	expect(apiNetworks).not.toHaveProperty("frontend");
 
 	// Caso 3: Objeto con redes simples
 	const redisNetworks = actualComposeData.services?.redis?.networks;
-	expect(redisNetworks).toHaveProperty(`backend-${prefix}`);
+	expect(redisNetworks).toHaveProperty(`backend-${suffix}`);
 	expect(redisNetworks).not.toHaveProperty("backend");
 });
 
@@ -117,14 +119,14 @@ networks:
     driver: bridge
 `);
 
-test("Add prefix to networks in compose file", () => {
+test("Add suffix to networks in compose file", () => {
 	const composeData = load(composeFileCombined) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 	if (!composeData?.networks) {
 		return;
 	}
-	const updatedComposeData = addPrefixToAllNetworks(composeData, prefix);
+	const updatedComposeData = addSuffixToAllNetworks(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFile);
 });
@@ -179,11 +181,11 @@ networks:
     driver: bridge
 `);
 
-test("Add prefix to networks in compose file with external and internal networks", () => {
+test("Add suffix to networks in compose file with external and internal networks", () => {
 	const composeData = load(composeFile2) as ComposeSpecification;
 
-	const prefix = "testhash";
-	const updatedComposeData = addPrefixToAllNetworks(composeData, prefix);
+	const suffix = "testhash";
+	const updatedComposeData = addSuffixToAllNetworks(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFile2);
 });
@@ -244,11 +246,89 @@ networks:
       com.docker.network.bridge.enable_icc: "true"
 `);
 
-test("Add prefix to networks in compose file with multiple services and complex network configurations", () => {
+test("Add suffix to networks in compose file with multiple services and complex network configurations", () => {
 	const composeData = load(composeFile3) as ComposeSpecification;
 
-	const prefix = "testhash";
-	const updatedComposeData = addPrefixToAllNetworks(composeData, prefix);
+	const suffix = "testhash";
+	const updatedComposeData = addSuffixToAllNetworks(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFile3);
 });
+
+const composeFile4 = `
+version: "3.8"
+
+services:
+  app:
+    image: myapp:latest
+    networks:
+      frontend:
+        aliases:
+          - app
+      backend:
+      dokploy-network:
+
+  worker:
+    image: worker:latest
+    networks:
+      - backend
+      - dokploy-network
+
+networks:
+  frontend:
+    driver: bridge
+    attachable: true
+
+  backend:
+    driver: bridge
+    driver_opts:
+      com.docker.network.bridge.enable_icc: "true"
+
+  dokploy-network:
+    driver: bridge
+
+`;
+
+const expectedComposeFile4 = load(`
+version: "3.8"
+
+services:
+  app:
+    image: myapp:latest
+    networks:
+      frontend-testhash:
+        aliases:
+          - app
+      backend-testhash:
+      dokploy-network:
+
+  worker:
+    image: worker:latest
+    networks:
+      - backend-testhash
+      - dokploy-network
+
+networks:
+  frontend-testhash:
+    driver: bridge
+    attachable: true
+
+  backend-testhash:
+    driver: bridge
+    driver_opts:
+      com.docker.network.bridge.enable_icc: "true"
+  
+  dokploy-network:
+    driver: bridge
+
+
+  
+`);
+
+test("Expect don't add suffix to dokploy-network in compose file with multiple services and complex network configurations", () => {
+	const composeData = load(composeFile4) as ComposeSpecification;
+
+	const suffix = "testhash";
+	const updatedComposeData = addSuffixToAllNetworks(composeData, suffix);
+	expect(updatedComposeData).toEqual(expectedComposeFile4);
+});

apps/dokploy/__test__/compose/secrets/secret-root.test.ts

@@ -1,8 +1,8 @@
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToSecretsRoot } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
+import { dump, load } from "js-yaml";
 import { expect, test } from "vitest";
-import { load, dump } from "js-yaml";
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
-import { addPrefixToSecretsRoot } from "@/server/utils/docker/compose/secrets";
 
 test("Generate random hash with 8 characters", () => {
 	const hash = generateRandomHash();
@@ -23,18 +23,18 @@ secrets:
     file: ./db_password.txt
 `;
 
-test("Add prefix to secrets in root property", () => {
+test("Add suffix to secrets in root property", () => {
 	const composeData = load(composeFileSecretsRoot) as ComposeSpecification;
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.secrets) {
 		return;
 	}
-	const secrets = addPrefixToSecretsRoot(composeData.secrets, prefix);
+	const secrets = addSuffixToSecretsRoot(composeData.secrets, suffix);
 	expect(secrets).toBeDefined();
 	if (secrets) {
 		for (const secretKey of Object.keys(secrets)) {
-			expect(secretKey).toContain(`-${prefix}`);
+			expect(secretKey).toContain(`-${suffix}`);
 			expect(secrets[secretKey]).toBeDefined();
 		}
 	}
@@ -52,19 +52,19 @@ secrets:
     file: ./api_key.txt
 `;
 
-test("Add prefix to secrets in root property (Test 1)", () => {
+test("Add suffix to secrets in root property (Test 1)", () => {
 	const composeData = load(composeFileSecretsRoot1) as ComposeSpecification;
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.secrets) {
 		return;
 	}
-	const secrets = addPrefixToSecretsRoot(composeData.secrets, prefix);
+	const secrets = addSuffixToSecretsRoot(composeData.secrets, suffix);
 	expect(secrets).toBeDefined();
 
 	if (secrets) {
 		for (const secretKey of Object.keys(secrets)) {
-			expect(secretKey).toContain(`-${prefix}`);
+			expect(secretKey).toContain(`-${suffix}`);
 			expect(secrets[secretKey]).toBeDefined();
 		}
 	}
@@ -84,19 +84,19 @@ secrets:
     external: true
 `;
 
-test("Add prefix to secrets in root property (Test 2)", () => {
+test("Add suffix to secrets in root property (Test 2)", () => {
 	const composeData = load(composeFileSecretsRoot2) as ComposeSpecification;
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.secrets) {
 		return;
 	}
-	const secrets = addPrefixToSecretsRoot(composeData.secrets, prefix);
+	const secrets = addSuffixToSecretsRoot(composeData.secrets, suffix);
 	expect(secrets).toBeDefined();
 
 	if (secrets) {
 		for (const secretKey of Object.keys(secrets)) {
-			expect(secretKey).toContain(`-${prefix}`);
+			expect(secretKey).toContain(`-${suffix}`);
 			expect(secrets[secretKey]).toBeDefined();
 		}
 	}

apps/dokploy/__test__/compose/secrets/secret-services.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToSecretsInServices } from "@/server/utils/docker/compose/secrets";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToSecretsInServices } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -18,22 +18,22 @@ secrets:
     file: ./db_password.txt
 `;
 
-test("Add prefix to secrets in services", () => {
+test("Add suffix to secrets in services", () => {
 	const composeData = load(composeFileSecretsServices) as ComposeSpecification;
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
 
-	const updatedComposeData = addPrefixToSecretsInServices(
+	const updatedComposeData = addSuffixToSecretsInServices(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	expect(actualComposeData.services?.db?.secrets).toContain(
-		`db_password-${prefix}`,
+		`db_password-${suffix}`,
 	);
 });
 
@@ -51,22 +51,22 @@ secrets:
     file: ./app_secret.txt
 `;
 
-test("Add prefix to secrets in services (Test 1)", () => {
+test("Add suffix to secrets in services (Test 1)", () => {
 	const composeData = load(composeFileSecretsServices1) as ComposeSpecification;
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
 
-	const updatedComposeData = addPrefixToSecretsInServices(
+	const updatedComposeData = addSuffixToSecretsInServices(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	expect(actualComposeData.services?.app?.secrets).toContain(
-		`app_secret-${prefix}`,
+		`app_secret-${suffix}`,
 	);
 });
 
@@ -90,24 +90,24 @@ secrets:
     file: ./frontend_secret.txt
 `;
 
-test("Add prefix to secrets in services (Test 2)", () => {
+test("Add suffix to secrets in services (Test 2)", () => {
 	const composeData = load(composeFileSecretsServices2) as ComposeSpecification;
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
 
-	const updatedComposeData = addPrefixToSecretsInServices(
+	const updatedComposeData = addSuffixToSecretsInServices(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	expect(actualComposeData.services?.backend?.secrets).toContain(
-		`backend_secret-${prefix}`,
+		`backend_secret-${suffix}`,
 	);
 	expect(actualComposeData.services?.frontend?.secrets).toContain(
-		`frontend_secret-${prefix}`,
+		`frontend_secret-${suffix}`,
 	);
 });

apps/dokploy/__test__/compose/secrets/secret.test.ts

@@ -1,5 +1,5 @@
-import { addPrefixToAllSecrets } from "@/server/utils/docker/compose/secrets";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { addSuffixToAllSecrets } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -47,11 +47,11 @@ secrets:
     file: ./app_secret.txt
 `) as ComposeSpecification;
 
-test("Add prefix to all secrets", () => {
+test("Add suffix to all secrets", () => {
 	const composeData = load(composeFileCombinedSecrets) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllSecrets(composeData, prefix);
+	const updatedComposeData = addSuffixToAllSecrets(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFileCombinedSecrets);
 });
@@ -98,11 +98,11 @@ secrets:
     file: ./cache_secret.txt
 `) as ComposeSpecification;
 
-test("Add prefix to all secrets (3rd Case)", () => {
+test("Add suffix to all secrets (3rd Case)", () => {
 	const composeData = load(composeFileCombinedSecrets3) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllSecrets(composeData, prefix);
+	const updatedComposeData = addSuffixToAllSecrets(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFileCombinedSecrets3);
 });
@@ -149,11 +149,11 @@ secrets:
     file: ./db_password.txt
 `) as ComposeSpecification;
 
-test("Add prefix to all secrets (4th Case)", () => {
+test("Add suffix to all secrets (4th Case)", () => {
 	const composeData = load(composeFileCombinedSecrets4) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllSecrets(composeData, prefix);
+	const updatedComposeData = addSuffixToAllSecrets(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFileCombinedSecrets4);
 });

apps/dokploy/__test__/compose/service/service-container-name.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToServiceNames } from "@/server/utils/docker/compose/service";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToServiceNames } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -27,33 +27,33 @@ test("Generate random hash with 8 characters", () => {
 	expect(hash.length).toBe(8);
 });
 
-test("Add prefix to service names with container_name in compose file", () => {
+test("Add suffix to service names with container_name in compose file", () => {
 	const composeData = load(composeFile) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
-	const updatedComposeData = addPrefixToServiceNames(
+	const updatedComposeData = addSuffixToServiceNames(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	// Verificar que el nombre del contenedor ha cambiado correctamente
-	expect(actualComposeData.services[`web-${prefix}`].container_name).toBe(
-		`web_container-${prefix}`,
+	expect(actualComposeData.services?.[`web-${suffix}`]?.container_name).toBe(
+		`web_container-${suffix}`,
 	);
 	// Verificar que la nueva clave del servicio tiene el prefijo y la vieja clave no existe
-	expect(actualComposeData.services).toHaveProperty(`web-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`web-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("web");
 
 	// Verificar que la configuración de la imagen sigue igual
-	expect(actualComposeData.services[`web-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`web-${suffix}`]?.image).toBe(
 		"nginx:latest",
 	);
-	expect(actualComposeData.services[`api-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`api-${suffix}`]?.image).toBe(
 		"myapi:latest",
 	);
 });

apps/dokploy/__test__/compose/service/service-depends-on.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToServiceNames } from "@/server/utils/docker/compose/service";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToServiceNames } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -32,49 +32,49 @@ networks:
     driver: bridge
 `;
 
-test("Add prefix to service names with depends_on (array) in compose file", () => {
+test("Add suffix to service names with depends_on (array) in compose file", () => {
 	const composeData = load(composeFile4) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
-	const updatedComposeData = addPrefixToServiceNames(
+	const updatedComposeData = addSuffixToServiceNames(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	// Verificar que la nueva clave del servicio tiene el prefijo y la vieja clave no existe
-	expect(actualComposeData.services).toHaveProperty(`web-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`web-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("web");
 
 	// Verificar que la configuración de la imagen sigue igual
-	expect(actualComposeData.services[`web-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`web-${suffix}`]?.image).toBe(
 		"nginx:latest",
 	);
-	expect(actualComposeData.services[`api-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`api-${suffix}`]?.image).toBe(
 		"myapi:latest",
 	);
 
 	// Verificar que los nombres en depends_on tienen el prefijo
-	expect(actualComposeData.services[`web-${prefix}`].depends_on).toContain(
-		`db-${prefix}`,
+	expect(actualComposeData.services?.[`web-${suffix}`]?.depends_on).toContain(
+		`db-${suffix}`,
 	);
-	expect(actualComposeData.services[`web-${prefix}`].depends_on).toContain(
-		`api-${prefix}`,
+	expect(actualComposeData.services?.[`web-${suffix}`]?.depends_on).toContain(
+		`api-${suffix}`,
 	);
 
 	// Verificar que los servicios `db` y `api` también tienen el prefijo
-	expect(actualComposeData.services).toHaveProperty(`db-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`db-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("db");
-	expect(actualComposeData.services[`db-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`db-${suffix}`]?.image).toBe(
 		"postgres:latest",
 	);
-	expect(actualComposeData.services).toHaveProperty(`api-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`api-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("api");
-	expect(actualComposeData.services[`api-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`api-${suffix}`]?.image).toBe(
 		"myapi:latest",
 	);
 });
@@ -102,49 +102,49 @@ networks:
     driver: bridge
 `;
 
-test("Add prefix to service names with depends_on (object) in compose file", () => {
+test("Add suffix to service names with depends_on (object) in compose file", () => {
 	const composeData = load(composeFile5) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
-	const updatedComposeData = addPrefixToServiceNames(
+	const updatedComposeData = addSuffixToServiceNames(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	// Verificar que la nueva clave del servicio tiene el prefijo y la vieja clave no existe
-	expect(actualComposeData.services).toHaveProperty(`web-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`web-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("web");
 
 	// Verificar que la configuración de la imagen sigue igual
-	expect(actualComposeData.services[`web-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`web-${suffix}`]?.image).toBe(
 		"nginx:latest",
 	);
-	expect(actualComposeData.services[`api-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`api-${suffix}`]?.image).toBe(
 		"myapi:latest",
 	);
 
 	// Verificar que los nombres en depends_on tienen el prefijo
-	const webDependsOn = actualComposeData.services[`web-${prefix}`]
-		.depends_on as Record<string, any>;
-	expect(webDependsOn).toHaveProperty(`db-${prefix}`);
-	expect(webDependsOn).toHaveProperty(`api-${prefix}`);
-	expect(webDependsOn[`db-${prefix}`].condition).toBe("service_healthy");
-	expect(webDependsOn[`api-${prefix}`].condition).toBe("service_started");
+	const webDependsOn = actualComposeData.services?.[`web-${suffix}`]
+		?.depends_on as Record<string, any>;
+	expect(webDependsOn).toHaveProperty(`db-${suffix}`);
+	expect(webDependsOn).toHaveProperty(`api-${suffix}`);
+	expect(webDependsOn[`db-${suffix}`].condition).toBe("service_healthy");
+	expect(webDependsOn[`api-${suffix}`].condition).toBe("service_started");
 
 	// Verificar que los servicios `db` y `api` también tienen el prefijo
-	expect(actualComposeData.services).toHaveProperty(`db-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`db-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("db");
-	expect(actualComposeData.services[`db-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`db-${suffix}`]?.image).toBe(
 		"postgres:latest",
 	);
-	expect(actualComposeData.services).toHaveProperty(`api-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`api-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("api");
-	expect(actualComposeData.services[`api-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`api-${suffix}`]?.image).toBe(
 		"myapi:latest",
 	);
 });

apps/dokploy/__test__/compose/service/service-extends.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToServiceNames } from "@/server/utils/docker/compose/service";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToServiceNames } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -30,41 +30,41 @@ networks:
     driver: bridge
 `;
 
-test("Add prefix to service names with extends (string) in compose file", () => {
+test("Add suffix to service names with extends (string) in compose file", () => {
 	const composeData = load(composeFile6) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
-	const updatedComposeData = addPrefixToServiceNames(
+	const updatedComposeData = addSuffixToServiceNames(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	// Verificar que la nueva clave del servicio tiene el prefijo y la vieja clave no existe
-	expect(actualComposeData.services).toHaveProperty(`web-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`web-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("web");
 
 	// Verificar que la configuración de la imagen sigue igual
-	expect(actualComposeData.services[`web-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`web-${suffix}`]?.image).toBe(
 		"nginx:latest",
 	);
-	expect(actualComposeData.services[`api-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`api-${suffix}`]?.image).toBe(
 		"myapi:latest",
 	);
 
 	// Verificar que el nombre en extends tiene el prefijo
-	expect(actualComposeData.services[`web-${prefix}`].extends).toBe(
-		`base_service-${prefix}`,
+	expect(actualComposeData.services?.[`web-${suffix}`]?.extends).toBe(
+		`base_service-${suffix}`,
 	);
 
 	// Verificar que el servicio `base_service` también tiene el prefijo
-	expect(actualComposeData.services).toHaveProperty(`base_service-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`base_service-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("base_service");
-	expect(actualComposeData.services[`base_service-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`base_service-${suffix}`]?.image).toBe(
 		"base:latest",
 	);
 });
@@ -90,42 +90,42 @@ networks:
     driver: bridge
 `;
 
-test("Add prefix to service names with extends (object) in compose file", () => {
+test("Add suffix to service names with extends (object) in compose file", () => {
 	const composeData = load(composeFile7) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
-	const updatedComposeData = addPrefixToServiceNames(
+	const updatedComposeData = addSuffixToServiceNames(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	// Verificar que la nueva clave del servicio tiene el prefijo y la vieja clave no existe
-	expect(actualComposeData.services).toHaveProperty(`web-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`web-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("web");
 
 	// Verificar que la configuración de la imagen sigue igual
-	expect(actualComposeData.services[`web-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`web-${suffix}`]?.image).toBe(
 		"nginx:latest",
 	);
-	expect(actualComposeData.services[`api-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`api-${suffix}`]?.image).toBe(
 		"myapi:latest",
 	);
 
 	// Verificar que el nombre en extends.service tiene el prefijo
-	const webExtends = actualComposeData.services[`web-${prefix}`].extends;
+	const webExtends = actualComposeData.services?.[`web-${suffix}`]?.extends;
 	if (typeof webExtends !== "string") {
-		expect(webExtends.service).toBe(`base_service-${prefix}`);
+		expect(webExtends?.service).toBe(`base_service-${suffix}`);
 	}
 
 	// Verificar que el servicio `base_service` también tiene el prefijo
-	expect(actualComposeData.services).toHaveProperty(`base_service-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`base_service-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("base_service");
-	expect(actualComposeData.services[`base_service-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`base_service-${suffix}`]?.image).toBe(
 		"base:latest",
 	);
 });

apps/dokploy/__test__/compose/service/service-links.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToServiceNames } from "@/server/utils/docker/compose/service";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToServiceNames } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -31,46 +31,46 @@ networks:
     driver: bridge
 `;
 
-test("Add prefix to service names with links in compose file", () => {
+test("Add suffix to service names with links in compose file", () => {
 	const composeData = load(composeFile2) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
-	const updatedComposeData = addPrefixToServiceNames(
+	const updatedComposeData = addSuffixToServiceNames(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	// Verificar que la nueva clave del servicio tiene el prefijo y la vieja clave no existe
-	expect(actualComposeData.services).toHaveProperty(`web-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`web-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("web");
 
 	// Verificar que la configuración de la imagen sigue igual
-	expect(actualComposeData.services[`web-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`web-${suffix}`]?.image).toBe(
 		"nginx:latest",
 	);
-	expect(actualComposeData.services[`api-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`api-${suffix}`]?.image).toBe(
 		"myapi:latest",
 	);
 
 	// Verificar que los nombres en links tienen el prefijo
-	expect(actualComposeData.services[`web-${prefix}`].links).toContain(
-		`db-${prefix}`,
+	expect(actualComposeData.services?.[`web-${suffix}`]?.links).toContain(
+		`db-${suffix}`,
 	);
 
 	// Verificar que los servicios `db` y `api` también tienen el prefijo
-	expect(actualComposeData.services).toHaveProperty(`db-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`db-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("db");
-	expect(actualComposeData.services[`db-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`db-${suffix}`]?.image).toBe(
 		"postgres:latest",
 	);
-	expect(actualComposeData.services).toHaveProperty(`api-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`api-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("api");
-	expect(actualComposeData.services[`api-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`api-${suffix}`]?.image).toBe(
 		"myapi:latest",
 	);
 });

apps/dokploy/__test__/compose/service/service-names.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToServiceNames } from "@/server/utils/docker/compose/service";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToServiceNames } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -26,23 +26,23 @@ networks:
     driver: bridge
 `;
 
-test("Add prefix to service names in compose file", () => {
+test("Add suffix to service names in compose file", () => {
 	const composeData = load(composeFile) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
-	const updatedComposeData = addPrefixToServiceNames(
+	const updatedComposeData = addSuffixToServiceNames(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	// Verificar que los nombres de los servicios han cambiado correctamente
-	expect(actualComposeData.services).toHaveProperty(`web-${prefix}`);
-	expect(actualComposeData.services).toHaveProperty(`api-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`web-${suffix}`);
+	expect(actualComposeData.services).toHaveProperty(`api-${suffix}`);
 	// Verificar que las claves originales no existen
 	expect(actualComposeData.services).not.toHaveProperty("web");
 	expect(actualComposeData.services).not.toHaveProperty("api");

apps/dokploy/__test__/compose/service/service.test.ts

@@ -1,8 +1,8 @@
 import {
-	addPrefixToAllServiceNames,
-	addPrefixToServiceNames,
-} from "@/server/utils/docker/compose/service";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+	addSuffixToAllServiceNames,
+	addSuffixToServiceNames,
+} from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -70,17 +70,17 @@ networks:
     driver: bridge
 `);
 
-test("Add prefix to all service names in compose file", () => {
+test("Add suffix to all service names in compose file", () => {
 	const composeData = load(composeFileCombinedAllCases) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
 	if (!composeData.services) {
 		return;
 	}
-	const updatedComposeData = addPrefixToServiceNames(
+	const updatedComposeData = addSuffixToServiceNames(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
@@ -175,11 +175,11 @@ networks:
     driver: bridge
 `) as ComposeSpecification;
 
-test("Add prefix to all service names in compose file 1", () => {
+test("Add suffix to all service names in compose file 1", () => {
 	const composeData = load(composeFile1) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllServiceNames(composeData, prefix);
+	const updatedComposeData = addSuffixToAllServiceNames(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFile1);
 });
@@ -270,11 +270,11 @@ networks:
     driver: bridge
 `) as ComposeSpecification;
 
-test("Add prefix to all service names in compose file 2", () => {
+test("Add suffix to all service names in compose file 2", () => {
 	const composeData = load(composeFile2) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllServiceNames(composeData, prefix);
+	const updatedComposeData = addSuffixToAllServiceNames(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFile2);
 });
@@ -365,11 +365,11 @@ networks:
     driver: bridge
 `) as ComposeSpecification;
 
-test("Add prefix to all service names in compose file 3", () => {
+test("Add suffix to all service names in compose file 3", () => {
 	const composeData = load(composeFile3) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllServiceNames(composeData, prefix);
+	const updatedComposeData = addSuffixToAllServiceNames(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedComposeFile3);
 });

apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToServiceNames } from "@/server/utils/docker/compose/service";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToServiceNames } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -35,42 +35,44 @@ networks:
     driver: bridge
 `;
 
-test("Add prefix to service names with volumes_from in compose file", () => {
+test("Add suffix to service names with volumes_from in compose file", () => {
 	const composeData = load(composeFile3) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
-	const updatedComposeData = addPrefixToServiceNames(
+	const updatedComposeData = addSuffixToServiceNames(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	// Verificar que la nueva clave del servicio tiene el prefijo y la vieja clave no existe
-	expect(actualComposeData.services).toHaveProperty(`web-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`web-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("web");
 
 	// Verificar que la configuración de la imagen sigue igual
-	expect(actualComposeData.services[`web-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`web-${suffix}`]?.image).toBe(
 		"nginx:latest",
 	);
-	expect(actualComposeData.services[`api-${prefix}`].image).toBe(
+	expect(actualComposeData.services?.[`api-${suffix}`]?.image).toBe(
 		"myapi:latest",
 	);
 
 	// Verificar que los nombres en volumes_from tienen el prefijo
-	expect(actualComposeData.services[`web-${prefix}`].volumes_from).toContain(
-		`shared-${prefix}`,
+	expect(actualComposeData.services?.[`web-${suffix}`]?.volumes_from).toContain(
+		`shared-${suffix}`,
 	);
-	expect(actualComposeData.services[`api-${prefix}`].volumes_from).toContain(
-		`shared-${prefix}`,
+	expect(actualComposeData.services?.[`api-${suffix}`]?.volumes_from).toContain(
+		`shared-${suffix}`,
 	);
 
 	// Verificar que el servicio shared también tiene el prefijo
-	expect(actualComposeData.services).toHaveProperty(`shared-${prefix}`);
+	expect(actualComposeData.services).toHaveProperty(`shared-${suffix}`);
 	expect(actualComposeData.services).not.toHaveProperty("shared");
-	expect(actualComposeData.services[`shared-${prefix}`].image).toBe("busybox");
+	expect(actualComposeData.services?.[`shared-${suffix}`]?.image).toBe(
+		"busybox",
+	);
 });

apps/dokploy/__test__/compose/volume/volume-2.test.ts

@@ -1,9 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import {
-	addPrefixToVolumesRoot,
-	addPrefixToAllVolumes,
-} from "@/server/utils/docker/compose/volume";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToAllVolumes, addSuffixToVolumesRoot } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -142,15 +139,15 @@ test("Generate random hash with 8 characters", () => {
 
 // Docker compose needs unique names for services, volumes, networks and containers
 // So base on a input which is a dockercompose file, it should replace the name with a hash and return a new dockercompose file
-test("Add prefix to volumes root property", () => {
+test("Add suffix to volumes root property", () => {
 	const composeData = load(composeFile) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.volumes) {
 		return;
 	}
-	const volumes = addPrefixToVolumesRoot(composeData.volumes, prefix);
+	const volumes = addSuffixToVolumesRoot(composeData.volumes, suffix);
 
 	// {
 	// 	'db-data-af045046': { driver: 'local' },
@@ -160,15 +157,15 @@ test("Add prefix to volumes root property", () => {
 
 	expect(volumes).toBeDefined();
 	for (const volumeKey of Object.keys(volumes)) {
-		expect(volumeKey).toContain(`-${prefix}`);
+		expect(volumeKey).toContain(`-${suffix}`);
 	}
 });
 
-test("Expect to change the prefix in all the possible places", () => {
+test("Expect to change the suffix in all the possible places", () => {
 	const composeData = load(composeFile) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllVolumes(composeData, prefix);
+	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedDockerCompose);
 });
@@ -217,11 +214,11 @@ volumes:
   mongo-data-testhash:
 `) as ComposeSpecification;
 
-test("Expect to change the prefix in all the possible places (2 Try)", () => {
+test("Expect to change the suffix in all the possible places (2 Try)", () => {
 	const composeData = load(composeFile2) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllVolumes(composeData, prefix);
+	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedDockerCompose2);
 });
@@ -270,11 +267,11 @@ volumes:
   mongo-data-testhash:
 `) as ComposeSpecification;
 
-test("Expect to change the prefix in all the possible places (3 Try)", () => {
+test("Expect to change the suffix in all the possible places (3 Try)", () => {
 	const composeData = load(composeFile3) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllVolumes(composeData, prefix);
+	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedDockerCompose3);
 });
@@ -1011,11 +1008,11 @@ volumes:
   db-config-testhash:
 `) as ComposeSpecification;
 
-test("Expect to change the prefix in all the possible places (4 Try)", () => {
+test("Expect to change the suffix in all the possible places (4 Try)", () => {
 	const composeData = load(composeFileComplex) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllVolumes(composeData, prefix);
+	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedDockerComposeComplex);
 });
@@ -1110,11 +1107,11 @@ volumes:
   db-data-testhash:
 `) as ComposeSpecification;
 
-test("Expect to change the prefix in all the possible places (5 Try)", () => {
+test("Expect to change the suffix in all the possible places (5 Try)", () => {
 	const composeData = load(composeFileExample1) as ComposeSpecification;
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllVolumes(composeData, prefix);
+	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
 
 	expect(updatedComposeData).toEqual(expectedDockerComposeExample1);
 });

apps/dokploy/__test__/compose/volume/volume-root.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToVolumesRoot } from "@/server/utils/docker/compose/volume";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToVolumesRoot } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -29,18 +29,18 @@ test("Generate random hash with 8 characters", () => {
 	expect(hash.length).toBe(8);
 });
 
-test("Add prefix to volumes in root property", () => {
+test("Add suffix to volumes in root property", () => {
 	const composeData = load(composeFile) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.volumes) {
 		return;
 	}
-	const volumes = addPrefixToVolumesRoot(composeData.volumes, prefix);
+	const volumes = addSuffixToVolumesRoot(composeData.volumes, suffix);
 	expect(volumes).toBeDefined();
 	for (const volumeKey of Object.keys(volumes)) {
-		expect(volumeKey).toContain(`-${prefix}`);
+		expect(volumeKey).toContain(`-${suffix}`);
 		expect(volumes[volumeKey]).toBeDefined();
 	}
 });
@@ -67,18 +67,18 @@ networks:
     driver: bridge
 `;
 
-test("Add prefix to volumes in root property (Case 2)", () => {
+test("Add suffix to volumes in root property (Case 2)", () => {
 	const composeData = load(composeFile2) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.volumes) {
 		return;
 	}
-	const volumes = addPrefixToVolumesRoot(composeData.volumes, prefix);
+	const volumes = addSuffixToVolumesRoot(composeData.volumes, suffix);
 	expect(volumes).toBeDefined();
 	for (const volumeKey of Object.keys(volumes)) {
-		expect(volumeKey).toContain(`-${prefix}`);
+		expect(volumeKey).toContain(`-${suffix}`);
 		expect(volumes[volumeKey]).toBeDefined();
 	}
 });
@@ -101,19 +101,19 @@ networks:
     driver: bridge
 `;
 
-test("Add prefix to volumes in root property (Case 3)", () => {
+test("Add suffix to volumes in root property (Case 3)", () => {
 	const composeData = load(composeFile3) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData?.volumes) {
 		return;
 	}
-	const volumes = addPrefixToVolumesRoot(composeData.volumes, prefix);
+	const volumes = addSuffixToVolumesRoot(composeData.volumes, suffix);
 
 	expect(volumes).toBeDefined();
 	for (const volumeKey of Object.keys(volumes)) {
-		expect(volumeKey).toContain(`-${prefix}`);
+		expect(volumeKey).toContain(`-${suffix}`);
 		expect(volumes[volumeKey]).toBeDefined();
 	}
 });
@@ -179,15 +179,15 @@ volumes:
 
 `) as ComposeSpecification;
 
-test("Add prefix to volumes in root property", () => {
+test("Add suffix to volumes in root property", () => {
 	const composeData = load(composeFile4) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
 	if (!composeData?.volumes) {
 		return;
 	}
-	const volumes = addPrefixToVolumesRoot(composeData.volumes, prefix);
+	const volumes = addSuffixToVolumesRoot(composeData.volumes, suffix);
 	const updatedComposeData = { ...composeData, volumes };
 
 	// Verificar que el resultado coincide con el archivo esperado

apps/dokploy/__test__/compose/volume/volume-services.test.ts

@@ -1,6 +1,6 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
-import { addPrefixToVolumesInServices } from "@/server/utils/docker/compose/volume";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+import { generateRandomHash } from "@dokploy/server";
+import { addSuffixToVolumesInServices } from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -21,22 +21,22 @@ services:
       - db_data:/var/lib/postgresql/data
 `;
 
-test("Add prefix to volumes declared directly in services", () => {
+test("Add suffix to volumes declared directly in services", () => {
 	const composeData = load(composeFile1) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
 
-	const updatedComposeData = addPrefixToVolumesInServices(
+	const updatedComposeData = addSuffixToVolumesInServices(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 	expect(actualComposeData.services?.db?.volumes).toContain(
-		`db_data-${prefix}:/var/lib/postgresql/data`,
+		`db_data-${suffix}:/var/lib/postgresql/data`,
 	);
 });
 
@@ -56,25 +56,25 @@ volumes:
     driver: local
 `;
 
-test("Add prefix to volumes declared directly in services (Case 2)", () => {
+test("Add suffix to volumes declared directly in services (Case 2)", () => {
 	const composeData = load(composeFileTypeVolume) as ComposeSpecification;
 
-	const prefix = generateRandomHash();
+	const suffix = generateRandomHash();
 
 	if (!composeData.services) {
 		return;
 	}
 
-	const updatedComposeData = addPrefixToVolumesInServices(
+	const updatedComposeData = addSuffixToVolumesInServices(
 		composeData.services,
-		prefix,
+		suffix,
 	);
 	const actualComposeData = { ...composeData, services: updatedComposeData };
 
 	expect(actualComposeData.services?.db?.volumes).toEqual([
 		{
 			type: "volume",
-			source: `db-test-${prefix}`,
+			source: `db-test-${suffix}`,
 			target: "/var/lib/postgresql/data",
 		},
 	]);

apps/dokploy/__test__/compose/volume/volume.test.ts

@@ -1,9 +1,9 @@
-import { generateRandomHash } from "@/server/utils/docker/compose";
+import { generateRandomHash } from "@dokploy/server";
 import {
-	addPrefixToAllVolumes,
-	addPrefixToVolumesInServices,
-} from "@/server/utils/docker/compose/volume";
-import type { ComposeSpecification } from "@/server/utils/docker/types";
+	addSuffixToAllVolumes,
+	addSuffixToVolumesInServices,
+} from "@dokploy/server";
+import type { ComposeSpecification } from "@dokploy/server";
 import { load } from "js-yaml";
 import { expect, test } from "vitest";
 
@@ -47,12 +47,12 @@ volumes:
     driver: local
 `) as ComposeSpecification;
 
-test("Add prefix to volumes with type: volume in services", () => {
+test("Add suffix to volumes with type: volume in services", () => {
 	const composeData = load(composeFileTypeVolume) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllVolumes(composeData, prefix);
+	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
 	const actualComposeData = { ...composeData, ...updatedComposeData };
 
 	expect(actualComposeData).toEqual(expectedComposeFileTypeVolume);
@@ -96,12 +96,12 @@ volumes:
     driver: local
 `) as ComposeSpecification;
 
-test("Add prefix to mixed volumes in services", () => {
+test("Add suffix to mixed volumes in services", () => {
 	const composeData = load(composeFileTypeVolume1) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllVolumes(composeData, prefix);
+	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
 	const actualComposeData = { ...composeData, ...updatedComposeData };
 
 	expect(actualComposeData).toEqual(expectedComposeFileTypeVolume1);
@@ -157,12 +157,12 @@ volumes:
       device: /path/to/app/logs
 `) as ComposeSpecification;
 
-test("Add prefix to complex volume configurations in services", () => {
+test("Add suffix to complex volume configurations in services", () => {
 	const composeData = load(composeFileTypeVolume2) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllVolumes(composeData, prefix);
+	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
 	const actualComposeData = { ...composeData, ...updatedComposeData };
 
 	expect(actualComposeData).toEqual(expectedComposeFileTypeVolume2);
@@ -276,12 +276,12 @@ volumes:
       device: /path/to/shared/logs
 `) as ComposeSpecification;
 
-test("Add prefix to complex nested volumes configuration in services", () => {
+test("Add suffix to complex nested volumes configuration in services", () => {
 	const composeData = load(composeFileTypeVolume3) as ComposeSpecification;
 
-	const prefix = "testhash";
+	const suffix = "testhash";
 
-	const updatedComposeData = addPrefixToAllVolumes(composeData, prefix);
+	const updatedComposeData = addSuffixToAllVolumes(composeData, suffix);
 	const actualComposeData = { ...composeData, ...updatedComposeData };
 
 	expect(actualComposeData).toEqual(expectedComposeFileTypeVolume3);

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

@@ -0,0 +1,194 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import { paths } from "@dokploy/server/constants";
+const { APPLICATIONS_PATH } = paths();
+import type { ApplicationNested } from "@dokploy/server";
+import { unzipDrop } from "@dokploy/server";
+import AdmZip from "adm-zip";
+import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
+
+vi.mock("@dokploy/server/constants", async (importOriginal) => {
+	const actual = await importOriginal();
+	return {
+		// @ts-ignore
+		...actual,
+		paths: () => ({
+			APPLICATIONS_PATH: "./__test__/drop/zips/output",
+		}),
+	};
+});
+
+if (typeof window === "undefined") {
+	const undici = require("undici");
+	globalThis.File = undici.File as any;
+	globalThis.FileList = undici.FileList as any;
+}
+
+const baseApp: ApplicationNested = {
+	applicationId: "",
+	applicationStatus: "done",
+	appName: "",
+	autoDeploy: true,
+	serverId: "",
+	branch: null,
+	dockerBuildStage: "",
+	project: {
+		env: "",
+		adminId: "",
+		name: "",
+		description: "",
+		createdAt: "",
+		projectId: "",
+	},
+	buildArgs: null,
+	buildPath: "/",
+	gitlabPathNamespace: "",
+	buildType: "nixpacks",
+	bitbucketBranch: "",
+	bitbucketBuildPath: "",
+	bitbucketId: "",
+	bitbucketRepository: "",
+	bitbucketOwner: "",
+	githubId: "",
+	gitlabProjectId: 0,
+	gitlabBranch: "",
+	gitlabBuildPath: "",
+	gitlabId: "",
+	gitlabRepository: "",
+	gitlabOwner: "",
+	command: null,
+	cpuLimit: null,
+	cpuReservation: null,
+	createdAt: "",
+	customGitBranch: "",
+	customGitBuildPath: "",
+	customGitSSHKeyId: null,
+	customGitUrl: "",
+	description: "",
+	dockerfile: null,
+	dockerImage: null,
+	dropBuildPath: null,
+	enabled: null,
+	env: null,
+	healthCheckSwarm: null,
+	labelsSwarm: null,
+	memoryLimit: null,
+	memoryReservation: null,
+	modeSwarm: null,
+	mounts: [],
+	name: "",
+	networkSwarm: null,
+	owner: null,
+	password: null,
+	placementSwarm: null,
+	ports: [],
+	projectId: "",
+	publishDirectory: null,
+	redirects: [],
+	refreshToken: "",
+	registry: null,
+	registryId: null,
+	replicas: 1,
+	repository: null,
+	restartPolicySwarm: null,
+	rollbackConfigSwarm: null,
+	security: [],
+	sourceType: "git",
+	subtitle: null,
+	title: null,
+	updateConfigSwarm: null,
+	username: null,
+	dockerContextPath: null,
+};
+
+describe("unzipDrop using real zip files", () => {
+	// const { APPLICATIONS_PATH } = paths();
+	beforeAll(async () => {
+		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
+	});
+
+	afterAll(async () => {
+		await fs.rm(APPLICATIONS_PATH, { recursive: true, force: true });
+	});
+
+	it("should correctly extract a zip with a single root folder", async () => {
+		baseApp.appName = "single-file";
+		// const appName = "single-file";
+		try {
+			const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+			const zip = new AdmZip("./__test__/drop/zips/single-file.zip");
+			console.log(`Output Path: ${outputPath}`);
+			const zipBuffer = zip.toBuffer();
+			const file = new File([zipBuffer], "single.zip");
+			await unzipDrop(file, baseApp);
+			const files = await fs.readdir(outputPath, { withFileTypes: true });
+			expect(files.some((f) => f.name === "test.txt")).toBe(true);
+		} catch (err) {
+			console.log(err);
+		} finally {
+		}
+	});
+
+	it("should correctly extract a zip with a single root folder and a subfolder", async () => {
+		baseApp.appName = "folderwithfile";
+		// const appName = "folderwithfile";
+		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+		const zip = new AdmZip("./__test__/drop/zips/folder-with-file.zip");
+
+		const zipBuffer = zip.toBuffer();
+		const file = new File([zipBuffer], "single.zip");
+		await unzipDrop(file, baseApp);
+
+		const files = await fs.readdir(outputPath, { withFileTypes: true });
+		expect(files.some((f) => f.name === "folder1.txt")).toBe(true);
+	});
+
+	it("should correctly extract a zip with multiple root folders", async () => {
+		baseApp.appName = "two-folders";
+		// const appName = "two-folders";
+		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+		const zip = new AdmZip("./__test__/drop/zips/two-folders.zip");
+
+		const zipBuffer = zip.toBuffer();
+		const file = new File([zipBuffer], "single.zip");
+		await unzipDrop(file, baseApp);
+
+		const files = await fs.readdir(outputPath, { withFileTypes: true });
+
+		expect(files.some((f) => f.name === "folder1")).toBe(true);
+		expect(files.some((f) => f.name === "folder2")).toBe(true);
+	});
+
+	it("should correctly extract a zip with a single root with a file", async () => {
+		baseApp.appName = "nested";
+		// const appName = "nested";
+		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+		const zip = new AdmZip("./__test__/drop/zips/nested.zip");
+
+		const zipBuffer = zip.toBuffer();
+		const file = new File([zipBuffer], "single.zip");
+		await unzipDrop(file, baseApp);
+
+		const files = await fs.readdir(outputPath, { withFileTypes: true });
+
+		expect(files.some((f) => f.name === "folder1")).toBe(true);
+		expect(files.some((f) => f.name === "folder2")).toBe(true);
+		expect(files.some((f) => f.name === "folder3")).toBe(true);
+	});
+
+	it("should correctly extract a zip with a single root with a folder", async () => {
+		baseApp.appName = "folder-with-sibling-file";
+		// const appName = "folder-with-sibling-file";
+		const outputPath = path.join(APPLICATIONS_PATH, baseApp.appName, "code");
+		const zip = new AdmZip("./__test__/drop/zips/folder-with-sibling-file.zip");
+
+		const zipBuffer = zip.toBuffer();
+		const file = new File([zipBuffer], "single.zip");
+		await unzipDrop(file, baseApp);
+
+		const files = await fs.readdir(outputPath, { withFileTypes: true });
+
+		expect(files.some((f) => f.name === "folder1")).toBe(true);
+		expect(files.some((f) => f.name === "test.txt")).toBe(true);
+	});
+});

apps/dokploy/__test__/drop/zips/folder1/folder1.txt

@@ -0,0 +1 @@
+Gogogogogogo

apps/dokploy/__test__/drop/zips/folder2/folder2.txt

@@ -0,0 +1 @@
+gogogogogog

apps/dokploy/__test__/drop/zips/folder3/file3.txt

@@ -0,0 +1 @@
+gogogogogogogogogo

apps/dokploy/__test__/drop/zips/test.txt

@@ -0,0 +1 @@
+dsafasdfasdf

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

@@ -0,0 +1,179 @@
+import { prepareEnvironmentVariables } 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 serviceEnv = `
+ENVIRONMENT=\${{project.ENVIRONMENT}}
+DATABASE_URL=\${{project.DATABASE_URL}}
+SERVICE_PORT=4000
+`;
+
+describe("prepareEnvironmentVariables", () => {
+	it("resolves project variables correctly", () => {
+		const resolved = prepareEnvironmentVariables(serviceEnv, projectEnv);
+
+		expect(resolved).toEqual([
+			"ENVIRONMENT=staging",
+			"DATABASE_URL=postgres://postgres:postgres@localhost:5432/project_db",
+			"SERVICE_PORT=4000",
+		]);
+	});
+
+	it("handles undefined project variables", () => {
+		const incompleteProjectEnv = `
+		NODE_ENV=production
+		`;
+
+		const invalidServiceEnv = `
+		UNDEFINED_VAR=\${{project.UNDEFINED_VAR}}
+		`;
+
+		expect(
+			() =>
+				prepareEnvironmentVariables(invalidServiceEnv, incompleteProjectEnv), // Cambiado el orden
+		).toThrow("Invalid project environment variable: project.UNDEFINED_VAR");
+	});
+	it("allows service-specific variables to override project variables", () => {
+		const serviceSpecificEnv = `
+		ENVIRONMENT=production
+		DATABASE_URL=\${{project.DATABASE_URL}}
+		`;
+
+		const resolved = prepareEnvironmentVariables(
+			serviceSpecificEnv,
+			projectEnv,
+		);
+
+		expect(resolved).toEqual([
+			"ENVIRONMENT=production", // Overrides project variable
+			"DATABASE_URL=postgres://postgres:postgres@localhost:5432/project_db",
+		]);
+	});
+
+	it("resolves complex references for dynamic endpoints", () => {
+		const projectEnv = `
+BASE_URL=https://api.example.com
+API_VERSION=v1
+PORT=8000
+`;
+		const serviceEnv = `
+API_ENDPOINT=\${{project.BASE_URL}}/\${{project.API_VERSION}}/endpoint
+SERVICE_PORT=9000
+`;
+		const resolved = prepareEnvironmentVariables(serviceEnv, projectEnv);
+
+		expect(resolved).toEqual([
+			"API_ENDPOINT=https://api.example.com/v1/endpoint",
+			"SERVICE_PORT=9000",
+		]);
+	});
+
+	it("handles missing project variables gracefully", () => {
+		const projectEnv = `
+PORT=8080
+`;
+		const serviceEnv = `
+MISSING_VAR=\${{project.MISSING_KEY}}
+SERVICE_PORT=3000
+`;
+
+		expect(() => prepareEnvironmentVariables(serviceEnv, projectEnv)).toThrow(
+			"Invalid project environment variable: project.MISSING_KEY",
+		);
+	});
+
+	it("overrides project variables with service-specific values", () => {
+		const projectEnv = `
+ENVIRONMENT=staging
+DATABASE_URL=postgres://project:project@localhost:5432/project_db
+`;
+		const serviceEnv = `
+ENVIRONMENT=\${{project.ENVIRONMENT}}
+DATABASE_URL=postgres://service:service@localhost:5432/service_db
+SERVICE_NAME=my-service
+`;
+		const resolved = prepareEnvironmentVariables(serviceEnv, projectEnv);
+
+		expect(resolved).toEqual([
+			"ENVIRONMENT=staging",
+			"DATABASE_URL=postgres://service:service@localhost:5432/service_db",
+			"SERVICE_NAME=my-service",
+		]);
+	});
+
+	it("handles project variables with normal and unusual characters", () => {
+		const projectEnv = `
+ENVIRONMENT=PRODUCTION
+`;
+
+		// Needs to be in quotes
+		const serviceEnv = `
+NODE_ENV=\${{project.ENVIRONMENT}}
+SPECIAL_VAR="$^@$^@#$^@!#$@#$-\${{project.ENVIRONMENT}}"
+`;
+
+		const resolved = prepareEnvironmentVariables(serviceEnv, projectEnv);
+
+		expect(resolved).toEqual([
+			"NODE_ENV=PRODUCTION",
+			"SPECIAL_VAR=$^@$^@#$^@!#$@#$-PRODUCTION",
+		]);
+	});
+
+	it("handles complex cases with multiple references, special characters, and spaces", () => {
+		const projectEnv = `
+ENVIRONMENT=STAGING
+APP_NAME=MyApp
+`;
+
+		const serviceEnv = `
+NODE_ENV=\${{project.ENVIRONMENT}}
+COMPLEX_VAR="Prefix-$#^!@-\${{project.ENVIRONMENT}}--\${{project.APP_NAME}} Suffix "
+`;
+		const resolved = prepareEnvironmentVariables(serviceEnv, projectEnv);
+
+		expect(resolved).toEqual([
+			"NODE_ENV=STAGING",
+			"COMPLEX_VAR=Prefix-$#^!@-STAGING--MyApp Suffix ",
+		]);
+	});
+
+	it("handles references enclosed in single quotes", () => {
+		const projectEnv = `
+	ENVIRONMENT=STAGING
+	APP_NAME=MyApp
+	`;
+
+		const serviceEnv = `
+	NODE_ENV='\${{project.ENVIRONMENT}}'
+	COMPLEX_VAR='Prefix-$#^!@-\${{project.ENVIRONMENT}}--\${{project.APP_NAME}} Suffix'
+	`;
+		const resolved = prepareEnvironmentVariables(serviceEnv, projectEnv);
+
+		expect(resolved).toEqual([
+			"NODE_ENV=STAGING",
+			"COMPLEX_VAR=Prefix-$#^!@-STAGING--MyApp Suffix",
+		]);
+	});
+
+	it("handles double and single quotes combined", () => {
+		const projectEnv = `
+ENVIRONMENT=PRODUCTION
+APP_NAME=MyApp
+`;
+		const serviceEnv = `
+NODE_ENV="'\${{project.ENVIRONMENT}}'"
+COMPLEX_VAR="'Prefix \"DoubleQuoted\" and \${{project.APP_NAME}}'"
+`;
+		const resolved = prepareEnvironmentVariables(serviceEnv, projectEnv);
+
+		expect(resolved).toEqual([
+			"NODE_ENV='PRODUCTION'",
+			"COMPLEX_VAR='Prefix \"DoubleQuoted\" and MyApp'",
+		]);
+	});
+});

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

@@ -0,0 +1,56 @@
+import { parseRawConfig, processLogs } from "@dokploy/server";
+import { describe, expect, it } from "vitest";
+const sampleLogEntry = `{"ClientAddr":"172.19.0.1:56732","ClientHost":"172.19.0.1","ClientPort":"56732","ClientUsername":"-","DownstreamContentSize":0,"DownstreamStatus":304,"Duration":14729375,"OriginContentSize":0,"OriginDuration":14051833,"OriginStatus":304,"Overhead":677542,"RequestAddr":"s222-umami-c381af.traefik.me","RequestContentSize":0,"RequestCount":122,"RequestHost":"s222-umami-c381af.traefik.me","RequestMethod":"GET","RequestPath":"/dashboard?_rsc=1rugv","RequestPort":"-","RequestProtocol":"HTTP/1.1","RequestScheme":"http","RetryAttempts":0,"RouterName":"s222-umami-60e104-47-web@docker","ServiceAddr":"10.0.1.15:3000","ServiceName":"s222-umami-60e104-47-web@docker","ServiceURL":{"Scheme":"http","Opaque":"","User":null,"Host":"10.0.1.15:3000","Path":"","RawPath":"","ForceQuery":false,"RawQuery":"","Fragment":"","RawFragment":""},"StartLocal":"2024-08-25T04:34:37.306691884Z","StartUTC":"2024-08-25T04:34:37.306691884Z","entryPointName":"web","level":"info","msg":"","time":"2024-08-25T04:34:37Z"}`;
+
+describe("processLogs", () => {
+	it("should process a single log entry correctly", () => {
+		const result = processLogs(sampleLogEntry);
+		expect(result).toHaveLength(1);
+		expect(result[0]).toEqual({
+			hour: "2024-08-25T04:00:00Z",
+			count: 1,
+		});
+	});
+
+	it("should process multiple log entries and group by hour", () => {
+		const sampleLogEntry = `{"ClientAddr":"172.19.0.1:58094","ClientHost":"172.19.0.1","ClientPort":"58094","ClientUsername":"-","DownstreamContentSize":50,"DownstreamStatus":200,"Duration":35914250,"OriginContentSize":50,"OriginDuration":35817959,"OriginStatus":200,"Overhead":96291,"RequestAddr":"s222-pocketbase-f4a6e5.traefik.me","RequestContentSize":0,"RequestCount":991,"RequestHost":"s222-pocketbase-f4a6e5.traefik.me","RequestMethod":"GET","RequestPath":"/api/logs/stats?filter=","RequestPort":"-","RequestProtocol":"HTTP/1.1","RequestScheme":"http","RetryAttempts":0,"RouterName":"s222-pocketbase-e94e25-44-web@docker","ServiceAddr":"10.0.1.12:80","ServiceName":"s222-pocketbase-e94e25-44-web@docker","ServiceURL":{"Scheme":"http","Opaque":"","User":null,"Host":"10.0.1.12:80","Path":"","RawPath":"","ForceQuery":false,"RawQuery":"","Fragment":"","RawFragment":""},"StartLocal":"2024-08-25T17:44:29.274072471Z","StartUTC":"2024-08-25T17:44:29.274072471Z","entryPointName":"web","level":"info","msg":"","time":"2024-08-25T17:44:29Z"}
+{"ClientAddr":"172.19.0.1:58108","ClientHost":"172.19.0.1","ClientPort":"58108","ClientUsername":"-","DownstreamContentSize":30975,"DownstreamStatus":200,"Duration":31406458,"OriginContentSize":30975,"OriginDuration":31046791,"OriginStatus":200,"Overhead":359667,"RequestAddr":"s222-pocketbase-f4a6e5.traefik.me","RequestContentSize":0,"RequestCount":992,"RequestHost":"s222-pocketbase-f4a6e5.traefik.me","RequestMethod":"GET","RequestPath":"/api/logs?page=1\u0026perPage=50\u0026sort=-rowid\u0026skipTotal=1\u0026filter=","RequestPort":"-","RequestProtocol":"HTTP/1.1","RequestScheme":"http","RetryAttempts":0,"RouterName":"s222-pocketbase-e94e25-44-web@docker","ServiceAddr":"10.0.1.12:80","ServiceName":"s222-pocketbase-e94e25-44-web@docker","ServiceURL":{"Scheme":"http","Opaque":"","User":null,"Host":"10.0.1.12:80","Path":"","RawPath":"","ForceQuery":false,"RawQuery":"","Fragment":"","RawFragment":""},"StartLocal":"2024-08-25T17:44:29.278990221Z","StartUTC":"2024-08-25T17:44:29.278990221Z","entryPointName":"web","level":"info","msg":"","time":"2024-08-25T17:44:29Z"}
+`;
+
+		const result = processLogs(sampleLogEntry);
+		expect(result).toHaveLength(1);
+		expect(result).toEqual([{ hour: "2024-08-25T17:00:00Z", count: 2 }]);
+	});
+
+	it("should return an empty array for empty input", () => {
+		expect(processLogs("")).toEqual([]);
+		expect(processLogs(null as any)).toEqual([]);
+		expect(processLogs(undefined as any)).toEqual([]);
+	});
+
+	// it("should parse a single log entry correctly", () => {
+	// 	const result = parseRawConfig(sampleLogEntry);
+	// 	expect(result).toHaveLength(1);
+	// 	expect(result.data[0]).toHaveProperty("ClientAddr", "172.19.0.1:56732");
+	// 	expect(result.data[0]).toHaveProperty(
+	// 		"StartUTC",
+	// 		"2024-08-25T04:34:37.306691884Z",
+	// 	);
+	// });
+
+	it("should parse multiple log entries", () => {
+		const multipleEntries = `${sampleLogEntry}\n${sampleLogEntry}`;
+		const result = parseRawConfig(multipleEntries);
+		expect(result.data).toHaveLength(2);
+
+		for (const entry of result.data) {
+			expect(entry).toHaveProperty("ClientAddr", "172.19.0.1:56732");
+		}
+	});
+
+	it("should handle whitespace and empty lines", () => {
+		const entryWithWhitespace = `\n${sampleLogEntry}\n\n${sampleLogEntry}\n`;
+		const result = parseRawConfig(entryWithWhitespace);
+		expect(result.data).toHaveLength(2);
+	});
+});

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

@@ -0,0 +1,95 @@
+import { fs, vol } from "memfs";
+
+vi.mock("node:fs", () => ({
+	...fs,
+	default: fs,
+}));
+
+import type { Admin, FileConfig } from "@dokploy/server";
+import {
+	createDefaultServerTraefikConfig,
+	loadOrCreateConfig,
+	updateServerTraefik,
+} from "@dokploy/server";
+import { beforeEach, expect, test, vi } from "vitest";
+
+const baseAdmin: Admin = {
+	createdAt: "",
+	authId: "",
+	adminId: "string",
+	serverIp: null,
+	certificateType: "none",
+	host: null,
+	letsEncryptEmail: null,
+	sshPrivateKey: null,
+	enableDockerCleanup: false,
+	enableLogRotation: false,
+	serversQuantity: 0,
+	stripeCustomerId: "",
+	stripeSubscriptionId: "",
+};
+
+beforeEach(() => {
+	vol.reset();
+	createDefaultServerTraefikConfig();
+});
+
+test("Should read the configuration file", () => {
+	const config: FileConfig = loadOrCreateConfig("dokploy");
+
+	expect(config.http?.routers?.["dokploy-router-app"]?.service).toBe(
+		"dokploy-service-app",
+	);
+});
+
+test("Should apply redirect-to-https", () => {
+	updateServerTraefik(
+		{
+			...baseAdmin,
+			certificateType: "letsencrypt",
+		},
+		"example.com",
+	);
+
+	const config: FileConfig = loadOrCreateConfig("dokploy");
+
+	expect(config.http?.routers?.["dokploy-router-app"]?.middlewares).toContain(
+		"redirect-to-https",
+	);
+});
+
+test("Should change only host when no certificate", () => {
+	updateServerTraefik(baseAdmin, "example.com");
+
+	const config: FileConfig = loadOrCreateConfig("dokploy");
+
+	expect(config.http?.routers?.["dokploy-router-app-secure"]).toBeUndefined();
+});
+
+test("Should not touch config without host", () => {
+	const originalConfig: FileConfig = loadOrCreateConfig("dokploy");
+
+	updateServerTraefik(baseAdmin, null);
+
+	const config: FileConfig = loadOrCreateConfig("dokploy");
+
+	expect(originalConfig).toEqual(config);
+});
+
+test("Should remove websecure if https rollback to http", () => {
+	const originalConfig: FileConfig = loadOrCreateConfig("dokploy");
+
+	updateServerTraefik(
+		{ ...baseAdmin, certificateType: "letsencrypt" },
+		"example.com",
+	);
+
+	updateServerTraefik({ ...baseAdmin, certificateType: "none" }, "example.com");
+
+	const config: FileConfig = loadOrCreateConfig("dokploy");
+
+	expect(config.http?.routers?.["dokploy-router-app-secure"]).toBeUndefined();
+	expect(
+		config.http?.routers?.["dokploy-router-app"]?.middlewares,
+	).not.toContain("redirect-to-https");
+});

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

@@ -0,0 +1,226 @@
+import type { Domain } from "@dokploy/server";
+import type { Redirect } from "@dokploy/server";
+import type { ApplicationNested } from "@dokploy/server";
+import { createRouterConfig } from "@dokploy/server";
+import { expect, test } from "vitest";
+
+const baseApp: ApplicationNested = {
+	applicationId: "",
+	applicationStatus: "done",
+	appName: "",
+	autoDeploy: true,
+	serverId: "",
+	branch: null,
+	dockerBuildStage: "",
+	buildArgs: null,
+	project: {
+		env: "",
+		adminId: "",
+		name: "",
+		description: "",
+		createdAt: "",
+		projectId: "",
+	},
+	buildPath: "/",
+	gitlabPathNamespace: "",
+	buildType: "nixpacks",
+	bitbucketBranch: "",
+	bitbucketBuildPath: "",
+	bitbucketId: "",
+	bitbucketRepository: "",
+	bitbucketOwner: "",
+	githubId: "",
+	gitlabProjectId: 0,
+	gitlabBranch: "",
+	gitlabBuildPath: "",
+	gitlabId: "",
+	gitlabRepository: "",
+	gitlabOwner: "",
+	command: null,
+	cpuLimit: null,
+	cpuReservation: null,
+	createdAt: "",
+	customGitBranch: "",
+	customGitBuildPath: "",
+	customGitSSHKeyId: null,
+	customGitUrl: "",
+	description: "",
+	dockerfile: null,
+	dockerImage: null,
+	dropBuildPath: null,
+	enabled: null,
+	env: null,
+	healthCheckSwarm: null,
+	labelsSwarm: null,
+	memoryLimit: null,
+	memoryReservation: null,
+	modeSwarm: null,
+	mounts: [],
+	name: "",
+	networkSwarm: null,
+	owner: null,
+	password: null,
+	placementSwarm: null,
+	ports: [],
+	projectId: "",
+	publishDirectory: null,
+	redirects: [],
+	refreshToken: "",
+	registry: null,
+	registryId: null,
+	replicas: 1,
+	repository: null,
+	restartPolicySwarm: null,
+	rollbackConfigSwarm: null,
+	security: [],
+	sourceType: "git",
+	subtitle: null,
+	title: null,
+	updateConfigSwarm: null,
+	username: null,
+	dockerContextPath: null,
+};
+
+const baseDomain: Domain = {
+	applicationId: "",
+	certificateType: "none",
+	createdAt: "",
+	domainId: "",
+	host: "",
+	https: false,
+	path: null,
+	port: null,
+	serviceName: "",
+	composeId: "",
+	domainType: "application",
+	uniqueConfigKey: 1,
+};
+
+const baseRedirect: Redirect = {
+	redirectId: "",
+	regex: "",
+	replacement: "",
+	permanent: false,
+	uniqueConfigKey: 1,
+	createdAt: "",
+	applicationId: "",
+};
+
+/** Middlewares */
+
+test("Web entrypoint on http domain", async () => {
+	const router = await createRouterConfig(
+		baseApp,
+		{ ...baseDomain, https: false },
+		"web",
+	);
+
+	expect(router.middlewares).not.toContain("redirect-to-https");
+	expect(router.rule).not.toContain("PathPrefix");
+});
+
+test("Web entrypoint on http domain with custom path", async () => {
+	const router = await createRouterConfig(
+		baseApp,
+		{ ...baseDomain, path: "/foo", https: false },
+		"web",
+	);
+
+	expect(router.rule).toContain("PathPrefix(`/foo`)");
+});
+
+test("Web entrypoint on http domain with redirect", async () => {
+	const router = await createRouterConfig(
+		{
+			...baseApp,
+			appName: "test",
+			redirects: [{ ...baseRedirect, uniqueConfigKey: 1 }],
+		},
+		{ ...baseDomain, https: false },
+		"web",
+	);
+
+	expect(router.middlewares).not.toContain("redirect-to-https");
+	expect(router.middlewares).toContain("redirect-test-1");
+});
+
+test("Web entrypoint on http domain with multiple redirect", async () => {
+	const router = await createRouterConfig(
+		{
+			...baseApp,
+			appName: "test",
+			redirects: [
+				{ ...baseRedirect, uniqueConfigKey: 1 },
+				{ ...baseRedirect, uniqueConfigKey: 2 },
+			],
+		},
+		{ ...baseDomain, https: false },
+		"web",
+	);
+
+	expect(router.middlewares).not.toContain("redirect-to-https");
+	expect(router.middlewares).toContain("redirect-test-1");
+	expect(router.middlewares).toContain("redirect-test-2");
+});
+
+test("Web entrypoint on https domain", async () => {
+	const router = await createRouterConfig(
+		baseApp,
+		{ ...baseDomain, https: true },
+		"web",
+	);
+
+	expect(router.middlewares).toContain("redirect-to-https");
+});
+
+test("Web entrypoint on https domain with redirect", async () => {
+	const router = await createRouterConfig(
+		{
+			...baseApp,
+			appName: "test",
+			redirects: [{ ...baseRedirect, uniqueConfigKey: 1 }],
+		},
+		{ ...baseDomain, https: true },
+		"web",
+	);
+
+	expect(router.middlewares).toContain("redirect-to-https");
+	expect(router.middlewares).not.toContain("redirect-test-1");
+});
+
+test("Websecure entrypoint on https domain", async () => {
+	const router = await createRouterConfig(
+		baseApp,
+		{ ...baseDomain, https: true },
+		"websecure",
+	);
+
+	expect(router.middlewares).not.toContain("redirect-to-https");
+});
+
+test("Websecure entrypoint on https domain with redirect", async () => {
+	const router = await createRouterConfig(
+		{
+			...baseApp,
+			appName: "test",
+			redirects: [{ ...baseRedirect, uniqueConfigKey: 1 }],
+		},
+		{ ...baseDomain, https: true },
+		"websecure",
+	);
+
+	expect(router.middlewares).not.toContain("redirect-to-https");
+	expect(router.middlewares).toContain("redirect-test-1");
+});
+
+/** Certificates */
+
+test("CertificateType on websecure entrypoint", async () => {
+	const router = await createRouterConfig(
+		baseApp,
+		{ ...baseDomain, certificateType: "letsencrypt" },
+		"websecure",
+	);
+
+	expect(router.tls?.certResolver).toBe("letsencrypt");
+});

apps/dokploy/__test__/vitest.config.ts

@@ -1,16 +1,24 @@
-import { defineConfig } from "vitest/config";
+import path from "node:path";
 import tsconfigPaths from "vite-tsconfig-paths";
+import { defineConfig } from "vitest/config";
 
 export default defineConfig({
-	plugins: [
-		tsconfigPaths({
-			root: "./",
-			projects: ["tsconfig.json"],
-		}),
-	],
 	test: {
 		include: ["__test__/**/*.test.ts"], // Incluir solo los archivos de test en el directorio __test__
 		exclude: ["**/node_modules/**", "**/dist/**", "**/.docker/**"],
 		pool: "forks",
 	},
+	define: {
+		"process.env": {
+			NODE: "test",
+		},
+	},
+	resolve: {
+		alias: {
+			"@dokploy/server": path.resolve(
+				__dirname,
+				"../../../packages/server/src",
+			),
+		},
+	},
 });

apps/dokploy/components.json

@@ -0,0 +1,17 @@
+{
+	"$schema": "https://ui.shadcn.com/schema.json",
+	"style": "default",
+	"rsc": false,
+	"tsx": true,
+	"tailwind": {
+		"config": "tailwind.config.ts",
+		"css": "styles/globals.css",
+		"baseColor": "zinc",
+		"cssVariables": true,
+		"prefix": ""
+	},
+	"aliases": {
+		"components": "@/components",
+		"utils": "@/lib/utils"
+	}
+}

apps/dokploy/components/auth/login-2fa.tsx

@@ -10,19 +10,19 @@ import {
 } from "@/components/ui/form";
 
 import { CardTitle } from "@/components/ui/card";
-import { api } from "@/utils/api";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { AlertTriangle } from "lucide-react";
-import { useEffect } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
 import {
 	InputOTP,
 	InputOTPGroup,
 	InputOTPSlot,
 } from "@/components/ui/input-otp";
+import { api } from "@/utils/api";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { AlertTriangle } from "lucide-react";
 import { useRouter } from "next/router";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
 
 const Login2FASchema = z.object({
 	pin: z.string().min(6, {

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

@@ -1,3 +1,5 @@
+import { AlertBlock } from "@/components/shared/alert-block";
+import { CodeEditor } from "@/components/shared/code-editor";
 import { Button } from "@/components/ui/button";
 import {
 	Dialog,
@@ -17,21 +19,19 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { api } from "@/utils/api";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
-import { HelpCircle, Settings } from "lucide-react";
 import {
 	Tooltip,
 	TooltipContent,
 	TooltipProvider,
 	TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { CodeEditor } from "@/components/shared/code-editor";
+import { api } from "@/utils/api";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { HelpCircle, Settings } from "lucide-react";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
 
 const HealthCheckSwarmSchema = z
 	.object({
@@ -278,6 +278,12 @@ export const AddSwarmSettings = ({ applicationId }: Props) => {
 					</DialogDescription>
 				</DialogHeader>
 				{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
+				<div className="px-4">
+					<AlertBlock type="info">
+						Changing settings such as placements may cause the logs/monitoring
+						to be unavailable.
+					</AlertBlock>
+				</div>
 
 				<Form {...form}>
 					<form

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

@@ -1,4 +1,5 @@
-import React from "react";
+import { AlertBlock } from "@/components/shared/alert-block";
+import { Button } from "@/components/ui/button";
 import {
 	Card,
 	CardContent,
@@ -6,8 +7,6 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@/components/ui/card";
-import { api } from "@/utils/api";
-import { z } from "zod";
 import {
 	Form,
 	FormControl,
@@ -16,11 +15,6 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { toast } from "sonner";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useForm } from "react-hook-form";
-import { useEffect } from "react";
-import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import {
 	Select,
@@ -31,10 +25,16 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import Link from "next/link";
+import { api } from "@/utils/api";
+import { zodResolver } from "@hookform/resolvers/zod";
 import { Server } from "lucide-react";
+import Link from "next/link";
+import React from "react";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
 import { AddSwarmSettings } from "./modify-swarm-settings";
-import { AlertBlock } from "@/components/shared/alert-block";
 
 interface Props {
 	applicationId: string;
@@ -81,7 +81,10 @@ export const ShowClusterSettings = ({ applicationId }: Props) => {
 	const onSubmit = async (data: AddCommand) => {
 		await mutateAsync({
 			applicationId,
-			registryId: data?.registryId === "none" ? null : data?.registryId,
+			registryId:
+				data?.registryId === "none" || !data?.registryId
+					? null
+					: data?.registryId,
 			replicas: data?.replicas,
 		})
 			.then(async () => {

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

@@ -1,4 +1,4 @@
-import React from "react";
+import { Button } from "@/components/ui/button";
 import {
 	Card,
 	CardContent,
@@ -6,8 +6,6 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@/components/ui/card";
-import { api } from "@/utils/api";
-import { z } from "zod";
 import {
 	Form,
 	FormControl,
@@ -16,12 +14,14 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { toast } from "sonner";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useForm } from "react-hook-form";
-import { useEffect } from "react";
-import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
+import { api } from "@/utils/api";
+import { zodResolver } from "@hookform/resolvers/zod";
+import React from "react";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
 interface Props {
 	applicationId: string;
 }

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

@@ -1,3 +1,4 @@
+import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
 import {
 	Dialog,
@@ -17,13 +18,6 @@ import {
 	FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { PlusIcon } from "lucide-react";
 import {
 	Select,
 	SelectContent,
@@ -31,6 +25,12 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
+import { api } from "@/utils/api";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { PlusIcon } from "lucide-react";
+import { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
 import { z } from "zod";
 
 const AddPortSchema = z.object({
@@ -52,6 +52,7 @@ export const AddPort = ({
 	applicationId,
 	children = <PlusIcon className="h-4 w-4" />,
 }: Props) => {
+	const [isOpen, setIsOpen] = useState(false);
 	const utils = api.useUtils();
 
 	const { mutateAsync, isLoading, error, isError } =
@@ -82,6 +83,7 @@ export const AddPort = ({
 				await utils.application.one.invalidate({
 					applicationId,
 				});
+				setIsOpen(false);
 			})
 			.catch(() => {
 				toast.error("Error to create the port");
@@ -89,7 +91,7 @@ export const AddPort = ({
 	};
 
 	return (
-		<Dialog>
+		<Dialog open={isOpen} onOpenChange={setIsOpen}>
 			<DialogTrigger asChild>
 				<Button>{children}</Button>
 			</DialogTrigger>
@@ -183,8 +185,7 @@ export const AddPort = ({
 														<SelectValue placeholder="Select a protocol" />
 													</SelectTrigger>
 												</FormControl>
-												<SelectContent defaultValue={"none"}>
-													<SelectItem value={"none"}>None</SelectItem>
+												<SelectContent>
 													<SelectItem value={"tcp"}>TCP</SelectItem>
 													<SelectItem value={"udp"}>UDP</SelectItem>
 												</SelectContent>

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

@@ -1,4 +1,4 @@
-import React from "react";
+import { AlertBlock } from "@/components/shared/alert-block";
 import {
 	Card,
 	CardContent,
@@ -8,10 +8,10 @@ import {
 } from "@/components/ui/card";
 import { api } from "@/utils/api";
 import { Rss } from "lucide-react";
+import React from "react";
 import { AddPort } from "./add-port";
 import { DeletePort } from "./delete-port";
 import { UpdatePort } from "./update-port";
-import { AlertBlock } from "@/components/shared/alert-block";
 interface Props {
 	applicationId: string;
 }

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

@@ -1,3 +1,4 @@
+import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
 import {
 	Dialog,
@@ -16,15 +17,7 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { api } from "@/utils/api";
-import { AlertBlock } from "@/components/shared/alert-block";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { PenBoxIcon, Pencil } from "lucide-react";
-import { useEffect } from "react";
-import { useForm } from "react-hook-form";
-import { toast } from "sonner";
-import { z } from "zod";
+import { Input, NumberInput } from "@/components/ui/input";
 import {
 	Select,
 	SelectContent,
@@ -32,6 +25,13 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
+import { api } from "@/utils/api";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { PenBoxIcon, Pencil } from "lucide-react";
+import { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
 
 const UpdatePortSchema = z.object({
 	publishedPort: z.number().int().min(1).max(65535),
@@ -49,6 +49,7 @@ interface Props {
 }
 
 export const UpdatePort = ({ portId }: Props) => {
+	const [isOpen, setIsOpen] = useState(false);
 	const utils = api.useUtils();
 	const { data } = api.port.one.useQuery(
 		{
@@ -89,6 +90,7 @@ export const UpdatePort = ({ portId }: Props) => {
 				await utils.application.one.invalidate({
 					applicationId: response?.applicationId,
 				});
+				setIsOpen(false);
 			})
 			.catch(() => {
 				toast.error("Error to update the port");
@@ -96,7 +98,7 @@ export const UpdatePort = ({ portId }: Props) => {
 	};
 
 	return (
-		<Dialog>
+		<Dialog open={isOpen} onOpenChange={setIsOpen}>
 			<DialogTrigger asChild>
 				<Button variant="ghost" isLoading={isLoading}>
 					<PenBoxIcon className="size-4 text-muted-foreground" />
@@ -123,28 +125,14 @@ export const UpdatePort = ({ portId }: Props) => {
 									<FormItem>
 										<FormLabel>Published Port</FormLabel>
 										<FormControl>
-											<Input
-												placeholder="1-65535"
-												{...field}
-												value={field.value?.toString() || ""}
-												onChange={(e) => {
-													const value = e.target.value;
-													if (value === "") {
-														field.onChange(0);
-													} else {
-														const number = Number.parseInt(value, 10);
-														if (!Number.isNaN(number)) {
-															field.onChange(number);
-														}
-													}
-												}}
-											/>
+											<NumberInput placeholder="1-65535" {...field} />
 										</FormControl>
 
 										<FormMessage />
 									</FormItem>
 								)}
 							/>
+
 							<FormField
 								control={form.control}
 								name="targetPort"
@@ -152,22 +140,7 @@ export const UpdatePort = ({ portId }: Props) => {
 									<FormItem>
 										<FormLabel>Target Port</FormLabel>
 										<FormControl>
-											<Input
-												placeholder="1-65535"
-												{...field}
-												value={field.value?.toString() || ""}
-												onChange={(e) => {
-													const value = e.target.value;
-													if (value === "") {
-														field.onChange(0);
-													} else {
-														const number = Number.parseInt(value, 10);
-														if (!Number.isNaN(number)) {
-															field.onChange(number);
-														}
-													}
-												}}
-											/>
+											<NumberInput placeholder="1-65535" {...field} />
 										</FormControl>
 
 										<FormMessage />

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

@@ -1,3 +1,4 @@
+import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
 import {
 	Dialog,
@@ -11,22 +12,30 @@ import {
 import {
 	Form,
 	FormControl,
+	FormDescription,
 	FormField,
 	FormItem,
 	FormLabel,
-	FormDescription,
 	FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { Separator } from "@/components/ui/separator";
+import { Switch } from "@/components/ui/switch";
 import { api } from "@/utils/api";
-import { AlertBlock } from "@/components/shared/alert-block";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect } from "react";
+import { PlusIcon } from "lucide-react";
+import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
-import { PlusIcon } from "lucide-react";
 import { z } from "zod";
-import { Switch } from "@/components/ui/switch";
 
 const AddRedirectchema = z.object({
 	regex: z.string().min(1, "Regex required"),
@@ -36,6 +45,36 @@ const AddRedirectchema = z.object({
 
 type AddRedirect = z.infer<typeof AddRedirectchema>;
 
+// Default presets
+const redirectPresets = [
+	// {
+	// 	label: "Allow www & non-www.",
+	// 	redirect: {
+	// 		regex: "",
+	// 		permanent: false,
+	// 		replacement: "",
+	// 	},
+	// },
+	{
+		id: "to-www",
+		label: "Redirect to www",
+		redirect: {
+			regex: "^https?://(?:www.)?(.+)",
+			permanent: true,
+			replacement: "https://www.${1}",
+		},
+	},
+	{
+		id: "to-non-www",
+		label: "Redirect to non-www",
+		redirect: {
+			regex: "^https?://www.(.+)",
+			permanent: true,
+			replacement: "https://${1}",
+		},
+	},
+];
+
 interface Props {
 	applicationId: string;
 	children?: React.ReactNode;
@@ -43,8 +82,10 @@ interface Props {
 
 export const AddRedirect = ({
 	applicationId,
-	children = <PlusIcon className="h-4 w-4" />,
+	children = <PlusIcon className="w-4 h-4" />,
 }: Props) => {
+	const [isOpen, setIsOpen] = useState(false);
+	const [presetSelected, setPresetSelected] = useState("");
 	const utils = api.useUtils();
 
 	const { mutateAsync, isLoading, error, isError } =
@@ -80,18 +121,36 @@ export const AddRedirect = ({
 				await utils.application.readTraefikConfig.invalidate({
 					applicationId,
 				});
+				onDialogToggle(false);
 			})
 			.catch(() => {
 				toast.error("Error to create the redirect");
 			});
 	};
 
+	const onDialogToggle = (open: boolean) => {
+		setIsOpen(open);
+		// commented for the moment because not reseting the form if accidentally closed the dialog can be considered as a feature instead of a bug
+		// setPresetSelected("");
+		// form.reset();
+	};
+
+	const onPresetSelect = (presetId: string) => {
+		const redirectPreset = redirectPresets.find(
+			(preset) => preset.id === presetId,
+		)?.redirect;
+		if (!redirectPreset) return;
+		const { regex, permanent, replacement } = redirectPreset;
+		form.reset({ regex, permanent, replacement }, { keepDefaultValues: true });
+		setPresetSelected(presetId);
+	};
+
 	return (
-		<Dialog>
+		<Dialog open={isOpen} onOpenChange={onDialogToggle}>
 			<DialogTrigger asChild>
 				<Button>{children}</Button>
 			</DialogTrigger>
-			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-lg">
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
 				<DialogHeader>
 					<DialogTitle>Redirects</DialogTitle>
 					<DialogDescription>
@@ -100,6 +159,24 @@ export const AddRedirect = ({
 				</DialogHeader>
 				{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
 
+				<div className="md:col-span-2">
+					<Label>Presets</Label>
+					<Select onValueChange={onPresetSelect} value={presetSelected}>
+						<SelectTrigger>
+							<SelectValue placeholder="No preset selected" />
+						</SelectTrigger>
+						<SelectContent>
+							{redirectPresets.map((preset) => (
+								<SelectItem key={preset.label} value={preset.id}>
+									{preset.label}
+								</SelectItem>
+							))}
+						</SelectContent>
+					</Select>
+				</div>
+
+				<Separator />
+
 				<Form {...form}>
 					<form
 						id="hook-form-add-redirect"
@@ -140,7 +217,7 @@ export const AddRedirect = ({
 								control={form.control}
 								name="permanent"
 								render={({ field }) => (
-									<FormItem className="mt-4 flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm">
+									<FormItem className="flex flex-row items-center justify-between p-3 mt-4 border rounded-lg shadow-sm">
 										<div className="space-y-0.5">
 											<FormLabel>Permanent</FormLabel>
 											<FormDescription>

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

@@ -1,4 +1,3 @@
-import React from "react";
 import {
 	Card,
 	CardContent,
@@ -8,6 +7,7 @@ import {
 } from "@/components/ui/card";
 import { api } from "@/utils/api";
 import { Split } from "lucide-react";
+import React from "react";
 import { AddRedirect } from "./add-redirect";
 import { DeleteRedirect } from "./delete-redirect";
 import { UpdateRedirect } from "./update-redirect";

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

@@ -1,3 +1,4 @@
+import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
 import {
 	Dialog,
@@ -11,22 +12,21 @@ import {
 import {
 	Form,
 	FormControl,
+	FormDescription,
 	FormField,
 	FormItem,
 	FormLabel,
-	FormDescription,
 	FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Switch } from "@/components/ui/switch";
 import { api } from "@/utils/api";
-import { AlertBlock } from "@/components/shared/alert-block";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { PenBoxIcon, Pencil } from "lucide-react";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
-import { Switch } from "@/components/ui/switch";
 const UpdateRedirectSchema = z.object({
 	regex: z.string().min(1, "Regex required"),
 	permanent: z.boolean().default(false),
@@ -41,6 +41,7 @@ interface Props {
 
 export const UpdateRedirect = ({ redirectId }: Props) => {
 	const utils = api.useUtils();
+	const [isOpen, setIsOpen] = useState(false);
 	const { data } = api.redirects.one.useQuery(
 		{
 			redirectId,
@@ -84,6 +85,7 @@ export const UpdateRedirect = ({ redirectId }: Props) => {
 				await utils.application.one.invalidate({
 					applicationId: response?.applicationId,
 				});
+				setIsOpen(false);
 			})
 			.catch(() => {
 				toast.error("Error to update the redirect");
@@ -91,7 +93,7 @@ export const UpdateRedirect = ({ redirectId }: Props) => {
 	};
 
 	return (
-		<Dialog>
+		<Dialog open={isOpen} onOpenChange={setIsOpen}>
 			<DialogTrigger asChild>
 				<Button variant="ghost" isLoading={isLoading}>
 					<PenBoxIcon className="size-4  text-muted-foreground" />