Merge pull request #637 from coollabsio/next

v3.10.9

apps/api/prisma/seed.js

@@ -94,6 +94,16 @@ async function main() {
 			}
 		});
 	}
+	// Set new preview secrets
+	const secrets = await prisma.secret.findMany({ where: { isPRMRSecret: false } })
+	if (secrets.length > 0) {
+		for (const secret of secrets) {
+			const previewSecrets = await prisma.secret.findMany({ where: { applicationId: secret.applicationId, name: secret.name, isPRMRSecret: true } })
+			if (previewSecrets.length === 0) {
+				await prisma.secret.create({ data: { ...secret, id: undefined, isPRMRSecret: true } })
+			}
+		}
+	}
 }
 main()
 	.catch((e) => {

apps/api/src/jobs/deployApplication.ts

@@ -211,7 +211,6 @@ import * as buildpacks from '../lib/buildPacks';
 										//
 									}
 									await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
-
 									if (forceRebuild) deployNeeded = true
 									if (!imageFound || deployNeeded) {
 										// if (true) {

apps/api/src/lib/buildPacks/common.ts

@@ -472,7 +472,8 @@ export const saveBuildLog = async ({
 
 	if (isDev) {
 		console.debug(`[${applicationId}] ${addTimestamp}`);
-	}
+		return
+	} 
 	try {
 		return await got.post(`${fluentBitUrl}/${applicationId}_buildlog_${buildId}.csv`, {
 			json: {
@@ -586,9 +587,9 @@ export async function buildImage({
 	} else {
 		await saveBuildLog({ line: `Building image started.`, buildId, applicationId });
 	}
-	if (!debug && isCache) {
+	if (!debug) {
 		await saveBuildLog({
-			line: `Debug turned off. To see more details, allow it in the configuration.`,
+			line: `Debug turned off. To see more details, allow it in the features tab.`,
 			buildId,
 			applicationId
 		});
@@ -607,30 +608,6 @@ export async function buildImage({
 	}
 }
 
-export async function streamEvents({ stream, docker, buildId, applicationId, debug }) {
-	await new Promise((resolve, reject) => {
-		docker.engine.modem.followProgress(stream, onFinished, onProgress);
-		function onFinished(err, res) {
-			if (err) reject(err);
-			resolve(res);
-		}
-		async function onProgress(event) {
-			if (event.error) {
-				reject(event.error);
-			} else if (event.stream) {
-				if (event.stream !== '\n') {
-					if (debug)
-						await saveBuildLog({
-							line: `${event.stream.replace('\n', '')}`,
-							buildId,
-							applicationId
-						});
-				}
-			}
-		}
-	});
-}
-
 export function makeLabelForStandaloneApplication({
 	applicationId,
 	fqdn,
@@ -721,6 +698,7 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 	if (installCommand) {
 		Dockerfile.push(`RUN ${installCommand}`);
 	}
+	// Dockerfile.push(`ARG CACHEBUST=1`);
 	Dockerfile.push(`RUN ${buildCommand}`);
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
 	await buildImage({ ...data, isCache: true });

apps/api/src/lib/buildPacks/docker.ts

@@ -13,36 +13,33 @@ export default async function (data) {
 		pullmergeRequestId,
 		dockerFileLocation
 	} = data
-	try {
-		const file = `${workdir}${baseDirectory}${dockerFileLocation}`;
-		data.workdir = `${workdir}${baseDirectory}`;
-		const Dockerfile: Array<string> = (await fs.readFile(`${file}`, 'utf8'))
-			.toString()
-			.trim()
-			.split('\n');
-		Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
-		if (secrets.length > 0) {
-			secrets.forEach((secret) => {
-				if (secret.isBuildSecret) {
-					if (
-						(pullmergeRequestId && secret.isPRMRSecret) ||
-						(!pullmergeRequestId && !secret.isPRMRSecret)
-					) {
-						Dockerfile.unshift(`ARG ${secret.name}=${secret.value}`);
+	const file = `${workdir}${baseDirectory}${dockerFileLocation}`;
+	data.workdir = `${workdir}${baseDirectory}`;
+	const DockerfileRaw = await fs.readFile(`${file}`, 'utf8')
+	const Dockerfile: Array<string> = DockerfileRaw
+		.toString()
+		.trim()
+		.split('\n');
+	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
+	if (secrets.length > 0) {
+		secrets.forEach((secret) => {
+			if (secret.isBuildSecret) {
+				if (
+					(pullmergeRequestId && secret.isPRMRSecret) ||
+					(!pullmergeRequestId && !secret.isPRMRSecret)
+				) {
+					Dockerfile.unshift(`ARG ${secret.name}=${secret.value}`);
 
-						Dockerfile.forEach((line, index) => {
-							if (line.startsWith('FROM')) {
-								Dockerfile.splice(index + 1, 0, `ARG ${secret.name}`);
-							}
-						});
-					}
+					Dockerfile.forEach((line, index) => {
+						if (line.startsWith('FROM')) {
+							Dockerfile.splice(index + 1, 0, `ARG ${secret.name}`);
+						}
+					});
 				}
-			});
-		}
-
-		await fs.writeFile(`${workdir}${dockerFileLocation}`, Dockerfile.join('\n'));
-		await buildImage(data);
-	} catch (error) {
-		throw error;
+			}
+		});
 	}
+
+	await fs.writeFile(`${workdir}${dockerFileLocation}`, Dockerfile.join('\n'));
+	await buildImage(data);
 }

apps/api/src/lib/common.ts

@@ -21,7 +21,7 @@ import { scheduler } from './scheduler';
 import { supportedServiceTypesAndVersions } from './services/supportedVersions';
 import { includeServices } from './services/common';
 
-export const version = '3.10.5';
+export const version = '3.10.9';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
@@ -1651,10 +1651,10 @@ export async function cleanupDockerStorage(dockerId, lowDiskSpace, force) {
 		}
 	} catch (error) { }
 	if (lowDiskSpace || force) {
-		if (isDev) {
-			if (!force) console.log(`[DEV MODE] Low disk space: ${lowDiskSpace}`);
-			return;
-		}
+		// if (isDev) {
+		// 	if (!force) console.log(`[DEV MODE] Low disk space: ${lowDiskSpace}`);
+		// 	return;
+		// }
 		try {
 			await executeDockerCmd({
 				dockerId,

apps/api/src/lib/services/handlers.ts

@@ -1430,6 +1430,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_EXECUTOR_HOST=http://${id}-executor/v1`,
                     `_APP_STATSD_HOST=${id}-telegraf`,
                     "_APP_STATSD_PORT=8125",
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1453,6 +1454,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_DB_SCHEMA=${mariadbDatabase}`,
                     `_APP_DB_USER=${mariadbUser}`,
                     `_APP_DB_PASS=${mariadbPassword}`,
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1476,6 +1478,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_DB_SCHEMA=${mariadbDatabase}`,
                     `_APP_DB_USER=${mariadbUser}`,
                     `_APP_DB_PASS=${mariadbPassword}`,
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1494,6 +1497,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_OPENSSL_KEY_V1=${opensslKeyV1}`,
                     `_APP_REDIS_HOST=${id}-redis`,
                     "_APP_REDIS_PORT=6379",
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1527,6 +1531,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_DB_PASS=${mariadbPassword}`,
                     `_APP_EXECUTOR_SECRET=${executorSecret}`,
                     `_APP_EXECUTOR_HOST=http://${id}-executor/v1`,
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1550,6 +1555,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_DB_SCHEMA=${mariadbDatabase}`,
                     `_APP_DB_USER=${mariadbUser}`,
                     `_APP_DB_PASS=${mariadbPassword}`,
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1575,6 +1581,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_DB_SCHEMA=${mariadbDatabase}`,
                     `_APP_DB_USER=${mariadbUser}`,
                     `_APP_DB_PASS=${mariadbPassword}`,
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1604,6 +1611,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_DB_SCHEMA=${mariadbDatabase}`,
                     `_APP_DB_USER=${mariadbUser}`,
                     `_APP_DB_PASS=${mariadbPassword}`,
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1630,6 +1638,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_DB_PASS=${mariadbPassword}`,
                     `_APP_EXECUTOR_SECRET=${executorSecret}`,
                     `_APP_EXECUTOR_HOST=http://${id}-executor/v1`,
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1654,6 +1663,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                 environment: [
                     "_APP_ENV=production",
                     `_APP_EXECUTOR_SECRET=${executorSecret}`,
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1671,6 +1681,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_OPENSSL_KEY_V1=${opensslKeyV1}`,
                     `_APP_REDIS_HOST=${id}-redis`,
                     "_APP_REDIS_PORT=6379",
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1687,6 +1698,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     "_APP_ENV=production",
                     `_APP_REDIS_HOST=${id}-redis`,
                     "_APP_REDIS_PORT=6379",
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1711,6 +1723,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `_APP_DB_SCHEMA=${mariadbDatabase}`,
                     `_APP_DB_USER=${mariadbUser}`,
                     `_APP_DB_PASS=${mariadbPassword}`,
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1727,6 +1740,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     "_APP_ENV=production",
                     `_APP_REDIS_HOST=${id}-redis`,
                     "_APP_REDIS_PORT=6379",
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                     ...secrets
                 ],
                 ...defaultComposeConfiguration(network),
@@ -1743,7 +1757,8 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                     `MYSQL_ROOT_PASSWORD=${mariadbRootUserPassword}`,
                     `MYSQL_USER=${mariadbUser}`,
                     `MYSQL_PASSWORD=${mariadbPassword}`,
-                    `MYSQL_DATABASE=${mariadbDatabase}`
+                    `MYSQL_DATABASE=${mariadbDatabase}`,
+                    `OPEN_RUNTIMES_NETWORK=${network}`,
                 ],
                 command: "mysqld --innodb-flush-method=fsync",
                 ...defaultComposeConfiguration(network),
@@ -1781,6 +1796,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
                 "_APP_INFLUXDB_PORT=8086",
                 `_APP_REDIS_HOST=${id}-redis`,
                 "_APP_REDIS_PORT=6379",
+                `OPEN_RUNTIMES_NETWORK=${network}`,
                 ...secrets
             ],
             ...defaultComposeConfiguration(network),
@@ -1799,6 +1815,7 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
             environment: [
                 `_APP_INFLUXDB_HOST=${id}-influxdb`,
                 "_APP_INFLUXDB_PORT=8086",
+                `OPEN_RUNTIMES_NETWORK=${network}`,
             ],
             ...defaultComposeConfiguration(network),
         }

apps/api/src/lib/services/supportedVersions.ts

@@ -235,7 +235,7 @@ export const supportedServiceTypesAndVersions = [
 	// },
 	{
 		name: 'grafana',
-		fancyName: 'Grafana Dashboard',
+		fancyName: 'Grafana',
 		baseImage: 'grafana/grafana',
 		images: [],
 		versions: ['latest', '9.1.3', '9.1.2', '9.0.8', '8.3.11', '8.4.11', '8.5.11'],

apps/api/src/routes/api/v1/applications/handlers.ts

@@ -15,7 +15,6 @@ import { checkContainer, formatLabelsOnDocker, isContainerExited, removeContaine
 import type { FastifyRequest } from 'fastify';
 import type { GetImages, CancelDeployment, CheckDNS, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, GetApplicationLogs, GetBuildIdLogs, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage, DeployApplication, CheckDomain, StopPreviewApplication, RestartPreviewApplication, GetBuilds } from './types';
 import { OnlyId } from '../../../../types';
-import path from 'node:path';
 
 function filterObject(obj, callback) {
     return Object.fromEntries(Object.entries(obj).
@@ -326,7 +325,7 @@ export async function saveApplicationSettings(request: FastifyRequest<SaveApplic
             where: { id },
             data: { fqdn: isBot ? null : undefined, settings: { update: { debug, previews, dualCerts, autodeploy, isBot, isDBBranching, isCustomSSL } } },
             include: { destinationDocker: true }
-        }); 
+        });
         return reply.code(201).send();
     } catch ({ status, message }) {
         return errorHandler({ status, message })
@@ -817,10 +816,15 @@ export async function getSecrets(request: FastifyRequest<OnlyId>) {
 export async function updatePreviewSecret(request: FastifyRequest<SaveSecret>, reply: FastifyReply) {
     try {
         const { id } = request.params
-        const { name, value } = request.body
+        let { name, value } = request.body
+        if (value) {
+            value = encrypt(value.trim())
+        } else {
+            value = ''
+        }
         await prisma.secret.updateMany({
             where: { applicationId: id, name, isPRMRSecret: true },
-            data: { value: encrypt(value.trim()) }
+            data: { value }
         });
         return reply.code(201).send()
     } catch ({ status, message }) {

apps/ui/src/lib/common.ts

@@ -3,7 +3,7 @@ import { addToast } from '$lib/store';
 export const asyncSleep = (delay: number) =>
 	new Promise((resolve) => setTimeout(resolve, delay));
 
-export function errorNotification(error: any): void {
+export function errorNotification(error: any | { message: string }): void {
 	if (error.message) {
 		if (error.message === 'Cannot read properties of undefined (reading \'postMessage\')') {
 			return addToast({

apps/ui/src/routes/_NewResource.svelte

@@ -18,8 +18,8 @@
 
 <div class="dropdown dropdown-bottom">
 	<slot>
-		<label for="new" tabindex="0" class="btn btn-square btn-sm bg-coollabs">
-			<svg
+		<label for="new" tabindex="0" class="btn btn-sm text-sm bg-coollabs hover:bg-coollabs-100">
+			Create New Resource <svg
 				class="h-6 w-6"
 				xmlns="http://www.w3.org/2000/svg"
 				fill="none"
@@ -35,11 +35,7 @@
 		>
 	</slot>
 
-	<ul
-		id="new"
-		tabindex="0"
-		class="dropdown-content menu p-2 shadow bg-coolgray-300 rounded w-52"
-	>
+	<ul id="new" tabindex="0" class="dropdown-content menu p-2 shadow bg-coolgray-300 rounded w-52">
 		<li>
 			<button on:click={newApplication} class="no-underline hover:bg-applications rounded-none ">
 				<svg

apps/ui/src/routes/applications/[id]/_Secret.svelte

@@ -39,8 +39,8 @@
 
 	async function addNewSecret() {
 		try {
-			if (!name) return errorNotification(`${t.get('forms.name')} ${t.get('forms.is_required')}`);
-			if (!value) return errorNotification(`${t.get('forms.value')} ${t.get('forms.is_required')}`);
+			if (!name) return errorNotification({ message: 'Name is required.' });
+			if (!value) return errorNotification({ message: 'Value is required.' });
 			await post(`/applications/${id}/secrets`, {
 				name,
 				value,
@@ -61,7 +61,7 @@
 		changeIsBuildSecret = false
 	}: { changeIsBuildSecret?: boolean } = {}) {
 		if (changeIsBuildSecret) isBuildSecret = !isBuildSecret;
-		if (isNewSecret) return
+		if (isNewSecret) return;
 		try {
 			await put(`/applications/${id}/secrets`, {
 				name,

apps/ui/src/routes/applications/[id]/__layout.svelte

@@ -59,6 +59,7 @@
 	import { goto } from '$app/navigation';
 	import { onDestroy, onMount } from 'svelte';
 	import { t } from '$lib/translations';
+	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import {
 		appSession,
 		status,
@@ -75,10 +76,25 @@
 
 	let statusInterval: any;
 	let forceDelete = false;
-	const { id } = $page.params;
 
+	const { id } = $page.params;
 	$isDeploymentEnabled = checkIfDeploymentEnabledApplications($appSession.isAdmin, application);
 
+	async function deleteApplication(name: string, force: boolean) {
+		const sure = confirm($t('application.confirm_to_delete', { name }));
+		if (sure) {
+			try {
+				await del(`/applications/${id}`, { id, force });
+				return await goto('/');
+			} catch (error) {
+				if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid`)) {
+					forceDelete = true;
+				}
+				return errorNotification(error);
+			} 
+		}
+	}
+
 	async function handleDeploySubmit(forceRebuild = false) {
 		if (!$isDeploymentEnabled) return;
 		try {
@@ -172,13 +188,13 @@
 </script>
 
 <div class="mx-auto max-w-screen-2xl px-6 grid grid-cols-1 lg:grid-cols-2">
-	<nav class="header flex flex-row order-2 lg:order-1 px-0 lg:px-4">
+	<nav class="header flex flex-row order-2 lg:order-1 px-0 lg:px-4 items-start">
 		<div class="title lg:pb-10">
 			{#if $page.url.pathname === `/applications/${id}/configuration/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`}
+			{: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
@@ -195,6 +211,32 @@
 				</div>
 			{/if}
 		</div>
+		{#if $page.url.pathname.startsWith(`/applications/${id}/configuration/`)}
+		<div class="px-2">
+			{#if forceDelete}
+				<button
+					on:click={() => deleteApplication(application.name, true)}
+					disabled={!$appSession.isAdmin}
+					class:bg-red-600={$appSession.isAdmin}
+					class:hover:bg-red-500={$appSession.isAdmin}
+					class="btn btn-sm btn-error text-sm"
+				>
+					Force Delete Application
+				</button>
+			{:else}
+				<button
+					on:click={() => deleteApplication(application.name, false)}
+					disabled={!$appSession.isAdmin}
+					class:bg-red-600={$appSession.isAdmin}
+					class:hover:bg-red-500={$appSession.isAdmin}
+					class="btn btn-sm btn-error text-sm"
+				>
+				 Delete Application
+				</button>
+			{/if}
+		</div>
+
+		{/if}
 	</nav>
 	<div
 		class="pt-4 flex flex-row items-start justify-center lg:justify-end space-x-2 order-1 lg:order-2"
@@ -320,8 +362,7 @@
 				</svg>
 			</button>
 			<Tooltip triggeredBy="#forceredeploy">Force Redeploy (without cache)</Tooltip>
-		{:else}
-		{#if $isDeploymentEnabled}
+		{:else if $isDeploymentEnabled}
 			<button
 				class="icons flex items-center font-bold"
 				disabled={!$isDeploymentEnabled}
@@ -342,7 +383,6 @@
 				</svg>
 				Deploy
 			</button>
-			{/if}
 		{/if}
 
 		{#if $location && $status.application.isRunning}

apps/ui/src/routes/applications/[id]/index.svelte

@@ -266,7 +266,6 @@
 		await getBaseBuildImages();
 		await handleSubmit();
 	}
-
 	async function isDNSValid(domain: any, isWWW: any) {
 		try {
 			await get(`/applications/${id}/check?domain=${domain}`);
@@ -707,24 +706,6 @@
 						/>
 					</div>
 				{/if}
-				{#if application.buildPack === 'docker'}
-					<div class="grid grid-cols-2 items-center pt-4">
-						<label for="dockerFileLocation"
-							>Dockerfile Location <Explainer
-								explanation={"Should be absolute path, like <span class='text-settings font-bold'>/data/Dockerfile</span> or <span class='text-settings font-bold'>/Dockerfile.</span>"}
-							/></label
-						>
-						<input
-							class="w-full"
-							disabled={isDisabled}
-							readonly={!$appSession.isAdmin}
-							name="dockerFileLocation"
-							id="dockerFileLocation"
-							bind:value={application.dockerFileLocation}
-							placeholder="default: /Dockerfile"
-						/>
-					</div>
-				{/if}
 				{#if application.buildPack === 'deno'}
 					<div class="grid grid-cols-2 items-center">
 						<label for="denoMainFile">Main File</label>
@@ -776,6 +757,31 @@
 						/>
 					</div>
 				{/if}
+				{#if application.buildPack === 'docker'}
+					<div class="grid grid-cols-2 items-center pb-4">
+						<label for="dockerFileLocation"
+						class="mb-10"
+							>Dockerfile Location <Explainer
+								explanation={"Should be absolute path, like <span class='text-settings font-bold'>/data/Dockerfile</span> or <span class='text-settings font-bold'>/Dockerfile.</span>"}
+							/></label
+						>
+						<div class="form-control w-full">
+							<input
+							class="w-full input"
+							disabled={isDisabled}
+							readonly={!$appSession.isAdmin}
+							name="dockerFileLocation"
+							id="dockerFileLocation"
+							bind:value={application.dockerFileLocation}
+							placeholder="default: /Dockerfile"
+						/>
+							<label class="label">
+							  <span class="label-text-alt text-xs">Path: {application.baseDirectory.replace(/^\/$/,'')}{application.dockerFileLocation}</span>
+							</label>
+						  </div>
+						
+					</div>
+				{/if}
 				{#if !notNodeDeployments.includes(application.buildPack)}
 					<div class="grid grid-cols-2 items-center">
 						<div class="flex-col">

apps/ui/src/routes/applications/[id]/logs/_BuildLog.svelte

@@ -7,6 +7,7 @@
 	import Tooltip from '$lib/components/Tooltip.svelte';
 	import { day } from '$lib/dayjs';
 	import { selectedBuildId } from '$lib/store';
+	import { dev } from '$app/env';
 
 	let logs: any = [];
 	let currentStatus: any;
@@ -104,86 +105,86 @@
 	});
 </script>
 
-	<div class="flex justify-start top-0 pb-2 space-x-2">
-		<button
-			on:click={followBuild}
-			class="btn btn-sm bg-coollabs"
-			disabled={currentStatus !== 'running'}
-			class:bg-coolgray-300={followingLogs || currentStatus !== 'running'}
-			class:text-applications={followingLogs}
+<div class="flex justify-start top-0 pb-2 space-x-2">
+	<button
+		on:click={followBuild}
+		class="btn btn-sm bg-coollabs"
+		disabled={currentStatus !== 'running'}
+		class:bg-coolgray-300={followingLogs || currentStatus !== 'running'}
+		class:text-applications={followingLogs}
+	>
+		<svg
+			xmlns="http://www.w3.org/2000/svg"
+			class="w-6 h-6 mr-2"
+			viewBox="0 0 24 24"
+			stroke-width="1.5"
+			stroke="currentColor"
+			fill="none"
+			stroke-linecap="round"
+			stroke-linejoin="round"
 		>
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				class="w-6 h-6 mr-2"
-				viewBox="0 0 24 24"
-				stroke-width="1.5"
-				stroke="currentColor"
-				fill="none"
-				stroke-linecap="round"
-				stroke-linejoin="round"
-			>
-				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-				<circle cx="12" cy="12" r="9" />
-				<line x1="8" y1="12" x2="12" y2="16" />
-				<line x1="12" y1="8" x2="12" y2="16" />
-				<line x1="16" y1="12" x2="12" y2="16" />
-			</svg>
+			<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+			<circle cx="12" cy="12" r="9" />
+			<line x1="8" y1="12" x2="12" y2="16" />
+			<line x1="12" y1="8" x2="12" y2="16" />
+			<line x1="16" y1="12" x2="12" y2="16" />
+		</svg>
 
-			{followingLogs ? 'Following Logs...' : 'Follow Logs'}
-		</button>
+		{followingLogs ? 'Following Logs...' : 'Follow Logs'}
+	</button>
 
-		<button
-			on:click={cancelBuild}
-			class:animation-spin={cancelInprogress}
-			class="btn btn-sm"
-			disabled={currentStatus !== 'running'}
-			class:bg-coolgray-300={cancelInprogress || currentStatus !== 'running'}
+	<button
+		on:click={cancelBuild}
+		class:animation-spin={cancelInprogress}
+		class="btn btn-sm"
+		disabled={currentStatus !== 'running'}
+		class:bg-coolgray-300={cancelInprogress || currentStatus !== 'running'}
+	>
+		<svg
+			xmlns="http://www.w3.org/2000/svg"
+			class="w-6 h-6 mr-2"
+			viewBox="0 0 24 24"
+			stroke-width="1.5"
+			stroke="currentColor"
+			fill="none"
+			stroke-linecap="round"
+			stroke-linejoin="round"
 		>
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				class="w-6 h-6 mr-2"
-				viewBox="0 0 24 24"
-				stroke-width="1.5"
-				stroke="currentColor"
-				fill="none"
-				stroke-linecap="round"
-				stroke-linejoin="round"
-			>
-				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-				<circle cx="12" cy="12" r="9" />
-				<path d="M10 10l4 4m0 -4l-4 4" />
-			</svg>
-			{cancelInprogress ? 'Cancelling...' : 'Cancel Build'}
-		</button>
-		{#if currentStatus === 'running'}
+			<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+			<circle cx="12" cy="12" r="9" />
+			<path d="M10 10l4 4m0 -4l-4 4" />
+		</svg>
+		{cancelInprogress ? 'Cancelling...' : 'Cancel Build'}
+	</button>
+	{#if currentStatus === 'running'}
 		<button id="streaming" class="btn btn-sm bg-transparent border-none loading" />
 		<Tooltip triggeredBy="#streaming">Streaming logs</Tooltip>
-		{/if}
-	</div>
-	{#if currentStatus === 'queued'}
-		<div
-			class="font-mono w-full bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded mb-20 flex flex-col whitespace-nowrap scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1"
-		>
-			{$t('application.build.queued_waiting_exec')}
-		</div>
-	{:else if logs.length > 0}
-		<div
-			bind:this={logsEl}
-			on:scroll={detect}
-			class="font-mono w-full bg-coolgray-100 border border-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded mb-20 flex flex-col scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1"
-		>
-			{#each logs as log}
-				{#if fromDb}
-					<div>{log.line + '\n'}</div>
-				{:else}
-					<div>[{day.unix(log.time).format('HH:mm:ss.SSS')}] {log.line + '\n'}</div>
-				{/if}
-			{/each}
-		</div>
-	{:else}
-		<div
-			class="font-mono w-full bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded mb-20 flex flex-col whitespace-nowrap scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1"
-		>
-			No logs found yet.
-		</div>
 	{/if}
+</div>
+{#if currentStatus === 'queued'}
+	<div
+		class="font-mono w-full bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded mb-20 flex flex-col whitespace-nowrap scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1"
+	>
+		{$t('application.build.queued_waiting_exec')}
+	</div>
+{:else if logs.length > 0}
+	<div
+		bind:this={logsEl}
+		on:scroll={detect}
+		class="font-mono w-full bg-coolgray-100 border border-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded mb-20 flex flex-col scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1"
+	>
+		{#each logs as log}
+			{#if fromDb}
+				<div>{log.line + '\n'}</div>
+			{:else}
+				<div>[{day.unix(log.time).format('HH:mm:ss.SSS')}] {log.line + '\n'}</div>
+			{/if}
+		{/each}
+	</div>
+{:else}
+	<div
+		class="font-mono w-full bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded mb-20 flex flex-col whitespace-nowrap scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1"
+	>
+		{dev ? 'In development, logs are  shown in the console.' : 'No logs found yet.'}
+	</div>
+{/if}

apps/ui/src/routes/index.svelte

@@ -309,6 +309,128 @@
 	{/if}
 </nav>
 <div class="container lg:mx-auto lg:p-0 px-8 pt-5">
+	<div class="space-x-2 lg:flex lg:justify-center  text-center mb-4 ">
+		<button
+			class="btn btn-sm btn-ghost"
+			class:bg-applications={$search === '!app'}
+			class:hover:bg-coollabs={$search !== '!app'}
+			on:click={() => doSearch('!app')}
+		>
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6 mr-2 hidden lg:block "
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentcolor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<rect x="4" y="4" width="6" height="6" rx="1" />
+				<rect x="4" y="14" width="6" height="6" rx="1" />
+				<rect x="14" y="14" width="6" height="6" rx="1" />
+				<line x1="14" y1="7" x2="20" y2="7" />
+				<line x1="17" y1="4" x2="17" y2="10" />
+			</svg> Applications</button
+		>
+		<button
+			class="btn btn-sm btn-ghost"
+			class:bg-services={$search === '!service'}
+			class:hover:bg-coollabs={$search !== '!service'}
+			on:click={() => doSearch('!service')}
+			><svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6 mr-2 hidden lg:block"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<path d="M7 18a4.6 4.4 0 0 1 0 -9a5 4.5 0 0 1 11 2h1a3.5 3.5 0 0 1 0 7h-12" />
+			</svg> Services</button
+		>
+		<button
+			class="btn btn-sm btn-ghost "
+			class:bg-databases={$search === '!db'}
+			class:hover:bg-coollabs={$search !== '!db'}
+			on:click={() => doSearch('!db')}
+		>
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6 mr-2 hidden lg:block"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<ellipse cx="12" cy="6" rx="8" ry="3" />
+				<path d="M4 6v6a8 3 0 0 0 16 0v-6" />
+				<path d="M4 12v6a8 3 0 0 0 16 0v-6" />
+			</svg> Databases</button
+		>
+		<button
+			class="btn btn-sm btn-ghost"
+			class:bg-sources={$search === '!git'}
+			class:hover:bg-coollabs={$search !== '!git'}
+			on:click={() => doSearch('!git')}
+		>
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6 mr-2 hidden lg:block"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<circle cx="6" cy="6" r="2" />
+				<circle cx="18" cy="18" r="2" />
+				<path d="M11 6h5a2 2 0 0 1 2 2v8" />
+				<polyline points="14 9 11 6 14 3" />
+				<path d="M13 18h-5a2 2 0 0 1 -2 -2v-8" />
+				<polyline points="10 15 13 18 10 21" />
+			</svg> Git Sources</button
+		>
+		<button
+			class="btn btn-sm btn-ghost"
+			class:bg-destinations={$search === '!destination'}
+			class:hover:bg-coollabs={$search !== '!destination'}
+			on:click={() => doSearch('!destination')}
+		>
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6 mr-2 hidden lg:block"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<path
+					d="M22 12.54c-1.804 -.345 -2.701 -1.08 -3.523 -2.94c-.487 .696 -1.102 1.568 -.92 2.4c.028 .238 -.32 1.002 -.557 1h-14c0 5.208 3.164 7 6.196 7c4.124 .022 7.828 -1.376 9.854 -5c1.146 -.101 2.296 -1.505 2.95 -2.46z"
+				/>
+				<path d="M5 10h3v3h-3z" />
+				<path d="M8 10h3v3h-3z" />
+				<path d="M11 10h3v3h-3z" />
+				<path d="M8 7h3v3h-3z" />
+				<path d="M11 7h3v3h-3z" />
+				<path d="M11 4h3v3h-3z" />
+				<path d="M4.571 18c1.5 0 2.047 -.074 2.958 -.78" />
+				<line x1="10" y1="16" x2="10" y2="16.01" />
+			</svg>Destinations</button
+		>
+	</div>
 	{#if applications.length !== 0 || destinations.length !== 0 || databases.length !== 0 || services.length !== 0 || gitSources.length !== 0 || destinations.length !== 0}
 		<div class="form-control">
 			<div class="input-group flex w-full">
@@ -343,40 +465,16 @@
 			</div>
 			<label for="search" class="label w-full mt-3">
 				<span class="label-text text-xs flex flex-wrap gap-2 items-center">
-					<button
-						class:bg-coollabs={$search === '!notmine'}
-						class="badge badge-lg text-white text-xs rounded"
-						on:click={() => doSearch('!notmine')}>Other Teams</button
-					>
-					<button
-						class:bg-coollabs={$search === '!app'}
-						class="badge badge-lg text-white text-xs rounded"
-						on:click={() => doSearch('!app')}>Applications</button
-					>
 					<button
 						class:bg-coollabs={$search === '!bot'}
 						class="badge badge-lg text-white text-xs rounded"
 						on:click={() => doSearch('!bot')}>Bots</button
 					>
+
 					<button
-						class:bg-coollabs={$search === '!service'}
+						class:bg-coollabs={$search === '!notmine'}
 						class="badge badge-lg text-white text-xs rounded"
-						on:click={() => doSearch('!service')}>Services</button
-					>
-					<button
-						class:bg-coollabs={$search === '!db'}
-						class="badge badge-lg text-white text-xs rounded"
-						on:click={() => doSearch('!db')}>Databases</button
-					>
-					<button
-						class:bg-coollabs={$search === '!git'}
-						class="badge badge-lg text-white text-xs rounded"
-						on:click={() => doSearch('!git')}>Git Sources</button
-					>
-					<button
-						class:bg-coollabs={$search === '!destination'}
-						class="badge badge-lg text-white text-xs rounded"
-						on:click={() => doSearch('!destination')}>Destinations</button
+						on:click={() => doSearch('!notmine')}>Other Teams</button
 					>
 					<button
 						class:bg-coollabs={$search === '!running'}
@@ -408,7 +506,7 @@
 	{#if filtered.applications.length > 0 && applications.length > 0}
 		<div class="divider" />
 		<div
-			class="grid grid-col gap-8 auto-cols-max grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 p-4"
+			class="grid grid-col gap-2 lg:gap-8 auto-cols-max grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 p-4"
 		>
 			{#if filtered.applications.length > 0}
 				{#each filtered.applications as application}

apps/ui/src/routes/services/[id]/logs/index.svelte

@@ -84,37 +84,6 @@
 	}
 </script>
 
-<div class="flex h-20 items-center space-x-2 p-5 px-6 font-bold">
-	<div class="-mb-5 flex-col">
-		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
-			Service Logs
-		</div>
-		<span class="text-xs">{service.name}</span>
-	</div>
-
-	{#if service.fqdn}
-		<a
-			href={service.fqdn}
-			target="_blank"
-			class="icons tooltip-bottom flex items-center bg-transparent text-sm"
-			><svg
-				xmlns="http://www.w3.org/2000/svg"
-				class="h-6 w-6"
-				viewBox="0 0 24 24"
-				stroke-width="1.5"
-				stroke="currentColor"
-				fill="none"
-				stroke-linecap="round"
-				stroke-linejoin="round"
-			>
-				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-				<path d="M11 7h-5a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-5" />
-				<line x1="10" y1="14" x2="20" y2="4" />
-				<polyline points="15 4 20 4 20 9" />
-			</svg></a
-		>
-	{/if}
-</div>
 <div class="flex flex-row justify-center space-x-2 px-10 pt-6">
 	{#if logs.length === 0}
 		<div class="text-xl font-bold tracking-tighter">{$t('application.build.waiting_logs')}</div>
@@ -150,9 +119,9 @@
 				</button>
 				<Tooltip triggeredBy="#follow">Follow Logs</Tooltip>
 			</div>
-			<div class="font-mono w-full rounder bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto max-h-[80vh] rounded-md mb-20 flex flex-col whitespace-nowrap -mt-12 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1">
+			<div class="font-mono w-full bg-coolgray-200 p-5 overflow-x-auto overflox-y-auto rounded mb-20 flex flex-col -mt-12 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 scrollbar-w-1">
 				{#each logs as log}
-					<p>{log.line + '\n'}</p>
+					<p>{log + '\n'}</p>
 				{/each}
 			</div>
 		</div>

apps/ui/src/routes/services/[id]/secrets.svelte

@@ -69,9 +69,6 @@
 </script>
 
 <div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
-	<h1 class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block font-bold mb-4">
-		Secrets
-	</h1>
 	<div class="overflow-x-auto">
 		<table class="w-full border-separate text-left">
 			<thead>

apps/ui/src/routes/services/[id]/storages.svelte

@@ -35,43 +35,6 @@
 	}
 </script>
 
-<div
-	class="flex items-center space-x-2 p-5 px-6 font-bold"
-	class:p-5={service.fqdn}
-	class:p-6={!service.fqdn}
->
-	<div class="-mb-5 flex-col">
-		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
-			Persistent Storage
-		</div>
-		<span class="text-xs">{service.name}</span>
-	</div>
-	{#if service.fqdn}
-		<a
-			href={service.fqdn}
-			target="_blank"
-			class="icons tooltip-bottom flex items-center bg-transparent text-sm"
-			><svg
-				xmlns="http://www.w3.org/2000/svg"
-				class="h-6 w-6"
-				viewBox="0 0 24 24"
-				stroke-width="1.5"
-				stroke="currentColor"
-				fill="none"
-				stroke-linecap="round"
-				stroke-linejoin="round"
-			>
-				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-				<path d="M11 7h-5a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-5" />
-				<line x1="10" y1="14" x2="20" y2="4" />
-				<polyline points="15 4 20 4 20 9" />
-			</svg></a
-		>
-	{/if}
-
-	<ServiceLinks {service} />
-</div>
-
 <div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
 	<div class="flex justify-center py-4 text-center">
 		<SimpleExplainer

apps/ui/src/routes/settings/coolify.svelte

@@ -216,7 +216,7 @@
 				>
 
 				{#if isFqdnSet}
-					<button on:click|preventDefault={removeFqdn} disabled={loading.remove} class="btn"
+					<button on:click|preventDefault={removeFqdn} disabled={loading.remove} class="btn btn-sm"
 						>{loading.remove ? $t('forms.removing') : $t('forms.remove_domain')}</button
 					>
 				{/if}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.10.5",
+  "version": "3.10.9",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {