Merge branch 'canary' into 394-ability-to-backup-named-volume-to-s3

packages/server/src/db/schema/port.ts

@@ -6,6 +6,7 @@ import { z } from "zod";
 import { applications } from "./application";
 
 export const protocolType = pgEnum("protocolType", ["tcp", "udp"]);
+export const publishModeType = pgEnum("publishModeType", ["ingress", "host"]);
 
 export const ports = pgTable("port", {
 	portId: text("portId")
@@ -13,6 +14,7 @@ export const ports = pgTable("port", {
 		.primaryKey()
 		.$defaultFn(() => nanoid()),
 	publishedPort: integer("publishedPort").notNull(),
+	publishMode: publishModeType("publishMode").notNull().default("host"),
 	targetPort: integer("targetPort").notNull(),
 	protocol: protocolType("protocol").notNull(),
 
@@ -32,6 +34,7 @@ const createSchema = createInsertSchema(ports, {
 	portId: z.string().min(1),
 	applicationId: z.string().min(1),
 	publishedPort: z.number(),
+	publishMode: z.enum(["ingress", "host"]).default("ingress"),
 	targetPort: z.number(),
 	protocol: z.enum(["tcp", "udp"]).default("tcp"),
 });
@@ -39,6 +42,7 @@ const createSchema = createInsertSchema(ports, {
 export const apiCreatePort = createSchema
 	.pick({
 		publishedPort: true,
+		publishMode: true,
 		targetPort: true,
 		protocol: true,
 		applicationId: true,
@@ -55,6 +59,7 @@ export const apiUpdatePort = createSchema
 	.pick({
 		portId: true,
 		publishedPort: true,
+		publishMode: true,
 		targetPort: true,
 		protocol: true,
 	})

packages/server/src/monitoring/utils.ts

@@ -73,7 +73,7 @@ export const readStatsFile = async (
 		const filePath = `${MONITORING_PATH}/${appName}/${statType}.json`;
 		const data = await promises.readFile(filePath, "utf-8");
 		return JSON.parse(data);
-	} catch (_error) {
+	} catch {
 		return [];
 	}
 };
@@ -108,7 +108,7 @@ export const readLastValueStatsFile = async (
 		const data = await promises.readFile(filePath, "utf-8");
 		const stats = JSON.parse(data);
 		return stats[stats.length - 1] || null;
-	} catch (_error) {
+	} catch {
 		return null;
 	}
 };

packages/server/src/services/docker.ts

@@ -98,7 +98,7 @@ export const getConfig = async (
 		const config = JSON.parse(stdout);
 
 		return config;
-	} catch (_error) {}
+	} catch {}
 };
 
 export const getContainersByAppNameMatch = async (
@@ -156,7 +156,7 @@ export const getContainersByAppNameMatch = async (
 		});
 
 		return containers || [];
-	} catch (_error) {}
+	} catch {}
 
 	return [];
 };
@@ -214,7 +214,7 @@ export const getStackContainersByAppName = async (
 		});
 
 		return containers || [];
-	} catch (_error) {}
+	} catch {}
 
 	return [];
 };
@@ -274,7 +274,7 @@ export const getServiceContainersByAppName = async (
 		});
 
 		return containers || [];
-	} catch (_error) {}
+	} catch {}
 
 	return [];
 };
@@ -331,7 +331,7 @@ export const getContainersByAppLabel = async (
 		});
 
 		return containers || [];
-	} catch (_error) {}
+	} catch {}
 
 	return [];
 };
@@ -350,7 +350,7 @@ export const containerRestart = async (containerId: string) => {
 		const config = JSON.parse(stdout);
 
 		return config;
-	} catch (_error) {}
+	} catch {}
 };
 
 export const getSwarmNodes = async (serverId?: string) => {
@@ -379,7 +379,7 @@ export const getSwarmNodes = async (serverId?: string) => {
 			.split("\n")
 			.map((line) => JSON.parse(line));
 		return nodesArray;
-	} catch (_error) {}
+	} catch {}
 };
 
 export const getNodeInfo = async (nodeId: string, serverId?: string) => {
@@ -405,7 +405,7 @@ export const getNodeInfo = async (nodeId: string, serverId?: string) => {
 		const nodeInfo = JSON.parse(stdout);
 
 		return nodeInfo;
-	} catch (_error) {}
+	} catch {}
 };
 
 export const getNodeApplications = async (serverId?: string) => {
@@ -437,7 +437,7 @@ export const getNodeApplications = async (serverId?: string) => {
 			.filter((service) => !service.Name.startsWith("dokploy-"));
 
 		return appArray;
-	} catch (_error) {}
+	} catch {}
 };
 
 export const getApplicationInfo = async (
@@ -470,5 +470,5 @@ export const getApplicationInfo = async (
 			.map((line) => JSON.parse(line));
 
 		return appArray;
-	} catch (_error) {}
+	} catch {}
 };

packages/server/src/services/github.ts

@@ -121,7 +121,7 @@ export const issueCommentExists = async ({
 			comment_id: comment_id,
 		});
 		return true;
-	} catch (_error) {
+	} catch {
 		return false;
 	}
 };

packages/server/src/services/mount.ts

@@ -212,7 +212,7 @@ export const deleteFileMount = async (mountId: string) => {
 		} else {
 			await removeFileOrDirectory(fullPath);
 		}
-	} catch (_error) {}
+	} catch {}
 };
 
 export const getBaseFilesPath = async (mountId: string) => {

packages/server/src/services/preview-deployment.ts

@@ -104,7 +104,7 @@ export const removePreviewDeployment = async (previewDeploymentId: string) => {
 		for (const operation of cleanupOperations) {
 			try {
 				await operation();
-			} catch (_error) {}
+			} catch {}
 		}
 		return deployment[0];
 	} catch (error) {

packages/server/src/services/rollbacks.ts

@@ -195,7 +195,7 @@ const rollbackApplication = async (
 				ForceUpdate: inspect.Spec.TaskTemplate.ForceUpdate + 1,
 			},
 		});
-	} catch (_error: unknown) {
+	} catch {
 		await docker.createService(settings);
 	}
 };

packages/server/src/setup/monitoring-setup.ts

@@ -66,7 +66,7 @@ export const setupMonitoring = async (serverId: string) => {
 			await container.inspect();
 			await container.remove({ force: true });
 			console.log("Removed existing container");
-		} catch (_error) {
+		} catch {
 			// Container doesn't exist, continue
 		}
 
@@ -135,7 +135,7 @@ export const setupWebMonitoring = async (userId: string) => {
 			await container.inspect();
 			await container.remove({ force: true });
 			console.log("Removed existing container");
-		} catch (_error) {}
+		} catch {}
 
 		await docker.createContainer(settings);
 		const newContainer = docker.getContainer(containerName);

packages/server/src/setup/server-setup.ts

@@ -419,14 +419,26 @@ if ! [ -x "$(command -v docker)" ]; then
             systemctl enable docker >/dev/null 2>&1
             ;;
 	"opencloudos")
-	    dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo >/dev/null 2>&1
-            dnf install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin >/dev/null 2>&1
+            # Special handling for OpenCloud OS
+            echo " - Installing Docker for OpenCloud OS..."
+            dnf install -y docker >/dev/null 2>&1
             if ! [ -x "$(command -v docker)" ]; then
                 echo " - Docker could not be installed automatically. Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
                 exit 1
             fi
-            systemctl start docker >/dev/null 2>&1
+            
+            # Remove --live-restore parameter from Docker configuration if it exists
+            if [ -f "/etc/sysconfig/docker" ]; then
+                echo " - Removing --live-restore parameter from Docker configuration..."
+                sed -i 's/--live-restore[^[:space:]]*//' /etc/sysconfig/docker >/dev/null 2>&1
+                sed -i 's/--live-restore//' /etc/sysconfig/docker >/dev/null 2>&1
+                # Clean up any double spaces that might be left
+                sed -i 's/  */ /g' /etc/sysconfig/docker >/dev/null 2>&1
+            fi
+            
             systemctl enable docker >/dev/null 2>&1
+            systemctl start docker >/dev/null 2>&1
+            echo " - Docker configured for OpenCloud OS"
             ;;
         "alpine")
             apk add docker docker-cli-compose >/dev/null 2>&1

packages/server/src/setup/setup.ts

@@ -18,7 +18,7 @@ export const dockerSwarmInitialized = async () => {
 		await docker.swarmInspect();
 
 		return true;
-	} catch (_e) {
+	} catch {
 		return false;
 	}
 };
@@ -41,7 +41,7 @@ export const dockerNetworkInitialized = async () => {
 	try {
 		await docker.getNetwork("dokploy-network").inspect();
 		return true;
-	} catch (_e) {
+	} catch {
 		return false;
 	}
 };

packages/server/src/setup/traefik-setup.ts

@@ -101,11 +101,11 @@ export const initializeTraefik = async ({
 					console.log("Waiting for service cleanup...");
 					await new Promise((resolve) => setTimeout(resolve, 5000));
 					attempts++;
-				} catch (_e) {
+				} catch {
 					break;
 				}
 			}
-		} catch (_err) {
+		} catch {
 			console.log("No existing service to remove");
 		}
 
@@ -120,7 +120,7 @@ export const initializeTraefik = async ({
 
 			await container.remove({ force: true });
 			await new Promise((resolve) => setTimeout(resolve, 5000));
-		} catch (_err) {
+		} catch {
 			console.log("No existing container to remove");
 		}
 

packages/server/src/utils/builders/index.ts

@@ -183,6 +183,7 @@ export const mechanizeDockerContainer = async (
 		RollbackConfig,
 		EndpointSpec: {
 			Ports: ports.map((port) => ({
+				PublishMode: port.publishMode,
 				Protocol: port.protocol,
 				TargetPort: port.targetPort,
 				PublishedPort: port.publishedPort,
@@ -203,7 +204,7 @@ export const mechanizeDockerContainer = async (
 				ForceUpdate: inspect.Spec.TaskTemplate.ForceUpdate + 1,
 			},
 		});
-	} catch (_error: unknown) {
+	} catch {
 		await docker.createService(settings);
 	}
 };

packages/server/src/utils/databases/mariadb.ts

@@ -98,7 +98,7 @@ export const buildMariadb = async (mariadb: MariadbNested) => {
 			version: Number.parseInt(inspect.Version.Index),
 			...settings,
 		});
-	} catch (_error) {
+	} catch {
 		await docker.createService(settings);
 	}
 };

packages/server/src/utils/databases/mongo.ts

@@ -152,7 +152,7 @@ ${command ?? "wait $MONGOD_PID"}`;
 			version: Number.parseInt(inspect.Version.Index),
 			...settings,
 		});
-	} catch (_error) {
+	} catch {
 		await docker.createService(settings);
 	}
 };

packages/server/src/utils/databases/mysql.ts

@@ -104,7 +104,7 @@ export const buildMysql = async (mysql: MysqlNested) => {
 			version: Number.parseInt(inspect.Version.Index),
 			...settings,
 		});
-	} catch (_error) {
+	} catch {
 		await docker.createService(settings);
 	}
 };

packages/server/src/utils/databases/redis.ts

@@ -95,7 +95,7 @@ export const buildRedis = async (redis: RedisNested) => {
 			version: Number.parseInt(inspect.Version.Index),
 			...settings,
 		});
-	} catch (_error) {
+	} catch {
 		await docker.createService(settings);
 	}
 };

packages/server/src/utils/docker/domain.ts

@@ -117,7 +117,7 @@ export const loadDockerComposeRemote = async (
 		if (!stdout) return null;
 		const parsedConfig = load(stdout) as ComposeSpecification;
 		return parsedConfig;
-	} catch (_err) {
+	} catch {
 		return null;
 	}
 };

packages/server/src/utils/docker/utils.ts

@@ -101,7 +101,7 @@ export const containerExists = async (containerName: string) => {
 	try {
 		await container.inspect();
 		return true;
-	} catch (_error) {
+	} catch {
 		return false;
 	}
 };

packages/server/src/utils/gpu-setup.ts

@@ -34,7 +34,7 @@ export async function checkGPUStatus(serverId?: string): Promise<GPUInfo> {
 			...gpuInfo,
 			...cudaInfo,
 		};
-	} catch (_error) {
+	} catch {
 		return {
 			driverInstalled: false,
 			driverVersion: undefined,
@@ -315,7 +315,7 @@ const setupLocalServer = async (daemonConfig: any) => {
 
 	try {
 		await execAsync(setupCommands);
-	} catch (_error) {
+	} catch {
 		throw new Error(
 			"Failed to configure GPU support. Please ensure you have sudo privileges and try again.",
 		);

packages/server/src/utils/traefik/application.ts

@@ -67,7 +67,7 @@ export const removeTraefikConfig = async (
 		if (fs.existsSync(configPath)) {
 			await fs.promises.unlink(configPath);
 		}
-	} catch (_error) {}
+	} catch {}
 };
 
 export const removeTraefikConfigRemote = async (
@@ -78,7 +78,7 @@ export const removeTraefikConfigRemote = async (
 		const { DYNAMIC_TRAEFIK_PATH } = paths(true);
 		const configPath = path.join(DYNAMIC_TRAEFIK_PATH, `${appName}.yml`);
 		await execAsyncRemote(serverId, `rm ${configPath}`);
-	} catch (_error) {}
+	} catch {}
 };
 
 export const loadOrCreateConfig = (appName: string): FileConfig => {
@@ -110,7 +110,7 @@ export const loadOrCreateConfigRemote = async (
 			http: { routers: {}, services: {} },
 		};
 		return parsedConfig;
-	} catch (_err) {
+	} catch {
 		return fileConfig;
 	}
 };
@@ -132,7 +132,7 @@ export const readRemoteConfig = async (serverId: string, appName: string) => {
 		const { stdout } = await execAsyncRemote(serverId, `cat ${configPath}`);
 		if (!stdout) return null;
 		return stdout;
-	} catch (_err) {
+	} catch {
 		return null;
 	}
 };