Merge pull request #69 from Dokploy/canary

v0.0.3
chore: bump version
2025-06-26 18:27:59 +00:00 · 2024-05-09 23:03:31 -06:00 · 2024-05-09 22:11:33 -06:00 · 2024-05-09 12:37:05 -06:00 · 2024-05-09 14:12:16 -04:00 · 2024-05-09 14:03:32 -04:00
4 changed files with 5 additions and 12 deletions
--- 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());
--- 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",
--- 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"),
--- 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) {
Author	SHA1	Message	Date
Mauricio Siu	17da90238f	Merge pull request #69 from Dokploy/canary v0.0.3	2024-05-09 23:03:31 -06:00
Mauricio Siu	907dc0784f	chore: bump version	2024-05-09 22:11:33 -06:00
Mauricio Siu	9554818552	Merge pull request #67 from manjime83/patch-1 fix: Properly parse environment variables	2024-05-09 12:37:05 -06:00
Manuel Jiménez	a83834fdef	format fix	2024-05-09 14:12:16 -04:00
Manuel Jiménez	312d66f0fa	fix: Properly parse environment variables	2024-05-09 14:03:32 -04:00
Mauricio Siu	9ba09debf8	Merge pull request #60 from vkrusen/patch-1 Correct Postgres url from password:password to user:password	2024-05-07 20:56:29 -06:00
Mauricio Siu	3193d5eabd	Merge pull request #59 from oesukam/chore-update-server-port-logs Correct server port log for non 3000 port	2024-05-07 20:56:09 -06:00
Victor Krusenstråhle	d1966d43f7	Correct Postgres url from password:password to user:password Postgres external url currently returns password:password when it should be user:password.	2024-05-07 21:40:12 +02:00
Olivier Esuka	2170c3f1e8	chore: correct server port log for non 3000 port	2024-05-07 21:23:52 +02:00