From 56b565b512f5a2a5307d8fa48ecd4e3c97992c1e Mon Sep 17 00:00:00 2001 From: Dominik Koch Date: Fri, 8 Nov 2024 20:39:55 +0000 Subject: [PATCH 01/10] fix: add colorized svgs --- .../components/icons/data-tools-icons.tsx | 68 ++++++++++--------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/apps/dokploy/components/icons/data-tools-icons.tsx b/apps/dokploy/components/icons/data-tools-icons.tsx index 43c2b371..b47b568a 100644 --- a/apps/dokploy/components/icons/data-tools-icons.tsx +++ b/apps/dokploy/components/icons/data-tools-icons.tsx @@ -161,29 +161,27 @@ export const GitlabIcon = ({ className }: Props) => { return ( ); @@ -209,30 +207,34 @@ export const GithubIcon = ({ className }: Props) => { export const BitbucketIcon = ({ className }: Props) => { return ( - + + + - - + + - - ); }; From e238dd8510488213a978701285238099a9d935e5 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 10 Nov 2024 00:28:27 -0600 Subject: [PATCH 02/10] chore(readme): add dokploy cloud message --- README.md | 2 ++ apps/dokploy/package.json | 2 +- apps/dokploy/server/server.ts | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1c8ef836..72620ef8 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,8 @@ Dokploy includes multiple features to make your life easier. 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 ``` diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index e62bb1dd..47dddfc9 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -11,7 +11,7 @@ "build-next": "next build", "setup": "tsx -r dotenv/config setup.ts && sleep 5 && pnpm run migration:run", "reset-password": "node -r dotenv/config dist/reset-password.mjs", - "dev": "TURBOPACK=1 tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ", + "dev": "tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ", "studio": "drizzle-kit studio --config ./server/db/drizzle.config.ts", "migration:generate": "drizzle-kit generate --config ./server/db/drizzle.config.ts", "migration:run": "tsx -r dotenv/config migration.ts", diff --git a/apps/dokploy/server/server.ts b/apps/dokploy/server/server.ts index b65446f8..bf111233 100644 --- a/apps/dokploy/server/server.ts +++ b/apps/dokploy/server/server.ts @@ -24,7 +24,7 @@ import { setupTerminalWebSocketServer } from "./wss/terminal"; config({ path: ".env" }); const PORT = Number.parseInt(process.env.PORT || "3000", 10); const dev = process.env.NODE_ENV !== "production"; -const app = next({ dev, turbopack: dev }); +const app = next({ dev }); const handle = app.getRequestHandler(); void app.prepare().then(async () => { try { From 2774701895a8b289dc3aba0bf3317dfc56120ca9 Mon Sep 17 00:00:00 2001 From: AprilNEA Date: Sun, 10 Nov 2024 07:38:16 +0000 Subject: [PATCH 03/10] fix: fix github icon path fill color #672 --- apps/dokploy/components/icons/data-tools-icons.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/dokploy/components/icons/data-tools-icons.tsx b/apps/dokploy/components/icons/data-tools-icons.tsx index 43c2b371..cf6cbc35 100644 --- a/apps/dokploy/components/icons/data-tools-icons.tsx +++ b/apps/dokploy/components/icons/data-tools-icons.tsx @@ -200,7 +200,6 @@ export const GithubIcon = ({ className }: Props) => { > From 000091cfb9b1cbeb93f76e8bb04d189972451a2b Mon Sep 17 00:00:00 2001 From: AprilNEA Date: Sun, 10 Nov 2024 07:46:45 +0000 Subject: [PATCH 04/10] fix: fix github icon in git providers of setting page --- .../dashboard/settings/git/github/add-github-provider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx b/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx index 914d0338..d7e5e418 100644 --- a/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx +++ b/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx @@ -55,7 +55,7 @@ export const AddGithubProvider = () => { From ed5b01c78d152c56664310221f6def2f2f78117f Mon Sep 17 00:00:00 2001 From: AprilNEA Date: Sun, 10 Nov 2024 07:51:48 +0000 Subject: [PATCH 05/10] styles: fix code format style --- .../dashboard/settings/git/github/add-github-provider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx b/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx index d7e5e418..d4178838 100644 --- a/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx +++ b/apps/dokploy/components/dashboard/settings/git/github/add-github-provider.tsx @@ -55,7 +55,7 @@ export const AddGithubProvider = () => { From 9728c49edd0bb0484de4f316cc01835ea0e8d1ae Mon Sep 17 00:00:00 2001 From: Dominik Koch Date: Sun, 10 Nov 2024 10:56:38 +0100 Subject: [PATCH 06/10] fix: mongodb naming --- packages/server/src/services/mongo.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/server/src/services/mongo.ts b/packages/server/src/services/mongo.ts index 1360372d..b87ec4da 100644 --- a/packages/server/src/services/mongo.ts +++ b/packages/server/src/services/mongo.ts @@ -14,7 +14,7 @@ export type Mongo = typeof mongo.$inferSelect; export const createMongo = async (input: typeof apiCreateMongo._type) => { input.appName = - `${input.appName}-${generatePassword(6)}` || generateAppName("postgres"); + `${input.appName}-${generatePassword(6)}` || generateAppName("mongo"); if (input.appName) { const valid = await validUniqueServerAppName(input.appName); @@ -72,12 +72,12 @@ export const findMongoById = async (mongoId: string) => { export const updateMongoById = async ( mongoId: string, - postgresData: Partial, + mongoData: Partial, ) => { const result = await db .update(mongo) .set({ - ...postgresData, + ...mongoData, }) .where(eq(mongo.mongoId, mongoId)) .returning(); From 046923aeb335381835fa3b3028607e5c2d2e50df Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 10 Nov 2024 18:38:43 -0600 Subject: [PATCH 07/10] Update data-tools-icons.tsx --- apps/dokploy/components/icons/data-tools-icons.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/components/icons/data-tools-icons.tsx b/apps/dokploy/components/icons/data-tools-icons.tsx index b47b568a..116f5d8a 100644 --- a/apps/dokploy/components/icons/data-tools-icons.tsx +++ b/apps/dokploy/components/icons/data-tools-icons.tsx @@ -198,7 +198,7 @@ export const GithubIcon = ({ className }: Props) => { > From e0fe4e499531fdf538e26361e561e4c77e072d2b Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 10 Nov 2024 19:06:45 -0600 Subject: [PATCH 08/10] chore: bump version --- apps/dokploy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 47dddfc9..9573eee5 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.10.10", + "version": "v0.11.0", "private": true, "license": "Apache-2.0", "type": "module", From 58b185f6ddb55069fd7eab962b38ae8f940bf905 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 12 Nov 2024 00:52:10 -0600 Subject: [PATCH 09/10] fix(compose): add path prefix inside Host rule --- apps/dokploy/__test__/compose/domain/labels.test.ts | 9 ++++----- packages/server/src/utils/docker/domain.ts | 10 ++-------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/apps/dokploy/__test__/compose/domain/labels.test.ts b/apps/dokploy/__test__/compose/domain/labels.test.ts index 4123b287..8b5c2f9c 100644 --- a/apps/dokploy/__test__/compose/domain/labels.test.ts +++ b/apps/dokploy/__test__/compose/domain/labels.test.ts @@ -26,7 +26,6 @@ describe("createDomainLabels", () => { "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", - "traefik.http.routers.test-app-1-web.rule=PathPrefix(`/`)", ]); }); @@ -37,21 +36,21 @@ describe("createDomainLabels", () => { "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", - "traefik.http.routers.test-app-1-websecure.rule=PathPrefix(`/`)", ]); }); - it("shouldn't add the path prefix if is empty", async () => { + it("should add the path prefix if is different than / empty", async () => { const labels = await createDomainLabels( appName, { ...baseDomain, - path: "", + path: "/hello", }, "websecure", ); + expect(labels).toEqual([ - "traefik.http.routers.test-app-1-websecure.rule=Host(`example.com`)", + "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", diff --git a/packages/server/src/utils/docker/domain.ts b/packages/server/src/utils/docker/domain.ts index a065f31c..69bfa222 100644 --- a/packages/server/src/utils/docker/domain.ts +++ b/packages/server/src/utils/docker/domain.ts @@ -259,21 +259,15 @@ export const createDomainLabels = async ( domain: Domain, entrypoint: "web" | "websecure", ) => { - const { host, port, https, uniqueConfigKey, certificateType } = domain; + const { host, port, https, uniqueConfigKey, certificateType, path } = domain; const routerName = `${appName}-${uniqueConfigKey}-${entrypoint}`; const labels = [ - `traefik.http.routers.${routerName}.rule=Host(\`${host}\`)`, + `traefik.http.routers.${routerName}.rule=Host(\`${host}\`)${path && path !== "/" ? ` && PathPrefix(\`${path}\`)` : ""}`, `traefik.http.routers.${routerName}.entrypoints=${entrypoint}`, `traefik.http.services.${routerName}.loadbalancer.server.port=${port}`, `traefik.http.routers.${routerName}.service=${routerName}`, ]; - if (domain.path) { - labels.push( - `traefik.http.routers.${routerName}.rule=PathPrefix(\`${domain.path}\`)`, - ); - } - if (entrypoint === "web" && https) { labels.push( `traefik.http.routers.${routerName}.middlewares=redirect-to-https@file`, From 29ffdf2c717a89f4dbc12ea99cc878c71b580e07 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 12 Nov 2024 00:53:34 -0600 Subject: [PATCH 10/10] chore(version): bump version --- apps/dokploy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 9573eee5..ebee5cac 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.11.0", + "version": "v0.11.1", "private": true, "license": "Apache-2.0", "type": "module",