From 388399b370929cdf672bb193ccf8b99fe8b39299 Mon Sep 17 00:00:00 2001 From: Aleksandr Sokolov Date: Tue, 6 May 2025 13:02:26 +0200 Subject: [PATCH 1/6] fix: use root password instead of user one --- packages/server/src/utils/backups/utils.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/server/src/utils/backups/utils.ts b/packages/server/src/utils/backups/utils.ts index 0d4471f6..4f799a40 100644 --- a/packages/server/src/utils/backups/utils.ts +++ b/packages/server/src/utils/backups/utils.ts @@ -159,7 +159,10 @@ export const generateBackupCommand = (backup: BackupSchedule) => { case "mysql": { const mysql = backup.mysql; if (backupType === "database" && mysql) { - return getMysqlBackupCommand(backup.database, mysql.databasePassword); + return getMysqlBackupCommand( + backup.database, + mysql.databaseRootPassword, + ); } if (backupType === "compose" && backup.metadata?.mysql) { return getMysqlBackupCommand( From 8f14d854a0fa0c39b1ab11212e24793c8c376e4c Mon Sep 17 00:00:00 2001 From: Moritz Mauruschat <60385231+MauruschatM@users.noreply.github.com> Date: Tue, 6 May 2025 13:32:16 +0200 Subject: [PATCH 2/6] Update railpack to 0.064 --- packages/server/src/utils/builders/railpack.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/utils/builders/railpack.ts b/packages/server/src/utils/builders/railpack.ts index 55fd4049..481dc0fa 100644 --- a/packages/server/src/utils/builders/railpack.ts +++ b/packages/server/src/utils/builders/railpack.ts @@ -72,7 +72,7 @@ export const buildRailpack = async ( ] : []), "--build-arg", - "BUILDKIT_SYNTAX=ghcr.io/railwayapp/railpack-frontend:v0.0.55", + "BUILDKIT_SYNTAX=ghcr.io/railwayapp/railpack-frontend:v0.0.64", "-f", `${buildAppDirectory}/railpack-plan.json`, "--output", @@ -152,7 +152,7 @@ export const getRailpackCommand = ( ] : []), "--build-arg", - "BUILDKIT_SYNTAX=ghcr.io/railwayapp/railpack-frontend:v0.0.55", + "BUILDKIT_SYNTAX=ghcr.io/railwayapp/railpack-frontend:v0.0.64", "-f", `${buildAppDirectory}/railpack-plan.json`, "--output", From cd998c37f143abc34207681f847b113cb98d3f95 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 6 May 2025 23:04:58 -0600 Subject: [PATCH 3/6] refactor: update railpack --- Dockerfile | 2 +- packages/server/src/setup/server-setup.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e104eeb..98ed9851 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,7 +56,7 @@ RUN curl -sSL https://nixpacks.com/install.sh -o install.sh \ && pnpm install -g tsx # Install Railpack -ARG RAILPACK_VERSION=0.0.37 +ARG RAILPACK_VERSION=0.0.64 RUN curl -sSL https://railpack.com/install.sh | bash # Install buildpacks diff --git a/packages/server/src/setup/server-setup.ts b/packages/server/src/setup/server-setup.ts index bb0d34d8..d1d42257 100644 --- a/packages/server/src/setup/server-setup.ts +++ b/packages/server/src/setup/server-setup.ts @@ -587,7 +587,7 @@ const installRailpack = () => ` if command_exists railpack; then echo "Railpack already installed ✅" else - export RAILPACK_VERSION=0.0.37 + export RAILPACK_VERSION=0.0.64 bash -c "$(curl -fsSL https://railpack.com/install.sh)" echo "Railpack version $RAILPACK_VERSION installed ✅" fi From f854457d69910b4fc60137176db8abeb01f37d8d Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 6 May 2025 23:11:37 -0600 Subject: [PATCH 4/6] fix: wrap build arguments in single quotes for Docker command --- packages/server/src/utils/builders/docker-file.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/utils/builders/docker-file.ts b/packages/server/src/utils/builders/docker-file.ts index 150faa5e..f94247ac 100644 --- a/packages/server/src/utils/builders/docker-file.ts +++ b/packages/server/src/utils/builders/docker-file.ts @@ -109,7 +109,7 @@ export const getDockerCommand = ( } for (const arg of args) { - commandArgs.push("--build-arg", arg); + commandArgs.push("--build-arg", `'${arg}'`); } /* From c708f7ba62b2a3afec807ae2e2f90caa4d7406ca Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 6 May 2025 23:13:42 -0600 Subject: [PATCH 5/6] Update version in package.json to v0.22.3 --- 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 72307326..9bdaf995 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.22.2", + "version": "v0.22.3", "private": true, "license": "Apache-2.0", "type": "module", From e6028e73ac47b18454ccac91951d6341f1b824b2 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Tue, 6 May 2025 23:37:05 -0600 Subject: [PATCH 6/6] feat: add alert block to ShowBuildChooseForm for resource usage guidance --- .../dashboard/application/build/show.tsx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/apps/dokploy/components/dashboard/application/build/show.tsx b/apps/dokploy/components/dashboard/application/build/show.tsx index 16a45225..9535a318 100644 --- a/apps/dokploy/components/dashboard/application/build/show.tsx +++ b/apps/dokploy/components/dashboard/application/build/show.tsx @@ -1,3 +1,4 @@ +import { AlertBlock } from "@/components/shared/alert-block"; import { Badge } from "@/components/ui/badge"; import { Button } from "@/components/ui/button"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; @@ -200,6 +201,22 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
+ + Builders can consume significant memory and CPU resources + (recommended: 4+ GB RAM and 2+ CPU cores). For production + environments, please review our{" "} + + Production Guide + {" "} + for best practices and optimization recommendations. Builders are + suitable for development and prototyping purposes when you have + sufficient resources available. +