mirror of
https://github.com/ershisan99/coolify.git
synced 2025-12-20 12:33:12 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
52b712d90b | ||
|
|
331e13b7cb | ||
|
|
64bb4a2525 |
@@ -23,7 +23,7 @@ const customConfig: Config = {
|
|||||||
length: 3
|
length: 3
|
||||||
};
|
};
|
||||||
export const isDev = process.env.NODE_ENV === 'development';
|
export const isDev = process.env.NODE_ENV === 'development';
|
||||||
export const version = '3.0.1';
|
export const version = '3.0.2';
|
||||||
|
|
||||||
export const defaultProxyImage = `coolify-haproxy-alpine:latest`;
|
export const defaultProxyImage = `coolify-haproxy-alpine:latest`;
|
||||||
export const defaultProxyImageTcp = `coolify-haproxy-tcp-alpine:latest`;
|
export const defaultProxyImageTcp = `coolify-haproxy-tcp-alpine:latest`;
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ export async function getDestination(request: FastifyRequest) {
|
|||||||
const destination = await prisma.destinationDocker.findFirst({
|
const destination = await prisma.destinationDocker.findFirst({
|
||||||
where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } }
|
where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } }
|
||||||
});
|
});
|
||||||
if (!destination) {
|
if (!destination && id !== 'new') {
|
||||||
throw { status: 404, message: `Destination not found.` };
|
throw { status: 404, message: `Destination not found.` };
|
||||||
}
|
}
|
||||||
const settings = await listSettings();
|
const settings = await listSettings();
|
||||||
@@ -62,10 +62,7 @@ export async function getDestination(request: FastifyRequest) {
|
|||||||
// // await saveSshKey(destination);
|
// // await saveSshKey(destination);
|
||||||
// payload.state = await checkContainer(engine, 'coolify-haproxy');
|
// payload.state = await checkContainer(engine, 'coolify-haproxy');
|
||||||
} else {
|
} else {
|
||||||
let containerName = 'coolify-proxy';
|
const containerName = 'coolify-proxy';
|
||||||
if (!settings.isTraefikUsed) {
|
|
||||||
containerName = 'coolify-haproxy';
|
|
||||||
}
|
|
||||||
payload.state =
|
payload.state =
|
||||||
destination?.engine && (await checkContainer(destination.engine, containerName));
|
destination?.engine && (await checkContainer(destination.engine, containerName));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ interface AppSession {
|
|||||||
}
|
}
|
||||||
export const loginEmail: Writable<string | undefined> = writable()
|
export const loginEmail: Writable<string | undefined> = writable()
|
||||||
export const appSession: Writable<AppSession> = writable({
|
export const appSession: Writable<AppSession> = writable({
|
||||||
version: '3.0.1',
|
version: '3.0.2',
|
||||||
userId: null,
|
userId: null,
|
||||||
teamId: null,
|
teamId: null,
|
||||||
permission: 'read',
|
permission: 'read',
|
||||||
|
|||||||
@@ -136,6 +136,8 @@
|
|||||||
statusInterval = setInterval(async () => {
|
statusInterval = setInterval(async () => {
|
||||||
await getStatus();
|
await getStatus();
|
||||||
}, 2000);
|
}, 2000);
|
||||||
|
} else {
|
||||||
|
$status.application.initialLoading = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -126,6 +126,8 @@
|
|||||||
statusInterval = setInterval(async () => {
|
statusInterval = setInterval(async () => {
|
||||||
await getStatus();
|
await getStatus();
|
||||||
}, 2000);
|
}, 2000);
|
||||||
|
} else {
|
||||||
|
$status.database.initialLoading = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
import { t } from '$lib/translations';
|
import { t } from '$lib/translations';
|
||||||
import { appSession } from '$lib/store';
|
import { appSession } from '$lib/store';
|
||||||
import { get } from '$lib/api';
|
import { get, post } from '$lib/api';
|
||||||
|
|
||||||
const ownDestinations = destinations.filter((destination) => {
|
const ownDestinations = destinations.filter((destination) => {
|
||||||
if (destination.teams[0].id === $appSession.teamId) {
|
if (destination.teams[0].id === $appSession.teamId) {
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
<div class="flex space-x-1 p-6 font-bold">
|
<div class="flex space-x-1 p-6 font-bold">
|
||||||
<div class="mr-4 text-2xl tracking-tight">{$t('index.destinations')}</div>
|
<div class="mr-4 text-2xl tracking-tight">{$t('index.destinations')}</div>
|
||||||
{#if $appSession.isAdmin}
|
{#if $appSession.isAdmin}
|
||||||
<a href="/destinations/new" class="add-icon bg-sky-600 hover:bg-sky-500">
|
<a href="/destinations/new" class="add-icon bg-sky-600 hover:bg-sky-500">
|
||||||
<svg
|
<svg
|
||||||
class="w-6"
|
class="w-6"
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
|||||||
@@ -135,6 +135,8 @@
|
|||||||
statusInterval = setInterval(async () => {
|
statusInterval = setInterval(async () => {
|
||||||
await getStatus();
|
await getStatus();
|
||||||
}, 2000);
|
}, 2000);
|
||||||
|
} else {
|
||||||
|
$status.service.initialLoading = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "coolify",
|
"name": "coolify",
|
||||||
"version": "3.0.1",
|
"version": "3.0.2",
|
||||||
"description": "An open-source & self-hostable Heroku / Netlify alternative.",
|
"description": "An open-source & self-hostable Heroku / Netlify alternative.",
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user