diff --git a/.env.template b/.env.template index ce02dc5bd..0fa7427f3 100644 --- a/.env.template +++ b/.env.template @@ -2,4 +2,5 @@ COOLIFY_APP_ID= COOLIFY_SECRET_KEY=12341234123412341234123412341234 COOLIFY_DATABASE_URL=file:../db/dev.db COOLIFY_SENTRY_DSN= -COOLIFY_IS_ON="docker" \ No newline at end of file +COOLIFY_IS_ON="docker" +COOLIFY_WHITE_LABELED="false" \ No newline at end of file diff --git a/prisma/schema.prisma b/prisma/schema.prisma index d5e322337..7f37f9a2b 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -336,7 +336,7 @@ model Wordpress { ftpUser String? ftpPassword String? ftpPublicPort Int? - ftpHostKey String? + ftpHostKey String? ftpHostKeyPrivate String? serviceId String @unique service Service @relation(fields: [serviceId], references: [id]) diff --git a/src/lib/database/services.ts b/src/lib/database/services.ts index d578a500c..b4d355946 100644 --- a/src/lib/database/services.ts +++ b/src/lib/database/services.ts @@ -220,18 +220,6 @@ export async function updatePlausibleAnalyticsService({ id, fqdn, email, usernam export async function updateService({ id, fqdn, name }) { return await prisma.service.update({ where: { id }, data: { fqdn, name } }); } -export async function updateLanguageToolService({ id, fqdn, name }) { - return await prisma.service.update({ where: { id }, data: { fqdn, name } }); -} -export async function updateMeiliSearchService({ id, fqdn, name }) { - return await prisma.service.update({ where: { id }, data: { fqdn, name } }); -} -export async function updateVaultWardenService({ id, fqdn, name }) { - return await prisma.service.update({ where: { id }, data: { fqdn, name } }); -} -export async function updateVsCodeServer({ id, fqdn, name }) { - return await prisma.service.update({ where: { id }, data: { fqdn, name } }); -} export async function updateWordpress({ id, fqdn, name, mysqlDatabase, extraConfig }) { return await prisma.service.update({ where: { id }, diff --git a/src/lib/types/composeFile.ts b/src/lib/types/composeFile.ts index 43b8d2e7b..1e2a0723c 100644 --- a/src/lib/types/composeFile.ts +++ b/src/lib/types/composeFile.ts @@ -18,7 +18,11 @@ export type ComposeFileService = { restart: ComposeFileRestartOption; depends_on?: string[]; command?: string; - build?: string; + build?: { + context: string; + dockerfile: string; + args?: Record; + }; }; export type ComposerFileVersion = diff --git a/src/routes/services/[id]/languagetool/index.json.ts b/src/routes/services/[id]/languagetool/index.json.ts index c253112b9..d717502c5 100644 --- a/src/routes/services/[id]/languagetool/index.json.ts +++ b/src/routes/services/[id]/languagetool/index.json.ts @@ -13,7 +13,7 @@ export const post: RequestHandler = async (event) => { if (fqdn) fqdn = fqdn.toLowerCase(); try { - await db.updateMeiliSearchService({ id, fqdn, name }); + await db.updateService({ id, fqdn, name }); return { status: 201 }; } catch (error) { return ErrorHandler(error); diff --git a/src/routes/services/[id]/meilisearch/index.json.ts b/src/routes/services/[id]/meilisearch/index.json.ts index e33112fe8..d717502c5 100644 --- a/src/routes/services/[id]/meilisearch/index.json.ts +++ b/src/routes/services/[id]/meilisearch/index.json.ts @@ -13,7 +13,7 @@ export const post: RequestHandler = async (event) => { if (fqdn) fqdn = fqdn.toLowerCase(); try { - await db.updateLanguageToolService({ id, fqdn, name }); + await db.updateService({ id, fqdn, name }); return { status: 201 }; } catch (error) { return ErrorHandler(error); diff --git a/src/routes/services/[id]/vaultwarden/index.json.ts b/src/routes/services/[id]/vaultwarden/index.json.ts index 08d80a547..5ec3fa69a 100644 --- a/src/routes/services/[id]/vaultwarden/index.json.ts +++ b/src/routes/services/[id]/vaultwarden/index.json.ts @@ -12,7 +12,7 @@ export const post: RequestHandler = async (event) => { if (fqdn) fqdn = fqdn.toLowerCase(); try { - await db.updateVaultWardenService({ id, fqdn, name }); + await db.updateService({ id, fqdn, name }); return { status: 201 }; } catch (error) { return ErrorHandler(error); diff --git a/src/routes/services/[id]/vscodeserver/index.json.ts b/src/routes/services/[id]/vscodeserver/index.json.ts index d1ec862bc..d717502c5 100644 --- a/src/routes/services/[id]/vscodeserver/index.json.ts +++ b/src/routes/services/[id]/vscodeserver/index.json.ts @@ -13,7 +13,7 @@ export const post: RequestHandler = async (event) => { if (fqdn) fqdn = fqdn.toLowerCase(); try { - await db.updateVsCodeServer({ id, fqdn, name }); + await db.updateService({ id, fqdn, name }); return { status: 201 }; } catch (error) { return ErrorHandler(error);