dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: logs in docker bp

Browse Source
This commit is contained in:
Andras Bacsai
2022-09-26 20:37:58 +00:00
parent 9d15d2be77
commit 21dfa5227c
3 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/api/src/jobs/deployApplication.ts
View File

@@ -211,7 +211,6 @@ import * as buildpacks from '../lib/buildPacks';
// //
} }
await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage); await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
if (forceRebuild) deployNeeded = true if (forceRebuild) deployNeeded = true
if (!imageFound || deployNeeded) { if (!imageFound || deployNeeded) {
// if (true) { // if (true) {

4
apps/api/src/lib/buildPacks/common.ts
View File

@@ -586,9 +586,9 @@ export async function buildImage({
} else { } else {
await saveBuildLog({ line: `Building image started.`, buildId, applicationId }); await saveBuildLog({ line: `Building image started.`, buildId, applicationId });
} }
if (!debug && isCache) { if (!debug) {
await saveBuildLog({ await saveBuildLog({
line: `Debug turned off. To see more details, allow it in the configuration.`, line: `Debug turned off. To see more details, allow it in the features tab.`,
buildId, buildId,
applicationId applicationId
}); });

7
apps/api/src/lib/buildPacks/docker.ts
View File

@@ -13,10 +13,10 @@ export default async function (data) {
pullmergeRequestId, pullmergeRequestId,
dockerFileLocation dockerFileLocation
} = data } = data
try {
const file = `${workdir}${baseDirectory}${dockerFileLocation}`; const file = `${workdir}${baseDirectory}${dockerFileLocation}`;
data.workdir = `${workdir}${baseDirectory}`; data.workdir = `${workdir}${baseDirectory}`;
const Dockerfile: Array<string> = (await fs.readFile(`${file}`, 'utf8')) const DockerfileRaw = await fs.readFile(`${file}`, 'utf8')
const Dockerfile: Array<string> = DockerfileRaw
.toString() .toString()
.trim() .trim()
.split('\n'); .split('\n');
@@ -42,7 +42,4 @@ export default async function (data) {
await fs.writeFile(`${workdir}${dockerFileLocation}`, Dockerfile.join('\n')); await fs.writeFile(`${workdir}${dockerFileLocation}`, Dockerfile.join('\n'));
await buildImage(data); await buildImage(data);
} catch (error) {
throw error;
}
} }