diff --git a/apps/dokploy/pages/dashboard/docker.tsx b/apps/dokploy/pages/dashboard/docker.tsx
index d2dbba70d..27a54373a 100644
--- a/apps/dokploy/pages/dashboard/docker.tsx
+++ b/apps/dokploy/pages/dashboard/docker.tsx
@@ -26,7 +26,6 @@ const DEFAULT_SWARM_TAB = "overview";
const Dashboard = () => {
const router = useRouter();
- const { data: isCloud } = api.settings.isCloud.useQuery();
const { data: permissions } = api.user.getPermissions.useQuery();
// Host-level diagnostics, so this needs server.read on top of docker.read.
const canSeeHealth = !!permissions?.docker.read && !!permissions?.server.read;
@@ -34,10 +33,7 @@ const Dashboard = () => {
const queryTab =
typeof router.query.tab === "string" ? router.query.tab : DEFAULT_TAB;
const activeTab =
- (isCloud && queryTab === "networks") ||
- (queryTab === "health" && !canSeeHealth)
- ? DEFAULT_TAB
- : queryTab;
+ queryTab === "health" && !canSeeHealth ? DEFAULT_TAB : queryTab;
const activeSwarmTab =
typeof router.query.subtab === "string"
@@ -78,7 +74,7 @@ const Dashboard = () => {
Swarm
Images
Volumes
- {!isCloud && Networks}
+ Networks
Events
Disk Usage
{canSeeHealth && Health}
@@ -114,11 +110,9 @@ const Dashboard = () => {
- {!isCloud && (
-
-
-
- )}
+
+
+
diff --git a/packages/server/src/services/deployment.ts b/packages/server/src/services/deployment.ts
index cf6b3b7b4..846dc26e0 100644
--- a/packages/server/src/services/deployment.ts
+++ b/packages/server/src/services/deployment.ts
@@ -1096,8 +1096,10 @@ export const findFailedDeploymentsCentralized = async (
failed,
LOG_TAIL_CONCURRENCY,
async (deployment) => {
+ // Same buildServerId-then-serverId precedence used app-wide (application.ts, drop.ts, etc.)
const serverId =
deployment.buildServer?.serverId ||
+ deployment.application?.buildServer?.serverId ||
deployment.server?.serverId ||
deployment.application?.server?.serverId ||
deployment.compose?.server?.serverId ||