feat: force rebuild + env.PORT for port + public repo build

apps/api/src/jobs/deployApplication.ts

@@ -56,6 +56,7 @@ import * as buildpacks from '../lib/buildPacks';
 						baseImage,
 						baseBuildImage,
 						deploymentType,
+						forceRebuild
 					} = message
 					let {
 						branch,
@@ -174,7 +175,6 @@ import * as buildpacks from '../lib/buildPacks';
 
 							if (!pullmergeRequestId) {
 
-
 								if (configHash !== currentHash) {
 									deployNeeded = true;
 									if (configHash) {
@@ -198,6 +198,8 @@ import * as buildpacks from '../lib/buildPacks';
 								//
 							}
 							await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
+
+							if (forceRebuild) deployNeeded = true
 							if (!imageFound || deployNeeded) {
 								// if (true) {
 								if (buildpacks[buildPack])
@@ -248,7 +250,9 @@ import * as buildpacks from '../lib/buildPacks';
 							} catch (error) {
 								//
 							}
-							const envs = [];
+							const envs = [
+								`PORT=${port}`
+							];
 							if (secrets.length > 0) {
 								secrets.forEach((secret) => {
 									if (pullmergeRequestId) {

apps/api/src/lib/common.ts

@@ -1189,9 +1189,7 @@ export async function checkExposedPort({ id, configuredPort, exposePort, dockerI
 			}
 		}
 	} else {
-
 		const availablePort = await getFreeExposedPort(id, exposePort, dockerId, remoteIpAddress);
-console.log(availablePort, exposePort)
 		if (availablePort.toString() !== exposePort.toString()) {
 			throw { status: 500, message: `Port ${exposePort} is already in use.` }
 		}

apps/api/src/lib/docker.ts

@@ -71,7 +71,6 @@ export async function removeContainer({
 }): Promise<void> {
 	try {
 		const { stdout } = await executeDockerCmd({ dockerId, command: `docker inspect --format '{{json .State}}' ${id}` })
-		console.log(id)
 		if (JSON.parse(stdout).Running) {
 			await executeDockerCmd({ dockerId, command: `docker stop -t 0 ${id}` })
 			await executeDockerCmd({ dockerId, command: `docker rm ${id}` })

apps/api/src/routes/api/v1/applications/handlers.ts

@@ -428,7 +428,7 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
     try {
         const { id } = request.params
         const teamId = request.user?.teamId;
-        const { pullmergeRequestId = null, branch } = request.body
+        const { pullmergeRequestId = null, branch, forceRebuild } = request.body
         const buildId = cuid();
         const application = await getApplicationFromDB(id, teamId);
         if (application) {
@@ -467,13 +467,15 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
                     type: 'manual',
                     ...application,
                     sourceBranch: branch,
-                    pullmergeRequestId
+                    pullmergeRequestId,
+                    forceRebuild
                 });
             } else {
                 scheduler.workers.get('deployApplication').postMessage({
                     build_id: buildId,
                     type: 'manual',
-                    ...application
+                    ...application,
+                    forceRebuild
                 });
 
             }

apps/api/src/routes/api/v1/applications/types.ts

@@ -44,7 +44,7 @@ export interface CheckDNS extends OnlyId {
 }
 export interface DeployApplication {
     Querystring: { domain: string }
-    Body: { pullmergeRequestId: string | null, branch: string }
+    Body: { pullmergeRequestId: string | null, branch: string, forceRebuild?: boolean }
 }
 export interface GetImages {
     Body: { buildPack: string, deploymentType: string }
@@ -115,7 +115,8 @@ export interface CancelDeployment {
 export interface DeployApplication extends OnlyId {
     Body: {
         pullmergeRequestId: string | null,
-        branch: string
+        branch: string,
+        forceRebuild?: boolean
     }
 }
 

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

@@ -77,9 +77,9 @@
 
 	const { id } = $page.params;
 
-	async function handleDeploySubmit() {
+	async function handleDeploySubmit(forceRebuild = false) {
 		try {
-			const { buildId } = await post(`/applications/${id}/deploy`, { ...application });
+			const { buildId } = await post(`/applications/${id}/deploy`, { ...application, forceRebuild });
 			addToast({
 				message: $t('application.deployment_queued'),
 				type: 'success'
@@ -141,8 +141,7 @@
 		if (
 			application.gitSourceId &&
 			application.destinationDockerId &&
-			(application.fqdn ||
+			(application.fqdn || application.settings.isBot)
-			application.settings.isBot)
 		) {
 			await getStatus();
 			statusInterval = setInterval(async () => {
@@ -256,7 +255,7 @@
 					<rect x="14" y="5" width="4" height="14" rx="1" />
 				</svg>
 			</button>
-			<form on:submit|preventDefault={handleDeploySubmit}>
+			<form on:submit|preventDefault={() => handleDeploySubmit(true)}>
 				<button
 					type="submit"
 					disabled={$disabledButton || !isQueueActive}
@@ -264,7 +263,7 @@
 					class="icons bg-transparent tooltip tooltip-primary tooltip-bottom text-sm flex items-center space-x-2"
 					data-tip={$appSession.isAdmin
 						? isQueueActive
-							? 'Rebuild Application'
+							? 'Force Rebuild Application'
 							: 'Autoupdate inprogress. Cannot rebuild application.'
 						: 'You do not have permission to rebuild application.'}
 				>

apps/ui/src/routes/applications/[id]/configuration/_BuildPack.svelte

@@ -26,7 +26,7 @@
 			delete tempBuildPack.color;
 			delete tempBuildPack.hoverColor;
 
-			if (foundConfig.buildPack !== name) {
+			if (foundConfig?.buildPack !== name) {
 				await post(`/applications/${id}`, { ...tempBuildPack, buildPack: name });
 			}
 			await post(`/applications/${id}/configuration/buildpack`, { buildPack: name });

apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte

@@ -10,7 +10,7 @@
 
 	const { id } = $page.params;
 
-	let publicRepositoryLink: string = 'https://github.com/zekth/fastify-typescript-example';
+	let publicRepositoryLink: string = 'https://gitlab.com/aleveha/fastify-example';
 	let projectId: number;
 	let repositoryName: string;
 	let branchName: string;
@@ -21,43 +21,85 @@
 		branches: false
 	};
 	async function loadBranches() {
+		try {
+			loading.branches = true;
+
 			const protocol = publicRepositoryLink.split(':')[0];
 			const gitUrl = publicRepositoryLink.replace('http://', '').replace('https://', '');
+
 			let [host, ...path] = gitUrl.split('/');
 			const [owner, repository, ...branch] = path;
 
 			ownerName = owner;
 			repositoryName = repository;
 
-		if (branch[0] === 'tree') {
-			branchName = branch[1];
-			await saveRepository();
-			return;
-		}
 			if (host === 'github.com') {
 				host = 'api.github.com';
 				type = 'github';
+				if (branch[0] === 'tree' && branch[1]) {
+					branchName = branch[1];
+				}
 			}
 			if (host === 'gitlab.com') {
 				host = 'gitlab.com/api/v4';
 				type = 'gitlab';
+				if (branch[1] === 'tree' && branch[2]) {
+					branchName = branch[2];
+				}
 			}
 			const apiUrl = `${protocol}://${host}`;
-
+			if (type === 'github') {
 				const repositoryDetails = await get(`${apiUrl}/repos/${ownerName}/${repositoryName}`);
 				projectId = repositoryDetails.id.toString();
-
+			}
+			if (type === 'gitlab') {
+				const repositoryDetails = await get(`${apiUrl}/projects/${ownerName}%2F${repositoryName}`);
+				projectId = repositoryDetails.id.toString();
+			}
+			if (type === 'github' && branchName) {
+				try {
+					await get(`${apiUrl}/repos/${ownerName}/${repositoryName}/branches/${branchName}`);
+					await saveRepository();
+					loading.branches = false;
+					return;
+				} catch (error) {
+					errorNotification(error);
+				}
+			}
+			if (type === 'gitlab' && branchName) {
+				try {
+					await get(
+						`${apiUrl}/projects/${ownerName}%2F${repositoryName}/repository/branches/${branchName}`
+					);
+					await saveRepository();
+					loading.branches = false;
+					return;
+				} catch (error) {
+					errorNotification(error);
+				}
+			}
 			let branches: any[] = [];
 			let page = 1;
 			let branchCount = 0;
-		loading.branches = true;
+			const loadedBranches = await loadBranchesByPage(
-		const loadedBranches = await loadBranchesByPage(apiUrl, ownerName, repositoryName, page);
+				apiUrl,
+				ownerName,
+				repositoryName,
+				page,
+				type
+			);
 			branches = branches.concat(loadedBranches);
 			branchCount = branches.length;
 			if (branchCount === 100) {
 				while (branchCount === 100) {
 					page = page + 1;
-				const nextBranches = await loadBranchesByPage(apiUrl, ownerName, repositoryName, page);
+					const nextBranches = await loadBranchesByPage(
+						apiUrl,
+						ownerName,
+						repositoryName,
+						page,
+						type
+					);
 					branches = branches.concat(nextBranches);
 					branchCount = nextBranches.length;
 				}
@@ -67,10 +109,28 @@
 				value: branch.name,
 				label: branch.name
 			}));
+		} catch (error) {
+			return errorNotification(error);
+		} finally {
+			loading.branches = false;
 		}
-	async function loadBranchesByPage(apiUrl: string, owner: string, repository: string, page = 1) {
+	}
+	async function loadBranchesByPage(
+		apiUrl: string,
+		owner: string,
+		repository: string,
+		page = 1,
+		type: string
+	) {
+		if (type === 'github') {
 			return await get(`${apiUrl}/repos/${owner}/${repository}/branches?per_page=100&page=${page}`);
 		}
+		if (type === 'gitlab') {
+			return await get(
+				`${apiUrl}/projects/${ownerName}%2F${repositoryName}/repository/branches?page=${page}`
+			);
+		}
+	}
 	async function saveRepository(event?: any) {
 		try {
 			if (event?.detail?.value) {
@@ -89,6 +149,7 @@
 				webhookToken: null,
 				isPublicRepository: true
 			});
+
 			return await goto(`/applications/${id}/configuration/destination`);
 		} catch (error) {
 			return errorNotification(error);
@@ -96,11 +157,21 @@
 	}
 </script>
 
-<div class="title">Public repository link</div>
+<div class="mx-auto max-w-7xl">
-<Explainer text="Only works with Github.com and Gitlab.com" />
+	<div class="grid grid-flow-row gap-2 px-10">
-<div>
+		<div class="flex">
-	<input bind:value={publicRepositoryLink} />
+			<form class="flex" on:submit|preventDefault={loadBranches}>
-	<button on:click={loadBranches}>Load</button>
+				<div class="flex-col">
+					<label for="fqdn" class="pt-2 w-40 text-base font-bold text-stone-100"
+						>Public Git HTTP Url</label
+					>
+
+					<Explainer
+						text="Only works with Github.com and Gitlab.com.<br><br><span class='text-green-500 font-bold'>https://github.com/zekth/fastify-typescript-example</span><br>or<br><span class='text-green-500 font-bold'>https://github.com/zekth/fastify-typescript-example/tree/main</span> to import a specific branch <br>or<br>https://gitlab.com/aleveha/fastify-example <br>or<br>"
+					/>
+				</div>
+				<div class="space-y-4">
+					<input class="w-[32rem]" bind:value={publicRepositoryLink} />
 					{#if branchSelectOptions.length > 0}
 						<div class="custom-select-wrapper">
 							<Select
@@ -120,3 +191,11 @@
 						</div>
 					{/if}
 				</div>
+
+				<button class="btn mx-4 bg-green-600" class:loading={loading.branches} type="submit"
+					>Load Repository</button
+				>
+			</form>
+		</div>
+	</div>
+</div>

apps/ui/src/routes/applications/[id]/configuration/buildpack.svelte

@@ -249,7 +249,6 @@
 		if (!isPublicRepository) {
 			await scanRepository();
 		} else {
-			foundConfig = findBuildPack('node', packageManager);
 			scanning = false;
 		}
 	});

apps/ui/src/routes/applications/[id]/configuration/source.svelte

@@ -32,6 +32,7 @@
 	import { errorNotification } from '$lib/common';
 	import { appSession } from '$lib/store';
 	import PublicRepository from './_PublicRepository.svelte';
+import Explainer from '$lib/components/Explainer.svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -72,7 +73,9 @@
 		{$t('application.configuration.select_a_git_source')}
 	</div>
 </div>
-<div class="flex flex-col justify-center">
+<div class="max-w-7xl mx-auto ">
+	<div class="title pb-8">Git App</div>
+	<div class="flex flex-wrap justify-center">
 		{#if !filteredSources || ownSources.length === 0}
 			<div class="flex-col">
 				<div class="pb-2 text-center font-bold">
@@ -189,7 +192,9 @@
 			</div>
 		{/if}
 	</div>
+	<div class="title">Public Repository</div>
 
-<div class="flex flex-wrap justify-center pt-10 items-center">
+	<div class="flex flex-wrap justify-center items-center pt-4">
 		<PublicRepository />
 	</div>
+</div>

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

@@ -620,7 +620,7 @@
 					</div>
 				{/if}
 			{/if}
-			{#if !staticDeployments.includes(application.buildPack) && !isBot}
+			{#if !staticDeployments.includes(application.buildPack)}
 				<div class="grid grid-cols-2 items-center">
 					<label for="port" class="text-base font-bold text-stone-100">{$t('forms.port')}</label>
 					<input
@@ -631,6 +631,9 @@
 						bind:value={application.port}
 						placeholder="{$t('forms.default')}: 'python' ? '8000' : '3000'"
 					/>
+					<Explainer
+					text={'The port your application listens on.'}
+				/>
 				</div>
 			{/if}
 			<div class="grid grid-cols-2 items-center">