From 54376fd105119547cf740009d33d7c092ba8b955 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 27 Feb 2022 11:14:46 +0100 Subject: [PATCH] remove remote docker for now --- prisma/schema.prisma | 6 +----- src/lib/common.ts | 5 +++++ src/lib/queues/proxy.ts | 4 ++++ src/routes/destinations/[id]/index.json.ts | 11 ++++++++--- src/routes/new/destination/index.svelte | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 34d8de6b1..9ec70de70 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -147,12 +147,8 @@ model DestinationDocker { id String @id @default(cuid()) network String @unique name String - engine String? + engine String remoteEngine Boolean @default(false) - ipAddress String? - sshPrivateKey String? - user String? @default("root") - port Int? @default(22) isCoolifyProxyUsed Boolean? @default(false) teams Team[] application Application[] diff --git a/src/lib/common.ts b/src/lib/common.ts index de33fb267..c36196113 100644 --- a/src/lib/common.ts +++ b/src/lib/common.ts @@ -106,6 +106,11 @@ export function getEngine(engine) { return engine === '/var/run/docker.sock' ? 'unix:///var/run/docker.sock' : engine; } +// export async function saveSshKey(destination) { +// return await asyncExecShell( +// `echo '${destination.sshPrivateKey}' > /tmp/id_rsa_${destination.id} && chmod 600 /tmp/id_rsa_${destination.id}` +// ); +// } export async function removeContainer(id, engine) { const host = getEngine(engine); try { diff --git a/src/lib/queues/proxy.ts b/src/lib/queues/proxy.ts index 5f7a8a189..45363285a 100644 --- a/src/lib/queues/proxy.ts +++ b/src/lib/queues/proxy.ts @@ -13,6 +13,7 @@ import { startHttpProxy } from '$lib/haproxy'; import * as db from '$lib/database'; +// import { generateRemoteEngine } from '$lib/components/common'; export default async function () { try { @@ -20,6 +21,9 @@ export default async function () { const destinationDockers = await prisma.destinationDocker.findMany({}); for (const destination of destinationDockers) { if (destination.isCoolifyProxyUsed) { + // if (destination.remoteEngine) { + // const engine = generateRemoteEngine(destination); + // } const docker = dockerInstance({ destinationDocker: destination }); const containers = await docker.engine.listContainers(); const configurations = containers.filter( diff --git a/src/routes/destinations/[id]/index.json.ts b/src/routes/destinations/[id]/index.json.ts index 7d83d9da3..e88c29825 100644 --- a/src/routes/destinations/[id]/index.json.ts +++ b/src/routes/destinations/[id]/index.json.ts @@ -1,4 +1,4 @@ -import { getUserDetails } from '$lib/common'; +import { asyncExecShell, getUserDetails } from '$lib/common'; import { generateRemoteEngine } from '$lib/components/common'; import * as db from '$lib/database'; import { ErrorHandler } from '$lib/database'; @@ -19,8 +19,13 @@ export const get: RequestHandler = async (event) => { state: false }; if (destination.remoteEngine) { - const engine = await generateRemoteEngine(destination); - payload.state = await checkContainer(engine, 'coolify-haproxy'); + // const { stdout } = await asyncExecShell( + // `ssh -p ${destination.port} ${destination.user}@${destination.ipAddress} "docker ps -a"` + // ); + // console.log(stdout) + // const engine = await generateRemoteEngine(destination); + // // await saveSshKey(destination); + // payload.state = await checkContainer(engine, 'coolify-haproxy'); } else { payload.state = destination?.engine && (await checkContainer(destination.engine, 'coolify-haproxy')); diff --git a/src/routes/new/destination/index.svelte b/src/routes/new/destination/index.svelte index 3ebb6b04d..5ad82cbb7 100644 --- a/src/routes/new/destination/index.svelte +++ b/src/routes/new/destination/index.svelte @@ -42,7 +42,7 @@
Predefined destinations
- +