ui: fix basedirectory meaning

apps/api/src/lib/buildPacks/common.ts

@@ -607,30 +607,6 @@ export async function buildImage({
 	}
 }
 
-export async function streamEvents({ stream, docker, buildId, applicationId, debug }) {
-	await new Promise((resolve, reject) => {
-		docker.engine.modem.followProgress(stream, onFinished, onProgress);
-		function onFinished(err, res) {
-			if (err) reject(err);
-			resolve(res);
-		}
-		async function onProgress(event) {
-			if (event.error) {
-				reject(event.error);
-			} else if (event.stream) {
-				if (event.stream !== '\n') {
-					if (debug)
-						await saveBuildLog({
-							line: `${event.stream.replace('\n', '')}`,
-							buildId,
-							applicationId
-						});
-				}
-			}
-		}
-	});
-}
-
 export function makeLabelForStandaloneApplication({
 	applicationId,
 	fqdn,

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

@@ -266,7 +266,6 @@
 		await getBaseBuildImages();
 		await handleSubmit();
 	}
-
 	async function isDNSValid(domain: any, isWWW: any) {
 		try {
 			await get(`/applications/${id}/check?domain=${domain}`);
@@ -707,24 +706,6 @@
 						/>
 					</div>
 				{/if}
-				{#if application.buildPack === 'docker'}
-					<div class="grid grid-cols-2 items-center pt-4">
-						<label for="dockerFileLocation"
-							>Dockerfile Location <Explainer
-								explanation={"Should be absolute path, like <span class='text-settings font-bold'>/data/Dockerfile</span> or <span class='text-settings font-bold'>/Dockerfile.</span>"}
-							/></label
-						>
-						<input
-							class="w-full"
-							disabled={isDisabled}
-							readonly={!$appSession.isAdmin}
-							name="dockerFileLocation"
-							id="dockerFileLocation"
-							bind:value={application.dockerFileLocation}
-							placeholder="default: /Dockerfile"
-						/>
-					</div>
-				{/if}
 				{#if application.buildPack === 'deno'}
 					<div class="grid grid-cols-2 items-center">
 						<label for="denoMainFile">Main File</label>
@@ -776,6 +757,31 @@
 						/>
 					</div>
 				{/if}
+				{#if application.buildPack === 'docker'}
+					<div class="grid grid-cols-2 items-center pb-4">
+						<label for="dockerFileLocation"
+						class="mb-10"
+							>Dockerfile Location <Explainer
+								explanation={"Should be absolute path, like <span class='text-settings font-bold'>/data/Dockerfile</span> or <span class='text-settings font-bold'>/Dockerfile.</span>"}
+							/></label
+						>
+						<div class="form-control w-full">
+							<input
+							class="w-full input"
+							disabled={isDisabled}
+							readonly={!$appSession.isAdmin}
+							name="dockerFileLocation"
+							id="dockerFileLocation"
+							bind:value={application.dockerFileLocation}
+							placeholder="default: /Dockerfile"
+						/>
+							<label class="label">
+							  <span class="label-text-alt text-xs">Path: {application.baseDirectory.replace(/^\/$/,'')}{application.dockerFileLocation}</span>
+							</label>
+						  </div>
+						
+					</div>
+				{/if}
 				{#if !notNodeDeployments.includes(application.buildPack)}
 					<div class="grid grid-cols-2 items-center">
 						<div class="flex-col">