From 2170c3f1e8f78a2e99b05175751169c2be8b274e Mon Sep 17 00:00:00 2001 From: Olivier Esuka Date: Tue, 7 May 2024 21:23:52 +0200 Subject: [PATCH 1/5] chore: correct server port log for non 3000 port --- server/server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server.ts b/server/server.ts index cc2bd042e..8a15362ad 100644 --- a/server/server.ts +++ b/server/server.ts @@ -74,7 +74,7 @@ async function welcomeServer() { "", "Dokploy server is up and running!", "Please wait for 15 seconds before opening the browser.", - ` http://${ip}:3000`, + ` http://${ip}:${PORT}`, "", "", ].join("\n"), From d1966d43f7b7bb3086b1cc8329b1b30b7f29effa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20Krusenstr=C3=A5hle?= Date: Tue, 7 May 2024 21:40:12 +0200 Subject: [PATCH 2/5] Correct Postgres url from password:password to user:password Postgres external url currently returns password:password when it should be user:password. --- .../postgres/general/show-external-postgres-credentials.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/dashboard/postgres/general/show-external-postgres-credentials.tsx b/components/dashboard/postgres/general/show-external-postgres-credentials.tsx index 08bae8c61..215356cee 100644 --- a/components/dashboard/postgres/general/show-external-postgres-credentials.tsx +++ b/components/dashboard/postgres/general/show-external-postgres-credentials.tsx @@ -80,7 +80,7 @@ export const ShowExternalPostgresCredentials = ({ postgresId }: Props) => { const hostname = window.location.hostname; const port = form.watch("externalPort") || data?.externalPort; - return `postgresql://${data?.databasePassword}:${data?.databasePassword}@${hostname}:${port}/${data?.databaseName}`; + return `postgresql://${data?.databaseUser}:${data?.databasePassword}@${hostname}:${port}/${data?.databaseName}`; }; setConnectionUrl(buildConnectionUrl()); From 312d66f0fa1399c29344207412b533b8a603829b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez?= Date: Thu, 9 May 2024 14:03:32 -0400 Subject: [PATCH 3/5] fix: Properly parse environment variables --- server/utils/docker/utils.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/server/utils/docker/utils.ts b/server/utils/docker/utils.ts index 21a6614b7..3df2638ab 100644 --- a/server/utils/docker/utils.ts +++ b/server/utils/docker/utils.ts @@ -5,6 +5,7 @@ import { APPLICATIONS_PATH, docker } from "@/server/constants"; import type { ContainerInfo, ResourceRequirements } from "dockerode"; import type { ApplicationNested } from "../builders"; import { execAsync } from "../process/execAsync"; +import { parse } from "dotenv"; interface RegistryAuth { username: string; @@ -154,15 +155,7 @@ export const removeService = async (appName: string) => { }; export const prepareEnvironmentVariables = (env: string | null) => - env - ?.split("\n") - .map((line) => line.trim()) // Trim whitespace - .filter((line) => line && !line.startsWith("#")) // Exclude empty lines and comments - .map((envVar) => { - let [key, value] = envVar.split("=", 2); - value = value?.replace(/^"(.*)"$/, "$1"); // Remove surrounding double quotes - return `${key}=${value}`; - }) || []; + Object.entries(parse(env ?? "")).map(([key, value]) => `${key}=${value}`); export const generateVolumeMounts = (mounts: ApplicationNested["mounts"]) => { if (!mounts || mounts.length === 0) { From a83834fdefa412bdd5f677b068d7098a3ae266e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez?= Date: Thu, 9 May 2024 14:12:16 -0400 Subject: [PATCH 4/5] format fix --- server/utils/docker/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/utils/docker/utils.ts b/server/utils/docker/utils.ts index 3df2638ab..2cd881bbc 100644 --- a/server/utils/docker/utils.ts +++ b/server/utils/docker/utils.ts @@ -155,7 +155,7 @@ export const removeService = async (appName: string) => { }; export const prepareEnvironmentVariables = (env: string | null) => - Object.entries(parse(env ?? "")).map(([key, value]) => `${key}=${value}`); + Object.entries(parse(env ?? "")).map(([key, value]) => `${key}=${value}`); export const generateVolumeMounts = (mounts: ApplicationNested["mounts"]) => { if (!mounts || mounts.length === 0) { From 907dc0784fe0be06295e4a0bbc1918d21fa0c0ba Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 9 May 2024 22:11:33 -0600 Subject: [PATCH 5/5] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9afbe835e..bb7284270 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.0.2", + "version": "v0.0.3", "private": true, "license": "AGPL-3.0-only", "type": "module",