Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: ssh pid agent name

Browse Source
This commit is contained in:
Andras Bacsai 2022-09-05 08:14:43 +02:00
parent 47c3af6a0e
commit 6d7c2ae74a
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/api/src/routes/api/v1/destinations/handlers.ts
View File

@ -210,7 +210,7 @@ export async function verifyRemoteDockerEngine(request: FastifyRequest, reply: F
const { id } = request.params; const { id } = request.params;
await createRemoteEngineConfiguration(id); await createRemoteEngineConfiguration(id);
const { remoteIpAddress, remoteUser, network } = await prisma.destinationDocker.findFirst({ where: { id } }) const { remoteIpAddress, remoteUser, network, isCoolifyProxyUsed } = await prisma.destinationDocker.findFirst({ where: { id } })
const host = `ssh://${remoteUser}@${remoteIpAddress}` const host = `ssh://${remoteUser}@${remoteIpAddress}`
const { stdout } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=${network}' --no-trunc --format "{{json .}}"`); const { stdout } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=${network}' --no-trunc --format "{{json .}}"`);
@ -222,6 +222,9 @@ export async function verifyRemoteDockerEngine(request: FastifyRequest, reply: F
if (!coolifyNetwork) { if (!coolifyNetwork) {
await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable coolify-infra`); await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable coolify-infra`);
} }
if (isCoolifyProxyUsed) {
await startTraefikProxy(id);
}
await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } }) await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } })
return reply.code(201).send() return reply.code(201).send()

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

@ -106,7 +106,7 @@
await del(`/applications/${id}`, { id, force }); await del(`/applications/${id}`, { id, force });
return await goto(`/applications`); return await goto(`/applications`);
} catch (error) { } catch (error) {
if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/ssh-agent.pid`)) { if (error.message.startsWith(`Command failed: SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid`)) {
forceDelete = true; forceDelete = true;
} }
return errorNotification(error); return errorNotification(error);

8
apps/ui/src/routes/destinations/[id]/__layout.svelte
View File

@ -58,11 +58,11 @@
import DeleteIcon from '$lib/components/DeleteIcon.svelte'; import DeleteIcon from '$lib/components/DeleteIcon.svelte';
import Tooltip from '$lib/components/Tooltip.svelte'; import Tooltip from '$lib/components/Tooltip.svelte';
const { id } = $page.params;
const isDestinationDeletable = const isDestinationDeletable =
destination?.application.length === 0 && (destination?.application.length === 0 &&
destination?.database.length === 0 && destination?.database.length === 0 &&
destination?.service.length === 0; destination?.service.length === 0) ||
true;
async function deleteDestination(destination: any) { async function deleteDestination(destination: any) {
if (!isDestinationDeletable) return; if (!isDestinationDeletable) return;
@ -88,7 +88,7 @@
} }
</script> </script>
{#if id !== 'new'} {#if $page.params.id !== 'new'}
<nav class="nav-side"> <nav class="nav-side">
<button <button
id="delete" id="delete"