Merge branch 'canary' into canary

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

@@ -14,7 +14,7 @@ import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
 import { validateAndFormatYAML } from "../../application/advanced/traefik/update-traefik-config";
-import { RandomizeCompose } from "./randomize-compose";
+import { ShowUtilities } from "./show-utilities";
 
 interface Props {
 	composeId: string;
@@ -125,7 +125,7 @@ services:
 				</Form>
 				<div className="flex justify-between flex-col lg:flex-row gap-2">
 					<div className="w-full flex flex-col lg:flex-row gap-4 items-end">
-						<RandomizeCompose composeId={composeId} />
+						<ShowUtilities composeId={composeId} />
 					</div>
 					<Button
 						type="submit"

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

@@ -0,0 +1,191 @@
+import { AlertBlock } from "@/components/shared/alert-block";
+import { CodeEditor } from "@/components/shared/code-editor";
+import { Button } from "@/components/ui/button";
+import {
+	DialogDescription,
+	DialogHeader,
+	DialogTitle,
+} from "@/components/ui/dialog";
+import {
+	Form,
+	FormControl,
+	FormDescription,
+	FormField,
+	FormItem,
+	FormLabel,
+} from "@/components/ui/form";
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
+import { api } from "@/utils/api";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { AlertTriangle } from "lucide-react";
+import { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
+
+interface Props {
+	composeId: string;
+}
+
+const schema = z.object({
+	isolatedDeployment: z.boolean().optional(),
+});
+
+type Schema = z.infer<typeof schema>;
+
+export const IsolatedDeployment = ({ composeId }: Props) => {
+	const utils = api.useUtils();
+	const [compose, setCompose] = useState<string>("");
+	const { mutateAsync, error, isError } =
+		api.compose.isolatedDeployment.useMutation();
+
+	const { mutateAsync: updateCompose } = api.compose.update.useMutation();
+
+	const { data, refetch } = api.compose.one.useQuery(
+		{ composeId },
+		{ enabled: !!composeId },
+	);
+
+	console.log(data);
+
+	const form = useForm<Schema>({
+		defaultValues: {
+			isolatedDeployment: false,
+		},
+		resolver: zodResolver(schema),
+	});
+
+	useEffect(() => {
+		randomizeCompose();
+		if (data) {
+			form.reset({
+				isolatedDeployment: data?.isolatedDeployment || false,
+			});
+		}
+	}, [form, form.reset, form.formState.isSubmitSuccessful, data]);
+
+	const onSubmit = async (formData: Schema) => {
+		await updateCompose({
+			composeId,
+			isolatedDeployment: formData?.isolatedDeployment || false,
+		})
+			.then(async (data) => {
+				randomizeCompose();
+				refetch();
+				toast.success("Compose updated");
+			})
+			.catch(() => {
+				toast.error("Error updating the compose");
+			});
+	};
+
+	const randomizeCompose = async () => {
+		await mutateAsync({
+			composeId,
+			suffix: data?.appName || "",
+		})
+			.then(async (data) => {
+				await utils.project.all.invalidate();
+				setCompose(data);
+				toast.success("Compose Isolated");
+			})
+			.catch(() => {
+				toast.error("Error isolating the compose");
+			});
+	};
+
+	return (
+		<>
+			<DialogHeader>
+				<DialogTitle>Isolate Deployment</DialogTitle>
+				<DialogDescription>
+					Use this option to isolate the deployment of this compose file.
+				</DialogDescription>
+			</DialogHeader>
+			<div className="text-sm text-muted-foreground flex flex-col gap-2">
+				<span>
+					This feature creates an isolated environment for your deployment by
+					adding unique prefixes to all resources. It establishes a dedicated
+					network based on your compose file's name, ensuring your services run
+					in isolation. This prevents conflicts when running multiple instances
+					of the same template or services with identical names.
+				</span>
+				<div className="space-y-4">
+					<div>
+						<h4 className="font-medium mb-2">
+							Resources that will be isolated:
+						</h4>
+						<ul className="list-disc list-inside">
+							<li>Docker volumes</li>
+							<li>Docker networks</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+			{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
+			<Form {...form}>
+				<form
+					onSubmit={form.handleSubmit(onSubmit)}
+					id="hook-form-add-project"
+					className="grid w-full gap-4"
+				>
+					{isError && (
+						<div className="flex flex-row gap-4 rounded-lg items-center bg-red-50 p-2 dark:bg-red-950">
+							<AlertTriangle className="text-red-600 dark:text-red-400" />
+							<span className="text-sm text-red-600 dark:text-red-400">
+								{error?.message}
+							</span>
+						</div>
+					)}
+
+					<div className="flex flex-col lg:flex-col  gap-4 w-full ">
+						<div>
+							<FormField
+								control={form.control}
+								name="isolatedDeployment"
+								render={({ field }) => (
+									<FormItem className="mt-4 flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm">
+										<div className="space-y-0.5">
+											<FormLabel>Enable Randomize ({data?.appName})</FormLabel>
+											<FormDescription>
+												Enable randomize to the compose file.
+											</FormDescription>
+										</div>
+										<FormControl>
+											<Switch
+												checked={field.value}
+												onCheckedChange={field.onChange}
+											/>
+										</FormControl>
+									</FormItem>
+								)}
+							/>
+						</div>
+
+						<div className="flex flex-col lg:flex-row  gap-4 w-full items-end justify-end">
+							<Button
+								form="hook-form-add-project"
+								type="submit"
+								className="lg:w-fit"
+							>
+								Save
+							</Button>
+						</div>
+					</div>
+					<div className="flex flex-col gap-4">
+						<Label>Preview</Label>
+						<pre>
+							<CodeEditor
+								value={compose || ""}
+								language="yaml"
+								readOnly
+								height="50rem"
+							/>
+						</pre>
+					</div>
+				</form>
+			</Form>
+		</>
+	);
+};

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

@@ -1,14 +1,10 @@
 import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { Button } from "@/components/ui/button";
-import { CardTitle } from "@/components/ui/card";
 import {
-	Dialog,
-	DialogContent,
 	DialogDescription,
 	DialogHeader,
 	DialogTitle,
-	DialogTrigger,
 } from "@/components/ui/dialog";
 import {
 	Form,
@@ -20,11 +16,6 @@ import {
 	FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
-import {
-	InputOTP,
-	InputOTPGroup,
-	InputOTPSlot,
-} from "@/components/ui/input-otp";
 import { Switch } from "@/components/ui/switch";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -70,6 +61,7 @@ export const RandomizeCompose = ({ composeId }: Props) => {
 	const suffix = form.watch("suffix");
 
 	useEffect(() => {
+		randomizeCompose();
 		if (data) {
 			form.reset({
 				suffix: data?.suffix || "",
@@ -110,19 +102,12 @@ export const RandomizeCompose = ({ composeId }: Props) => {
 	};
 
 	return (
-		<Dialog open={isOpen} onOpenChange={setIsOpen}>
+		<div className="w-full">
-			<DialogTrigger asChild onClick={() => randomizeCompose()}>
-				<Button className="max-lg:w-full" variant="outline">
-					<Dices className="h-4 w-4" />
-					Randomize Compose
-				</Button>
-			</DialogTrigger>
-			<DialogContent className="sm:max-w-6xl max-h-[50rem] overflow-y-auto">
 			<DialogHeader>
 				<DialogTitle>Randomize Compose (Experimental)</DialogTitle>
 				<DialogDescription>
-						Use this in case you want to deploy the same compose file and you
+					Use this in case you want to deploy the same compose file and you have
-						have conflicts with some property like volumes, networks, etc.
+					conflicts with some property like volumes, networks, etc.
 				</DialogDescription>
 			</DialogHeader>
 			<div className="text-sm text-muted-foreground flex flex-col gap-2">
@@ -138,9 +123,8 @@ export const RandomizeCompose = ({ composeId }: Props) => {
 					<li>secrets</li>
 				</ul>
 				<AlertBlock type="info">
-						When you activate this option, we will include a env
+					When you activate this option, we will include a env `COMPOSE_PREFIX`
-						`COMPOSE_PREFIX` variable to the compose file so you can use it in
+					variable to the compose file so you can use it in your compose file.
-						your compose file.
 				</AlertBlock>
 			</div>
 			{isError && <AlertBlock type="error">{error?.message}</AlertBlock>}
@@ -165,7 +149,7 @@ export const RandomizeCompose = ({ composeId }: Props) => {
 								control={form.control}
 								name="suffix"
 								render={({ field }) => (
-										<FormItem className="flex flex-col justify-center max-sm:items-center w-full">
+									<FormItem className="flex flex-col justify-center max-sm:items-center w-full mt-4">
 										<FormLabel>Suffix</FormLabel>
 										<FormControl>
 											<Input
@@ -229,7 +213,6 @@ export const RandomizeCompose = ({ composeId }: Props) => {
 					</pre>
 				</form>
 			</Form>
-			</DialogContent>
+		</div>
-		</Dialog>
 	);
 };

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

@@ -0,0 +1,46 @@
+import { Button } from "@/components/ui/button";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { useState } from "react";
+import { IsolatedDeployment } from "./isolated-deployment";
+import { RandomizeCompose } from "./randomize-compose";
+
+interface Props {
+	composeId: string;
+}
+
+export const ShowUtilities = ({ composeId }: Props) => {
+	const [isOpen, setIsOpen] = useState(false);
+	return (
+		<Dialog open={isOpen} onOpenChange={setIsOpen}>
+			<DialogTrigger asChild>
+				<Button variant="ghost">Show Utilities</Button>
+			</DialogTrigger>
+			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-5xl">
+				<DialogHeader>
+					<DialogTitle>Utilities </DialogTitle>
+					<DialogDescription>Modify the application data</DialogDescription>
+				</DialogHeader>
+				<Tabs defaultValue="isolated">
+					<TabsList className="grid w-full grid-cols-2">
+						<TabsTrigger value="isolated">Isolated Deployment</TabsTrigger>
+						<TabsTrigger value="randomize">Randomize Compose</TabsTrigger>
+					</TabsList>
+					<TabsContent value="randomize" className="pt-5">
+						<RandomizeCompose composeId={composeId} />
+					</TabsContent>
+					<TabsContent value="isolated" className="pt-5">
+						<IsolatedDeployment composeId={composeId} />
+					</TabsContent>
+				</Tabs>
+			</DialogContent>
+		</Dialog>
+	);
+};

apps/dokploy/drizzle/0064_previous_agent_brand.sql

@@ -0,0 +1 @@
+ALTER TABLE "compose" ADD COLUMN "deployable" boolean DEFAULT false NOT NULL;

apps/dokploy/drizzle/0065_daily_zaladane.sql

@@ -0,0 +1 @@
+ALTER TABLE "compose" RENAME COLUMN "deployable" TO "isolatedDeployment";

apps/dokploy/drizzle/meta/_journal.json

@@ -449,6 +449,20 @@
       "when": 1738522845992,
       "tag": "0063_panoramic_dreadnoughts",
       "breakpoints": true
+    },
+    {
+      "idx": 64,
+      "version": "7",
+      "when": 1738564387043,
+      "tag": "0064_previous_agent_brand",
+      "breakpoints": true
+    },
+    {
+      "idx": 65,
+      "version": "7",
+      "when": 1739087857244,
+      "tag": "0065_daily_zaladane",
+      "breakpoints": true
     }
   ]
 }

apps/dokploy/server/api/routers/compose.ts

@@ -46,6 +46,7 @@ import {
 	findServerById,
 	loadServices,
 	randomizeComposeFile,
+	randomizeIsolatedDeploymentComposeFile,
 	removeCompose,
 	removeComposeDirectory,
 	removeDeploymentsByComposeId,
@@ -216,6 +217,21 @@ export const composeRouter = createTRPCRouter({
 			}
 			return await randomizeComposeFile(input.composeId, input.suffix);
 		}),
+	isolatedDeployment: protectedProcedure
+		.input(apiRandomizeCompose)
+		.mutation(async ({ input, ctx }) => {
+			const compose = await findComposeById(input.composeId);
+			if (compose.project.adminId !== ctx.user.adminId) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to randomize this compose",
+				});
+			}
+			return await randomizeIsolatedDeploymentComposeFile(
+				input.composeId,
+				input.suffix,
+			);
+		}),
 	getConvertedCompose: protectedProcedure
 		.input(apiFindCompose)
 		.query(async ({ input, ctx }) => {
@@ -399,6 +415,7 @@ export const composeRouter = createTRPCRouter({
 				name: input.id,
 				sourceType: "raw",
 				appName: `${projectName}-${generatePassword(6)}`,
+				isolatedDeployment: true,
 			});
 
 			if (ctx.user.rol === "user") {

apps/dokploy/templates/activepieces/docker-compose.yml

@@ -4,8 +4,7 @@ services:
   activepieces:
     image: activepieces/activepieces:0.35.0
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     depends_on:
       postgres:
         condition: service_healthy
@@ -35,8 +34,7 @@ services:
   postgres:
     image: postgres:14
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     environment:
       POSTGRES_DB: activepieces
       POSTGRES_PASSWORD: ${AP_POSTGRES_PASSWORD}
@@ -52,8 +50,7 @@ services:
   redis:
     image: redis:7
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     volumes:
       - redis_data:/data
     healthcheck:

apps/dokploy/templates/answer/docker-compose.yml

@@ -17,8 +17,7 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
-    networks:
+
-      - dokploy-network
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:

apps/dokploy/templates/aptabase/docker-compose.yml

@@ -7,8 +7,7 @@ services:
     environment:
       POSTGRES_USER: aptabase
       POSTGRES_PASSWORD: sTr0NGp4ssw0rd
-    networks:
+
-      - dokploy-network
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U aptabase"]
       interval: 10s
@@ -27,8 +26,7 @@ services:
       nofile:
         soft: 262144
         hard: 262144
-    networks:
+
-      - dokploy-network
     healthcheck:
       test: ["CMD-SHELL", "curl -f http://localhost:8123 || exit 1"]
       interval: 10s

apps/dokploy/templates/budibase/docker-compose.yml

@@ -2,8 +2,7 @@ services:
   apps:
     image: budibase.docker.scarf.sh/budibase/apps:3.2.25
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     environment:
       SELF_HOSTED: 1
       LOG_LEVEL: info
@@ -43,8 +42,7 @@ services:
   worker:
     image: budibase.docker.scarf.sh/budibase/worker:3.2.25
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     environment:
       SELF_HOSTED: 1
       LOG_LEVEL: info
@@ -83,8 +81,7 @@ services:
   minio:
     image: minio/minio:RELEASE.2024-11-07T00-52-20Z
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     volumes:
       - 'minio_data:/data'
     environment:
@@ -104,8 +101,7 @@ services:
   proxy:
     image: budibase/proxy:3.2.25
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     environment:
       PROXY_RATE_LIMIT_WEBHOOKS_PER_SECOND: 10
       PROXY_RATE_LIMIT_API_PER_SECOND: 20
@@ -137,8 +133,7 @@ services:
   couchdb:
     image: budibase/couchdb:v3.3.3
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     environment:
       COUCHDB_USER: budibase
       COUCHDB_PASSWORD: ${BB_COUCHDB_PASSWORD}
@@ -157,8 +152,7 @@ services:
       - 'couchdb3_data:/opt/couchdb/data'
   redis:
     image: redis:7.2-alpine
-    networks:
+
-      - dokploy-network
     restart: unless-stopped
     command: 'redis-server --requirepass "${BB_REDIS_PASSWORD}"'
     volumes:
@@ -176,8 +170,7 @@ services:
       start_period: 10s
   watchtower:
     restart: unless-stopped   
-    networks:
+ 
-      - dokploy-network 
     image: containrrr/watchtower:1.7.1
     volumes:
       - '/var/run/docker.sock:/var/run/docker.sock'

apps/dokploy/templates/calcom/docker-compose.yml

@@ -1,8 +1,7 @@
 services:
   postgres:
     image: postgres:16-alpine
-    networks:
+
-      - dokploy-network
     volumes:
       - calcom-data:/var/lib/postgresql/data
     environment:

apps/dokploy/templates/chatwoot/docker-compose.yml

@@ -51,8 +51,7 @@ services:
     restart: always
     volumes:
       - chatwoot-postgres-data:/var/lib/postgresql/data
-    networks:
+
-      - dokploy-network
     environment:
       - POSTGRES_DB=${POSTGRES_DATABASE}
       - POSTGRES_USER=${POSTGRES_USERNAME}
@@ -63,8 +62,7 @@ services:
     restart: always
     volumes:
       - chatwoot-redis-data:/data
-    networks:
+
-      - dokploy-network
 
 networks:
   dokploy-network:

apps/dokploy/templates/checkmate/docker-compose.yml

@@ -9,8 +9,7 @@ services:
       - 443
     depends_on:
       - server
-    networks:
+
-      - dokploy-network
   server:
     image: bluewaveuptime/uptime_server:latest
     restart: always
@@ -22,8 +21,7 @@ services:
     environment:
       - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
       - REDIS_HOST=redis
-    networks:
+
-      - dokploy-network
     # volumes:
     # - /var/run/docker.sock:/var/run/docker.sock:ro
   redis:
@@ -33,8 +31,7 @@ services:
       - 6379
     volumes:
       - ../files/redis/data:/data
-    networks:
+
-      - dokploy-network
   mongodb:
     image: bluewaveuptime/uptime_database_mongo:latest
     restart: always
@@ -43,5 +40,3 @@ services:
     command: ["mongod", "--quiet"]
     ports:
       - 27017
-    networks:
-      - dokploy-network

apps/dokploy/templates/coder/docker-compose.yml

@@ -1,8 +1,7 @@
 services:
   coder:
     image: ghcr.io/coder/coder:v2.15.3
-    networks:
+
-      - dokploy-network
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     group_add:
@@ -17,8 +16,7 @@ services:
 
   db:
     image: postgres:17
-    networks:
+
-      - dokploy-network
     environment:
       - POSTGRES_PASSWORD
       - POSTGRES_USER

apps/dokploy/templates/directus/docker-compose.yml

@@ -3,8 +3,7 @@ services:
     image: postgis/postgis:13-master
     volumes:
       - directus_database:/var/lib/postgresql/data
-    networks:
+
-      - dokploy-network
     environment:
       POSTGRES_USER: "directus"
       POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
@@ -26,8 +25,7 @@ services:
       retries: 5
       start_interval: 5s
       start_period: 30s
-    networks:
+
-      - dokploy-network
 
   directus:
     image: directus/directus:11.0.2

apps/dokploy/templates/discord-tickets/docker-compose.yml

@@ -4,8 +4,7 @@ services:
   tickets-postgres:
     image: mysql:8
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     volumes:
       - tickets-mysql-data:/var/lib/mysql
     environment:
@@ -25,8 +24,7 @@ services:
       tickets-postgres:
         condition: service_healthy
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     volumes:
       - tickets-app-data:/home/container/user
       - /etc/timezone:/etc/timezone:ro

apps/dokploy/templates/discourse/docker-compose.yml

@@ -3,8 +3,7 @@ version: '3.7'
 services:
   discourse-db:
     image: docker.io/bitnami/postgresql:17
-    networks:
+
-      - dokploy-network
     volumes:
       - discourse-postgresql-data:/bitnami/postgresql
     environment:
@@ -20,8 +19,7 @@ services:
 
   discourse-redis:
     image: docker.io/bitnami/redis:7.4
-    networks:
+
-      - dokploy-network
     volumes:
       - discourse-redis-data:/bitnami/redis
     environment:
@@ -35,8 +33,7 @@ services:
 
   discourse-app:
     image: docker.io/bitnami/discourse:3.3.2
-    networks:
+
-      - dokploy-network
     volumes:
       - discourse-data:/bitnami/discourse
     depends_on:
@@ -63,8 +60,7 @@ services:
 
   discourse-sidekiq:
     image: docker.io/bitnami/discourse:3.3.2
-    networks:
+
-      - dokploy-network
     volumes:
       - discourse-sidekiq-data:/bitnami/discourse
     depends_on:

apps/dokploy/templates/docmost/docker-compose.yml

@@ -12,8 +12,7 @@ services:
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}?schema=public
       - REDIS_URL=redis://redis:6379
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     volumes:
       - docmost:/app/data/storage
 
@@ -24,16 +23,14 @@ services:
       - POSTGRES_USER
       - POSTGRES_PASSWORD
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     volumes:
       - db_docmost_data:/var/lib/postgresql/data
 
   redis:
     image: redis:7.2-alpine
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     volumes:
       - redis_docmost_data:/data
 

apps/dokploy/templates/documenso/docker-compose.yml

@@ -2,8 +2,7 @@ version: "3.8"
 services:
   postgres:
     image: postgres:16
-    networks:
+
-      - dokploy-network
     volumes:
       - documenso-data:/var/lib/postgresql/data
     environment:

apps/dokploy/templates/drawio/docker-compose.yml

@@ -4,16 +4,14 @@ services:
     image: plantuml/plantuml-server
     ports:
       - "8080"
-    networks:
+
-      - dokploy-network
     volumes:
       - fonts_volume:/usr/share/fonts/drawio
   image-export:
     image: jgraph/export-server
     ports:
       - "8000"
-    networks:
+
-      - dokploy-network
     volumes:
       - fonts_volume:/usr/share/fonts/drawio
     environment:
@@ -28,8 +26,7 @@ services:
     depends_on:
       - plantuml-server
       - image-export
-    networks:
+
-      - dokploy-network
     environment:
       RAWIO_SELF_CONTAINED: 1
       DRAWIO_USE_HTTP: 1

apps/dokploy/templates/evolutionapi/docker-compose.yml

@@ -4,8 +4,7 @@ services:
     restart: always
     volumes:
       - evolution-instances:/evolution/instances
-    networks:
+
-      - dokploy-network
     environment:
       - SERVER_URL=${SERVER_URL}
       - AUTHENTICATION_TYPE=${AUTHENTICATION_TYPE}
@@ -36,8 +35,7 @@ services:
     restart: always
     volumes:
       - evolution-postgres-data:/var/lib/postgresql/data
-    networks:
+
-      - dokploy-network
     environment:
       - POSTGRES_DB=${POSTGRES_DATABASE}
       - POSTGRES_USER=${POSTGRES_USERNAME}
@@ -48,8 +46,7 @@ services:
     restart: always
     volumes:
       - evolution-redis-data:/data
-    networks:
+
-      - dokploy-network
 
 networks:
   dokploy-network:

apps/dokploy/templates/excalidraw/docker-compose.yml

@@ -2,6 +2,5 @@ version: "3.8"
 
 services:
   excalidraw:
-    networks:
+
-      - dokploy-network
     image: excalidraw/excalidraw:latest

apps/dokploy/templates/formbricks/docker-compose.yml

@@ -18,8 +18,7 @@ services:
       - postgres:/var/lib/postgresql/data
     environment:
       - POSTGRES_PASSWORD=postgres
-    networks:
+
-      - dokploy-network
 
   formbricks:
     restart: always

apps/dokploy/templates/ghost/docker-compose.yml

@@ -17,8 +17,7 @@ services:
   db:
     image: mysql:8.0
     restart: always
-    networks:
+
-      - dokploy-network
     environment:
       MYSQL_ROOT_PASSWORD: example
     volumes:

apps/dokploy/templates/gitea/docker-compose.yml

@@ -11,8 +11,7 @@ services:
       - GITEA__database__USER=gitea
       - GITEA__database__PASSWD=gitea
     restart: always
-    networks:
+
-      - dokploy-network
     volumes:
       - gitea_server:/data
       - /etc/timezone:/etc/timezone:ro
@@ -27,8 +26,7 @@ services:
       - POSTGRES_USER=gitea
       - POSTGRES_PASSWORD=gitea
       - POSTGRES_DB=gitea
-    networks:
+
-      - dokploy-network
     volumes:
       - gitea_db:/var/lib/postgresql/data
 

apps/dokploy/templates/glitchtip/docker-compose.yml

@@ -20,13 +20,11 @@ services:
     restart: unless-stopped
     volumes:
       - pg-data:/var/lib/postgresql/data
-    networks:
+
-      - dokploy-network
   redis:
     image: redis
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
   web:
     image: glitchtip/glitchtip:v4.0
     depends_on: *default-depends_on
@@ -44,15 +42,13 @@ services:
     restart: unless-stopped
     volumes:
       - uploads:/code/uploads
-    networks:
+
-      - dokploy-network
   migrate:
     image: glitchtip/glitchtip:v4.0
     depends_on: *default-depends_on
     command: "./manage.py migrate"
     environment: *default-environment
-    networks:
+
-      - dokploy-network
 
 volumes:
   pg-data:

apps/dokploy/templates/glpi/docker-compose.yml

@@ -4,8 +4,7 @@ services:
     restart: always
     volumes:
       - glpi-mysql-data:/var/lib/mysql
-    networks:
+
-      - dokploy-network
 
   glpi-web:
     image: elestio/glpi:10.0.16
@@ -16,8 +15,7 @@ services:
       - glpi-www-data:/var/www/html/glpi
     environment:
       - TIMEZONE=Europe/Brussels
-    networks:
+
-      - dokploy-network
 
 volumes:
   glpi-mysql-data:

apps/dokploy/templates/hi-events/docker-compose.yml

@@ -28,8 +28,7 @@ services:
   postgres:
     image: elestio/postgres:16
     restart: always
-    networks:
+
-      - dokploy-network
     environment:
       - POSTGRES_DB
       - POSTGRES_USER

apps/dokploy/templates/huly/docker-compose.yml

@@ -2,8 +2,7 @@ name: ${DOCKER_NAME}
 version: "3"
 services:
   nginx:
-    networks:
+
-      - dokploy-network
     image: "nginx:1.21.3"
     ports:
       - 80
@@ -12,8 +11,7 @@ services:
     restart: unless-stopped
 
   mongodb:
-    networks:
+
-      - dokploy-network
     image: "mongo:7-jammy"
     environment:
       - PUID=1000
@@ -23,8 +21,7 @@ services:
     restart: unless-stopped
 
   minio:
-    networks:
+
-      - dokploy-network
     image: "minio/minio:RELEASE.2024-11-07T00-52-20Z"
     command: server /data --address ":9000" --console-address ":9001"
     volumes:
@@ -32,8 +29,7 @@ services:
     restart: unless-stopped
 
   elastic:
-    networks:
+
-      - dokploy-network
     image: "elasticsearch:7.14.2"
     command: |
       /bin/sh -c "./bin/elasticsearch-plugin list | grep -q ingest-attachment || yes | ./bin/elasticsearch-plugin install --silent ingest-attachment;
@@ -54,8 +50,7 @@ services:
     restart: unless-stopped
 
   rekoni:
-    networks:
+
-      - dokploy-network
     image: hardcoreeng/rekoni-service:${HULY_VERSION}
     environment:
       - SECRET=${SECRET}
@@ -66,8 +61,7 @@ services:
     restart: unless-stopped
 
   transactor:
-    networks:
+
-      - dokploy-network
     image: hardcoreeng/transactor:${HULY_VERSION}
     environment:
       - SERVER_PORT=3333
@@ -84,8 +78,7 @@ services:
     restart: unless-stopped
 
   collaborator:
-    networks:
+
-      - dokploy-network
     image: hardcoreeng/collaborator:${HULY_VERSION}
     environment:
       - COLLABORATOR_PORT=3078
@@ -97,8 +90,7 @@ services:
     restart: unless-stopped
 
   account:
-    networks:
+
-      - dokploy-network
     image: hardcoreeng/account:${HULY_VERSION}
     environment:
       - SERVER_PORT=3000
@@ -115,8 +107,7 @@ services:
     restart: unless-stopped
 
   workspace:
-    networks:
+
-      - dokploy-network
     image: hardcoreeng/workspace:${HULY_VERSION}
     environment:
       - SERVER_SECRET=${SECRET}
@@ -130,8 +121,7 @@ services:
     restart: unless-stopped
 
   front:
-    networks:
+
-      - dokploy-network
     image: hardcoreeng/front:${HULY_VERSION}
     environment:
       - SERVER_PORT=8080
@@ -156,8 +146,7 @@ services:
     restart: unless-stopped
 
   fulltext:
-    networks:
+
-      - dokploy-network
     image: hardcoreeng/fulltext:${HULY_VERSION}
     environment:
       - SERVER_SECRET=${SECRET}
@@ -171,8 +160,7 @@ services:
     restart: unless-stopped
 
   stats:
-    networks:
+
-      - dokploy-network
     image: hardcoreeng/stats:${HULY_VERSION}
     environment:
       - PORT=4900

apps/dokploy/templates/immich/docker-compose.yml

@@ -3,8 +3,7 @@ version: "3.9"
 services:
   immich-server:
     image: ghcr.io/immich-app/immich-server:v1.121.0
-    networks:
+
-      - dokploy-network
     volumes:
       - immich-library:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
@@ -38,8 +37,7 @@ services:
 
   immich-machine-learning:
     image: ghcr.io/immich-app/immich-machine-learning:v1.121.0
-    networks:
+
-      - dokploy-network
     volumes:
       - immich-model-cache:/cache
     environment:
@@ -55,8 +53,7 @@ services:
 
   immich-redis:
     image: redis:6.2-alpine
-    networks:
+
-      - dokploy-network
     volumes:
       - immich-redis-data:/data
     healthcheck:
@@ -68,8 +65,7 @@ services:
 
   immich-database:
     image: tensorchord/pgvecto-rs:pg14-v0.2.0
-    networks:
+
-      - dokploy-network
     volumes:
       - immich-postgres:/var/lib/postgresql/data
     environment:

apps/dokploy/templates/infisical/docker-compose.yml

@@ -19,8 +19,7 @@ services:
       - SMTP_SECURE=true
     command: npm run migration:latest
     pull_policy: always
-    networks:
+
-      - dokploy-network
 
   backend:
     restart: unless-stopped
@@ -46,8 +45,7 @@ services:
       - SMTP_USERNAME
       - SMTP_PASSWORD
       - SMTP_SECURE=true
-    networks:
+
-      - dokploy-network
 
   redis:
     image: redis:7.4.1
@@ -55,8 +53,7 @@ services:
     restart: always
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
-    networks:
+
-      - dokploy-network
     volumes:
       - redis_infisical_data:/data
 
@@ -69,8 +66,7 @@ services:
       - POSTGRES_DB
     volumes:
       - pg_infisical_data:/var/lib/postgresql/data
-    networks:
+
-      - dokploy-network
     healthcheck:
       test: "pg_isready --username=${POSTGRES_USER} && psql --username=${POSTGRES_USER} --list"
       interval: 5s

apps/dokploy/templates/invoiceshelf/docker-compose.yml

@@ -3,8 +3,7 @@ version: "3.8"
 services:
   invoiceshelf-postgres:
     image: postgres:15
-    networks:
+
-      - dokploy-network
     volumes:
       - invoiceshelf-postgres-data:/var/lib/postgresql/data
     environment:
@@ -19,8 +18,7 @@ services:
 
   invoiceshelf-app:
     image: invoiceshelf/invoiceshelf:latest
-    networks:
+
-      - dokploy-network
     volumes:
       - invoiceshelf-app-data:/data
       - invoiceshelf-app-conf:/conf

apps/dokploy/templates/kimai/docker-compose.yml

@@ -16,8 +16,7 @@ services:
     depends_on:
       db:
         condition: service_healthy
-    networks:
+
-      - dokploy-network
   db:
     image: mariadb:10.11
     restart: unless-stopped
@@ -39,8 +38,7 @@ services:
       timeout: 5s
       retries: 5
       start_period: 30s
-    networks:
+
-      - dokploy-network
 
 networks:
   dokploy-network:

apps/dokploy/templates/langflow/docker-compose.yml

@@ -12,8 +12,7 @@ services:
       # This variable defines where the logs, file storage, monitor data and secret keys are stored.
     volumes:
       - langflow-data:/app/langflow
-    networks:
+
-      - dokploy-network
 
   postgres-langflow:
     image: postgres:16
@@ -25,8 +24,7 @@ services:
       - 5432
     volumes:
       - langflow-postgres:/var/lib/postgresql/data
-    networks:
+
-      - dokploy-network
 
 volumes:
   langflow-postgres:

apps/dokploy/templates/listmonk/docker-compose.yml

@@ -3,8 +3,7 @@ services:
     image: postgres:17-alpine
     ports:
       - 5432
-    networks:
+
-      - dokploy-network
     environment:
       - POSTGRES_PASSWORD=listmonk
       - POSTGRES_USER=listmonk
@@ -20,8 +19,7 @@ services:
 
   setup:
     image: listmonk/listmonk:v4.1.0
-    networks:
+
-      - dokploy-network
     volumes:
       - ../files/config.toml:/listmonk/config.toml
     depends_on:

apps/dokploy/templates/logto/docker-compose.yml

@@ -8,8 +8,7 @@ services:
     ports:
       - 3001
       - 3002
-    networks:
+
-      - dokploy-network
     environment:
       TRUST_PROXY_HEADER: 1
       DB_URL: postgres://logto:${LOGTO_POSTGRES_PASSWORD}@postgres:5432/logto
@@ -20,8 +19,7 @@ services:
   postgres:
     image: postgres:17-alpine
     user: postgres
-    networks:
+
-      - dokploy-network
     environment:
       POSTGRES_USER: logto
       POSTGRES_PASSWORD: ${LOGTO_POSTGRES_PASSWORD}

apps/dokploy/templates/maybe/docker-compose.yml

@@ -24,8 +24,7 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
-    networks:
+
-      - dokploy-network
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:

apps/dokploy/templates/metabase/docker-compose.yml

@@ -22,5 +22,4 @@ services:
       POSTGRES_USER: metabase
       POSTGRES_DB: metabaseappdb
       POSTGRES_PASSWORD: mysecretpassword
-    networks:
+
-      - dokploy-network

apps/dokploy/templates/nextcloud-aio/docker-compose.yml

@@ -2,8 +2,7 @@ services:
   nextcloud:
     image: nextcloud:30.0.2
     restart: always
-    networks:
+
-      - dokploy-network
     ports:
       - 80
     volumes:
@@ -19,8 +18,7 @@ services:
   nextcloud_db:
     image: mariadb
     restart: always
-    networks:
+
-      - dokploy-network
     volumes:
       - nextcloud_db_data:/var/lib/mysql
     environment:

apps/dokploy/templates/nocodb/docker-compose.yml

@@ -13,8 +13,7 @@ services:
   root_db:
     image: postgres:17
     restart: always
-    networks:
+
-      - dokploy-network
     environment:
       POSTGRES_DB: root_db
       POSTGRES_PASSWORD: password

apps/dokploy/templates/odoo/docker-compose.yml

@@ -15,8 +15,7 @@ services:
 
   db:
     image: postgres:13
-    networks:
+
-      - dokploy-network
     environment:
       - POSTGRES_DB=postgres
       - POSTGRES_USER=odoo

apps/dokploy/templates/open-webui/docker-compose.yml

@@ -3,8 +3,7 @@ services:
   ollama:
     volumes:
       - ollama:/root/.ollama
-    networks:
+
-      - dokploy-network
     pull_policy: always
     tty: true
     restart: unless-stopped

apps/dokploy/templates/penpot/docker-compose.yml

@@ -46,8 +46,7 @@ services:
       - penpot-backend
       - penpot-exporter
 
-    networks:
+
-      - dokploy-network
 
     environment:
       PENPOT_FLAGS: disable-email-verification enable-smtp enable-prepl-server disable-secure-session-cookies
@@ -63,8 +62,7 @@ services:
       - penpot-postgres
       - penpot-redis
 
-    networks:
+
-      - dokploy-network
 
     ## Configuration envronment variables for the backend
     ## container.
@@ -143,8 +141,7 @@ services:
   penpot-exporter:
     image: "penpotapp/exporter:2.3.2"
     restart: always
-    networks:
+
-      - dokploy-network
 
     environment:
       # Don't touch it; this uses an internal docker network to
@@ -162,8 +159,7 @@ services:
     volumes:
       - penpot_postgres_v15:/var/lib/postgresql/data
 
-    networks:
+
-      - dokploy-network
 
     environment:
       - POSTGRES_INITDB_ARGS=--data-checksums
@@ -174,8 +170,7 @@ services:
   penpot-redis:
     image: redis:7.2
     restart: always
-    networks:
+
-      - dokploy-network
 
   ## A mailcatch service, used as temporal SMTP server. You can access via HTTP to the
   ## port 1080 for read all emails the penpot platform has sent. Should be only used as a
@@ -188,8 +183,7 @@ services:
       - '1025'
     ports:
       - 1080
-    networks:
+
-      - dokploy-network
 
   ## Example configuration of MiniIO (S3 compatible object storage service); If you don't
   ## have preference, then just use filesystem, this is here just for the completeness.

apps/dokploy/templates/peppermint/docker-compose.yml

@@ -4,8 +4,7 @@ services:
   peppermint-postgres:
     image: postgres:latest
     restart: always
-    networks:
+
-      - dokploy-network
     volumes:
       - peppermint-postgres-data:/var/lib/postgresql/data
     environment:
@@ -21,8 +20,7 @@ services:
   peppermint-app:
     image: pepperlabs/peppermint:latest
     restart: always
-    networks:
+
-      - dokploy-network
     depends_on:
       peppermint-postgres:
         condition: service_healthy

apps/dokploy/templates/photoprism/docker-compose.yml

@@ -7,8 +7,7 @@ services:
     security_opt:
       - seccomp:unconfined
       - apparmor:unconfined
-    networks:
+
-      - dokploy-network
     environment:
       PHOTOPRISM_ADMIN_USER: "admin"
       PHOTOPRISM_ADMIN_PASSWORD: ${ADMIN_PASSWORD}
@@ -57,8 +56,7 @@ services:
     image: mariadb:11
     restart: unless-stopped
     stop_grace_period: 5s
-    networks:
+
-      - dokploy-network
     security_opt:
       - seccomp:unconfined
       - apparmor:unconfined

apps/dokploy/templates/phpmyadmin/docker-compose.yml

@@ -10,8 +10,7 @@ services:
       MYSQL_PASSWORD: ${MYSQL_PASSWORD}
     volumes:
       - db_data:/var/lib/mysql
-    networks:
+
-      - dokploy-network
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:5.2.1

apps/dokploy/templates/plausible/docker-compose.yml

@@ -3,8 +3,7 @@ services:
   plausible_db:
     image: postgres:16-alpine
     restart: always
-    networks:
+
-      - dokploy-network
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:
@@ -13,8 +12,7 @@ services:
   plausible_events_db:
     image: clickhouse/clickhouse-server:24.3.3.102-alpine
     restart: always
-    networks:
+
-      - dokploy-network
     volumes:
       - event-data:/var/lib/clickhouse
       - event-logs:/var/log/clickhouse-server

apps/dokploy/templates/portainer/docker-compose.yml

@@ -6,8 +6,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/lib/docker/volumes:/var/lib/docker/volumes
-    networks:
+
-      - dokploy-network
     
     deploy:
       mode: global

apps/dokploy/templates/postiz/docker-compose.yml

@@ -4,8 +4,7 @@ services:
   postiz-app:
     image: ghcr.io/gitroomhq/postiz-app:latest
     restart: always
-    networks:
+
-      - dokploy-network
     environment:
       MAIN_URL: "https://${POSTIZ_HOST}"
       FRONTEND_URL: "https://${POSTIZ_HOST}"
@@ -30,8 +29,7 @@ services:
   postiz-postgres:
     image: postgres:17-alpine
     restart: always
-    networks:
+
-      - dokploy-network
     environment:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_USER: ${DB_USER}
@@ -47,8 +45,7 @@ services:
   postiz-redis:
     image: redis:7.2
     restart: always
-    networks:
+
-      - dokploy-network
     healthcheck:
       test: redis-cli ping
       interval: 10s

apps/dokploy/templates/rocketchat/docker-compose.yml

@@ -28,8 +28,7 @@ services:
       MONGODB_ADVERTISED_HOSTNAME: mongodb
       MONGODB_ENABLE_JOURNAL: true
       ALLOW_EMPTY_PASSWORD: yes
-    networks:
+
-      - dokploy-network
 
 volumes:
   mongodb_data: { driver: local }

apps/dokploy/templates/roundcube/docker-compose.yml

@@ -9,8 +9,7 @@ services:
       - ROUNDCUBEMAIL_SKIN=elastic
       - ROUNDCUBEMAIL_DEFAULT_HOST=${DEFAULT_HOST}
       - ROUNDCUBEMAIL_SMTP_SERVER=${SMTP_SERVER}
-    networks:
+
-      - dokploy-network
 
 networks:
   dokploy-network:

apps/dokploy/templates/ryot/docker-compose.yml

@@ -3,8 +3,7 @@ version: '3.7'
 services:
   ryot-app:
     image: ignisda/ryot:v7.10
-    networks:
+
-      - dokploy-network
     environment:
       - DATABASE_URL=postgres://postgres:${POSTGRES_PASSWORD}@ryot-db:5432/postgres
       - SERVER_ADMIN_ACCESS_TOKEN=${ADMIN_ACCESS_TOKEN}
@@ -19,8 +18,7 @@ services:
 
   ryot-db:
     image: postgres:16-alpine
-    networks:
+
-      - dokploy-network
     volumes:
       - ryot-postgres-data:/var/lib/postgresql/data
     environment:

apps/dokploy/templates/slash/docker-compose.yml

@@ -3,8 +3,7 @@ version: "3.8"
 services:
   slash-app:
     image: yourselfhosted/slash:latest
-    networks:
+
-      - dokploy-network
     volumes:
       - slash-app-data:/var/opt/slash
     environment:
@@ -17,8 +16,7 @@ services:
 
   slash-postgres:
     image: postgres:16-alpine
-    networks:
+
-      - dokploy-network
     volumes:
       - slash-postgres-data:/var/lib/postgresql/data
     environment:

apps/dokploy/templates/supabase/docker-compose.yml

@@ -11,8 +11,7 @@ services:
   studio:
     container_name: supabase-studio
     image: supabase/studio:20240729-ce42139
-    networks:
+
-      - dokploy-network
     restart: unless-stopped
     healthcheck:
       test:
@@ -53,8 +52,7 @@ services:
     container_name: supabase-kong
     image: kong:2.8.1
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     # https://unix.stackexchange.com/a/294837
     entrypoint: bash -c 'eval "echo \"$$(cat ~/temp.yml)\"" > ~/kong.yml && /docker-entrypoint.sh kong docker-start'
     #ports:
@@ -85,8 +83,7 @@ services:
   auth:
     container_name: supabase-auth
     image: supabase/gotrue:v2.158.1
-    networks:
+
-      - dokploy-network
     depends_on:
       db:
         # Disable this if you are using an external Postgres database
@@ -157,8 +154,7 @@ services:
   rest:
     container_name: supabase-rest
     image: postgrest/postgrest:v12.2.0
-    networks:
+
-      - dokploy-network
     depends_on:
       db:
         # Disable this if you are using an external Postgres database
@@ -180,8 +176,7 @@ services:
     # This container name looks inconsistent but is correct because realtime constructs tenant id by parsing the subdomain
     container_name: realtime-dev.supabase-realtime
     image: supabase/realtime:v2.30.23
-    networks:
+
-      - dokploy-network
     depends_on:
       db:
         # Disable this if you are using an external Postgres database
@@ -226,8 +221,7 @@ services:
   storage:
     container_name: supabase-storage
     image: supabase/storage-api:v1.0.6
-    networks:
+
-      - dokploy-network
     depends_on:
       db:
         # Disable this if you are using an external Postgres database
@@ -271,8 +265,7 @@ services:
   imgproxy:
     container_name: supabase-imgproxy
     image: darthsim/imgproxy:v3.8.0
-    networks:
+
-      - dokploy-network
     healthcheck:
       test: ["CMD", "imgproxy", "health"]
       timeout: 5s
@@ -289,8 +282,7 @@ services:
   meta:
     container_name: supabase-meta
     image: supabase/postgres-meta:v0.83.2
-    networks:
+
-      - dokploy-network
     depends_on:
       db:
         # Disable this if you are using an external Postgres database
@@ -310,8 +302,7 @@ services:
     container_name: supabase-edge-functions
     image: supabase/edge-runtime:v1.56.0
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     depends_on:
       analytics:
         condition: service_healthy
@@ -333,8 +324,7 @@ services:
   analytics:
     container_name: supabase-analytics
     image: supabase/logflare:1.4.0
-    networks:
+
-      - dokploy-network
     healthcheck:
       test: ["CMD", "curl", "http://localhost:4000/health"]
       timeout: 5s
@@ -380,8 +370,7 @@ services:
   db:
     container_name: supabase-db
     image: supabase/postgres:15.1.1.78
-    networks:
+
-      - dokploy-network
     healthcheck:
       test: pg_isready -U postgres -h localhost
       interval: 5s
@@ -430,8 +419,7 @@ services:
   vector:
     container_name: supabase-vector
     image: timberio/vector:0.28.1-alpine
-    networks:
+
-      - dokploy-network
     healthcheck:
       test:
         [

apps/dokploy/templates/superset/docker-compose.yml

@@ -43,8 +43,7 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-    networks:
+
-      - dokploy-network
 
   superset_redis:
     image: redis
@@ -57,8 +56,7 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-    networks:
+
-      - dokploy-network
 
 volumes:
   superset_postgres_data:

apps/dokploy/templates/teable/docker-compose.yml

@@ -41,8 +41,7 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-    networks:
+
-      - dokploy-network
     healthcheck:
       test:
         [
@@ -58,8 +57,7 @@ services:
     environment:
       - TZ=${TIMEZONE}
       - PRISMA_DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-    networks:
+
-      - dokploy-network
     depends_on:
       teable-db:
         condition: service_healthy

apps/dokploy/templates/templates.ts

@@ -1482,6 +1482,5 @@ export const templates: TemplateData[] = [
 		},
 		tags: ["forms", "analytics"],
 		load: () => import("./formbricks/index").then((m) => m.generate),
-
 	},
 ];

apps/dokploy/templates/twenty/docker-compose.yml

@@ -4,8 +4,7 @@ services:
   twenty-change-vol-ownership:
     image: ubuntu
     user: root
-    networks:
+
-      - dokploy-network
     volumes:
       - twenty-server-local-data:/tmp/server-local-data
       - twenty-docker-data:/tmp/docker-data
@@ -16,8 +15,7 @@ services:
 
   twenty-server:
     image: twentycrm/twenty:latest
-    networks:
+
-      - dokploy-network
     volumes:
       - twenty-server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage}
       - twenty-docker-data:/app/docker-data
@@ -45,8 +43,7 @@ services:
 
   twenty-worker:
     image: twentycrm/twenty:latest
-    networks:
+
-      - dokploy-network
     command: ["yarn", "worker:prod"]
     environment:
       PG_DATABASE_URL: postgres://${DB_USER}:${DB_PASSWORD}@twenty-postgres:5432/twenty
@@ -65,8 +62,7 @@ services:
 
   twenty-postgres:
     image: postgres:16-alpine
-    networks:
+
-      - dokploy-network
     volumes:
       - twenty-postgres-data:/var/lib/postgresql/data
     environment:
@@ -82,8 +78,7 @@ services:
 
   twenty-redis:
     image: redis:latest
-    networks:
+
-      - dokploy-network
     volumes:
       - twenty-redis-data:/data
     healthcheck:

apps/dokploy/templates/typebot/docker-compose.yml

@@ -13,8 +13,7 @@ services:
       POSTGRES_USER: typebot
       POSTGRES_DB: typebot
       POSTGRES_PASSWORD: typebot
-    networks:
+
-      - dokploy-network
 
   typebot-builder:
     image: baptistearno/typebot-builder:2.27

apps/dokploy/templates/umami/docker-compose.yml

@@ -22,8 +22,7 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
-    networks:
+
-      - dokploy-network
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:

apps/dokploy/templates/unifi/docker-compose.yml

@@ -29,8 +29,7 @@ services:
     restart: unless-stopped
     depends_on:
       - unifi-db
-    networks:
+
-      - dokploy-network
 
   unifi-db:
     image: mongo:4.4
@@ -40,8 +39,7 @@ services:
     ports:
       - 27017
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
 
 networks:
   dokploy-network:

apps/dokploy/templates/unsend/docker-compose.yml

@@ -3,8 +3,7 @@ name: unsend-prod
 services:
   unsend-db-prod:
     image: postgres:16
-    networks:
+
-      - dokploy-network
     restart: always
     environment:
       - POSTGRES_USER=${POSTGRES_USER:?err}
@@ -22,8 +21,7 @@ services:
 
   unsend-redis-prod:
     image: redis:7
-    networks:
+
-      - dokploy-network
     restart: always
     # ports:
     #   - "6379:6379"
@@ -33,8 +31,7 @@ services:
 
   unsend-storage-prod:
     image: minio/minio:RELEASE.2024-11-07T00-52-20Z
-    networks:
+
-      - dokploy-network
     ports:
       - 9002
       - 9001
@@ -48,8 +45,6 @@ services:
 
   unsend:
     image: unsend/unsend:v1.3.2
-    networks:
-      - dokploy-network
     restart: always
     ports:
       - ${PORT:-3000}

apps/dokploy/templates/windmill/docker-compose.yml

@@ -7,8 +7,7 @@ services:
     restart: unless-stopped
     volumes:
       - windmill-postgres-data:/var/lib/postgresql/data
-    networks:
+
-      - dokploy-network
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: windmill
@@ -20,8 +19,7 @@ services:
 
   windmill-server:
     image: ghcr.io/windmill-labs/windmill:main
-    networks:
+
-      - dokploy-network
     restart: unless-stopped
     environment:
       - DATABASE_URL=${DATABASE_URL}
@@ -42,8 +40,7 @@ services:
           cpus: "1"
           memory: 2048M
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     environment:
       - DATABASE_URL=${DATABASE_URL}
       - MODE=worker
@@ -65,8 +62,7 @@ services:
           cpus: "0.1"
           memory: 128M
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     environment:
       - DATABASE_URL=${DATABASE_URL}
       - MODE=worker
@@ -82,16 +78,14 @@ services:
   windmill-lsp:
     image: ghcr.io/windmill-labs/windmill-lsp:latest
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     volumes:
       - windmill-lsp-cache:/root/.cache
 
   windmill-caddy:
     image: ghcr.io/windmill-labs/caddy-l4:latest
     restart: unless-stopped
-    networks:
+
-      - dokploy-network
     volumes:
       - ../files/Caddyfile:/etc/caddy/Caddyfile
     environment:

apps/dokploy/templates/wordpress/docker-compose.yml

@@ -12,8 +12,6 @@ services:
 
   db:
     image: mysql:5.7.34
-    networks:
-      - dokploy-network
     environment:
       MYSQL_DATABASE: exampledb
       MYSQL_USER: exampleuser

apps/dokploy/templates/yourls/docker-compose.yml

@@ -3,8 +3,7 @@ version: '3.7'
 services:
   yourls-app:
     image: yourls:1.9.2
-    networks:
+
-      - dokploy-network
     environment:
       YOURLS_SITE: https://${YOURLS_HOST}
       YOURLS_USER: ${YOURLS_ADMIN_USER}
@@ -22,8 +21,7 @@ services:
 
   yourls-mysql:
     image: mysql:5.7
-    networks:
+
-      - dokploy-network
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
       MYSQL_DATABASE: yourls

apps/dokploy/templates/zipline/docker-compose.yml

@@ -2,8 +2,7 @@ version: "3"
 services:
   postgres:
     image: postgres:15
-    networks:
+
-      - dokploy-network
     restart: unless-stopped
     environment:
       - POSTGRES_USER=postgres

packages/server/src/db/schema/compose.ts

@@ -69,6 +69,7 @@ export const compose = pgTable("compose", {
 	composePath: text("composePath").notNull().default("./docker-compose.yml"),
 	suffix: text("suffix").notNull().default(""),
 	randomize: boolean("randomize").notNull().default(false),
+	isolatedDeployment: boolean("isolatedDeployment").notNull().default(false),
 	composeStatus: applicationStatus("composeStatus").notNull().default("idle"),
 	projectId: text("projectId")
 		.notNull()

packages/server/src/index.ts

@@ -73,6 +73,7 @@ export * from "./utils/builders/utils";
 export * from "./utils/cluster/upload";
 
 export * from "./utils/docker/compose";
+export * from "./utils/docker/collision";
 export * from "./utils/docker/domain";
 export * from "./utils/docker/utils";
 export * from "./utils/docker/types";

packages/server/src/utils/builders/compose.ts

@@ -34,6 +34,12 @@ export const buildCompose = async (compose: ComposeNested, logPath: string) => {
 		await writeDomainsToCompose(compose, domains);
 		createEnvFile(compose);
 
+		if (compose.isolatedDeployment) {
+			await execAsync(
+				`docker network inspect ${compose.appName} >/dev/null 2>&1 || docker network create --attachable ${compose.appName}`,
+			);
+		}
+
 		const logContent = `
     App Name: ${appName}
     Build Compose 🐳
@@ -73,6 +79,12 @@ export const buildCompose = async (compose: ComposeNested, logPath: string) => {
 			},
 		);
 
+		if (compose.isolatedDeployment) {
+			await execAsync(
+				`docker network connect ${compose.appName} $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1`,
+			);
+		}
+
 		writeStream.write("Docker Compose Deployed: ✅");
 	} catch (error) {
 		writeStream.write(`Error ❌ ${(error as Error).message}`);
@@ -129,8 +141,9 @@ Compose Type: ${composeType} ✅`;
 		cd "${projectPath}";
 
         ${exportEnvCommand}
-
+		${compose.isolatedDeployment ? `docker network inspect ${compose.appName} >/dev/null 2>&1 || docker network create --attachable ${compose.appName}` : ""}
 		docker ${command.split(" ").join(" ")} >> "${logPath}" 2>&1 || { echo "Error: ❌ Docker command failed" >> "${logPath}"; exit 1; }
+		${compose.isolatedDeployment ? `docker network connect ${compose.appName} $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1` : ""}
 	
 		echo "Docker Compose Deployed: ✅" >> "${logPath}"
 	} || {

packages/server/src/utils/docker/collision.ts

@@ -0,0 +1,46 @@
+import { findComposeById } from "@dokploy/server/services/compose";
+import { dump, load } from "js-yaml";
+import { addAppNameToAllServiceNames } from "./collision/root-network";
+import { generateRandomHash } from "./compose";
+import { addSuffixToAllVolumes } from "./compose/volume";
+import type { ComposeSpecification } from "./types";
+
+export const addAppNameToPreventCollision = (
+	composeData: ComposeSpecification,
+	appName: string,
+): ComposeSpecification => {
+	let updatedComposeData = { ...composeData };
+
+	updatedComposeData = addAppNameToAllServiceNames(updatedComposeData, appName);
+	updatedComposeData = addSuffixToAllVolumes(updatedComposeData, appName);
+	return updatedComposeData;
+};
+
+export const randomizeIsolatedDeploymentComposeFile = async (
+	composeId: string,
+	suffix?: string,
+) => {
+	const compose = await findComposeById(composeId);
+	const composeFile = compose.composeFile;
+	const composeData = load(composeFile) as ComposeSpecification;
+
+	const randomSuffix = suffix || compose.appName || generateRandomHash();
+
+	const newComposeFile = addAppNameToPreventCollision(
+		composeData,
+		randomSuffix,
+	);
+
+	return dump(newComposeFile);
+};
+
+export const randomizeDeployableSpecificationFile = (
+	composeSpec: ComposeSpecification,
+	suffix?: string,
+) => {
+	if (!suffix) {
+		return composeSpec;
+	}
+	const newComposeFile = addAppNameToPreventCollision(composeSpec, suffix);
+	return newComposeFile;
+};

packages/server/src/utils/docker/collision/root-network.ts

@@ -0,0 +1,62 @@
+import _ from "lodash";
+import type { ComposeSpecification, DefinitionsService } from "../types";
+
+export const addAppNameToRootNetwork = (
+	composeData: ComposeSpecification,
+	appName: string,
+): ComposeSpecification => {
+	const updatedComposeData = { ...composeData };
+
+	// Initialize networks if it doesn't exist
+	if (!updatedComposeData.networks) {
+		updatedComposeData.networks = {};
+	}
+
+	// Add the new network with the app name
+	updatedComposeData.networks[appName] = {
+		name: appName,
+		external: true,
+	};
+
+	return updatedComposeData;
+};
+
+export const addAppNameToServiceNetworks = (
+	services: { [key: string]: DefinitionsService },
+	appName: string,
+): { [key: string]: DefinitionsService } => {
+	return _.mapValues(services, (service) => {
+		if (!service.networks) {
+			service.networks = [appName];
+			return service;
+		}
+
+		if (Array.isArray(service.networks)) {
+			if (!service.networks.includes(appName)) {
+				service.networks.push(appName);
+			}
+		} else {
+			service.networks[appName] = {};
+		}
+
+		return service;
+	});
+};
+
+export const addAppNameToAllServiceNames = (
+	composeData: ComposeSpecification,
+	appName: string,
+): ComposeSpecification => {
+	let updatedComposeData = { ...composeData };
+
+	updatedComposeData = addAppNameToRootNetwork(updatedComposeData, appName);
+
+	if (updatedComposeData.services) {
+		updatedComposeData.services = addAppNameToServiceNetworks(
+			updatedComposeData.services,
+			appName,
+		);
+	}
+
+	return updatedComposeData;
+};

packages/server/src/utils/docker/domain.ts

@@ -26,6 +26,7 @@ import {
 	createComposeFileRaw,
 	createComposeFileRawRemote,
 } from "../providers/raw";
+import { randomizeDeployableSpecificationFile } from "./collision";
 import { randomizeSpecificationFile } from "./compose";
 import type {
 	ComposeSpecification,
@@ -190,7 +191,13 @@ export const addDomainToCompose = async (
 		return null;
 	}
 
-	if (compose.randomize) {
+	if (compose.isolatedDeployment) {
+		const randomized = randomizeDeployableSpecificationFile(
+			result,
+			compose.suffix || compose.appName,
+		);
+		result = randomized;
+	} else if (compose.randomize) {
 		const randomized = randomizeSpecificationFile(result, compose.suffix);
 		result = randomized;
 	}
@@ -240,14 +247,18 @@ export const addDomainToCompose = async (
 			labels.push(...httpLabels);
 		}
 
+		if (!compose.isolatedDeployment) {
 			// Add the dokploy-network to the service
 			result.services[serviceName].networks = addDokployNetworkToService(
 				result.services[serviceName].networks,
 			);
 		}
+	}
 
 	// Add dokploy-network to the root of the compose file
+	if (!compose.isolatedDeployment) {
 		result.networks = addDokployNetworkToRoot(result.networks);
+	}
 
 	return result;
 };