Merge pull request #185 from Dokploy/canary

v0.3.0

components/dashboard/compose/general/stop-compose.tsx

@@ -62,11 +62,11 @@ export const StopCompose = ({ composeId }: Props) => {
 											toast.success("Compose rebuild succesfully");
 										})
 										.catch(() => {
-											toast.error("Error to rebuild the compose");
+											toast.error("Error to stop the compose");
 										});
 								})
 								.catch(() => {
-									toast.error("Error to rebuild the compose");
+									toast.error("Error to stop the compose");
 								});
 						}}
 					>

components/dashboard/docker/show/show-containers.tsx

@@ -161,10 +161,6 @@ export const ShowContainers = () => {
 					</Table>
 				</div>
 				<div className="flex items-center justify-end space-x-2 py-4">
-					<div className="flex-1 text-sm text-muted-foreground">
-						{table.getFilteredSelectedRowModel().rows.length} of{" "}
-						{table.getFilteredRowModel().rows.length} row(s) selected.
-					</div>
 					<div className="space-x-2 flex flex-wrap">
 						<Button
 							variant="outline"

components/dashboard/project/add-template.tsx

@@ -54,7 +54,7 @@ export const AddTemplate = ({ projectId }: Props) => {
 				</DropdownMenuItem>
 			</DialogTrigger>
 			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-7xl p-0">
-				<div className="sticky top-0 z-10 flex flex-col gap-4 bg-black p-6 border-b">
+				<div className="sticky top-0 z-10 flex flex-col gap-4 dark:bg-black p-6 border-b">
 					<DialogHeader>
 						<DialogTitle>Create Template</DialogTitle>
 						<DialogDescription>

package.json

@@ -1,8 +1,8 @@
 {
   "name": "dokploy",
-  "version": "v0.2.5",
+  "version": "v0.3.0",
   "private": true,
-  "license": "AGPL-3.0-only",
+  "license": "Apache-2.0",
   "type": "module",
   "scripts": {
     "build": "npm run build-server && npm run build-next",
@@ -19,7 +19,7 @@
     "migration:drop": "drizzle-kit drop --config ./server/db/drizzle.config.ts",
     "db:push": "drizzle-kit --config ./server/db/drizzle.config.ts",
     "db:truncate": "tsx -r dotenv/config ./server/db/reset.ts",
-    "db:studio": "drizzle-kit studio",
+    "db:studio": "drizzle-kit studio --config ./server/db/drizzle.config.ts",
     "lint": "biome lint",
     "db:seed": "tsx -r dotenv/config ./server/db/seed.ts",
     "db:clean": "tsx -r dotenv/config ./server/db/reset.ts",

templates/appsmith/docker-compose.yml

@@ -0,0 +1,18 @@
+version: "3.8"
+services:
+   appsmith:
+     image: index.docker.io/appsmith/appsmith-ee:v1.29
+     networks:
+        - dokploy-network
+     ports:
+         - ${APP_SMITH_PORT}
+     labels:
+        - "traefik.enable=true"
+        - "traefik.http.routers.${HASH}.rule=Host(`${APP_SMITH_HOST}`)"
+        - "traefik.http.services.${HASH}.loadbalancer.server.port=${APP_SMITH_PORT}"
+     volumes:
+         - ./stacks:/appsmith-stacks
+
+networks:
+  dokploy-network:
+    external: true

templates/appsmith/index.ts

@@ -0,0 +1,20 @@
+import {
+	generateHash,
+	generateRandomDomain,
+	type Template,
+	type Schema,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainServiceHash = generateHash(schema.projectName);
+	const randomDomain = generateRandomDomain(schema);
+	const envs = [
+		`APP_SMITH_HOST=${randomDomain}`,
+		"APP_SMITH_PORT=80",
+		`HASH=${mainServiceHash}`,
+	];
+
+	return {
+		envs,
+	};
+}

templates/baserow/docker-compose.yml

@@ -0,0 +1,22 @@
+version: "3.8"
+services:
+  baserow:
+    image: baserow/baserow:1.25.2
+    networks:
+      - dokploy-network
+    environment:
+      BASEROW_PUBLIC_URL: "http://${BASEROW_HOST}"
+    ports:
+      - ${BASEROW_PORT}
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.${HASH}.rule=Host(`${BASEROW_HOST}`)
+      - traefik.http.services.${HASH}.loadbalancer.server.port=${BASEROW_PORT}
+    volumes:
+      - baserow_data:/baserow/data
+volumes:
+  baserow_data:
+
+networks:
+  dokploy-network:
+    external: true

templates/baserow/index.ts

@@ -0,0 +1,20 @@
+import {
+	generateHash,
+	generateRandomDomain,
+	type Template,
+	type Schema,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainServiceHash = generateHash(schema.projectName);
+	const randomDomain = generateRandomDomain(schema);
+	const envs = [
+		`BASEROW_HOST=${randomDomain}`,
+		"BASEROW_PORT=80",
+		`HASH=${mainServiceHash}`,
+	];
+
+	return {
+		envs,
+	};
+}

templates/calcom/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   postgres:
     image: postgres:16-alpine
@@ -17,8 +16,8 @@ services:
     depends_on:
       - postgres
     environment:
-      - NEXTAUTH_SECRET=asklmdaklsmdklasmdklasd
-      - CALENDSO_ENCRYPTION_KEY=asklmdaklsmdklasmdklasd
+      - NEXTAUTH_SECRET=${NEXTAUTH_SECRET}
+      - CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY}
       - DATABASE_URL=postgres://postgres:password@postgres:5432/db
       - NEXT_PUBLIC_WEBAPP_URL=http://${CALCOM_HOST}
       - NEXTAUTH_URL=http://${CALCOM_HOST}/api/auth

templates/calcom/index.ts

@@ -3,16 +3,22 @@ import {
 	generateRandomDomain,
 	type Template,
 	type Schema,
+    generateBase64,
 } from "../utils";
 
 // https://cal.com/
 export function generate(schema: Schema): Template {
 	const mainServiceHash = generateHash(schema.projectName);
 	const randomDomain = generateRandomDomain(schema);
+    const calcomEncryptionKey = generateBase64(32);
+    const nextAuthSecret = generateBase64(32);
+
 	const envs = [
 		`CALCOM_HOST=${randomDomain}`,
 		"CALCOM_PORT=3000",
 		`HASH=${mainServiceHash}`,
+        `NEXTAUTH_SECRET=${nextAuthSecret}`,
+        `CALENDSO_ENCRYPTION_KEY=${calcomEncryptionKey}`,
 	];
 
 	return {

templates/directus/docker-compose.yml

@@ -0,0 +1,56 @@
+version: "3.8"
+services:
+  database:
+    image: postgis/postgis:13-master
+    volumes:
+      - directus:/var/lib/postgresql/data
+    networks:
+      - dokploy-network
+    environment:
+      POSTGRES_USER: "directus"
+      POSTGRES_PASSWORD: "directus"
+      POSTGRES_DB: "directus"
+
+  cache:
+    image: redis:6
+    networks:
+      - dokploy-network
+
+  directus:
+    image: directus/directus:10.12.1
+    networks:
+      - dokploy-network
+    ports:
+      - 8055
+    volumes:
+      - ./uploads:/directus/uploads
+      - ./extensions:/directus/extensions
+    depends_on:
+      - cache
+      - database
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.${HASH}.rule=Host(`${DIRECTUS_HOST}`)
+      - traefik.http.services.${HASH}.loadbalancer.server.port=${DIRECTUS_PORT}
+    environment:
+      SECRET: "replace-with-secure-random-value"
+
+      DB_CLIENT: "pg"
+      DB_HOST: "database"
+      DB_PORT: "5432"
+      DB_DATABASE: "directus"
+      DB_USER: "directus"
+      DB_PASSWORD: "directus"
+
+      CACHE_ENABLED: "true"
+      CACHE_AUTO_PURGE: "true"
+      CACHE_STORE: "redis"
+      REDIS: "redis://cache:6379"
+
+      ADMIN_EMAIL: "[email protected]"
+      ADMIN_PASSWORD: "d1r3ctu5"
+networks:
+  dokploy-network:
+    external: true
+volumes:
+  directus: 

templates/directus/index.ts

@@ -0,0 +1,20 @@
+import {
+	generateHash,
+	generateRandomDomain,
+	type Template,
+	type Schema,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainServiceHash = generateHash(schema.projectName);
+	const randomDomain = generateRandomDomain(schema);
+	const envs = [
+		`DIRECTUS_HOST=${randomDomain}`,
+		"DIRECTUS_PORT=8055",
+		`HASH=${mainServiceHash}`,
+	];
+
+	return {
+		envs,
+	};
+}

templates/documenso/docker-compose.yml

@@ -0,0 +1,53 @@
+version: "3.8"
+services:
+  postgres:
+    image: postgres:16
+    networks:
+      - dokploy-network
+    volumes:
+      - documenso-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=documenso
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=documenso
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U documenso"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+
+  documenso:
+    image: documenso/documenso:1.5.6-rc.2
+    networks:
+      - dokploy-network
+    depends_on:
+      postgres:
+        condition: service_healthy
+    environment:
+      - PORT=${DOCUMENSO_PORT}
+      - NEXTAUTH_URL=http://${DOCUMENSO_HOST}
+      - NEXTAUTH_SECRET=${NEXTAUTH_SECRET}
+      - NEXT_PRIVATE_ENCRYPTION_KEY=${NEXT_PRIVATE_ENCRYPTION_KEY}
+      - NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY=${NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY}
+      - NEXT_PUBLIC_WEBAPP_URL=http://${DOCUMENSO_HOST}
+      - NEXT_PRIVATE_DATABASE_URL=postgres://documenso:password@postgres:5432/documenso
+      - NEXT_PRIVATE_DIRECT_DATABASE_URL=postgres://documenso:password@postgres:5432/documenso
+      - NEXT_PUBLIC_UPLOAD_TRANSPORT=database
+      - NEXT_PRIVATE_SMTP_TRANSPORT=smtp-auth
+      - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=/opt/documenso/cert.p12
+    ports:
+      - ${DOCUMENSO_PORT}
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.${HASH}.rule=Host(`${DOCUMENSO_HOST}`)"
+      - "traefik.http.services.${HASH}.loadbalancer.server.port=${DOCUMENSO_PORT}"
+    volumes:
+      - /opt/documenso/cert.p12:/opt/documenso/cert.p12
+
+networks:
+  dokploy-network:
+    external: true
+
+volumes:
+  documenso-data: