Merge pull request #635 from coollabsio/next

v3.10.8

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/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.8';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';

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/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 (!name) return errorNotification({ message: 'Name is required.' });
-			if (!value) return errorNotification(`${t.get('forms.value')} ${t.get('forms.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/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.8",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {