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

fix: Reconfigure proxy on restart

Browse Source
This commit is contained in:
Andras Bacsai
2022-03-01 14:02:46 +01:00
parent 61679749eb
commit e722f8a87c
9 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/applications/[id]/__layout.svelte
View File

@@ -86,7 +86,7 @@
async function handleDeploySubmit() {
try {
const { buildId } = await post(`/applications/${id}/deploy.json`, { ...application });
return await goto(`/applications/${id}/logs/build?buildId=${buildId}`);
return window.location.assign(`/applications/${id}/logs/build?buildId=${buildId}`);
} catch ({ error }) {
return errorNotification(error);
}

1
src/routes/applications/[id]/deploy.json.ts
View File

@@ -29,6 +29,7 @@ export const post: RequestHandler = async (event) => {
.digest('hex');
await db.prisma.application.update({ where: { id }, data: { configHash } });
}
await db.prisma.application.update({ where: { id }, data: { updatedAt: new Date() } });
await buildQueue.add(buildId, { build_id: buildId, type: 'manual', ...applicationFound });
return {
status: 200,

1
src/routes/applications/[id]/logs/build/index.svelte
View File

@@ -51,7 +51,6 @@
build.took = data.builds[0].took;
build.since = data.builds[0].since;
}
window.location.reload();
return build;
});
return;

2
src/routes/destinations/[id]/_LocalDocker.svelte
View File

@@ -117,6 +117,8 @@
setTimeout(() => {
window.location.reload();
}, 5000);
} finally {
restarting = false;
}
}
}

16
src/routes/webhooks/github/events.ts
View File

@@ -84,6 +84,10 @@ export const post: RequestHandler = async (event) => {
data: { configHash }
});
}
await db.prisma.application.update({
where: { id: applicationFound.id },
data: { updatedAt: new Date() }
});
await buildQueue.add(buildId, {
build_id: buildId,
type: 'webhook_commit',
@@ -128,6 +132,10 @@ export const post: RequestHandler = async (event) => {
pullmergeRequestAction === 'reopened' ||
pullmergeRequestAction === 'synchronize'
) {
await db.prisma.application.update({
where: { id: applicationFound.id },
data: { updatedAt: new Date() }
});
await buildQueue.add(buildId, {
build_id: buildId,
type: 'webhook_pr',
@@ -143,16 +151,8 @@ export const post: RequestHandler = async (event) => {
};
} else if (pullmergeRequestAction === 'closed') {
if (applicationFound.destinationDockerId) {
const domain = getDomain(applicationFound.fqdn);
const isHttps = applicationFound.fqdn.startsWith('https://');
const isWWW = applicationFound.fqdn.includes('www.');
const fqdn = `${isHttps ? 'https://' : 'http://'}${
isWWW ? 'www.' : ''
}${pullmergeRequestId}.${domain}`;
const id = `${applicationFound.id}-${pullmergeRequestId}`;
const engine = applicationFound.destinationDocker.engine;
await removeDestinationDocker({ id, engine });
}
return {

16
src/routes/webhooks/gitlab/events.ts
View File

@@ -48,6 +48,10 @@ export const post: RequestHandler = async (event) => {
data: { configHash }
});
}
await db.prisma.application.update({
where: { id: applicationFound.id },
data: { updatedAt: new Date() }
});
await buildQueue.add(buildId, {
build_id: buildId,
type: 'webhook_commit',
@@ -125,6 +129,10 @@ export const post: RequestHandler = async (event) => {
action === 'open' ||
action === 'update'
) {
await db.prisma.application.update({
where: { id: applicationFound.id },
data: { updatedAt: new Date() }
});
await buildQueue.add(buildId, {
build_id: buildId,
type: 'webhook_mr',
@@ -140,16 +148,8 @@ export const post: RequestHandler = async (event) => {
};
} else if (action === 'close') {
if (applicationFound.destinationDockerId) {
const domain = getDomain(applicationFound.fqdn);
const isHttps = applicationFound.fqdn.startsWith('https://');
const isWWW = applicationFound.fqdn.includes('www.');
const fqdn = `${isHttps ? 'https://' : 'http://'}${
isWWW ? 'www.' : ''
}${pullmergeRequestId}.${domain}`;
const id = `${applicationFound.id}-${pullmergeRequestId}`;
const engine = applicationFound.destinationDocker.engine;
await removeDestinationDocker({ id, engine });
}