Merge pull request #744 from coollabsio/next

v3.11.13
2022-11-23 13:08:13 +01:00 · 2022-11-23 13:08:13 +01:00 · 0f4536c3d3
commit 0f4536c3d3
parent c2d72ad309 f43c584463
15 changed files with 482 additions and 400 deletions
--- a/apps/api/devTemplates.yaml
+++ b/apps/api/devTemplates.yaml
@ -1,5 +1,4 @@
 - templateVersion: 1.0.0
-  ignore: true
  defaultVersion: "1.17"
  documentation: https://docs.gitea.io
  type: gitea
@ -25,7 +24,8 @@
        - ROOT_URL=$$config_root_url
        - SECRET_KEY=$$secret_secret_key
        - INTERNAL_TOKEN=$$secret_internal_token
-        - SSH_PORT=$$config_hostport_ssh
+        - SSH_PORT=22
+        - START_SSH_SERVER=$$config_start_ssh_server
      ports:
        - "3000"
        - "22"
@ -49,6 +49,11 @@
      label: SSH Domain
      defaultValue: $$generate_domain
      description: ""
+    - id: $$config_start_ssh_server
+      name: START_SSH_SERVER
+      label: Start SSH Server
+      defaultValue: "true"
+      description: ""
    - id: $$config_root_url
      name: ROOT_URL
      label: Root URL of Gitea
@ -59,13 +64,11 @@
      label: Secret Key
      defaultValue: $$generate_hex(32)
      description: ""
-      showOnConfiguration: true
    - id: $$secret_internal_token
      name: INTERNAL_TOKEN
      label: Internal JWT Token
      defaultValue: $$generate_token
      description: ""
-      showOnConfiguration: true
 - templateVersion: 1.0.0
  defaultVersion: "20.0"
  documentation: https://www.keycloak.org/documentation
@ -1821,7 +1824,7 @@
        - HASURA_GRAPHQL_ENABLE_CONSOLE=$$config_hasura_graphql_enable_console
        - >-
          HASURA_GRAPHQL_METADATA_DATABASE_URL=$$secret_hasura_graphql_metadata_database_url
-        - HASURA_GRAPHQL_ADMIN_PASSWORD=$$secret_hasura_graphql_admin_password
+        - HASURA_GRAPHQL_ADMIN_SECRET=$$secret_hasura_graphql_admin_secret
      ports:
        - "8080"
    $$id-postgresql:
@ -1847,8 +1850,8 @@
      defaultValue: >-
        postgresql://$$config_postgres_user:$$secret_postgres_password@$$id-postgresql:5432/$$config_postgres_db
      description: ""
-    - id: $$secret_hasura_graphql_admin_password
-      name: HASURA_GRAPHQL_ADMIN_PASSWORD
+    - id: $$secret_hasura_graphql_admin_secret
+      name: HASURA_GRAPHQL_ADMIN_SECRET
      label: Hasura Admin Password
      defaultValue: $$generate_password
      description: ""
