fix: resolve merge conflicts with upstream/canary

packages/server/src/utils/access-log/handler.ts

@@ -1,5 +1,5 @@
-import { IS_CLOUD, paths } from "@/server/constants";
-import { updateAdmin } from "@/server/services/admin";
+import { IS_CLOUD, paths } from "@dokploy/server/constants";
+import { updateAdmin } from "@dokploy/server/services/admin";
 import { type RotatingFileStream, createStream } from "rotating-file-stream";
 import { db } from "../../db";
 import { execAsync } from "../process/execAsync";

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

@@ -1,5 +1,5 @@
-import { findAdmin } from "@/server/services/admin";
-import { getAllServers } from "@/server/services/server";
+import { findAdmin } from "@dokploy/server/services/admin";
+import { getAllServers } from "@dokploy/server/services/server";
 import { scheduleJob } from "node-schedule";
 import { db } from "../../db/index";
 import {

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

@@ -1,7 +1,7 @@
 import path from "node:path";
-import type { BackupSchedule } from "@/server/services/backup";
-import type { Mariadb } from "@/server/services/mariadb";
-import { findProjectById } from "@/server/services/project";
+import type { BackupSchedule } from "@dokploy/server/services/backup";
+import type { Mariadb } from "@dokploy/server/services/mariadb";
+import { findProjectById } from "@dokploy/server/services/project";
 import {
 	getRemoteServiceContainer,
 	getServiceContainer,

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

@@ -1,7 +1,7 @@
 import path from "node:path";
-import type { BackupSchedule } from "@/server/services/backup";
-import type { Mongo } from "@/server/services/mongo";
-import { findProjectById } from "@/server/services/project";
+import type { BackupSchedule } from "@dokploy/server/services/backup";
+import type { Mongo } from "@dokploy/server/services/mongo";
+import { findProjectById } from "@dokploy/server/services/project";
 import {
 	getRemoteServiceContainer,
 	getServiceContainer,

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

@@ -1,8 +1,8 @@
 import { unlink } from "node:fs/promises";
 import path from "node:path";
-import type { BackupSchedule } from "@/server/services/backup";
-import type { MySql } from "@/server/services/mysql";
-import { findProjectById } from "@/server/services/project";
+import type { BackupSchedule } from "@dokploy/server/services/backup";
+import type { MySql } from "@dokploy/server/services/mysql";
+import { findProjectById } from "@dokploy/server/services/project";
 import {
 	getRemoteServiceContainer,
 	getServiceContainer,

packages/server/src/utils/backups/postgres.ts

@@ -1,7 +1,7 @@
 import path from "node:path";
-import type { BackupSchedule } from "@/server/services/backup";
-import type { Postgres } from "@/server/services/postgres";
-import { findProjectById } from "@/server/services/project";
+import type { BackupSchedule } from "@dokploy/server/services/backup";
+import type { Postgres } from "@dokploy/server/services/postgres";
+import { findProjectById } from "@dokploy/server/services/project";
 import {
 	getRemoteServiceContainer,
 	getServiceContainer,

packages/server/src/utils/backups/utils.ts

@@ -1,5 +1,5 @@
-import type { BackupSchedule } from "@/server/services/backup";
-import type { Destination } from "@/server/services/destination";
+import type { BackupSchedule } from "@dokploy/server/services/backup";
+import type { Destination } from "@dokploy/server/services/destination";
 import { scheduleJob, scheduledJobs } from "node-schedule";
 import { runMariadbBackup } from "./mariadb";
 import { runMongoBackup } from "./mongo";

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

@@ -5,8 +5,8 @@ import {
 	writeFileSync,
 } from "node:fs";
 import { dirname, join } from "node:path";
-import { paths } from "@/server/constants";
-import type { InferResultType } from "@/server/types/with";
+import { paths } from "@dokploy/server/constants";
+import type { InferResultType } from "@dokploy/server/types/with";
 import boxen from "boxen";
 import {
 	writeDomainsToCompose,

packages/server/src/utils/builders/docker-file.ts

@@ -1,5 +1,5 @@
 import type { WriteStream } from "node:fs";
-import { prepareEnvironmentVariables } from "@/server/utils/docker/utils";
+import { prepareEnvironmentVariables } from "@dokploy/server/utils/docker/utils";
 import type { ApplicationNested } from ".";
 import {
 	getBuildAppDirectory,

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

@@ -1,8 +1,8 @@
 import fs from "node:fs/promises";
 import path, { join } from "node:path";
-import { paths } from "@/server/constants";
-import type { Application } from "@/server/services/application";
-import { findServerById } from "@/server/services/server";
+import { paths } from "@dokploy/server/constants";
+import type { Application } from "@dokploy/server/services/application";
+import { findServerById } from "@dokploy/server/services/server";
 import AdmZip from "adm-zip";
 import { Client, type SFTPWrapper } from "ssh2";
 import {

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

@@ -1,7 +1,8 @@
 import { createWriteStream } from "node:fs";
-import type { InferResultType } from "@/server/types/with";
+import { join } from "node:path";
+import type { InferResultType } from "@dokploy/server/types/with";
 import type { CreateServiceOptions } from "dockerode";
-import { uploadImage } from "../cluster/upload";
+import { uploadImage, uploadImageRemoteCommand } from "../cluster/upload";
 import {
 	calculateResources,
 	generateBindMounts,
@@ -69,19 +70,30 @@ export const getBuildCommand = (
 	application: ApplicationNested,
 	logPath: string,
 ) => {
-	const { buildType } = application;
+	let command = "";
+	const { buildType, registry } = application;
 	switch (buildType) {
 		case "nixpacks":
-			return getNixpacksCommand(application, logPath);
+			command = getNixpacksCommand(application, logPath);
+			break;
 		case "heroku_buildpacks":
-			return getHerokuCommand(application, logPath);
+			command = getHerokuCommand(application, logPath);
+			break;
 		case "paketo_buildpacks":
-			return getPaketoCommand(application, logPath);
+			command = getPaketoCommand(application, logPath);
+			break;
 		case "static":
-			return getStaticCommand(application, logPath);
+			command = getStaticCommand(application, logPath);
+			break;
 		case "dockerfile":
-			return getDockerCommand(application, logPath);
+			command = getDockerCommand(application, logPath);
+			break;
 	}
+	if (registry) {
+		command += uploadImageRemoteCommand(application, logPath);
+	}
+
+	return command;
 };
 
 export const mechanizeDockerContainer = async (
@@ -186,11 +198,11 @@ const getImageName = (application: ApplicationNested) => {
 		return dockerImage || "ERROR-NO-IMAGE-PROVIDED";
 	}
 
-	const registryUrl = registry?.registryUrl || "";
-	const imagePrefix = registry?.imagePrefix ? `${registry.imagePrefix}/` : "";
-	return registry
-		? `${registryUrl}/${imagePrefix}${appName}`
-		: `${appName}:latest`;
+	if (registry) {
+		return join(registry.imagePrefix || "", appName);
+	}
+
+	return `${appName}:latest`;
 };
 
 const getAuthConfig = (application: ApplicationNested) => {

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

@@ -1,6 +1,9 @@
 import { type WriteStream, existsSync, mkdirSync } from "node:fs";
 import path from "node:path";
-import { buildStatic, getStaticCommand } from "@/server/utils/builders/static";
+import {
+	buildStatic,
+	getStaticCommand,
+} from "@dokploy/server/utils/builders/static";
 import { nanoid } from "nanoid";
 import type { ApplicationNested } from ".";
 import { prepareEnvironmentVariables } from "../docker/utils";

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

@@ -2,7 +2,7 @@ import type { WriteStream } from "node:fs";
 import {
 	buildCustomDocker,
 	getDockerCommand,
-} from "@/server/utils/builders/docker-file";
+} from "@dokploy/server/utils/builders/docker-file";
 import type { ApplicationNested } from ".";
 import { createFile, getCreateFileCommand } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";

packages/server/src/utils/cluster/upload.ts

@@ -1,4 +1,5 @@
 import type { WriteStream } from "node:fs";
+import { join } from "node:path";
 import type { ApplicationNested } from "../builders";
 import { spawnAsync } from "../process/spawnAsync";
 
@@ -16,23 +17,14 @@ export const uploadImage = async (
 	const { appName } = application;
 	const imageName = `${appName}:latest`;
 
-	const finalURL =
-		registryType === "selfHosted"
-			? process.env.NODE_ENV === "development"
-				? "localhost:5000"
-				: registryUrl
-			: registryUrl;
+	const finalURL = registryUrl;
 
-	const registryTag = imagePrefix
-		? `${finalURL}/${imagePrefix}/${imageName}`
-		: `${finalURL}/${imageName}`;
+	const registryTag = join(imagePrefix || "", imageName);
 
 	try {
-		console.log(finalURL, registryTag);
 		writeStream.write(
 			`📦 [Enabled Registry] Uploading image to ${registry.registryType} | ${registryTag} | ${finalURL}\n`,
 		);
-
 		await spawnAsync(
 			"docker",
 			["login", finalURL, "-u", registry.username, "-p", registry.password],
@@ -59,7 +51,48 @@ export const uploadImage = async (
 		throw error;
 	}
 };
-// docker:
-// endpoint: "unix:///var/run/docker.sock"
-// exposedByDefault: false
-// swarmMode: true
+
+export const uploadImageRemoteCommand = (
+	application: ApplicationNested,
+	logPath: string,
+) => {
+	const registry = application.registry;
+
+	if (!registry) {
+		throw new Error("Registry not found");
+	}
+
+	const { registryUrl, imagePrefix } = registry;
+	const { appName } = application;
+	const imageName = `${appName}:latest`;
+
+	const finalURL = registryUrl;
+
+	const registryTag = join(imagePrefix || "", imageName);
+
+	try {
+		const command = `
+		echo "📦 [Enabled Registry] Uploading image to '${registry.registryType}' | '${registryTag}'" >> ${logPath};
+		docker login ${finalURL} -u ${registry.username} -p ${registry.password} >> ${logPath} 2>> ${logPath} || { 
+			echo "❌ DockerHub Failed" >> ${logPath};
+			exit 1;
+		}
+		echo "✅ DockerHub Login Success" >> ${logPath};
+		docker tag ${imageName} ${registryTag} >> ${logPath} 2>> ${logPath} || { 
+			echo "❌ Error tagging image" >> ${logPath};
+			exit 1;
+		}
+			echo "✅ Image Tagged" >> ${logPath};
+
+		docker push ${registryTag} 2>> ${logPath} || { 
+			echo "❌ Error pushing image" >> ${logPath};
+			exit 1;
+		}
+			echo "✅ Image Pushed" >> ${logPath};
+		`;
+		return command;
+	} catch (error) {
+		console.log(error);
+		throw error;
+	}
+};

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

@@ -1,4 +1,4 @@
-import type { InferResultType } from "@/server/types/with";
+import type { InferResultType } from "@dokploy/server/types/with";
 import type { CreateServiceOptions } from "dockerode";
 import {
 	calculateResources,

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

@@ -1,4 +1,4 @@
-import type { InferResultType } from "@/server/types/with";
+import type { InferResultType } from "@dokploy/server/types/with";
 import type { CreateServiceOptions } from "dockerode";
 import {
 	calculateResources,

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

@@ -1,4 +1,4 @@
-import type { InferResultType } from "@/server/types/with";
+import type { InferResultType } from "@dokploy/server/types/with";
 import type { CreateServiceOptions } from "dockerode";
 import {
 	calculateResources,

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

@@ -1,4 +1,4 @@
-import type { InferResultType } from "@/server/types/with";
+import type { InferResultType } from "@dokploy/server/types/with";
 import type { CreateServiceOptions } from "dockerode";
 import {
 	calculateResources,

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

@@ -1,4 +1,4 @@
-import type { InferResultType } from "@/server/types/with";
+import type { InferResultType } from "@dokploy/server/types/with";
 import type { CreateServiceOptions } from "dockerode";
 import {
 	calculateResources,

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

@@ -1,5 +1,5 @@
 import crypto from "node:crypto";
-import { findComposeById } from "@/server/services/compose";
+import { findComposeById } from "@dokploy/server/services/compose";
 import { dump, load } from "js-yaml";
 import { addSuffixToAllConfigs } from "./compose/configs";
 import { addSuffixToAllNetworks } from "./compose/network";

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

@@ -1,9 +1,9 @@
 import fs, { existsSync, readFileSync } from "node:fs";
 import { writeFile } from "node:fs/promises";
 import { join } from "node:path";
-import { paths } from "@/server/constants";
-import type { Compose } from "@/server/services/compose";
-import type { Domain } from "@/server/services/domain";
+import { paths } from "@dokploy/server/constants";
+import type { Compose } from "@dokploy/server/services/compose";
+import type { Domain } from "@dokploy/server/services/domain";
 import { dump, load } from "js-yaml";
 import { execAsyncRemote } from "../process/execAsync";
 import {

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

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import type { Readable } from "node:stream";
-import { docker, paths } from "@/server/constants";
+import { docker, paths } from "@dokploy/server/constants";
 import type { ContainerInfo, ResourceRequirements } from "dockerode";
 import { parse } from "dotenv";
 import type { ApplicationNested } from "../builders";

packages/server/src/utils/filesystem/directory.ts

@@ -1,7 +1,7 @@
 import fs, { promises as fsPromises } from "node:fs";
 import path from "node:path";
-import { paths } from "@/server/constants";
-import type { Application } from "@/server/services/application";
+import { paths } from "@dokploy/server/constants";
+import type { Application } from "@dokploy/server/services/application";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 
 export const recreateDirectory = async (pathFolder: string): Promise<void> => {

packages/server/src/utils/notifications/build-error.ts

@@ -1,6 +1,6 @@
-import { db } from "@/server/db";
-import { notifications } from "@/server/db/schema";
-import BuildFailedEmail from "@/server/emails/emails/build-failed";
+import { db } from "@dokploy/server/db";
+import { notifications } from "@dokploy/server/db/schema";
+import BuildFailedEmail from "@dokploy/server/emails/emails/build-failed";
 import { renderAsync } from "@react-email/components";
 import { eq } from "drizzle-orm";
 import {

packages/server/src/utils/notifications/build-success.ts

@@ -1,6 +1,6 @@
-import { db } from "@/server/db";
-import { notifications } from "@/server/db/schema";
-import BuildSuccessEmail from "@/server/emails/emails/build-success";
+import { db } from "@dokploy/server/db";
+import { notifications } from "@dokploy/server/db/schema";
+import BuildSuccessEmail from "@dokploy/server/emails/emails/build-success";
 import { renderAsync } from "@react-email/components";
 import { eq } from "drizzle-orm";
 import {

packages/server/src/utils/notifications/database-backup.ts

@@ -1,6 +1,6 @@
-import { db } from "@/server/db";
-import { notifications } from "@/server/db/schema";
-import DatabaseBackupEmail from "@/server/emails/emails/database-backup";
+import { db } from "@dokploy/server/db";
+import { notifications } from "@dokploy/server/db/schema";
+import DatabaseBackupEmail from "@dokploy/server/emails/emails/database-backup";
 import { renderAsync } from "@react-email/components";
 import { eq } from "drizzle-orm";
 import {

packages/server/src/utils/notifications/docker-cleanup.ts

@@ -1,6 +1,6 @@
-import { db } from "@/server/db";
-import { notifications } from "@/server/db/schema";
-import DockerCleanupEmail from "@/server/emails/emails/docker-cleanup";
+import { db } from "@dokploy/server/db";
+import { notifications } from "@dokploy/server/db/schema";
+import DockerCleanupEmail from "@dokploy/server/emails/emails/docker-cleanup";
 import { renderAsync } from "@react-email/components";
 import { eq } from "drizzle-orm";
 import {

packages/server/src/utils/notifications/dokploy-restart.ts

@@ -1,6 +1,6 @@
-import { db } from "@/server/db";
-import { notifications } from "@/server/db/schema";
-import DokployRestartEmail from "@/server/emails/emails/dokploy-restart";
+import { db } from "@dokploy/server/db";
+import { notifications } from "@dokploy/server/db/schema";
+import DokployRestartEmail from "@dokploy/server/emails/emails/dokploy-restart";
 import { renderAsync } from "@react-email/components";
 import { eq } from "drizzle-orm";
 import {

packages/server/src/utils/notifications/utils.ts

@@ -1,4 +1,9 @@
-import type { discord, email, slack, telegram } from "@/server/db/schema";
+import type {
+	discord,
+	email,
+	slack,
+	telegram,
+} from "@dokploy/server/db/schema";
 import nodemailer from "nodemailer";
 
 export const sendEmailNotification = async (

packages/server/src/utils/process/execAsync.ts

@@ -1,6 +1,6 @@
 import { exec } from "node:child_process";
 import util from "node:util";
-import { findServerById } from "@/server/services/server";
+import { findServerById } from "@dokploy/server/services/server";
 import { Client } from "ssh2";
 export const execAsync = util.promisify(exec);
 

packages/server/src/utils/providers/bitbucket.ts

@@ -1,13 +1,13 @@
 import { createWriteStream } from "node:fs";
 import { join } from "node:path";
-import { paths } from "@/server/constants";
+import { paths } from "@dokploy/server/constants";
 import type {
 	apiBitbucketTestConnection,
 	apiFindBitbucketBranches,
-} from "@/server/db/schema";
-import { findBitbucketById } from "@/server/services/bitbucket";
-import type { Compose } from "@/server/services/compose";
-import type { InferResultType } from "@/server/types/with";
+} from "@dokploy/server/db/schema";
+import { findBitbucketById } from "@dokploy/server/services/bitbucket";
+import type { Compose } from "@dokploy/server/services/compose";
+import type { InferResultType } from "@dokploy/server/types/with";
 import { TRPCError } from "@trpc/server";
 import { recreateDirectory } from "../filesystem/directory";
 import { execAsyncRemote } from "../process/execAsync";
@@ -227,42 +227,42 @@ export const getBitbucketRepositories = async (bitbucketId?: string) => {
 	const username =
 		bitbucketProvider.bitbucketWorkspaceName ||
 		bitbucketProvider.bitbucketUsername;
-	const url = `https://api.bitbucket.org/2.0/repositories/${username}?pagelen=100`;
+	let url = `https://api.bitbucket.org/2.0/repositories/${username}?pagelen=100`;
+	let repositories: {
+		name: string;
+		url: string;
+		owner: { username: string };
+	}[] = [];
 
 	try {
-		const response = await fetch(url, {
-			method: "GET",
-			headers: {
-				Authorization: `Basic ${Buffer.from(`${bitbucketProvider.bitbucketUsername}:${bitbucketProvider.appPassword}`).toString("base64")}`,
-			},
-		});
-
-		if (!response.ok) {
-			throw new TRPCError({
-				code: "BAD_REQUEST",
-				message: `Failed to fetch repositories: ${response.statusText}`,
+		while (url) {
+			const response = await fetch(url, {
+				method: "GET",
+				headers: {
+					Authorization: `Basic ${Buffer.from(`${bitbucketProvider.bitbucketUsername}:${bitbucketProvider.appPassword}`).toString("base64")}`,
+				},
 			});
-		}
 
-		const data = await response.json();
+			if (!response.ok) {
+				throw new TRPCError({
+					code: "BAD_REQUEST",
+					message: `Failed to fetch repositories: ${response.statusText}`,
+				});
+			}
 
-		const mappedData = data.values.map((repo: any) => {
-			return {
+			const data = await response.json();
+
+			const mappedData = data.values.map((repo: any) => ({
 				name: repo.name,
 				url: repo.links.html.href,
 				owner: {
 					username: repo.workspace.slug,
 				},
-			};
-		});
-
-		return mappedData as {
-			name: string;
-			url: string;
-			owner: {
-				username: string;
-			};
-		}[];
+			}));
+			repositories = repositories.concat(mappedData);
+			url = data.next || null;
+		}
+		return repositories;
 	} catch (error) {
 		throw error;
 	}

packages/server/src/utils/providers/git.ts

@@ -1,8 +1,11 @@
 import { createWriteStream } from "node:fs";
 import path, { join } from "node:path";
-import { paths } from "@/server/constants";
-import type { Compose } from "@/server/services/compose";
-import { findSSHKeyById, updateSSHKeyById } from "@/server/services/ssh-key";
+import { paths } from "@dokploy/server/constants";
+import type { Compose } from "@dokploy/server/services/compose";
+import {
+	findSSHKeyById,
+	updateSSHKeyById,
+} from "@dokploy/server/services/ssh-key";
 import { TRPCError } from "@trpc/server";
 import { recreateDirectory } from "../filesystem/directory";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
@@ -55,8 +58,6 @@ export const cloneGitRepository = async (
 			await addHostToKnownHosts(customGitUrl);
 		}
 		await recreateDirectory(outputPath);
-		// const command = `GIT_SSH_COMMAND="ssh -i ${keyPath} -o UserKnownHostsFile=${knownHostsPath}" git clone --branch ${customGitBranch} --depth 1 ${customGitUrl} ${gitCopyPath} --progress`;
-		// const { stdout, stderr } = await execAsync(command);
 		writeStream.write(
 			`\nCloning Repo Custom ${customGitUrl} to ${outputPath}: ✅\n`,
 		);
@@ -187,7 +188,6 @@ export const getCustomGitCloneCommand = async (
 		command.push(`echo "Cloned Custom Git ${customGitUrl}: ✅" >> ${logPath};`);
 		return command.join("\n");
 	} catch (error) {
-		console.log(error);
 		throw error;
 	}
 };

packages/server/src/utils/providers/github.ts

@@ -1,16 +1,16 @@
 import { createWriteStream } from "node:fs";
 import { join } from "node:path";
-import { paths } from "@/server/constants";
-import type { InferResultType } from "@/server/types/with";
+import { paths } from "@dokploy/server/constants";
+import type { InferResultType } from "@dokploy/server/types/with";
 import { createAppAuth } from "@octokit/auth-app";
 import { TRPCError } from "@trpc/server";
 import { Octokit } from "octokit";
 import { recreateDirectory } from "../filesystem/directory";
 import { spawnAsync } from "../process/spawnAsync";
 
-import type { apiFindGithubBranches } from "@/server/db/schema";
-import type { Compose } from "@/server/services/compose";
-import { type Github, findGithubById } from "@/server/services/github";
+import type { apiFindGithubBranches } from "@dokploy/server/db/schema";
+import type { Compose } from "@dokploy/server/services/compose";
+import { type Github, findGithubById } from "@dokploy/server/services/github";
 import { execAsyncRemote } from "../process/execAsync";
 
 export const authGithub = (githubProvider: Github): Octokit => {

packages/server/src/utils/providers/gitlab.ts

@@ -1,14 +1,14 @@
 import { createWriteStream } from "node:fs";
 import { join } from "node:path";
-import { paths } from "@/server/constants";
-import type { apiGitlabTestConnection } from "@/server/db/schema";
-import type { Compose } from "@/server/services/compose";
+import { paths } from "@dokploy/server/constants";
+import type { apiGitlabTestConnection } from "@dokploy/server/db/schema";
+import type { Compose } from "@dokploy/server/services/compose";
 import {
 	type Gitlab,
 	findGitlabById,
 	updateGitlab,
-} from "@/server/services/gitlab";
-import type { InferResultType } from "@/server/types/with";
+} from "@dokploy/server/services/gitlab";
+import type { InferResultType } from "@dokploy/server/types/with";
 import { TRPCError } from "@trpc/server";
 import { recreateDirectory } from "../filesystem/directory";
 import { execAsyncRemote } from "../process/execAsync";
@@ -47,8 +47,6 @@ export const refreshGitlabToken = async (gitlabProviderId: string) => {
 
 	const expiresAt = Math.floor(Date.now() / 1000) + data.expires_in;
 
-	console.log("Refreshed token");
-
 	await updateGitlab(gitlabProviderId, {
 		accessToken: data.access_token,
 		refreshToken: data.refresh_token,

packages/server/src/utils/providers/raw.ts

@@ -1,8 +1,8 @@
 import { createWriteStream } from "node:fs";
 import { writeFile } from "node:fs/promises";
 import { join } from "node:path";
-import { paths } from "@/server/constants";
-import type { Compose } from "@/server/services/compose";
+import { paths } from "@dokploy/server/constants";
+import type { Compose } from "@dokploy/server/services/compose";
 import { encodeBase64 } from "../docker/utils";
 import { recreateDirectory } from "../filesystem/directory";
 import { execAsyncRemote } from "../process/execAsync";

packages/server/src/utils/servers/remote-docker.ts

@@ -1,5 +1,5 @@
-import { docker } from "@/server/constants";
-import { findServerById } from "@/server/services/server";
+import { docker } from "@dokploy/server/constants";
+import { findServerById } from "@dokploy/server/services/server";
 import Dockerode from "dockerode";
 
 export const getRemoteDocker = async (serverId?: string | null) => {

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

@@ -1,7 +1,7 @@
 import fs, { writeFileSync } from "node:fs";
 import path from "node:path";
-import { paths } from "@/server/constants";
-import type { Domain } from "@/server/services/domain";
+import { paths } from "@dokploy/server/constants";
+import type { Domain } from "@dokploy/server/services/domain";
 import { dump, load } from "js-yaml";
 import { encodeBase64 } from "../docker/utils";
 import { execAsyncRemote } from "../process/execAsync";

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

@@ -1,4 +1,4 @@
-import type { Domain } from "@/server/services/domain";
+import type { Domain } from "@dokploy/server/services/domain";
 import type { ApplicationNested } from "../builders";
 import {
 	createServiceConfig,

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

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { paths } from "@/server/constants";
+import { paths } from "@dokploy/server/constants";
 import { dump, load } from "js-yaml";
 import type { ApplicationNested } from "../builders";
 import { execAsyncRemote } from "../process/execAsync";

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

@@ -1,4 +1,4 @@
-import type { Redirect } from "@/server/services/redirect";
+import type { Redirect } from "@dokploy/server/services/redirect";
 import type { ApplicationNested } from "../builders";
 import {
 	loadOrCreateConfig,

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

@@ -1,75 +0,0 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import { paths } from "@/server/constants";
-import type { Registry } from "@/server/services/registry";
-import { dump, load } from "js-yaml";
-import { removeDirectoryIfExistsContent } from "../filesystem/directory";
-import type { FileConfig, HttpRouter } from "./file-types";
-
-export const manageRegistry = async (registry: Registry) => {
-	const { REGISTRY_PATH } = paths();
-	if (!existsSync(REGISTRY_PATH)) {
-		mkdirSync(REGISTRY_PATH, { recursive: true });
-	}
-
-	const appName = "dokploy-registry";
-	const config: FileConfig = loadOrCreateConfig();
-
-	const serviceName = `${appName}-service`;
-	const routerName = `${appName}-router`;
-
-	config.http = config.http || { routers: {}, services: {} };
-	config.http.routers = config.http.routers || {};
-	config.http.services = config.http.services || {};
-
-	config.http.routers[routerName] = await createRegistryRouterConfig(registry);
-
-	config.http.services[serviceName] = {
-		loadBalancer: {
-			servers: [{ url: `http://${appName}:5000` }],
-			passHostHeader: true,
-		},
-	};
-
-	const yamlConfig = dump(config);
-	const configFile = join(REGISTRY_PATH, "registry.yml");
-	writeFileSync(configFile, yamlConfig);
-};
-
-export const removeSelfHostedRegistry = async () => {
-	const { REGISTRY_PATH } = paths();
-	await removeDirectoryIfExistsContent(REGISTRY_PATH);
-};
-
-const createRegistryRouterConfig = async (registry: Registry) => {
-	const { registryUrl } = registry;
-	const routerConfig: HttpRouter = {
-		rule: `Host(\`${registryUrl}\`)`,
-		service: "dokploy-registry-service",
-		middlewares: ["redirect-to-https"],
-		entryPoints: [
-			"web",
-			...(process.env.NODE_ENV === "production" ? ["websecure"] : []),
-		],
-		...(process.env.NODE_ENV === "production"
-			? {
-					tls: { certResolver: "letsencrypt" },
-				}
-			: {}),
-	};
-
-	return routerConfig;
-};
-
-const loadOrCreateConfig = (): FileConfig => {
-	const { REGISTRY_PATH } = paths();
-	const configPath = join(REGISTRY_PATH, "registry.yml");
-	if (existsSync(configPath)) {
-		const yamlStr = readFileSync(configPath, "utf8");
-		const parsedConfig = (load(yamlStr) as FileConfig) || {
-			http: { routers: {}, services: {} },
-		};
-		return parsedConfig;
-	}
-	return { http: { routers: {}, services: {} } };
-};

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

@@ -1,4 +1,4 @@
-import type { Security } from "@/server/services/security";
+import type { Security } from "@dokploy/server/services/security";
 import * as bcrypt from "bcrypt";
 import type { ApplicationNested } from "../builders";
 import {

packages/server/src/utils/traefik/web-server.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { paths } from "@/server/constants";
-import type { Admin } from "@/server/services/admin";
+import { paths } from "@dokploy/server/constants";
+import type { Admin } from "@dokploy/server/services/admin";
 import { dump, load } from "js-yaml";
 import { loadOrCreateConfig, writeTraefikConfig } from "./application";
 import type { FileConfig } from "./file-types";