diff --git a/apps/api/package.json b/apps/api/package.json index 3bc32ff2b..c1c6e5028 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -3,6 +3,7 @@ "description": "Coolify's Fastify API", "license": "Apache-2.0", "scripts": { + "db:generate":"prisma generate", "db:push": "prisma db push && prisma generate", "db:seed": "prisma db seed", "db:studio": "prisma studio", @@ -11,7 +12,7 @@ "build": "rimraf build && esbuild `find src \\( -name '*.ts' \\)| grep -v client/` --minify=true --platform=node --outdir=build --format=cjs", "format": "prettier --write 'src/**/*.{js,ts,json,md}'", "lint": "prettier --check 'src/**/*.{js,ts,json,md}' && eslint --ignore-path .eslintignore .", - "start": "NODE_ENV=production npx -y prisma migrate deploy && npx prisma generate && npx prisma db seed && node index.js" + "start": "NODE_ENV=production pnpm prisma migrate deploy && pnpm prisma generate && pnpm prisma db seed && node index.js" }, "dependencies": { "@breejs/ts-worker": "2.0.0", @@ -25,6 +26,7 @@ "@iarna/toml": "2.2.5", "@ladjs/graceful": "3.0.2", "@prisma/client": "4.4.0", + "prisma": "4.4.0", "axios": "0.27.2", "bcryptjs": "2.4.3", "bree": "9.1.2", @@ -66,7 +68,7 @@ "eslint-plugin-prettier": "4.2.1", "nodemon": "2.0.20", "prettier": "2.7.1", - "prisma": "4.4.0", + "rimraf": "3.0.2", "tsconfig-paths": "4.1.0", "typescript": "4.8.4" diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index 6b43db8b7..a40ea38f2 100644 --- a/apps/api/src/index.ts +++ b/apps/api/src/index.ts @@ -10,6 +10,7 @@ import { asyncExecShell, createRemoteEngineConfiguration, getDomain, isDev, list import { scheduler } from './lib/scheduler'; import { compareVersions } from 'compare-versions'; import Graceful from '@ladjs/graceful' +import { verifyRemoteDockerEngineFn } from './routes/api/v1/destinations/handlers'; declare module 'fastify' { interface FastifyInstance { config: { @@ -27,7 +28,8 @@ declare module 'fastify' { const port = isDev ? 3001 : 3000; const host = '0.0.0.0'; -prisma.setting.findFirst().then(async (settings) => { +(async () => { + const settings = await prisma.setting.findFirst() const fastify = Fastify({ logger: settings?.isAPIDebuggingEnabled || false, trustProxy: true @@ -117,11 +119,8 @@ prisma.setting.findFirst().then(async (settings) => { // console.log('not allowed', request.headers.host) } }) - fastify.listen({ port, host }, async (err: any, address: any) => { - if (err) { - console.error(err); - process.exit(1); - } + try { + await fastify.listen({ port, host }) console.log(`Coolify's API is listening on ${host}:${port}`); await initServer(); @@ -140,12 +139,12 @@ prisma.setting.findFirst().then(async (settings) => { // autoUpdater setInterval(async () => { scheduler.workers.has('infrastructure') && scheduler.workers.get('infrastructure').postMessage("action:autoUpdater") - }, isDev ? 5000 : 60000 * 15) + }, 60000 * 15) // cleanupStorage setInterval(async () => { scheduler.workers.has('infrastructure') && scheduler.workers.get('infrastructure').postMessage("action:cleanupStorage") - }, isDev ? 6000 : 60000 * 10) + }, 60000 * 10) // checkProxies and checkFluentBit setInterval(async () => { @@ -162,19 +161,28 @@ prisma.setting.findFirst().then(async (settings) => { getIPAddress(), configureRemoteDockers(), ]) - }); -}) + } catch (error) { + console.error(error); + process.exit(1); + } + + + +})(); + async function getIPAddress() { const { publicIpv4, publicIpv6 } = await import('public-ip') try { const settings = await listSettings(); if (!settings.ipv4) { + console.log(`Getting public IPv4 address...`); const ipv4 = await publicIpv4({ timeout: 2000 }) await prisma.setting.update({ where: { id: settings.id }, data: { ipv4 } }) } if (!settings.ipv6) { + console.log(`Getting public IPv6 address...`); const ipv6 = await publicIpv6({ timeout: 2000 }) await prisma.setting.update({ where: { id: settings.id }, data: { ipv6 } }) } @@ -183,6 +191,7 @@ async function getIPAddress() { } async function initServer() { try { + console.log(`Initializing server...`); await asyncExecShell(`docker network create --attachable coolify`); } catch (error) { } try { @@ -196,6 +205,7 @@ async function getArch() { try { const settings = await prisma.setting.findFirst({}) if (settings && !settings.arch) { + console.log(`Getting architecture...`); await prisma.setting.update({ where: { id: settings.id }, data: { arch: process.arch } }) } } catch (error) { } @@ -207,9 +217,13 @@ async function configureRemoteDockers() { where: { remoteVerified: true, remoteEngine: true } }); if (remoteDocker.length > 0) { + console.log(`Verifying Remote Docker Engines...`); for (const docker of remoteDocker) { - await createRemoteEngineConfiguration(docker.id) + console.log('Verifying:', docker.remoteIpAddress) + await verifyRemoteDockerEngineFn(docker.id); } } - } catch (error) { } + } catch (error) { + console.log(error) + } } diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index 18b5aab23..6ccd2f71a 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -20,7 +20,7 @@ import { scheduler } from './scheduler'; import { supportedServiceTypesAndVersions } from './services/supportedVersions'; import { includeServices } from './services/common'; -export const version = '3.10.13'; +export const version = '3.10.14'; export const isDev = process.env.NODE_ENV === 'development'; const algorithm = 'aes-256-ctr'; diff --git a/apps/api/src/lib/services/handlers.ts b/apps/api/src/lib/services/handlers.ts index ee9ab88ec..3dcf0d5e8 100644 --- a/apps/api/src/lib/services/handlers.ts +++ b/apps/api/src/lib/services/handlers.ts @@ -919,7 +919,7 @@ async function startMeilisearchService(request: FastifyRequest const config = { meilisearch: { image: `${image}:${version}`, - volumes: [`${id}-datams:/data.ms`], + volumes: [`${id}-datams:/meili_data/data.ms`, `${id}-data:/meili_data `], environmentVariables: { MEILI_MASTER_KEY: masterKey } diff --git a/apps/api/src/lib/services/supportedVersions.ts b/apps/api/src/lib/services/supportedVersions.ts index 485e89ecf..64f049961 100644 --- a/apps/api/src/lib/services/supportedVersions.ts +++ b/apps/api/src/lib/services/supportedVersions.ts @@ -63,7 +63,7 @@ export const supportedServiceTypesAndVersions = [ }, { name: 'wordpress', - fancyName: 'Wordpress', + fancyName: 'WordPress', baseImage: 'wordpress', images: ['bitnami/mysql:5.7'], versions: ['latest', 'php8.1', 'php8.0', 'php7.4', 'php7.3'], @@ -255,4 +255,4 @@ export const supportedServiceTypesAndVersions = [ main: 8080 } }, -]; \ No newline at end of file +]; diff --git a/apps/api/src/routes/api/v1/base/index.ts b/apps/api/src/routes/api/v1/base/index.ts index f1b64baf3..76854af8a 100644 --- a/apps/api/src/routes/api/v1/base/index.ts +++ b/apps/api/src/routes/api/v1/base/index.ts @@ -2,12 +2,13 @@ import { FastifyPluginAsync } from 'fastify'; import { errorHandler, listSettings, version } from '../../../../lib/common'; const root: FastifyPluginAsync = async (fastify): Promise => { - fastify.get('/', async () => { + fastify.get('/', async (request) => { + const teamId = request.user?.teamId; const settings = await listSettings() try { return { - ipv4: settings.ipv4, - ipv6: settings.ipv6, + ipv4: teamId ? settings.ipv4 : 'nope', + ipv6: teamId ? settings.ipv6 : 'nope', version, whiteLabeled: process.env.COOLIFY_WHITE_LABELED === 'true', whiteLabeledIcon: process.env.COOLIFY_WHITE_LABELED_ICON, diff --git a/apps/api/src/routes/api/v1/destinations/handlers.ts b/apps/api/src/routes/api/v1/destinations/handlers.ts index e4f038881..729426b2e 100644 --- a/apps/api/src/routes/api/v1/destinations/handlers.ts +++ b/apps/api/src/routes/api/v1/destinations/handlers.ts @@ -4,7 +4,7 @@ import sshConfig from 'ssh-config' import fs from 'fs/promises' import os from 'os'; -import { asyncExecShell, createRemoteEngineConfiguration, decrypt, errorHandler, executeDockerCmd, listSettings, prisma, startTraefikProxy, stopTraefikProxy } from '../../../../lib/common'; +import { asyncExecShell, createRemoteEngineConfiguration, decrypt, errorHandler, executeDockerCmd, executeSSHCmd, listSettings, prisma, startTraefikProxy, stopTraefikProxy } from '../../../../lib/common'; import { checkContainer } from '../../../../lib/docker'; import type { OnlyId } from '../../../../types'; @@ -202,25 +202,58 @@ export async function assignSSHKey(request: FastifyRequest) { return errorHandler({ status, message }) } } -export async function verifyRemoteDockerEngine(request: FastifyRequest, reply: FastifyReply) { +export async function verifyRemoteDockerEngineFn(id: string) { + await createRemoteEngineConfiguration(id); + const { remoteIpAddress, remoteUser, network, isCoolifyProxyUsed } = await prisma.destinationDocker.findFirst({ where: { id } }) + const host = `ssh://${remoteUser}@${remoteIpAddress}` + const { stdout } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=${network}' --no-trunc --format "{{json .}}"`); + if (!stdout) { + await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable ${network}`); + } + const { stdout: coolifyNetwork } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=coolify-infra' --no-trunc --format "{{json .}}"`); + if (!coolifyNetwork) { + await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable coolify-infra`); + } + if (isCoolifyProxyUsed) await startTraefikProxy(id); + const { stdout: daemonJson } = await executeSSHCmd({ dockerId: id, command: `cat /etc/docker/daemon.json` }); try { - const { id } = request.params; - await createRemoteEngineConfiguration(id); - const { remoteIpAddress, remoteUser, network, isCoolifyProxyUsed } = await prisma.destinationDocker.findFirst({ where: { id } }) - const host = `ssh://${remoteUser}@${remoteIpAddress}` - const { stdout } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=${network}' --no-trunc --format "{{json .}}"`); - if (!stdout) { - await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable ${network}`); - } - const { stdout: coolifyNetwork } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=coolify-infra' --no-trunc --format "{{json .}}"`); - if (!coolifyNetwork) { - 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 } }) - return reply.code(201).send() + let daemonJsonParsed = JSON.parse(daemonJson); + let isUpdated = false; + if (!daemonJsonParsed['live-restore'] || daemonJsonParsed['live-restore'] !== true) { + isUpdated = true; + daemonJsonParsed['live-restore'] = true + } + if (!daemonJsonParsed?.features?.buildkit) { + isUpdated = true; + daemonJsonParsed.features = { + buildkit: true + } + } + if (isUpdated) { + await executeSSHCmd({ dockerId: id, command: `echo '${JSON.stringify(daemonJsonParsed)}' > /etc/docker/daemon.json` }); + await executeSSHCmd({ dockerId: id, command: `systemctl restart docker` }); + } + } catch (error) { + const daemonJsonParsed = { + "live-restore": true, + "features": { + "buildkit": true + } + } + await executeSSHCmd({ dockerId: id, command: `echo '${JSON.stringify(daemonJsonParsed)}' > /etc/docker/daemon.json` }); + await executeSSHCmd({ dockerId: id, command: `systemctl restart docker` }); + } finally { + await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } }) + } +} +export async function verifyRemoteDockerEngine(request: FastifyRequest, reply: FastifyReply) { + const { id } = request.params; + try { + await verifyRemoteDockerEngineFn(id); + return reply.code(201).send() } catch ({ status, message }) { + await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: false } }) return errorHandler({ status, message }) } } diff --git a/apps/api/src/routes/api/v1/servers/handlers.ts b/apps/api/src/routes/api/v1/servers/handlers.ts index d9705e9ef..874f5a9f7 100644 --- a/apps/api/src/routes/api/v1/servers/handlers.ts +++ b/apps/api/src/routes/api/v1/servers/handlers.ts @@ -8,7 +8,16 @@ export async function listServers(request: FastifyRequest) { try { const userId = request.user.userId; const teamId = request.user.teamId; - const servers = await prisma.destinationDocker.findMany({ where: { teams: { some: { id: teamId === '0' ? undefined : teamId } }}, distinct: ['remoteIpAddress', 'engine'] }) + let servers = await prisma.destinationDocker.findMany({ where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }, distinct: ['remoteIpAddress', 'engine'] }) + servers = servers.filter((server) => { + if (server.remoteEngine) { + if (server.remoteVerified) { + return server + } + } else { + return server + } + }) return { servers } @@ -78,7 +87,7 @@ export async function showUsage(request: FastifyRequest) { freeMemPercentage: (parsed.totalMemoryKB - parsed.usedMemoryKB) / parsed.totalMemoryKB * 100 }, cpu: { - load: [0,0,0], + load: [0, 0, 0], usage: cpuUsage, count: cpus }, diff --git a/apps/ui/src/routes/destinations/[id]/_RemoteDocker.svelte b/apps/ui/src/routes/destinations/[id]/_RemoteDocker.svelte index e9c444e3d..4c65e7796 100644 --- a/apps/ui/src/routes/destinations/[id]/_RemoteDocker.svelte +++ b/apps/ui/src/routes/destinations/[id]/_RemoteDocker.svelte @@ -175,24 +175,23 @@ disabled={loading.save} >{$t('forms.save')} - {#if !destination.remoteVerified} - - {:else} - - {/if} + + + {/if}
diff --git a/package.json b/package.json index 741d79460..6f580d533 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coolify", "description": "An open-source & self-hostable Heroku / Netlify alternative.", - "version": "3.10.13", + "version": "3.10.14", "license": "Apache-2.0", "repository": "github:coollabsio/coolify", "scripts": {