Merge branch 'next' into some-tweaks

apps/api/src/jobs/deployApplication.ts

@@ -357,8 +357,10 @@ import * as buildpacks from '../lib/buildPacks';
 									where: { id: buildId, status: { in: ['queued', 'running'] } },
 									data: { status: 'failed' }
 								});
+								if (error !== 1) {
 									await saveBuildLog({ line: error, buildId, applicationId: application.id });
 								}
+							}
 						});
 					}
 					await pAll.default(actions, { concurrency })

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.2';
+export const version = '3.10.3';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
@@ -96,7 +96,8 @@ export const asyncExecShellStream = async ({
 				const array = stdout.split('\n');
 				for (const line of array) {
 					if (line !== '\n' && line !== '') {
-						await saveBuildLog({
+						logs.push(line.replace('\n', ''))
+						debug && await saveBuildLog({
 							line: `${line.replace('\n', '')}`,
 							buildId,
 							applicationId
@@ -109,7 +110,8 @@ export const asyncExecShellStream = async ({
 				const array = stderr.split('\n');
 				for (const line of array) {
 					if (line !== '\n' && line !== '') {
-						await saveBuildLog({
+						errorLogs.push(line.replace('\n', ''))
+						debug && await saveBuildLog({
 							line: `${line.replace('\n', '')}`,
 							buildId,
 							applicationId

apps/api/src/lib/importers/gitlab.ts

@@ -40,7 +40,7 @@ export default async function ({
 
 	if (forPublic) {
 		await asyncExecShell(
-			`git clone -q -b ${branch} git@${url}:${repository}.git --config core.sshCommand="ssh -p ${customPort} -q -o StrictHostKeyChecking=no" ${workdir}/ && cd ${workdir}/ && git submodule update --init --recursive && git lfs pull && cd .. `
+			`git clone -q -b ${branch} https://${url}/${repository}.git ${workdir}/ && cd ${workdir}/ && git submodule update --init --recursive && git lfs pull && cd .. `
 		);
 	} else {
 		await asyncExecShell(

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

@@ -1006,78 +1006,135 @@ async function startUmamiService(request: FastifyRequest<ServiceStartStop>) {
         }
 
         const initDbSQL = `
-		drop table if exists event;
+		-- CreateTable
-		drop table if exists pageview;
+CREATE TABLE "account" (
-		drop table if exists session;
+    "user_id" SERIAL NOT NULL,
-		drop table if exists website;
+    "username" VARCHAR(255) NOT NULL,
-		drop table if exists account;
+    "password" VARCHAR(60) NOT NULL,
+    "is_admin" BOOLEAN NOT NULL DEFAULT false,
+    "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
 
-		create table account (
+    PRIMARY KEY ("user_id")
-			user_id serial primary key,
-			username varchar(255) unique not null,
-			password varchar(60) not null,
-			is_admin bool not null default false,
-			created_at timestamp with time zone default current_timestamp,
-			updated_at timestamp with time zone default current_timestamp
 );
 
-		create table website (
+-- CreateTable
-			website_id serial primary key,
+CREATE TABLE "event" (
-			website_uuid uuid unique not null,
+    "event_id" SERIAL NOT NULL,
-			user_id int not null references account(user_id) on delete cascade,
+    "website_id" INTEGER NOT NULL,
-			name varchar(100) not null,
+    "session_id" INTEGER NOT NULL,
-			domain varchar(500),
+    "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
-			share_id varchar(64) unique,
+    "url" VARCHAR(500) NOT NULL,
-			created_at timestamp with time zone default current_timestamp
+    "event_type" VARCHAR(50) NOT NULL,
+    "event_value" VARCHAR(50) NOT NULL,
+
+    PRIMARY KEY ("event_id")
 );
 
-		create table session (
+-- CreateTable
-			session_id serial primary key,
+CREATE TABLE "pageview" (
-			session_uuid uuid unique not null,
+    "view_id" SERIAL NOT NULL,
-			website_id int not null references website(website_id) on delete cascade,
+    "website_id" INTEGER NOT NULL,
-			created_at timestamp with time zone default current_timestamp,
+    "session_id" INTEGER NOT NULL,
-			hostname varchar(100),
+    "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
-			browser varchar(20),
+    "url" VARCHAR(500) NOT NULL,
-			os varchar(20),
+    "referrer" VARCHAR(500),
-			device varchar(20),
+
-			screen varchar(11),
+    PRIMARY KEY ("view_id")
-			language varchar(35),
-			country char(2)
 );
 
-		create table pageview (
+-- CreateTable
-			view_id serial primary key,
+CREATE TABLE "session" (
-			website_id int not null references website(website_id) on delete cascade,
+    "session_id" SERIAL NOT NULL,
-			session_id int not null references session(session_id) on delete cascade,
+    "session_uuid" UUID NOT NULL,
-			created_at timestamp with time zone default current_timestamp,
+    "website_id" INTEGER NOT NULL,
-			url varchar(500) not null,
+    "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
-			referrer varchar(500)
+    "hostname" VARCHAR(100),
+    "browser" VARCHAR(20),
+    "os" VARCHAR(20),
+    "device" VARCHAR(20),
+    "screen" VARCHAR(11),
+    "language" VARCHAR(35),
+    "country" CHAR(2),
+
+    PRIMARY KEY ("session_id")
 );
 
-		create table event (
+-- CreateTable
-			event_id serial primary key,
+CREATE TABLE "website" (
-			website_id int not null references website(website_id) on delete cascade,
+    "website_id" SERIAL NOT NULL,
-			session_id int not null references session(session_id) on delete cascade,
+    "website_uuid" UUID NOT NULL,
-			created_at timestamp with time zone default current_timestamp,
+    "user_id" INTEGER NOT NULL,
-			url varchar(500) not null,
+    "name" VARCHAR(100) NOT NULL,
-			event_type varchar(50) not null,
+    "domain" VARCHAR(500),
-			event_value varchar(50) not null
+    "share_id" VARCHAR(64),
+    "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY ("website_id")
 );
 
-		create index website_user_id_idx on website(user_id);
+-- CreateIndex
+CREATE UNIQUE INDEX "account.username_unique" ON "account"("username");
 
-		create index session_created_at_idx on session(created_at);
+-- CreateIndex
-		create index session_website_id_idx on session(website_id);
+CREATE INDEX "event_created_at_idx" ON "event"("created_at");
 
-		create index pageview_created_at_idx on pageview(created_at);
+-- CreateIndex
-		create index pageview_website_id_idx on pageview(website_id);
+CREATE INDEX "event_session_id_idx" ON "event"("session_id");
-		create index pageview_session_id_idx on pageview(session_id);
-		create index pageview_website_id_created_at_idx on pageview(website_id, created_at);
-		create index pageview_website_id_session_id_created_at_idx on pageview(website_id, session_id, created_at);
 
-		create index event_created_at_idx on event(created_at);
+-- CreateIndex
-		create index event_website_id_idx on event(website_id);
+CREATE INDEX "event_website_id_idx" ON "event"("website_id");
-		create index event_session_id_idx on event(session_id);
+
+-- CreateIndex
+CREATE INDEX "pageview_created_at_idx" ON "pageview"("created_at");
+
+-- CreateIndex
+CREATE INDEX "pageview_session_id_idx" ON "pageview"("session_id");
+
+-- CreateIndex
+CREATE INDEX "pageview_website_id_created_at_idx" ON "pageview"("website_id", "created_at");
+
+-- CreateIndex
+CREATE INDEX "pageview_website_id_idx" ON "pageview"("website_id");
+
+-- CreateIndex
+CREATE INDEX "pageview_website_id_session_id_created_at_idx" ON "pageview"("website_id", "session_id", "created_at");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "session.session_uuid_unique" ON "session"("session_uuid");
+
+-- CreateIndex
+CREATE INDEX "session_created_at_idx" ON "session"("created_at");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_idx" ON "session"("website_id");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "website.website_uuid_unique" ON "website"("website_uuid");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "website.share_id_unique" ON "website"("share_id");
+
+-- CreateIndex
+CREATE INDEX "website_user_id_idx" ON "website"("user_id");
+
+-- AddForeignKey
+ALTER TABLE "event" ADD FOREIGN KEY ("session_id") REFERENCES "session"("session_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "event" ADD FOREIGN KEY ("website_id") REFERENCES "website"("website_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "pageview" ADD FOREIGN KEY ("session_id") REFERENCES "session"("session_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "pageview" ADD FOREIGN KEY ("website_id") REFERENCES "website"("website_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "session" ADD FOREIGN KEY ("website_id") REFERENCES "website"("website_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "website" ADD FOREIGN KEY ("user_id") REFERENCES "account"("user_id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 		insert into account (username, password, is_admin) values ('admin', '${bcrypt.hashSync(
             umamiAdminPassword,

apps/ui/src/routes/applications/[id]/logs/build.svelte

@@ -28,7 +28,7 @@ import {addToast} from '$lib/store';
 	import BuildLog from './_BuildLog.svelte';
 	import { get, post } from '$lib/api';
 	import { t } from '$lib/translations';
-	import { changeQueryParams, dateOptions, errorNotification } from '$lib/common';
+	import { changeQueryParams, dateOptions, errorNotification, asyncSleep } from '$lib/common';
 	import Tooltip from '$lib/components/Tooltip.svelte';
 
 	let buildId: any;
@@ -94,6 +94,8 @@ import {addToast} from '$lib/store';
 					message: 'Queue reset done.',
 					type: 'success'
 			});
+			await asyncSleep(500)
+			return window.location.reload()
 		} catch (error) {
 			return errorNotification(error);
 		}
@@ -162,12 +164,8 @@ import {addToast} from '$lib/store';
 					on:click={() => loadBuild(build.id)}
 					class:rounded-tr={index === 0}
 					class:rounded-br={index === builds.length - 1}
-					class="flex cursor-pointer items-center justify-center border-l-2 py-4 no-underline transition-all duration-100 hover:bg-coolgray-400 hover:shadow-xl"
+					class="flex cursor-pointer items-center justify-center py-4 no-underline transition-all duration-100 hover:bg-coolgray-400 hover:shadow-xl"
 					class:bg-coolgray-400={buildId === build.id}
-					class:border-red-500={build.status === 'failed'}
-					class:border-orange-500={build.status === 'canceled'}
-					class:border-green-500={build.status === 'success'}
-					class:border-yellow-500={build.status === 'running'}
 				>
 					<div class="flex-col px-2 text-center min-w-[10rem]">
 						<div class="text-sm font-bold">
@@ -176,6 +174,11 @@ import {addToast} from '$lib/store';
 						<div class="text-xs">
 							{build.type}
 						</div>
+						<div class="badge badge-sm text-xs text-white uppercase rounded bg-coolgray-300 border-none font-bold" 
+						class:text-red-500={build.status === 'failed'} 
+						class:text-orange-500={build.status === 'canceled'}
+						class:text-green-500={build.status === 'success'}
+						class:text-yellow-500={build.status === 'running'}>{build.status}</div>
 					</div>
 
 					<div class="w-48 text-center text-xs">

package.json

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