diff --git a/apps/api/src/lib/buildPacks/common.ts b/apps/api/src/lib/buildPacks/common.ts index 44812a76d..f89568360 100644 --- a/apps/api/src/lib/buildPacks/common.ts +++ b/apps/api/src/lib/buildPacks/common.ts @@ -348,7 +348,6 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st if (buildPack === 'heroku') { payload.baseImage = 'heroku/buildpacks:20'; payload.baseImages = herokuVersions; - } return payload; } diff --git a/apps/ui/src/lib/templates.ts b/apps/ui/src/lib/templates.ts index c4ec05ad6..671bf9d5a 100644 --- a/apps/ui/src/lib/templates.ts +++ b/apps/ui/src/lib/templates.ts @@ -195,6 +195,7 @@ export function findBuildPack(pack: string, packageManager = 'npm') { export const buildPacks = [ { name: 'node', + type: 'base', fancyName: 'Node.js', hoverColor: 'hover:bg-green-700', color: 'bg-green-700', @@ -202,6 +203,7 @@ export const buildPacks = [ }, { name: 'static', + type: 'base', fancyName: 'Static', hoverColor: 'hover:bg-orange-700', color: 'bg-orange-700', @@ -210,6 +212,7 @@ export const buildPacks = [ { name: 'php', + type: 'base', fancyName: 'PHP', hoverColor: 'hover:bg-indigo-700', color: 'bg-indigo-700', @@ -217,6 +220,8 @@ export const buildPacks = [ }, { name: 'laravel', + type: 'specific', + base: 'php', fancyName: 'Laravel', hoverColor: 'hover:bg-indigo-700', color: 'bg-indigo-700', @@ -224,6 +229,7 @@ export const buildPacks = [ }, { name: 'docker', + type: 'base', fancyName: 'Docker', hoverColor: 'hover:bg-sky-700', color: 'bg-sky-700', @@ -231,6 +237,8 @@ export const buildPacks = [ }, { name: 'svelte', + type: 'specific', + base: 'node', fancyName: 'Svelte', hoverColor: 'hover:bg-orange-700', color: 'bg-orange-700', @@ -238,6 +246,8 @@ export const buildPacks = [ }, { name: 'vuejs', + type: 'specific', + base: 'node', fancyName: 'VueJS', hoverColor: 'hover:bg-green-700', color: 'bg-green-700', @@ -245,6 +255,8 @@ export const buildPacks = [ }, { name: 'nuxtjs', + type: 'specific', + base: 'node', fancyName: 'NuxtJS', hoverColor: 'hover:bg-green-700', color: 'bg-green-700', @@ -252,6 +264,8 @@ export const buildPacks = [ }, { name: 'gatsby', + type: 'specific', + base: 'node', fancyName: 'Gatsby', hoverColor: 'hover:bg-blue-700', color: 'bg-blue-700', @@ -259,6 +273,8 @@ export const buildPacks = [ }, { name: 'astro', + type: 'specific', + base: 'node', fancyName: 'Astro', hoverColor: 'hover:bg-pink-700', color: 'bg-pink-700', @@ -266,14 +282,17 @@ export const buildPacks = [ }, { name: 'eleventy', + type: 'specific', + base: 'node', fancyName: 'Eleventy', hoverColor: 'hover:bg-red-700', color: 'bg-red-700', isCoolifyBuildPack: true, }, - { name: 'react', + type: 'specific', + base: 'node', fancyName: 'React', hoverColor: 'hover:bg-blue-700', color: 'bg-blue-700', @@ -281,6 +300,8 @@ export const buildPacks = [ }, { name: 'preact', + type: 'specific', + base: 'node', fancyName: 'Preact', hoverColor: 'hover:bg-blue-700', color: 'bg-blue-700', @@ -288,6 +309,8 @@ export const buildPacks = [ }, { name: 'nextjs', + type: 'specific', + base: 'node', fancyName: 'NextJS', hoverColor: 'hover:bg-blue-700', color: 'bg-blue-700', @@ -295,6 +318,8 @@ export const buildPacks = [ }, { name: 'nestjs', + type: 'specific', + base: 'node', fancyName: 'NestJS', hoverColor: 'hover:bg-red-700', color: 'bg-red-700', @@ -302,6 +327,7 @@ export const buildPacks = [ }, { name: 'rust', + type: 'base', fancyName: 'Rust', hoverColor: 'hover:bg-pink-700', color: 'bg-pink-700', @@ -309,6 +335,7 @@ export const buildPacks = [ }, { name: 'python', + type: 'base', fancyName: 'Python', hoverColor: 'hover:bg-green-700', color: 'bg-green-700', @@ -316,6 +343,7 @@ export const buildPacks = [ }, { name: 'deno', + type: 'base', fancyName: 'Deno', hoverColor: 'hover:bg-green-700', color: 'bg-green-700', @@ -323,6 +351,7 @@ export const buildPacks = [ }, { name: 'heroku', + type: 'base', fancyName: 'Heroku', hoverColor: 'hover:bg-purple-700', color: 'bg-purple-700', diff --git a/apps/ui/src/routes/applications/[id]/_Menu.svelte b/apps/ui/src/routes/applications/[id]/_Menu.svelte index 5e880724a..9df3744c1 100644 --- a/apps/ui/src/routes/applications/[id]/_Menu.svelte +++ b/apps/ui/src/routes/applications/[id]/_Menu.svelte @@ -218,9 +218,10 @@
  • -
    {#if $page.url.pathname === `/applications/${id}/configuration/source`} - Select a Git Source + Select a Source {:else if $page.url.pathname === `/applications/${id}/configuration/destination`} Select a Destination + {:else if $page.url.pathname === `/applications/${id}/configuration/repository`} + Select a Repository {:else if $page.url.pathname === `/applications/${id}/configuration/buildpack`} Select a Build Pack {:else} @@ -319,14 +321,15 @@ Force Redeploy (without cache) {:else} + {#if $isDeploymentEnabled} + {/if} {/if} {#if $location && $status.application.isRunning} @@ -363,10 +367,15 @@ {/if}
    -
    - +
    + {#if !$page.url.pathname.startsWith(`/applications/${id}/configuration/`)} + + {/if}
    diff --git a/apps/ui/src/routes/applications/[id]/configuration/_BuildPack.svelte b/apps/ui/src/routes/applications/[id]/configuration/_BuildPack.svelte index 89625336b..13db5a24a 100644 --- a/apps/ui/src/routes/applications/[id]/configuration/_BuildPack.svelte +++ b/apps/ui/src/routes/applications/[id]/configuration/_BuildPack.svelte @@ -40,9 +40,13 @@
    handleSubmit(buildPack.name)}>
    diff --git a/apps/ui/src/routes/applications/[id]/configuration/buildpack.svelte b/apps/ui/src/routes/applications/[id]/configuration/buildpack.svelte index 2e673c35a..3a4c41115 100644 --- a/apps/ui/src/routes/applications/[id]/configuration/buildpack.svelte +++ b/apps/ui/src/routes/applications/[id]/configuration/buildpack.svelte @@ -261,7 +261,7 @@
    {:else} -
    +
    Other
    {#each buildPacks.filter((bp) => bp.isHerokuBuildPack === true) as buildPack} @@ -271,10 +271,20 @@ {/each}
    -
    -
    Coolify Custom
    +
    +
    Coolify Base
    - {#each buildPacks.filter((bp) => bp.isCoolifyBuildPack === true) as buildPack} + {#each buildPacks.filter((bp) => bp.isCoolifyBuildPack === true && bp.type ==='base') as buildPack} +
    + +
    + {/each} +
    +
    +
    +
    Coolify Specific
    +
    + {#each buildPacks.filter((bp) => bp.isCoolifyBuildPack === true && bp.type ==='specific') as buildPack}
    diff --git a/apps/ui/src/routes/applications/[id]/configuration/repository.svelte b/apps/ui/src/routes/applications/[id]/configuration/repository.svelte index 002e1f74c..4924afcce 100644 --- a/apps/ui/src/routes/applications/[id]/configuration/repository.svelte +++ b/apps/ui/src/routes/applications/[id]/configuration/repository.svelte @@ -36,16 +36,8 @@ import GitlabRepositories from './_GitlabRepositories.svelte'; -
    -
    - {$t('application.configuration.select_a_repository_project')} -
    -
    -
    - {#if application.gitSource.type === 'github'} - - {:else if application.gitSource.type === 'gitlab'} - - {/if} -
    - +{#if application.gitSource.type === 'github'} + +{:else if application.gitSource.type === 'gitlab'} + +{/if} diff --git a/apps/ui/src/routes/applications/[id]/configuration/source.svelte b/apps/ui/src/routes/applications/[id]/configuration/source.svelte index 96fb6fb03..b88ce3b1f 100644 --- a/apps/ui/src/routes/applications/[id]/configuration/source.svelte +++ b/apps/ui/src/routes/applications/[id]/configuration/source.svelte @@ -68,7 +68,7 @@ } -
    +
    Git App
    {#if !filteredSources || ownSources.length === 0} @@ -98,7 +98,7 @@
    {:else} -
    +
    {#each ownSources as source}
    diff --git a/apps/ui/src/routes/applications/[id]/danger.svelte b/apps/ui/src/routes/applications/[id]/danger.svelte index 28de992b0..e88bd0414 100644 --- a/apps/ui/src/routes/applications/[id]/danger.svelte +++ b/apps/ui/src/routes/applications/[id]/danger.svelte @@ -21,12 +21,11 @@