From 5ac32f9f24a6b56b20a0397042e799424b68391e Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 9 Nov 2025 03:16:18 -0600 Subject: [PATCH] Refactor repository cloning interfaces: standardize parameters for Bitbucket, Gitea, and GitLab repository cloning functions to improve consistency and maintainability across the codebase. --- packages/server/src/services/application.ts | 1 - packages/server/src/utils/providers/bitbucket.ts | 14 +++++++++++++- packages/server/src/utils/providers/gitea.ts | 13 ++++++++++++- packages/server/src/utils/providers/gitlab.ts | 11 ++++++++--- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/packages/server/src/services/application.ts b/packages/server/src/services/application.ts index e2c38a9fa..c3508352c 100644 --- a/packages/server/src/services/application.ts +++ b/packages/server/src/services/application.ts @@ -29,7 +29,6 @@ import { cloneGitlabRepository } from "@dokploy/server/utils/providers/gitlab"; import { createTraefikConfig } from "@dokploy/server/utils/traefik/application"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; -import { cleanUpSystemPrune, encodeBase64 } from "../utils/docker/utils"; import { getDokployUrl } from "./admin"; import { createDeployment, diff --git a/packages/server/src/utils/providers/bitbucket.ts b/packages/server/src/utils/providers/bitbucket.ts index 0267ec9b3..8a62c5d22 100644 --- a/packages/server/src/utils/providers/bitbucket.ts +++ b/packages/server/src/utils/providers/bitbucket.ts @@ -81,10 +81,22 @@ type BitbucketClone = (ApplicationWithBitbucket | ComposeWithBitbucket) & { type?: "application" | "compose"; }; +interface CloneBitbucketRepository { + appName: string; + bitbucketRepository: string | null; + bitbucketOwner: string | null; + bitbucketBranch: string | null; + bitbucketId: string | null; + bitbucket: Bitbucket | null; + enableSubmodules: boolean; + serverId: string | null; + type?: "application" | "compose"; +} + export const cloneBitbucketRepository = async ({ type = "application", ...entity -}: BitbucketClone) => { +}: CloneBitbucketRepository) => { let command = "set -e;"; const { appName, diff --git a/packages/server/src/utils/providers/gitea.ts b/packages/server/src/utils/providers/gitea.ts index 5b69f6826..ec8946ab3 100644 --- a/packages/server/src/utils/providers/gitea.ts +++ b/packages/server/src/utils/providers/gitea.ts @@ -119,10 +119,21 @@ type GiteaClone = (ApplicationWithGitea | ComposeWithGitea) & { type?: "application" | "compose"; }; +interface CloneGiteaRepository { + appName: string; + giteaBranch: string | null; + giteaId: string | null; + giteaOwner: string | null; + giteaRepository: string | null; + enableSubmodules: boolean; + serverId: string | null; + type?: "application" | "compose"; +} + export const cloneGiteaRepository = async ({ type = "application", ...entity -}: GiteaClone) => { +}: CloneGiteaRepository) => { let command = "set -e;"; const { appName, diff --git a/packages/server/src/utils/providers/gitlab.ts b/packages/server/src/utils/providers/gitlab.ts index 9c75cd239..a3106b8c0 100644 --- a/packages/server/src/utils/providers/gitlab.ts +++ b/packages/server/src/utils/providers/gitlab.ts @@ -97,15 +97,20 @@ const getGitlabCloneUrl = (gitlab: GitlabInfo, repoClone: string) => { return cloneUrl; }; -type GitlabClone = (ApplicationWithGitlab | ComposeWithGitlab) & { +interface CloneGitlabRepository { + appName: string; + gitlabBranch: string | null; + gitlabId: string | null; + gitlabPathNamespace: string | null; + enableSubmodules: boolean; serverId: string | null; type?: "application" | "compose"; -}; +} export const cloneGitlabRepository = async ({ type = "application", ...entity -}: GitlabClone) => { +}: CloneGitlabRepository) => { let command = "set -e;"; const { appName,