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

fixes

Browse Source
This commit is contained in:
Andras Bacsai
2022-12-01 09:51:56 +01:00
parent 9d3ed85ffd
commit 12c0760cb3
6 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -641,9 +641,9 @@ export async function buildImage({
commit
}) {
if (isCache) {
await saveBuildLog({ line: `Cache | Building cache image.`, buildId, applicationId });
await saveBuildLog({ line: `Building cache image`, buildId, applicationId });
} else {
await saveBuildLog({ line: `Production | Building production image.`, buildId, applicationId });
await saveBuildLog({ line: `Building production image`, buildId, applicationId });
}
if (!debug) {
await saveBuildLog({
@@ -667,12 +667,12 @@ export async function buildImage({
const { status } = await prisma.build.findUnique({ where: { id: buildId } })
if (status === 'canceled') {
throw new Error('Deployment | Canceled.')
throw new Error('Canceled.')
}
if (isCache) {
await saveBuildLog({ line: `Cache | Successful! 🎉`, buildId, applicationId });
await saveBuildLog({ line: `Building cache image built successful 🎉`, buildId, applicationId });
} else {
await saveBuildLog({ line: `Production | Successful! 🎉`, buildId, applicationId });
await saveBuildLog({ line: `Building production image built successful 🎉`, buildId, applicationId });
}
}

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

@@ -1535,7 +1535,7 @@ export async function stopBuild(buildId, applicationId) {
scheduler.workers.get('deployApplication').postMessage('cancel');
}
await cleanupDB(buildId, applicationId);
return reject(new Error('Deployment | Canceled.'));
return reject(new Error('Canceled.'));
}
const { stdout: buildContainers } = await executeDockerCmd({
dockerId,
@@ -1568,7 +1568,7 @@ async function cleanupDB(buildId: string, applicationId: string) {
if (data?.status === 'queued' || data?.status === 'running') {
await prisma.build.update({ where: { id: buildId }, data: { status: 'canceled' } });
}
await saveBuildLog({ line: 'Deployment | Canceled.', buildId, applicationId });
await saveBuildLog({ line: 'Canceled.', buildId, applicationId });
}
export function convertTolOldVolumeNames(type) {

9
apps/api/src/lib/importers/github.ts
View File

@@ -30,16 +30,15 @@ export default async function ({
}): Promise<string> {
const { default: got } = await import('got')
const url = htmlUrl.replace('https://', '').replace('http://', '');
await saveBuildLog({ line: 'Importer | Warming up GitHub importer.', buildId, applicationId });
if (forPublic) {
await saveBuildLog({
line: `Importer | Cloning ${repository}:${branch} branch.`,
line: `Cloning ${repository}:${branch} branch`,
buildId,
applicationId
});
if (gitCommitHash) {
await saveBuildLog({
line: `Importer | Checking out ${gitCommitHash} commit.`,
line: `Checking out ${gitCommitHash} commit`,
buildId,
applicationId
});
@@ -71,13 +70,13 @@ export default async function ({
})
.json();
await saveBuildLog({
line: `Importer | Cloning ${repository}:${branch} branch.`,
line: `Cloning ${repository}:${branch} branch`,
buildId,
applicationId
});
if (gitCommitHash) {
await saveBuildLog({
line: `Importer | Checking out ${gitCommitHash} commit.`,
line: `Checking out ${gitCommitHash} commit`,
buildId,
applicationId
});

6
apps/api/src/lib/importers/gitlab.ts
View File

@@ -27,21 +27,19 @@ export default async function ({
forPublic: boolean;
}): Promise<string> {
const url = htmlUrl.replace('https://', '').replace('http://', '').replace(/\/$/, '');
await saveBuildLog({ line: 'Importer | Warming up GitLab importer.', buildId, applicationId });
if (!forPublic) {
await asyncExecShell(`echo '${privateSshKey}' > ${repodir}/id.rsa`);
await asyncExecShell(`chmod 600 ${repodir}/id.rsa`);
}
await saveBuildLog({
line: `Importer | Cloning ${repository}:${branch} branch.`,
line: `Cloning ${repository}:${branch} branch`,
buildId,
applicationId
});
if (gitCommitHash) {
await saveBuildLog({
line: `Importer | Checking out ${gitCommitHash} commit.`,
line: `Checking out ${gitCommitHash} commit`,
buildId,
applicationId
});