fix: deletion + cleanupStuckedContainers
This commit is contained in:
parent
27021538d8
commit
6b2a453b8f
@ -171,6 +171,11 @@ const host = '0.0.0.0';
|
||||
await cleanupStorage();
|
||||
}, 60000 * 15);
|
||||
|
||||
// Cleanup stucked containers (not defined in Coolify, but still running and managed by Coolify)
|
||||
setInterval(async () => {
|
||||
await cleanupStuckedContainers();
|
||||
}, 60000 * 5);
|
||||
|
||||
// checkProxies, checkFluentBit & refresh templates
|
||||
setInterval(async () => {
|
||||
await checkProxies();
|
||||
|
@ -732,14 +732,15 @@ export async function deleteApplication(
|
||||
) {
|
||||
try {
|
||||
const { id } = request.params;
|
||||
const { force } = request.body;
|
||||
|
||||
const { teamId } = request.user;
|
||||
const application = await prisma.application.findUnique({
|
||||
where: { id },
|
||||
include: { destinationDocker: true }
|
||||
include: { destinationDocker: true, teams: true }
|
||||
});
|
||||
if (!force && application?.destinationDockerId && application.destinationDocker?.network) {
|
||||
if (!application.teams.find((team) => team.id === teamId) || teamId !== '0') {
|
||||
throw { status: 403, message: 'You are not allowed to delete this application.' };
|
||||
}
|
||||
if (application?.destinationDocker?.id && application.destinationDocker?.network) {
|
||||
const { stdout: containers } = await executeCommand({
|
||||
dockerId: application.destinationDocker.id,
|
||||
command: `docker ps -a --filter network=${application.destinationDocker.network} --filter name=${id} --format '{{json .}}'`
|
||||
|
@ -427,19 +427,15 @@ export async function deleteDatabase(request: FastifyRequest<DeleteDatabase>) {
|
||||
try {
|
||||
const teamId = request.user.teamId;
|
||||
const { id } = request.params;
|
||||
const { force } = request.body;
|
||||
const database = await prisma.database.findFirst({
|
||||
where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
|
||||
include: { destinationDocker: true, settings: true }
|
||||
});
|
||||
if (!force) {
|
||||
if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword);
|
||||
if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword);
|
||||
if (database.destinationDockerId) {
|
||||
const everStarted = await stopDatabaseContainer(database);
|
||||
if (everStarted)
|
||||
await stopTcpHttpProxy(id, database.destinationDocker, database.publicPort);
|
||||
}
|
||||
if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword);
|
||||
if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword);
|
||||
if (database.destinationDockerId) {
|
||||
const everStarted = await stopDatabaseContainer(database);
|
||||
if (everStarted) await stopTcpHttpProxy(id, database.destinationDocker, database.publicPort);
|
||||
}
|
||||
await prisma.databaseSettings.deleteMany({ where: { databaseId: id } });
|
||||
await prisma.databaseSecret.deleteMany({ where: { databaseId: id } });
|
||||
|
@ -4,7 +4,7 @@ export interface SaveDatabaseType extends OnlyId {
|
||||
Body: { type: string }
|
||||
}
|
||||
export interface DeleteDatabase extends OnlyId {
|
||||
Body: { force: string }
|
||||
Body: { }
|
||||
}
|
||||
export interface SaveVersion extends OnlyId {
|
||||
Body: {
|
||||
|
@ -617,6 +617,29 @@ export async function getServiceLogs(request: FastifyRequest<GetServiceLogs>) {
|
||||
export async function deleteService(request: FastifyRequest<OnlyId>) {
|
||||
try {
|
||||
const { id } = request.params;
|
||||
const teamId = request.user.teamId;
|
||||
const { destinationDockerId } = await getServiceFromDB({ id, teamId });
|
||||
if (destinationDockerId) {
|
||||
const { stdout: containers } = await executeCommand({
|
||||
dockerId: destinationDockerId,
|
||||
command: `docker ps -a --filter 'label=com.docker.compose.project=${id}' --format {{.ID}}`
|
||||
});
|
||||
if (containers) {
|
||||
const containerArray = containers.split('\n');
|
||||
if (containerArray.length > 0) {
|
||||
for (const container of containerArray) {
|
||||
await executeCommand({
|
||||
dockerId: destinationDockerId,
|
||||
command: `docker stop -t 0 ${container}`
|
||||
});
|
||||
await executeCommand({
|
||||
dockerId: destinationDockerId,
|
||||
command: `docker rm --force ${container}`
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
await removeService({ id });
|
||||
return {};
|
||||
} catch ({ status, message }) {
|
||||
|
@ -827,6 +827,29 @@ export const servicesRouter = router({
|
||||
.mutation(async ({ input }) => {
|
||||
// todo: check if user is allowed to delete service
|
||||
const { id } = input;
|
||||
const teamId = ctx.user?.teamId;
|
||||
const { destinationDockerId } = await getServiceFromDB({ id, teamId });
|
||||
if (destinationDockerId) {
|
||||
const { stdout: containers } = await executeCommand({
|
||||
dockerId: destinationDockerId,
|
||||
command: `docker ps -a --filter 'label=com.docker.compose.project=${id}' --format {{.ID}}`
|
||||
});
|
||||
if (containers) {
|
||||
const containerArray = containers.split('\n');
|
||||
if (containerArray.length > 0) {
|
||||
for (const container of containerArray) {
|
||||
await executeCommand({
|
||||
dockerId: destinationDockerId,
|
||||
command: `docker stop -t 0 ${container}`
|
||||
});
|
||||
await executeCommand({
|
||||
dockerId: destinationDockerId,
|
||||
command: `docker rm --force ${container}`
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
await prisma.serviceSecret.deleteMany({ where: { serviceId: id } });
|
||||
await prisma.serviceSetting.deleteMany({ where: { serviceId: id } });
|
||||
await prisma.servicePersistentStorage.deleteMany({ where: { serviceId: id } });
|
||||
|
@ -89,7 +89,7 @@
|
||||
const sure = confirm($t('application.confirm_to_delete', { name }));
|
||||
if (sure) {
|
||||
try {
|
||||
await del(`/applications/${id}`, { id, force });
|
||||
await del(`/applications/${id}`, {});
|
||||
return await goto('/');
|
||||
} catch (error) {
|
||||
if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid`)) {
|
||||
|
@ -34,7 +34,7 @@
|
||||
if (sure) {
|
||||
$status.application.initialLoading = true;
|
||||
try {
|
||||
await del(`/applications/${id}`, { id, force });
|
||||
await del(`/applications/${id}`,{});
|
||||
return await goto('/')
|
||||
} catch (error) {
|
||||
if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid`)) {
|
||||
|
@ -75,7 +75,7 @@
|
||||
if (sure) {
|
||||
$status.database.initialLoading = true;
|
||||
try {
|
||||
await del(`/databases/${database.id}`, { id: database.id, force });
|
||||
await del(`/databases/${database.id}`, {});
|
||||
return await window.location.assign('/');
|
||||
} catch (error) {
|
||||
return errorNotification(error);
|
||||
|
@ -437,7 +437,7 @@
|
||||
try {
|
||||
const sure = confirm('Are you sure? This will delete this application!');
|
||||
if (sure) {
|
||||
await del(`/applications/${id}`, { force: true });
|
||||
await del(`/applications/${id}`, {});
|
||||
return window.location.reload();
|
||||
}
|
||||
} catch (error) {
|
||||
@ -459,7 +459,7 @@
|
||||
try {
|
||||
const sure = confirm('Are you sure? This will delete this database!');
|
||||
if (sure) {
|
||||
await del(`/databases/${id}`, { force: true });
|
||||
await del(`/databases/${id}`, { });
|
||||
return window.location.reload();
|
||||
}
|
||||
} catch (error) {
|
||||
@ -784,11 +784,11 @@
|
||||
</a>
|
||||
{/if}
|
||||
{#if $appSession.isAdmin}
|
||||
<button
|
||||
class="icons hover:bg-green-500"
|
||||
on:click|stopPropagation|preventDefault={() =>
|
||||
deleteApplication(application.id)}><DeleteIcon /></button
|
||||
>
|
||||
<button
|
||||
class="icons hover:bg-green-500"
|
||||
on:click|stopPropagation|preventDefault={() =>
|
||||
deleteApplication(application.id)}><DeleteIcon /></button
|
||||
>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
@ -899,11 +899,11 @@
|
||||
</a>
|
||||
{/if}
|
||||
{#if $appSession.isAdmin}
|
||||
<button
|
||||
class="icons hover:bg-green-500"
|
||||
on:click|stopPropagation|preventDefault={() =>
|
||||
deleteApplication(application.id)}><DeleteIcon /></button
|
||||
>
|
||||
<button
|
||||
class="icons hover:bg-green-500"
|
||||
on:click|stopPropagation|preventDefault={() =>
|
||||
deleteApplication(application.id)}><DeleteIcon /></button
|
||||
>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
@ -996,11 +996,11 @@
|
||||
</a>
|
||||
{/if}
|
||||
{#if $appSession.isAdmin}
|
||||
<button
|
||||
class="icons hover:bg-pink-500"
|
||||
on:click|stopPropagation|preventDefault={() => deleteService(service.id)}
|
||||
><DeleteIcon /></button
|
||||
>
|
||||
<button
|
||||
class="icons hover:bg-pink-500"
|
||||
on:click|stopPropagation|preventDefault={() => deleteService(service.id)}
|
||||
><DeleteIcon /></button
|
||||
>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
@ -1084,11 +1084,11 @@
|
||||
</a>
|
||||
{/if}
|
||||
{#if $appSession.isAdmin}
|
||||
<button
|
||||
class="icons hover:bg-pink-500"
|
||||
on:click|stopPropagation|preventDefault={() => deleteService(service.id)}
|
||||
><DeleteIcon /></button
|
||||
>
|
||||
<button
|
||||
class="icons hover:bg-pink-500"
|
||||
on:click|stopPropagation|preventDefault={() => deleteService(service.id)}
|
||||
><DeleteIcon /></button
|
||||
>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
@ -1182,11 +1182,11 @@
|
||||
</div>
|
||||
{/if}
|
||||
{#if $appSession.isAdmin}
|
||||
<button
|
||||
class="icons hover:bg-databases-100"
|
||||
on:click|stopPropagation|preventDefault={() => deleteDatabase(database.id)}
|
||||
><DeleteIcon /></button
|
||||
>
|
||||
<button
|
||||
class="icons hover:bg-databases-100"
|
||||
on:click|stopPropagation|preventDefault={() =>
|
||||
deleteDatabase(database.id)}><DeleteIcon /></button
|
||||
>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
@ -1270,11 +1270,11 @@
|
||||
</div>
|
||||
{/if}
|
||||
{#if $appSession.isAdmin}
|
||||
<button
|
||||
class="icons hover:bg-databases"
|
||||
on:click|stopPropagation|preventDefault={() => deleteDatabase(database.id)}
|
||||
><DeleteIcon /></button
|
||||
>
|
||||
<button
|
||||
class="icons hover:bg-databases"
|
||||
on:click|stopPropagation|preventDefault={() => deleteDatabase(database.id)}
|
||||
><DeleteIcon /></button
|
||||
>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
@ -85,9 +85,7 @@
|
||||
if (sure) {
|
||||
$status.service.initialLoading = true;
|
||||
try {
|
||||
if (service.type && $status.service.isRunning)
|
||||
await post(`/services/${service.id}/stop`, {});
|
||||
await del(`/services/${service.id}`, { id: service.id });
|
||||
await del(`/services/${service.id}`, {});
|
||||
return await goto('/');
|
||||
} catch (error) {
|
||||
return errorNotification(error);
|
||||
|
@ -28,16 +28,12 @@
|
||||
import { goto } from '$app/navigation';
|
||||
const { id } = $page.params;
|
||||
|
||||
let forceDelete = false;
|
||||
async function deleteService() {
|
||||
const sure = confirm($t('application.confirm_to_delete', { name: service.name }));
|
||||
if (sure) {
|
||||
$status.service.initialLoading = true;
|
||||
try {
|
||||
if (service.type && $status.service.overallStatus !== 'stopped') {
|
||||
await post(`/services/${service.id}/stop`, {});
|
||||
}
|
||||
await del(`/services/${service.id}`, { id: service.id });
|
||||
await del(`/services/${service.id}`, {});
|
||||
return await goto('/');
|
||||
} catch (error) {
|
||||
return errorNotification(error);
|
||||
|
Loading…
x
Reference in New Issue
Block a user