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 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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();