chore: version++

Upgrade PSQL version to fix an issue with indices corruption

.gitpod.yml

@@ -0,0 +1,9 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
+# and commit this file to your remote git repository to share the goodness with others.
+
+tasks:
+  - init: npm install && npm run build
+    command: npm run start
+
+

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.9.7",
+	"version": "2.9.10",
 	"license": "AGPL-3.0",
 	"scripts": {
 		"dev": "docker-compose -f docker-compose-dev.yaml up -d && cross-env NODE_ENV=development & svelte-kit dev --host 0.0.0.0",

src/lib/buildPacks/python.ts

@@ -34,6 +34,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 	}
 	if (pythonWSGI?.toLowerCase() === 'gunicorn') {
 		Dockerfile.push(`RUN pip install gunicorn`);
+	} else if (pythonWSGI?.toLowerCase() === 'uvicorn') {
+		Dockerfile.push(`RUN pip install uvicorn`);
 	} else if (pythonWSGI?.toLowerCase() === 'uwsgi') {
 		Dockerfile.push(`RUN apk add --no-cache uwsgi-python3`);
 		// Dockerfile.push(`RUN pip install --no-cache-dir uwsgi`)
@@ -50,6 +52,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`EXPOSE ${port}`);
 	if (pythonWSGI?.toLowerCase() === 'gunicorn') {
 		Dockerfile.push(`CMD gunicorn -w=4 -b=0.0.0.0:8000 ${pythonModule}:${pythonVariable}`);
+	} else if (pythonWSGI?.toLowerCase() === 'uvicorn') {
+		Dockerfile.push(`CMD uvicorn ${pythonModule}:${pythonVariable} --port ${port} --host 0.0.0.0`);
 	} else if (pythonWSGI?.toLowerCase() === 'uwsgi') {
 		Dockerfile.push(
 			`CMD uwsgi --master -p 4 --http-socket 0.0.0.0:8000 --uid uwsgi --plugins python3 --protocol uwsgi --wsgi ${pythonModule}:${pythonVariable}`

src/lib/components/common.ts

@@ -62,7 +62,7 @@ export const supportedDatabaseTypesAndVersions = [
 		name: 'postgresql',
 		fancyName: 'PostgreSQL',
 		baseImage: 'bitnami/postgresql',
-		versions: ['14.2.0', '13.6.0', '12.10.0	', '11.15.0', '10.20.0']
+		versions: ['14.4.0', '13.6.0', '12.10.0', '11.15.0', '10.20.0']
 	},
 	{
 		name: 'redis',

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

@@ -10,7 +10,6 @@
 		}
 		const endpoint = `/applications/${params.id}.json`;
 		const res = await fetch(endpoint);
-
 		if (res.ok) {
 			return {
 				props: {
@@ -18,7 +17,6 @@
 				}
 			};
 		}
-
 		return {
 			status: res.status,
 			error: new Error(`Could not load ${endpoint}`)
@@ -39,7 +37,6 @@
 	import { errorNotification } from '$lib/form';
 	import { onDestroy, onMount } from 'svelte';
 	import Select from 'svelte-select';
-
 	import Explainer from '$lib/components/Explainer.svelte';
 	import Setting from '$lib/components/Setting.svelte';
 	import type Prisma from '@prisma/client';
@@ -51,9 +48,7 @@
 	import { disabledButton, status } from '$lib/store';
 	import { t } from '$lib/translations';
 	const { id } = $page.params;
-
 	let domainEl: HTMLInputElement;
-
 	let loading = false;
 
 	let usageLoading = false;
@@ -69,12 +64,12 @@
 	let previews = application.settings.previews;
 	let dualCerts = application.settings.dualCerts;
 	let autodeploy = application.settings.autodeploy;
-
 	let nonWWWDomain = application.fqdn && getDomain(application.fqdn).replace(/^www\./, '');
 	let isNonWWWDomainOK = false;
 	let isWWWDomainOK = false;
 
 	$: isDisabled = !$session.isAdmin || $status.application.isRunning;
+
 	let wsgis = [
 		{
 			value: 'None',
@@ -83,6 +78,10 @@
 		{
 			value: 'Gunicorn',
 			label: 'Gunicorn'
+		},
+		{
+			value: 'Uvicorn',
+			label: 'Uvicorn'
 		}
 	];
 	function containerClass() {
@@ -110,7 +109,6 @@
 			await getUsage();
 		}, 1000);
 	});
-
 	async function changeSettings(name) {
 		if (name === 'debug') {
 			debug = !debug;
@@ -196,7 +194,6 @@
 		application.baseBuildImage = event.detail.value;
 		await handleSubmit();
 	}
-
 	async function isDNSValid(domain, isWWW) {
 		try {
 			await get(`/applications/${id}/check.json?domain=${domain}`);
@@ -218,7 +215,6 @@
 		</div>
 		<span class="text-xs">{application.name} </span>
 	</div>
-
 	{#if application.fqdn}
 		<a
 			href={application.fqdn}
@@ -433,7 +429,6 @@
 					<label for="baseBuildImage" class="text-base font-bold text-stone-100"
 						>{$t('application.base_build_image')}</label
 					>
-
 					<div class="custom-select-wrapper">
 						<Select
 							{isDisabled}
@@ -530,12 +525,11 @@
 			</div>
 			{#if application.buildPack === 'python'}
 				<div class="grid grid-cols-2 items-center">
-					<label for="pythonModule" class="text-base font-bold text-stone-100">WSGI</label>
+					<label for="pythonModule" class="text-base font-bold text-stone-100">WSGI / ASGI</label>
 					<div class="custom-select-wrapper">
 						<Select id="wsgi" items={wsgis} on:select={selectWSGI} value={application.pythonWSGI} />
 					</div>
 				</div>
-
 				<div class="grid grid-cols-2 items-center">
 					<label for="pythonModule" class="text-base font-bold text-stone-100">Module</label>
 					<input
@@ -544,7 +538,7 @@
 						id="pythonModule"
 						required
 						bind:value={application.pythonModule}
-						placeholder={application.pythonWSGI?.toLowerCase() !== 'gunicorn' ? 'main.py' : 'main'}
+						placeholder={application.pythonWSGI?.toLowerCase() !== 'none' ? 'main' : 'main.py'}
 					/>
 				</div>
 				{#if application.pythonWSGI?.toLowerCase() === 'gunicorn'}
@@ -560,6 +554,19 @@
 						/>
 					</div>
 				{/if}
+				{#if application.pythonWSGI?.toLowerCase() === 'uvicorn'}
+					<div class="grid grid-cols-2 items-center">
+						<label for="pythonVariable" class="text-base font-bold text-stone-100">Variable</label>
+						<input
+							readonly={!$session.isAdmin}
+							name="pythonVariable"
+							id="pythonVariable"
+							required
+							bind:value={application.pythonVariable}
+							placeholder="default: app"
+						/>
+					</div>
+				{/if}
 			{/if}
 			{#if !staticDeployments.includes(application.buildPack)}
 				<div class="grid grid-cols-2 items-center">
@@ -694,7 +701,6 @@
 						>
 						<Explainer text={$t('application.publish_directory_explainer')} />
 					</div>
-
 					<input
 						readonly={!$session.isAdmin}
 						name="publishDirectory"

src/routes/applications/[id]/previews/index.svelte

@@ -188,7 +188,7 @@
 			{/each}
 		{:else}
 			<div class="flex-col">
-				<div class="text-center font-bold text-xl">
+				<div class="text-center text-xl font-bold">
 					{$t('application.preview.no_previews_available')}
 				</div>
 			</div>

src/routes/services/[id]/nocodb/start.json.ts

@@ -27,6 +27,7 @@ export const post: RequestHandler = async (event) => {
 
 		const config = {
 			image: `${image}:${version}`,
+			volume: `${id}-nc:/usr/app/data`,
 			environmentVariables: {}
 		};
 		if (serviceSecret.length > 0) {
@@ -41,6 +42,7 @@ export const post: RequestHandler = async (event) => {
 					container_name: id,
 					image: config.image,
 					networks: [network],
+					volumes: [config.volume],
 					environment: config.environmentVariables,
 					restart: 'always',
 					...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
@@ -59,6 +61,11 @@ export const post: RequestHandler = async (event) => {
 				[network]: {
 					external: true
 				}
+			},
+			volumes: {
+				[config.volume.split(':')[0]]: {
+					name: config.volume.split(':')[0]
+				}
 			}
 		};
 		const composeFileDestination = `${workdir}/docker-compose.yaml`;