Merge pull request #724 from coollabsio/next

v3.11.6

README.md

@@ -93,15 +93,13 @@ Deploy your resource to:
 - [Fider](https://fider.io)
 - [Hasura](https://hasura.io)
 - [GlitchTip](https://glitchtip.com)
-
+- And more...
-## Migration from v1
-
-A fresh installation is necessary. v2 and v3 are not compatible with v1.
 
 ## Support
 
-- Twitter: [@andrasbacsai](https://twitter.com/andrasbacsai)
+- Mastodon: [@andrasbacsai@fosstodon.org](https://fosstodon.org/@andrasbacsai)
 - Telegram: [@andrasbacsai](https://t.me/andrasbacsai)
+- Twitter: [@andrasbacsai](https://twitter.com/andrasbacsai)
 - Email: [andras@coollabs.io](mailto:andras@coollabs.io)
 - Discord: [Invitation](https://coollabs.io/discord)
 

apps/api/devTemplates.yaml

@@ -1,3 +1,65 @@
+- templateVersion: 1.0.0
+  defaultVersion: v3.6
+  documentation: https://github.com/freyacodes/Lavalink
+  description: Standalone audio sending node based on Lavaplayer.
+  type: lavalink
+  name: Lavalink
+  labels:
+    - discord
+    - discord bot
+    - audio
+    - lavalink
+    - jda
+  services:
+    $$id:
+      name: Lavalink
+      image: fredboat/lavalink:$$core_version
+      environment: []
+      volumes:
+        - $$id-lavalink:/lavalink
+      ports:
+        - "2333"
+      files:
+        - location: /opt/Lavalink/application.yml
+          content: >-
+            server:
+              port: $$config_port
+              address: 0.0.0.0
+            lavalink:
+              server:
+                password: "$$secret_password"
+                sources:
+                  youtube: true
+                  bandcamp: true
+                  soundcloud: true
+                  twitch: true
+                  vimeo: true
+                  http: true
+                  local: false
+
+            logging:
+              file:
+                path: ./logs/
+
+              level:
+                root: INFO
+                lavalink: INFO
+
+              logback:
+                rollingpolicy:
+                  max-file-size: 1GB
+                  max-history: 30
+  variables:
+    - id: $$config_port
+      name: PORT
+      label: Port
+      defaultValue: '2333'
+      required: true
+    - id: $$secret_password
+      name: PASSWORD
+      label: Password
+      defaultValue: $$generate_password
+      required: true
 - templateVersion: 1.0.0
   defaultVersion: v1.8.6
   documentation: https://docs.appsmith.com/getting-started/setup/instance-configuration/
@@ -2385,7 +2447,7 @@
       name: MySQL
       depends_on: []
       image: "bitnami/mysql:5.7"
-      imageArm: "mysql:5.7"
+      imageArm: "mysql:8.0"
       volumes:
         - "$$id-mysql-data:/bitnami/mysql/data"
       volumesArm:

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.4';
+export const version = '3.11.6';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
@@ -972,7 +972,7 @@ export function generateDatabaseConfiguration(database: any, arch: string): Data
 	}
 }
 export function isARM(arch: string) {
-	if (arch === 'arm' || arch === 'arm64') {
+	if (arch === 'arm' || arch === 'arm64' || arch === 'aarch' || arch === 'aarch64') {
 		return true;
 	}
 	return false;

apps/api/src/lib/services.ts

@@ -22,15 +22,22 @@ const compareSemanticVersions = (a: string, b: string) => {
     return b1.length - a1.length;
 };
 export async function getTags(type: string) {
-    if (type) {
+
-        const tagsPath = isDev ? './tags.json' : '/app/tags.json';
+    try {
-        const data = await fs.readFile(tagsPath, 'utf8')
+        if (type) {
-        let tags = JSON.parse(data)
+            const tagsPath = isDev ? './tags.json' : '/app/tags.json';
-        if (tags) {
+            const data = await fs.readFile(tagsPath, 'utf8')
-            tags = tags.find((tag: any) => tag.name.includes(type))
+            let tags = JSON.parse(data)
-            tags.tags = tags.tags.sort(compareSemanticVersions).reverse();
+            if (tags) {
-            return tags
+                tags = tags.find((tag: any) => tag.name.includes(type))
+                tags.tags = tags.tags.sort(compareSemanticVersions).reverse();
+                return tags
+            }
         }
+    } catch (error) {
+        return []
+
     }
-    return []
+
+
 }

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

@@ -34,7 +34,8 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
         const { id } = request.params;
         const teamId = request.user.teamId;
         const service = await getServiceFromDB({ id, teamId });
-        const arm = isARM(service.arch)
+        console.log({service})
+        const arm = isARM(service.arch);
         const { type, destinationDockerId, destinationDocker, persistentStorage, exposePort } =
             service;
 
@@ -103,15 +104,22 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
                     }
                 }
             }
-
+            let port = null
+            if (template.services[s].ports?.length > 0) {
+                port = template.services[s].ports[0]
+            }
+            let image = template.services[s].image
+            if (arm && template.services[s].imageArm) {
+                image = template.services[s].imageArm
+            }
             config[s] = {
                 container_name: s,
                 build: template.services[s].build || undefined,
                 command: template.services[s].command,
                 entrypoint: template.services[s]?.entrypoint,
-                image: arm ? template.services[s].imageArm : template.services[s].image,
+                image,
                 expose: template.services[s].ports,
-                ...(exposePort ? { ports: [`${exposePort}:${exposePort}`] } : {}),
+                ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
                 volumes: Array.from(volumes),
                 environment: newEnvironments,
                 depends_on: template.services[s]?.depends_on,

apps/ui/src/lib/components/UpdateAvailable.svelte

@@ -1,7 +1,14 @@
 <script lang="ts">
 	import { dev } from '$app/env';
 	import { get, post } from '$lib/api';
-	import { addToast, appSession, features, updateLoading, isUpdateAvailable } from '$lib/store';
+	import {
+		addToast,
+		appSession,
+		features,
+		updateLoading,
+		isUpdateAvailable,
+		latestVersion
+	} from '$lib/store';
 	import { asyncSleep, errorNotification } from '$lib/common';
 	import { onMount } from 'svelte';
 	import Tooltip from './Tooltip.svelte';
@@ -11,15 +18,17 @@
 		loading: false,
 		success: null
 	};
-	let latestVersion = 'latest';
 	async function update() {
 		updateStatus.loading = true;
 		try {
 			if (dev) {
-				await asyncSleep(4000);
+				localStorage.setItem('lastVersion', $appSession.version);
+				await asyncSleep(1000);
+				updateStatus.loading = false;
 				return window.location.reload();
 			} else {
-				await post(`/update`, { type: 'update', latestVersion });
+				localStorage.setItem('lastVersion', $appSession.version);
+				await post(`/update`, { type: 'update', latestVersion: $latestVersion });
 				addToast({
 					message: 'Update completed.<br><br>Waiting for the new version to start...',
 					type: 'success'
@@ -62,7 +71,7 @@
 					$updateLoading = true;
 					const data = await get(`/update`);
 					if (overrideVersion || data?.isUpdateAvailable) {
-						latestVersion = overrideVersion || data.latestVersion;
+						$latestVersion = overrideVersion || data.latestVersion;
 						if (overrideVersion) {
 							$isUpdateAvailable = true;
 						} else {
@@ -91,7 +100,7 @@
 				{#if updateStatus.loading}
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
-						class="lds-heart h-8 w-8"
+						class="lds-heart h-8 w-8 mx-auto"
 						viewBox="0 0 24 24"
 						stroke-width="1.5"
 						stroke="currentColor"

apps/ui/src/lib/components/svg/services/ServiceIcons.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
 	export let type: string;
 	export let isAbsolute = false;
-
 	let extension = 'png';
 	let svgs = [
 		'languagetool',
@@ -31,8 +30,14 @@
 	function generateClass() {
 		switch (name) {
 			case 'n8n':
+				if (isAbsolute) {
+					return 'w-12 h-12 absolute -m-9 -mt-12';
+				}
 				return 'w-12 h-12 -mt-3';
 			case 'weblate':
+				if (isAbsolute) {
+					return 'w-12 h-12 absolute -m-9 -mt-12';
+				}
 				return 'w-12 h-12 -mt-3';
 			default:
 				return isAbsolute ? 'w-10 h-10 absolute -m-4 -mt-9 left-0' : 'w-10 h-10';

apps/ui/src/lib/store.ts

@@ -32,6 +32,7 @@ interface AddToast {
 }
 export const updateLoading: Writable<boolean> = writable(false);
 export const isUpdateAvailable: Writable<boolean> = writable(false);
+export const latestVersion: Writable<string> = writable('latest');
 export const search: any = writable('')
 export const loginEmail: Writable<string | undefined> = writable()
 export const appSession: Writable<AppSession> = writable({

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

@@ -32,10 +32,10 @@
 	}
 </script>
 
-<div class="w-full font-bold grid grid-cols-1 lg:grid-cols-4 gap-2 pb-2">
+<div class="w-full grid grid-cols-1 lg:grid-cols-4 gap-2 pb-2">
 	<div class="flex flex-col">
 		{#if index === 0 || length === 0}
-			<label for="name" class="pb-2 uppercase">name</label>
+			<label for="name" class="pb-2 uppercase font-bold">name</label>
 		{/if}
 
 		<input
@@ -50,7 +50,7 @@
 	</div>
 	<div class="flex flex-col">
 		{#if index === 0 || length === 0}
-			<label for="value" class="pb-2 uppercase">value</label>
+			<label for="value" class="pb-2 uppercase font-bold">value</label>
 		{/if}
 
 		<CopyPasswordField
@@ -63,9 +63,12 @@
 	</div>
 	<div class="flex lg:flex-col flex-row justify-start items-center pt-3 lg:pt-0">
 		{#if index === 0 || length === 0}
-			<label for="name" class="pb-2 uppercase lg:block hidden">Need during buildtime?</label>
+			<label for="name" class="pb-2 uppercase lg:block hidden font-bold"
+				>Need during buildtime?</label
+			>
 		{/if}
-		<label for="name" class="pb-2 uppercase lg:hidden block">Need during buildtime?</label>
+		<label for="name" class="pb-2 uppercase lg:hidden block font-bold">Need during buildtime?</label
+		>
 
 		<div class="flex justify-center h-full items-center pt-0 lg:pt-0 pl-4 lg:pl-0">
 			<button
@@ -114,7 +117,7 @@
 	</div>
 	<div class="flex flex-row lg:flex-col lg:items-center items-start">
 		{#if index === 0 || length === 0}
-			<label for="name" class="pb-2 uppercase lg:block hidden">Actions</label>
+			<label for="name" class="pb-5 uppercase lg:block hidden font-bold" />
 		{/if}
 
 		<div class="flex justify-center h-full items-center pt-3">

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

@@ -79,10 +79,10 @@
 	}
 </script>
 
-<div class="w-full font-bold grid grid-cols-1 lg:grid-cols-4 gap-2 pb-2">
+<div class="w-full grid grid-cols-1 lg:grid-cols-4 gap-2 pb-2">
 	<div class="flex flex-col">
 		{#if (index === 0 && !isNewSecret) || length === 0}
-			<label for="name" class="pb-2 uppercase">name</label>
+			<label for="name" class="pb-2 uppercase font-bold">name</label>
 		{/if}
 
 		<input
@@ -101,7 +101,7 @@
 	</div>
 	<div class="flex flex-col">
 		{#if (index === 0 && !isNewSecret) || length === 0}
-			<label for="value" class="pb-2 uppercase">value</label>
+			<label for="value" class="pb-2 uppercase font-bold">value</label>
 		{/if}
 
 		<CopyPasswordField
@@ -114,9 +114,12 @@
 	</div>
 	<div class="flex lg:flex-col flex-row justify-start items-center pt-3 lg:pt-0">
 		{#if (index === 0 && !isNewSecret) || length === 0}
-			<label for="name" class="pb-2 uppercase lg:block hidden">Need during buildtime?</label>
+			<label for="name" class="pb-2 uppercase lg:block hidden font-bold"
+				>Need during buildtime?</label
+			>
 		{/if}
-		<label for="name" class="pb-2 uppercase lg:hidden block">Need during buildtime?</label>
+		<label for="name" class="pb-2 uppercase lg:hidden block font-bold">Need during buildtime?</label
+		>
 
 		<div class="flex justify-center h-full items-center pt-0 lg:pt-0 pl-4 lg:pl-0">
 			<button
@@ -166,7 +169,7 @@
 	</div>
 	<div class="flex flex-row lg:flex-col lg:items-center items-start">
 		{#if (index === 0 && !isNewSecret) || length === 0}
-			<label for="name" class="pb-2 uppercase lg:block hidden">Action</label>
+			<label for="name" class="pb-5 uppercase lg:block hidden font-bold" />
 		{/if}
 
 		<div class="flex justify-center h-full items-center pt-3">

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

@@ -8,7 +8,7 @@
 </script>
 
 {#if linkToDocs}
-	<DocLink url={template[service.id].documentation} text={`Documentation`} isExternal={true} />
+	<DocLink url={template[service.id]?.documentation || 'https://docs.coollabs.io'} text={`Documentation`} isExternal={true} />
 {:else}
 	<ServiceIcons type={service.type} />
 {/if}

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

@@ -276,20 +276,25 @@
 			</div>
 			<div class="grid grid-cols-2 items-center">
 				<label for="version">Version / Tag</label>
-				<div class="custom-select-wrapper w-full">
+				{#if tags.tags?.length > 0}
-					<Select
+					<div class="custom-select-wrapper w-full">
-						form="saveForm"
+						<Select
-						containerClasses={isDisabled && containerClass()}
+							form="saveForm"
-						{isDisabled}
+							containerClasses={isDisabled && containerClass()}
-						id="version"
+							{isDisabled}
-						showIndicator={!isDisabled}
+							id="version"
-						items={[...tags.tags]}
+							showIndicator={!isDisabled}
-						on:select={selectTag}
+							items={[...tags.tags]}
-						value={service.version}
+							on:select={selectTag}
-						isClearable={false}
+							value={service.version}
-					/>
+							isClearable={false}
-				</div>
+						/>
+					</div>
+				{:else}
+					<input class="w-full border-red-500" disabled placeholder="Error getting tags...">
+				{/if}
 			</div>
+
 			<div class="grid grid-cols-2 items-center">
 				<label for="destination">{$t('application.destination')}</label>
 				<div>

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

@@ -24,6 +24,7 @@
 	import { addToast, appSession, features } from '$lib/store';
 	import { asyncSleep, errorNotification, getDomain } from '$lib/common';
 	import Explainer from '$lib/components/Explainer.svelte';
+	import { dev } from '$app/env';
 
 	let isAPIDebuggingEnabled = settings.isAPIDebuggingEnabled;
 	let isRegistrationEnabled = settings.isRegistrationEnabled;
@@ -45,9 +46,61 @@
 		save: false,
 		remove: false,
 		proxyMigration: false,
-		restart: false
+		restart: false,
+		rollback: false
 	};
+	let rollbackVersion = localStorage.getItem('lastVersion');
 
+	async function rollback() {
+		if (rollbackVersion) {
+			const sure = confirm(`Are you sure you want rollback Coolify to ${rollbackVersion}?`);
+			if (sure) {
+				try {
+					loading.rollback = true;
+					console.log('loading.rollback', loading.rollback);
+					if (dev) {
+						console.log('rolling back to', rollbackVersion);
+						await asyncSleep(4000);
+						return window.location.reload();
+					} else {
+						addToast({
+							message: 'Rollback started...',
+							type: 'success'
+						});
+						await post(`/update`, { type: 'update', latestVersion: rollbackVersion });
+						addToast({
+							message: 'Rollback completed.<br><br>Waiting for the new version to start...',
+							type: 'success'
+						});
+
+						let reachable = false;
+						let tries = 0;
+						do {
+							await asyncSleep(4000);
+							try {
+								await get(`/undead`);
+								reachable = true;
+							} catch (error) {
+								reachable = false;
+							}
+							if (reachable) break;
+							tries++;
+						} while (!reachable || tries < 120);
+						addToast({
+							message: 'New version reachable. Reloading...',
+							type: 'success'
+						});
+						await asyncSleep(3000);
+						return window.location.reload();
+					}
+				} catch (error) {
+					return errorNotification(error);
+				} finally {
+					loading.rollback = false;
+				}
+			}
+		}
+	}
 	async function removeFqdn() {
 		if (fqdn) {
 			loading.remove = true;
@@ -281,6 +334,17 @@
 						</div>
 					{/if}
 				</div>
+				<div class="grid grid-cols-2 items-center">
+					<Setting
+						id="dualCerts"
+						dataTooltip={$t('setting.must_remove_domain_before_changing')}
+						disabled={isFqdnSet}
+						bind:setting={dualCerts}
+						title={$t('application.ssl_www_and_non_www')}
+						description={$t('setting.generate_www_non_www_ssl')}
+						on:click={() => !isFqdnSet && changeSettings('dualCerts')}
+					/>
+				</div>
 				<div class="grid grid-cols-2 items-center">
 					<div>
 						Default Redirect URL
@@ -300,16 +364,29 @@
 						placeholder="{$t('forms.eg')}: https://coolify.io"
 					/>
 				</div>
-				<div class="grid grid-cols-2 items-center">
+
-					<Setting
+				<div class="grid grid-cols-4 items-center">
-						id="dualCerts"
+					<div class="col-span-2">
-						dataTooltip={$t('setting.must_remove_domain_before_changing')}
+						Rollback to a specific version
-						disabled={isFqdnSet}
+						<Explainer
-						bind:setting={dualCerts}
+							position="dropdown-bottom"
-						title={$t('application.ssl_www_and_non_www')}
+							explanation="You can rollback to a specific version of Coolify. This will not affect your current running resources.<br><br><a href='https://github.com/coollabsio/coolify/releases' target='_blank'>See available versions</a>"
-						description={$t('setting.generate_www_non_www_ssl')}
+						/>
-						on:click={() => !isFqdnSet && changeSettings('dualCerts')}
+					</div>
+					<input
+						class="w-full"
+						bind:value={rollbackVersion}
+						readonly={!$appSession.isAdmin}
+						disabled={!$appSession.isAdmin}
+						name="rollbackVersion"
+						id="rollbackVersion"
 					/>
+					<button
+						class:loading={loading.rollback}
+						class="btn btn-primary ml-2"
+						disabled={!rollbackVersion || loading.rollback}
+						on:click|preventDefault|stopPropagation={rollback}>Rollback</button
+					>
 				</div>
 				<div class="grid grid-cols-2 items-center">
 					<div>

package.json

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