--- a/apps/api/src/lib.ts
+++ b/apps/api/src/lib.ts
@ -250,7 +250,7 @@ async function hasura(service: any, template: any) {
    const { id } = service

    const secrets = [
-        `HASURA_GRAPHQL_ADMIN_PASSWORD@@@${graphQLAdminPassword}`,
+        `HASURA_GRAPHQL_ADMIN_SECRET@@@${graphQLAdminPassword}`,
        `HASURA_GRAPHQL_METADATA_DATABASE_URL@@@${encrypt(`postgres://${postgresqlUser}:${decrypt(postgresqlPassword)}@${id}-postgresql:5432/${postgresqlDatabase}`)}`,
        `POSTGRES_PASSWORD@@@${postgresqlPassword}`,
    ]
--- a/apps/api/src/lib/buildPacks/common.ts
+++ b/apps/api/src/lib/buildPacks/common.ts
@ -462,7 +462,13 @@ export const saveBuildLog = async ({
 	applicationId: string;
 }): Promise<any> => {
 	const { default: got } = await import('got')
-
+	if (typeof line === 'object' && line) {
+		if (line.shortMessage) {
+			line = line.shortMessage + '\n' + line.stderr; 
+		} else {
+			line = JSON.stringify(line);
+		}
+	}
 	if (line && typeof line === 'string' && line.includes('ghs_')) {
 		const regex = /ghs_.*@/g;
 		line = line.replace(regex, '<SENSITIVE_DATA_DELETED>@');
@ -589,7 +595,7 @@ export async function buildImage({
 	}
 	if (!debug) {
 		await saveBuildLog({
-			line: `Debug turned off. To see more details, allow it in the features tab.`,
+			line: `Debug logging is disabled. Enable it above if necessary!`,
 			buildId,
 			applicationId
 		});
--- a/apps/api/src/lib/buildPacks/compose.ts
+++ b/apps/api/src/lib/buildPacks/compose.ts
@ -86,9 +86,9 @@ export default async function (data) {
                let [v, path, permission] = volume.split(':');
                if (!path) {
                    path = v;
-                    v = `${applicationId}${v.replace(/\//gi, '-')}`
+                    v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`
                } else {
-                    v = `${applicationId}-${v}`
+                    v = `${applicationId}${v.replace(/\//gi, '-').replace(/\./gi, '')}`
                }
                composeVolumes[v] = {
                    name: v
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@ -17,7 +17,7 @@ import { day } from './dayjs';
 import { saveBuildLog } from './buildPacks/common';
 import { scheduler } from './scheduler';

-export const version = '3.11.12';
+export const version = '3.11.13';
 export const isDev = process.env.NODE_ENV === 'development';

 const algorithm = 'aes-256-ctr';
@ -28,9 +28,6 @@ const customConfig: Config = {
 	length: 3
 };

-export const defaultProxyImage = `coolify-haproxy-alpine:latest`;
-export const defaultProxyImageTcp = `coolify-haproxy-tcp-alpine:latest`;
-export const defaultProxyImageHttp = `coolify-haproxy-http-alpine:latest`;
 export const defaultTraefikImage = `traefik:v2.8`;
 export function getAPIUrl() {
 	if (process.env.GITPOD_WORKSPACE_URL) {
--- a/apps/api/src/lib/scheduler.ts
+++ b/apps/api/src/lib/scheduler.ts
@ -9,7 +9,7 @@ Bree.extend(TSBree);

 const options: any = {
 	defaultExtension: 'js',
-	logger: new Cabin(),
+	logger: false,
 	// logger: false,
 	// workerMessageHandler: async ({ name, message }) => {
 	// 	if (name === 'deployApplication' && message?.deploying) {
--- a/apps/api/src/lib/services/common.ts
+++ b/apps/api/src/lib/services/common.ts
@ -1,5 +1,5 @@

-import { prisma } from '../common';
+import { decrypt, prisma } from '../common';

 export async function removeService({ id }: { id: string }): Promise<void> {
 	await prisma.serviceSecret.deleteMany({ where: { serviceId: id } });
@ -23,3 +23,17 @@ export async function removeService({ id }: { id: string }): Promise<void> {

 	await prisma.service.delete({ where: { id } });
 }
+export async function verifyAndDecryptServiceSecrets(id: string) {
+	const secrets = await prisma.serviceSecret.findMany({ where: { serviceId: id } })
+	let decryptedSecrets = secrets.map(secret => {
+		const { name, value } = secret
+		if (value) {
+			let rawValue = decrypt(value)
+			rawValue = rawValue.replaceAll(/\$/gi, '$$$')
+			return { name, value: rawValue }
+		}
+		return { name, value }
+
+	})
+	return decryptedSecrets
+}
--- a/apps/api/src/lib/services/handlers.ts
+++ b/apps/api/src/lib/services/handlers.ts
@ -7,6 +7,7 @@ import { parseAndFindServiceTemplates } from '../../routes/api/v1/services/handl

 import { ServiceStartStop } from '../../routes/api/v1/services/types';
 import { OnlyId } from '../../types';
+import { verifyAndDecryptServiceSecrets } from './common';

 export async function stopService(request: FastifyRequest<ServiceStartStop>) {
    try {
@ -65,15 +66,17 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
                    }
                }
            }
-
-            const secrets = await prisma.serviceSecret.findMany({ where: { serviceId: id } })
+            const secrets = await verifyAndDecryptServiceSecrets(id)
            for (const secret of secrets) {
                const { name, value } = secret
                if (value) {
                    const foundEnv = !!template.services[s].environment?.find(env => env.startsWith(`${name}=`))
                    const foundNewEnv = !!newEnvironments?.find(env => env.startsWith(`${name}=`))
                    if (foundEnv && !foundNewEnv) {
-                        newEnvironments.push(`${name}=${decrypt(value)}`)
+                        newEnvironments.push(`${name}=${value}`)
+                    }
+                    if (!foundEnv && !foundNewEnv && s === id) {
+                        newEnvironments.push(`${name}=${value}`)
                    }
                }
            }
--- a/apps/api/templates.json
+++ b/apps/api/templates.json
--- a/apps/ui/src/routes/applications/[id]/features.svelte
+++ b/apps/ui/src/routes/applications/[id]/features.svelte
@ -44,7 +44,6 @@

 	const { id } = $page.params;

-	let debug = application.settings.debug;
 	let previews = application.settings.previews;
 	let dualCerts = application.settings.dualCerts;
 	let autodeploy = application.settings.autodeploy;
@ -52,9 +51,6 @@
 	let isDBBranching = application.settings.isDBBranching;

 	async function changeSettings(name: any) {
-		if (name === 'debug') {
-			debug = !debug;
-		}
 		if (name === 'previews') {
 			previews = !previews;
 		}
@ -77,7 +73,6 @@
 		try {
 			await post(`/applications/${id}/settings`, {
 				previews,
-				debug,
 				dualCerts,
 				isBot,
 				autodeploy,
@ -90,9 +85,6 @@
 				type: 'success'
 			});
 		} catch (error) {
-			if (name === 'debug') {
-				debug = !debug;
-			}
 			if (name === 'previews') {
 				previews = !previews;
 			}
@ -132,8 +124,7 @@
 						description={$t('application.enable_auto_deploy_webhooks')}
 					/>
 				</div>
-			{/if}
-			{#if !application.settings.isBot && !application.settings.isPublicRepository}
+				{#if !application.settings.isBot}
 					<div class="grid grid-cols-2 items-center">
 						<Setting
 							id="previews"
@ -145,16 +136,9 @@
 						/>
 					</div>
 				{/if}
-			<div class="grid grid-cols-2 items-center w-full">
-				<Setting
-					id="debug"
-					isCenter={false}
-					bind:setting={debug}
-					on:click={() => changeSettings('debug')}
-					title={$t('application.debug_logs')}
-					description={$t('application.enable_debug_log_during_build')}
-				/>
-			</div>
+			{:else}
+				No features available for this application
+			{/if}
 		</div>
 	</div>
 </div>
--- a/apps/ui/src/routes/applications/[id]/logs/_BuildLog.svelte
+++ b/apps/ui/src/routes/applications/[id]/logs/_BuildLog.svelte
@ -61,12 +61,27 @@
 			fromDb = from;

 			streamInterval = setInterval(async () => {
+				const nextSequence = logs[logs.length - 1]?.time || 0;
 				if (status !== 'running' && status !== 'queued') {
 					loading = false;
+					try {
+						const data = await get(
+							`/applications/${id}/logs/build/${$selectedBuildId}?sequence=${nextSequence}`
+						);
+						status = data.status;
+						currentStatus = status;
+						fromDb = data.fromDb;
+
+						logs = logs.concat(
+							data.logs.map((log: any) => ({ ...log, line: cleanAnsiCodes(log.line) }))
+						);
+						loading = false;
+					} catch (error) {
+						return errorNotification(error);
+					}
 					clearInterval(streamInterval);
 					return;
 				}
-				const nextSequence = logs[logs.length - 1]?.time || 0;
 				try {
 					const data = await get(
 						`/applications/${id}/logs/build/${$selectedBuildId}?sequence=${nextSequence}`
--- a/apps/ui/src/routes/applications/[id]/logs/build.svelte
+++ b/apps/ui/src/routes/applications/[id]/logs/build.svelte
@ -32,7 +32,7 @@
 	import { day } from '$lib/dayjs';
 	import { onDestroy, onMount } from 'svelte';
 	const { id } = $page.params;
-
+	let debug = application.settings.debug;
 	let loadBuildLogsInterval: any = null;

 	let skip = 0;
@ -104,29 +104,60 @@
 			return 'text-white';
 		}
 	}
+	async function changeSettings(name: any) {
+		if (name === 'debug') {
+			debug = !debug;
+		}
+		try {
+			await post(`/applications/${id}/settings`, {
+				debug,
+				branch: application.branch,
+				projectId: application.projectId
+			});
+			return addToast({
+				message: $t('application.settings_saved'),
+				type: 'success'
+			});
+		} catch (error) {
+			if (name === 'debug') {
+				debug = !debug;
+			}
+
+			return errorNotification(error);
+		}
+	}
 </script>

-<div class="mx-auto w-full">
-	<div class="flex flex-row border-b border-coolgray-500 mb-6 space-x-2">
+<div class="mx-auto w-full lg:px-0 px-1">
+	<div class="flex lg:flex-row flex-col border-b border-coolgray-500 mb-6 space-x-2">
 		<div class="flex flex-row">
 			<div class="title font-bold pb-3 pr-3">Build Logs</div>
 			<button class="btn btn-sm bg-error" on:click={resetQueue}>Reset Build Queue</button>
 		</div>
+		<div class=" flex-1" />
+		<div class="form-control">
+			<label class="label cursor-pointer">
+				<span class="label-text text-white pr-4 font-bold">Enable Debug Logs</span>
+				<input
+					type="checkbox"
+					checked={debug}
+					class="checkbox checkbox-success"
+					on:click={() => changeSettings('debug')}
+				/>
+			</label>
+		</div>
 	</div>
 </div>
-<div class="block flex-col justify-start space-x-5 flex flex-col-reverse lg:flex-row">
+<div class="justify-start space-x-5 flex flex-col-reverse lg:flex-row">
 	<div class="flex-1 md:w-96">
 		{#if $selectedBuildId}
 			{#key $selectedBuildId}
 				<svelte:component this={BuildLog} />
 			{/key}
-		{:else}
-		{#if buildCount === 0}
+		{:else if buildCount === 0}
 			Not build logs found.
 		{:else}
 			Select a build to see the logs.
-
-			{/if}
 		{/if}
 	</div>
 	<div class="mb-4 min-w-[16rem] space-y-2 md:mb-0 ">
@ -140,6 +171,7 @@
 				>
 			</div>
 			{#each builds as build, index (build.id)}
+				<!-- svelte-ignore a11y-click-events-have-key-events -->
 				<div
 					id={`building-${build.id}`}
 					on:click={() => loadBuild(build.id)}
--- a/apps/ui/src/routes/applications/[id]/storages.svelte
+++ b/apps/ui/src/routes/applications/[id]/storages.svelte
@ -37,9 +37,9 @@
 					let [volume, target] = volumeName.split(':');
 					if (!target) {
 						target = volume;
-						volume = `${application.id}${volume.replace(/\//gi, '-')}`;
+						volume = `${application.id}${volume.replace(/\//gi, '-').replace(/\./gi, '')}`;
 					} else {
-						volume = `${application.id}-${volume}`;
+						volume = `${application.id}${volume.replace(/\//gi, '-').replace(/\./gi, '')}`;
 					}
 					predefinedVolumes.push({ id: volume, path: target, predefined: true });
 				}
--- a/apps/ui/src/routes/index.svelte
+++ b/apps/ui/src/routes/index.svelte
@ -888,6 +888,7 @@
 		>
 			{#if filtered.services.length > 0}
 				{#each filtered.services as service}
+					{#key service.id}
 						<a class="no-underline mb-5" href={`/services/${service.id}`}>
 							<div
 								class="w-full rounded p-5 bg-coolgray-200 hover:bg-pink-600 indicator duration-150"
@ -951,6 +952,7 @@
 								</div>
 							</div>
 						</a>
+					{/key}
 				{/each}
 			{:else}
 				<h1 class="">Nothing here.</h1>
@ -967,8 +969,11 @@
 			class="grid grid-col gap-8 auto-cols-max grid-cols-1 md:grid-cols-2 lg:md:grid-cols-3 xl:grid-cols-4 p-4"
 		>
 			{#each filtered.otherServices as service}
+				{#key service.id}
 					<a class="no-underline mb-5" href={`/services/${service.id}`}>
-					<div class="w-full rounded p-5 bg-coolgray-200 hover:bg-pink-600 indicator duration-150">
+						<div
+							class="w-full rounded p-5 bg-coolgray-200 hover:bg-pink-600 indicator duration-150"
+						>
 							{#await getStatus(service)}
 								<span class="indicator-item badge bg-yellow-300 badge-sm" />
 							{:then}
@ -1028,6 +1033,7 @@
 							</div>
 						</div>
 					</a>
+				{/key}
 			{/each}
 		</div>
 	{/if}
@ -1054,6 +1060,7 @@
 		>
 			{#if filtered.databases.length > 0}
 				{#each filtered.databases as database}
+					{#key database.id}
 						<a class="no-underline mb-5" href={`/databases/${database.id}`}>
 							<div
 								class="w-full rounded p-5 bg-coolgray-200 hover:bg-databases indicator duration-150"
@ -1117,6 +1124,7 @@
 								</div>
 							</div>
 						</a>
+					{/key}
 				{/each}
 			{:else}
 				<h1 class="">Nothing here.</h1>
@ -1133,8 +1141,11 @@
 			class="grid grid-col gap-8 auto-cols-max grid-cols-1 md:grid-cols-2 lg:md:grid-cols-3 xl:grid-cols-4 p-4"
 		>
 			{#each filtered.otherDatabases as database}
+				{#key database.id}
 					<a class="no-underline mb-5" href={`/databases/${database.id}`}>
-					<div class="w-full rounded p-5 bg-coolgray-200 hover:bg-databases indicator duration-150">
+						<div
+							class="w-full rounded p-5 bg-coolgray-200 hover:bg-databases indicator duration-150"
+						>
 							{#await getStatus(database)}
 								<span class="indicator-item badge bg-yellow-300 badge-sm" />
 							{:then}
@ -1194,6 +1205,7 @@
 							</div>
 						</div>
 					</a>
+				{/key}
 			{/each}
 		</div>
 	{/if}
@ -1209,8 +1221,11 @@
 		>
 			{#if filtered.gitSources.length > 0}
 				{#each filtered.gitSources as source}
+					{#key source.id}
 						<a class="no-underline mb-5" href={`/sources/${source.id}`}>
-						<div class="w-full rounded p-5 bg-coolgray-200 hover:bg-sources indicator duration-150">
+							<div
+								class="w-full rounded p-5 bg-coolgray-200 hover:bg-sources indicator duration-150"
+							>
 								<div class="w-full flex flex-row">
 									<div class="absolute top-0 left-0 -m-5 flex">
 										{#if source?.type === 'gitlab'}
@ -1218,7 +1233,10 @@
 												<path
 													fill="#FC6D26"
 													d="M126.615 72.31l-7.034-21.647L105.64 7.76c-.716-2.206-3.84-2.206-4.556 0l-13.94 42.903H40.856L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664 1.385 72.31a4.792 4.792 0 001.74 5.358L64 121.894l60.874-44.227a4.793 4.793 0 001.74-5.357"
-											/><path fill="#E24329" d="M64 121.894l23.144-71.23H40.856L64 121.893z" /><path
+												/><path
+													fill="#E24329"
+													d="M64 121.894l23.144-71.23H40.856L64 121.893z"
+												/><path
 													fill="#FC6D26"
 													d="M64 121.894l-23.144-71.23H8.42L64 121.893z"
 												/><path
@ -1227,7 +1245,10 @@
 												/><path
 													fill="#E24329"
 													d="M8.42 50.663h32.436L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664z"
-											/><path fill="#FC6D26" d="M64 121.894l23.144-71.23h32.437L64 121.893z" /><path
+												/><path
+													fill="#FC6D26"
+													d="M64 121.894l23.144-71.23h32.437L64 121.893z"
+												/><path
 													fill="#FCA326"
 													d="M119.58 50.663l7.035 21.647a4.79 4.79 0 01-1.74 5.357L64 121.894l55.58-71.23z"
 												/><path
@ -1282,6 +1303,7 @@
 								</div>
 							</div>
 						</a>
+					{/key}
 				{/each}
 			{:else}
 				<h1 class="">Nothing here.</h1>
@ -1298,6 +1320,7 @@
 			class="grid grid-col gap-8 auto-cols-max grid-cols-1 md:grid-cols-2 lg:md:grid-cols-3 xl:grid-cols-4 p-4"
 		>
 			{#each filtered.otherGitSources as source}
+				{#key source.id}
 					<a class="no-underline mb-5" href={`/sources/${source.id}`}>
 						<div class="w-full rounded p-5 bg-coolgray-200 hover:bg-sources indicator duration-150">
 							<div class="w-full flex flex-row">
@ -1370,6 +1393,7 @@
 							</div>
 						</div>
 					</a>
+				{/key}
 			{/each}
 		</div>
 	{/if}
@ -1385,6 +1409,7 @@
 		>
 			{#if filtered.destinations.length > 0}
 				{#each filtered.destinations as destination}
+					{#key destination.id}
 						<a class="no-underline mb-5" href={`/destinations/${destination.id}`}>
 							<div
 								class="w-full rounded p-5 bg-coolgray-200 hover:bg-destinations indicator duration-150"
@ -1450,6 +1475,7 @@
 								</div>
 							</div>
 						</a>
+					{/key}
 				{/each}
 			{:else}
 				<h1 class="">Nothing here.</h1>
@ -1466,6 +1492,7 @@
 			class="grid grid-col gap-8 auto-cols-max grid-cols-1 md:grid-cols-2 lg:md:grid-cols-3 xl:grid-cols-4 p-4"
 		>
 			{#each filtered.otherDestinations as destination}
+				{#key destination.id}
 					<a class="no-underline mb-5" href={`/destinations/${destination.id}`}>
 						<div
 							class="w-full rounded p-5 bg-coolgray-200 hover:bg-destinations indicator duration-150"
@ -1531,6 +1558,7 @@
 							</div>
 						</div>
 					</a>
+				{/key}
 			{/each}
 		</div>
 	{/if}
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "coolify",
  "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.11.12",
+  "version": "3.11.13",
  "license": "Apache-2.0",
  "repository": "github:coollabsio/coolify",
  "scripts": {