From 068dd33033160686a2b18285e8d7e43d996afe87 Mon Sep 17 00:00:00 2001
From: Mael <laem@kont.me>
Date: Wed, 5 Feb 2025 16:31:52 +0100
Subject: [PATCH 1/4] Fix deploy env variable URL : should be a string, not an
 object

---
 packages/server/src/services/application.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/services/application.ts b/packages/server/src/services/application.ts
index c102e8ed..966c3baa 100644
--- a/packages/server/src/services/application.ts
+++ b/packages/server/src/services/application.ts
@@ -451,7 +451,7 @@ export const deployPreviewApplication = async ({
 			body: `### Dokploy Preview Deployment\n\n${buildingComment}`,
 		});
 		application.appName = previewDeployment.appName;
-		application.env = `${application.previewEnv}\nDOKPLOY_DEPLOY_URL=${previewDeployment?.domain}`;
+		application.env = `${application.previewEnv}\nDOKPLOY_DEPLOY_URL=${previewDomain}`;
 		application.buildArgs = application.previewBuildArgs;
 
 		const admin = await findAdminById(application.project.adminId);
@@ -564,7 +564,7 @@ export const deployRemotePreviewApplication = async ({
 			body: `### Dokploy Preview Deployment\n\n${buildingComment}`,
 		});
 		application.appName = previewDeployment.appName;
-		application.env = `${application.previewEnv}\nDOKPLOY_DEPLOY_URL=${previewDeployment?.domain}`;
+		application.env = `${application.previewEnv}\nDOKPLOY_DEPLOY_URL=${previewDomain}`;
 		application.buildArgs = application.previewBuildArgs;
 
 		if (application.serverId) {

From 8b3e643ce76a4f7c0972404e8956b0cf0688394b Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Thu, 6 Feb 2025 00:16:20 -0600
Subject: [PATCH 2/4] Update packages/server/src/services/application.ts

---
 packages/server/src/services/application.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/services/application.ts b/packages/server/src/services/application.ts
index 966c3baa..1bba2eb2 100644
--- a/packages/server/src/services/application.ts
+++ b/packages/server/src/services/application.ts
@@ -451,7 +451,7 @@ export const deployPreviewApplication = async ({
 			body: `### Dokploy Preview Deployment\n\n${buildingComment}`,
 		});
 		application.appName = previewDeployment.appName;
-		application.env = `${application.previewEnv}\nDOKPLOY_DEPLOY_URL=${previewDomain}`;
+		application.env = `${application.previewEnv}\nDOKPLOY_DEPLOY_URL=${previewDeployment?.domain?.host}`;
 		application.buildArgs = application.previewBuildArgs;
 
 		const admin = await findAdminById(application.project.adminId);

From bc8f54a2b99e092a071c7d157567ac12dd980e04 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Thu, 6 Feb 2025 00:16:25 -0600
Subject: [PATCH 3/4] Update packages/server/src/services/application.ts

---
 packages/server/src/services/application.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/services/application.ts b/packages/server/src/services/application.ts
index 1bba2eb2..02a20b59 100644
--- a/packages/server/src/services/application.ts
+++ b/packages/server/src/services/application.ts
@@ -564,7 +564,7 @@ export const deployRemotePreviewApplication = async ({
 			body: `### Dokploy Preview Deployment\n\n${buildingComment}`,
 		});
 		application.appName = previewDeployment.appName;
-		application.env = `${application.previewEnv}\nDOKPLOY_DEPLOY_URL=${previewDomain}`;
+		application.env = `${application.previewEnv}\nDOKPLOY_DEPLOY_URL=${previewDeployment?.domain?.host}`;
 		application.buildArgs = application.previewBuildArgs;
 
 		if (application.serverId) {

From 498a8523da7d869d9faff56876fb8a163e521753 Mon Sep 17 00:00:00 2001
From: Mahad Kalam <mahadkalam1@proton.me>
Date: Fri, 21 Feb 2025 00:50:09 +0000
Subject: [PATCH 4/4] fix: make spacing between sidebar elements consistent

---
 apps/dokploy/components/layouts/side.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/dokploy/components/layouts/side.tsx b/apps/dokploy/components/layouts/side.tsx
index 44a4b0ed..a74361e7 100644
--- a/apps/dokploy/components/layouts/side.tsx
+++ b/apps/dokploy/components/layouts/side.tsx
@@ -676,7 +676,7 @@ export default function Page({ children }: Props) {
 					</SidebarGroup>
 					<SidebarGroup>
 						<SidebarGroupLabel>Settings</SidebarGroupLabel>
-						<SidebarMenu className="gap-2">
+						<SidebarMenu>
 							{filteredSettings.map((item) => {
 								const isSingle = item.isSingle !== false;
 								const isActive = isSingle
@@ -793,7 +793,7 @@ export default function Page({ children }: Props) {
 						</SidebarMenu>
 					</SidebarGroup>
 				</SidebarContent>
-				<SidebarFooter>
+				<SidebarFooter className="gap-1">
 					<SidebarMenu>
 						<SidebarMenuItem>
 							<UserNav />