Merge pull request #195 from coollabsio/next

v2.0.22-fixes

src/lib/haproxy/index.ts

@@ -199,6 +199,13 @@ export async function checkProxyConfigurations() {
 					backend_name: backendName,
 					stats: { lastchg }
 				} = stat;
+				const { fqdn } = await db.listSettings();
+				if (fqdn) {
+					const domain = getDomain(fqdn);
+					if (backendName === domain) {
+						return;
+					}
+				}
 				const application = await db.getApplicationById(name);
 				if (!application) {
 					const transactionId = await getNextTransactionId();

src/routes/__layout.svelte

@@ -39,10 +39,12 @@
 	import { asyncSleep } from '$lib/components/common';
 	import { del, get, post } from '$lib/api';
 	import { browser } from '$app/env';
+	import { fade } from 'svelte/transition';
 
 	let isUpdateAvailable = false;
 	let updateStatus = {
 		loading: false,
+		checking: false,
 		success: null
 	};
 	let latestVersion = 'latest';
@@ -58,13 +60,17 @@
 			}
 			if ($session.teamId === '0') {
 				try {
+					updateStatus.checking = true;
 					const data = await get(`/update.json`);
 					if (overrideVersion || data?.isUpdateAvailable) {
 						latestVersion = overrideVersion || data.latestVersion;
 						isUpdateAvailable = overrideVersion ? true : data?.isUpdateAvailable;
-						await post(`/update.json`, { type: 'pull', latestVersion, overrideVersion });
+						await post(`/update.json`, { type: 'pull', latestVersion });
+					}
+				} catch (error) {
+				} finally {
+					updateStatus.checking = false;
 				}
-				} catch (error) {}
 			}
 		}
 	});
@@ -305,7 +311,32 @@
 
 			<div class="flex flex-col space-y-4 py-2">
 				{#if $session.teamId === '0'}
-					{#if isUpdateAvailable}
+					{#if updateStatus.checking}
+						<button
+							disabled
+							in:fade={{ duration: 150 }}
+							class="icons tooltip-right bg-gradient-to-r from-purple-500 via-pink-500 to-red-500 text-white duration-75 hover:scale-105"
+							data-tooltip="Checking for updates..."
+							><svg
+								xmlns="http://www.w3.org/2000/svg"
+								class="h-9 w-8 animate-spin"
+								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="M9 4.55a8 8 0 0 1 6 14.9m0 -4.45v5h5" />
+								<line x1="5.63" y1="7.16" x2="5.63" y2="7.17" />
+								<line x1="4.06" y1="11" x2="4.06" y2="11.01" />
+								<line x1="4.63" y1="15.1" x2="4.63" y2="15.11" />
+								<line x1="7.16" y1="18.37" x2="7.16" y2="18.38" />
+								<line x1="11" y1="19.94" x2="11" y2="19.95" />
+							</svg></button
+						>
+					{:else if isUpdateAvailable}
 						<button
 							disabled={updateStatus.success === false}
 							data-tooltip="Update available"

src/routes/update.json.ts

@@ -26,12 +26,10 @@ export const get: RequestHandler = async () => {
 };
 
 export const post: RequestHandler = async (event) => {
-	const { type, latestVersion, overrideVersion = false } = await event.request.json();
+	const { type, latestVersion } = await event.request.json();
 	if (type === 'pull') {
 		try {
 			if (!dev) {
-				if (!overrideVersion)
-					await asyncExecShell(`docker image inspect coollabsio/coolify:${latestVersion}`);
 				await asyncExecShell(`docker pull coollabsio/coolify:${latestVersion}`);
 				return {
 					status: 200,