From 68a117a61dc9e91f6f1fb531e0b726c593c95aa7 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 1 Aug 2022 18:11:00 +0000 Subject: [PATCH 001/332] fix: Fider BASE_URL set correctly --- apps/api/src/lib/common.ts | 2 +- apps/api/src/routes/api/v1/services/handlers.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index b18bfd003..abf409d6b 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -15,7 +15,7 @@ import { checkContainer, getEngine, removeContainer } from './docker'; import { day } from './dayjs'; import * as serviceFields from './serviceFields' -export const version = '3.1.3'; +export const version = '3.1.4'; export const isDev = process.env.NODE_ENV === 'development'; const algorithm = 'aes-256-ctr'; diff --git a/apps/api/src/routes/api/v1/services/handlers.ts b/apps/api/src/routes/api/v1/services/handlers.ts index 74658fc47..bf9c2f71f 100644 --- a/apps/api/src/routes/api/v1/services/handlers.ts +++ b/apps/api/src/routes/api/v1/services/handlers.ts @@ -2401,12 +2401,11 @@ async function startFiderService(request: FastifyRequest) { const { workdir } = await createDirectories({ repository: type, buildId: id }); const image = getServiceImage(type); - const domain = getDomain(fqdn); const config = { fider: { image: `${image}:${version}`, environmentVariables: { - BASE_URL: domain, + BASE_URL: fqdn, DATABASE_URL: `postgresql://${postgresqlUser}:${postgresqlPassword}@${id}-postgresql:5432/${postgresqlDatabase}?sslmode=disable`, JWT_SECRET: `${jwtSecret.replace(/\$/g, '$$$')}`, EMAIL_NOREPLY: emailNoreply, From c3bb81f84d4bd048ffc88acd459193d93d7a4417 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 1 Aug 2022 18:11:10 +0000 Subject: [PATCH 002/332] chore: version++ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d7071d38..3bb3c4afa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coolify", "description": "An open-source & self-hostable Heroku / Netlify alternative.", - "version": "3.1.3", + "version": "3.1.4", "license": "AGPL-3.0", "scripts": { "db:studio": "pnpm run --filter coolify-api db:studio", From 3d488da5ab6b4f8ac064c3f19d675cf996523d17 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 Aug 2022 17:06:23 +0000 Subject: [PATCH 003/332] fix: ssh tunnel --- apps/api/src/lib/common.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index 6bfbcc47c..7cf27a22f 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -488,18 +488,16 @@ export async function createRemoteEngineConfiguration(id: string) { } await asyncExecShell(`SSH_AUTH_SOCK=/tmp/ssh-agent.pid ssh-add -q ${sshKeyFile}`) - const { stdout: numberOfSSHTunnelsRunning } = await asyncExecShell(`ps ax | grep 'ssh -fNL 11122:localhost:22' | grep -v grep | wc -l`) - console.log(numberOfSSHTunnelsRunning) + const { stdout: numberOfSSHTunnelsRunning } = await asyncExecShell(`ps ax | grep 'ssh -o StrictHostKeyChecking no -fNL 11122:localhost:${remotePort}' | grep -v grep | wc -l`) if (numberOfSSHTunnelsRunning !== '' && Number(numberOfSSHTunnelsRunning.trim()) == 0) { try { - await asyncExecShell(`SSH_AUTH_SOCK=/tmp/ssh-agent.pid ssh -fNL 11122:localhost:22 ${remoteIpAddress}`) + await asyncExecShell(`SSH_AUTH_SOCK=/tmp/ssh-agent.pid ssh -o "StrictHostKeyChecking no" -fNL 11122:localhost:${remotePort} ${remoteUser}@${remoteIpAddress}`) } catch(error){ console.log(error) } } - const config = sshConfig.parse('') const found = config.find({ Host: remoteIpAddress }) From de77cbb9d8d0334762f3b3a075c7edabeee8a069 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 6 Aug 2022 09:21:16 +0000 Subject: [PATCH 004/332] fix: dns checking --- .../20220806090621_fqdn_not_unique_anymore/migration.sql | 2 ++ apps/api/prisma/schema.prisma | 2 +- apps/api/src/lib/common.ts | 8 ++++---- apps/api/src/routes/api/v1/applications/handlers.ts | 2 +- apps/api/src/routes/api/v1/services/handlers.ts | 4 ++-- apps/ui/src/routes/applications/[id]/_Setting.svelte | 1 - 6 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 apps/api/prisma/migrations/20220806090621_fqdn_not_unique_anymore/migration.sql diff --git a/apps/api/prisma/migrations/20220806090621_fqdn_not_unique_anymore/migration.sql b/apps/api/prisma/migrations/20220806090621_fqdn_not_unique_anymore/migration.sql new file mode 100644 index 000000000..f1eab666b --- /dev/null +++ b/apps/api/prisma/migrations/20220806090621_fqdn_not_unique_anymore/migration.sql @@ -0,0 +1,2 @@ +-- DropIndex +DROP INDEX "Application_fqdn_key"; diff --git a/apps/api/prisma/schema.prisma b/apps/api/prisma/schema.prisma index 3b68829e3..61ea5ca7f 100644 --- a/apps/api/prisma/schema.prisma +++ b/apps/api/prisma/schema.prisma @@ -82,7 +82,7 @@ model TeamInvitation { model Application { id String @id @default(cuid()) name String - fqdn String? @unique + fqdn String? repository String? configHash String? branch String? diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index 7cf27a22f..330f93e47 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -318,12 +318,12 @@ export async function isDomainConfigured({ id, fqdn, checkOwn = false, - dockerId = undefined + remoteIpAddress = undefined }: { id: string; fqdn: string; checkOwn?: boolean; - dockerId?: string; + remoteIpAddress?: string; }): Promise { const domain = getDomain(fqdn); const nakedDomain = domain.replace('www.', ''); @@ -335,7 +335,7 @@ export async function isDomainConfigured({ ], id: { not: id }, destinationDocker: { - id: dockerId + remoteIpAddress, } }, select: { fqdn: true } @@ -350,7 +350,7 @@ export async function isDomainConfigured({ ], id: { not: checkOwn ? undefined : id }, destinationDocker: { - id: dockerId + remoteIpAddress } }, select: { fqdn: true } diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts index 838f7f9b4..b3ef49133 100644 --- a/apps/api/src/routes/api/v1/applications/handlers.ts +++ b/apps/api/src/routes/api/v1/applications/handlers.ts @@ -387,7 +387,7 @@ export async function checkDNS(request: FastifyRequest) { const { destinationDocker: { id: dockerId, remoteIpAddress, remoteEngine }, exposePort: configuredPort } = await prisma.application.findUnique({ where: { id }, include: { destinationDocker: true } }) const { isDNSCheckEnabled } = await prisma.setting.findFirst({}); - const found = await isDomainConfigured({ id, fqdn, dockerId }); + const found = await isDomainConfigured({ id, fqdn, remoteIpAddress }); if (found) { throw { status: 500, message: `Domain ${getDomain(fqdn).replace('www.', '')} is already in use!` } } diff --git a/apps/api/src/routes/api/v1/services/handlers.ts b/apps/api/src/routes/api/v1/services/handlers.ts index cb2b2abb7..60b29981b 100644 --- a/apps/api/src/routes/api/v1/services/handlers.ts +++ b/apps/api/src/routes/api/v1/services/handlers.ts @@ -368,13 +368,13 @@ export async function checkService(request: FastifyRequest) { const { destinationDocker: { id: dockerId, remoteIpAddress, remoteEngine }, exposePort: configuredPort } = await prisma.service.findUnique({ where: { id }, include: { destinationDocker: true } }) const { isDNSCheckEnabled } = await prisma.setting.findFirst({}); - let found = await isDomainConfigured({ id, fqdn, dockerId }); + let found = await isDomainConfigured({ id, fqdn, remoteIpAddress }); if (found) { throw { status: 500, message: `Domain ${getDomain(fqdn).replace('www.', '')} is already in use!` } } if (otherFqdns && otherFqdns.length > 0) { for (const ofqdn of otherFqdns) { - found = await isDomainConfigured({ id, fqdn: ofqdn, dockerId }); + found = await isDomainConfigured({ id, fqdn: ofqdn,remoteIpAddress }); if (found) { throw { status: 500, message: `Domain ${getDomain(ofqdn).replace('www.', '')} is already in use!` } } diff --git a/apps/ui/src/routes/applications/[id]/_Setting.svelte b/apps/ui/src/routes/applications/[id]/_Setting.svelte index d1cf55dc0..eaaaf17e8 100644 --- a/apps/ui/src/routes/applications/[id]/_Setting.svelte +++ b/apps/ui/src/routes/applications/[id]/_Setting.svelte @@ -23,7 +23,6 @@ class="flex justify-center" >
Date: Sat, 6 Aug 2022 09:36:40 +0000 Subject: [PATCH 005/332] debug log --- apps/api/src/routes/api/v1/destinations/handlers.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/api/src/routes/api/v1/destinations/handlers.ts b/apps/api/src/routes/api/v1/destinations/handlers.ts index 81fcaf28e..7662d474c 100644 --- a/apps/api/src/routes/api/v1/destinations/handlers.ts +++ b/apps/api/src/routes/api/v1/destinations/handlers.ts @@ -30,6 +30,7 @@ export async function listDestinations(request: FastifyRequest destinations } } catch ({ status, message }) { + console.log({status, message}) return errorHandler({ status, message }) } } From cd50242d4d21ff3e8f1f8dcf50e763262d2b535a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 6 Aug 2022 09:42:05 +0000 Subject: [PATCH 006/332] add github sponsors --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index ddd313869..f96d5b45c 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ open_collective: coollabsio +github: coollabsio \ No newline at end of file From cbc5bed16f13419cdaa9bef90a641ae5699395a8 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 6 Aug 2022 09:45:56 +0000 Subject: [PATCH 007/332] staging use next version --- apps/api/src/routes/api/v1/handlers.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/api/src/routes/api/v1/handlers.ts b/apps/api/src/routes/api/v1/handlers.ts index 69dd9b468..b55f8e8b4 100644 --- a/apps/api/src/routes/api/v1/handlers.ts +++ b/apps/api/src/routes/api/v1/handlers.ts @@ -31,11 +31,14 @@ export async function checkUpdate(request: FastifyRequest) { const { data: versions } = await axios.get( `https://get.coollabs.io/versions.json?appId=${process.env['COOLIFY_APP_ID']}&version=${currentVersion}` ); - const latestVersion = - isStaging - ? versions['coolify'].next.version - : versions['coolify'].main.version; + const latestVersion = versions['coolify'].main.version const isUpdateAvailable = compare(latestVersion, currentVersion); + if (isStaging) { + return { + isUpdateAvailable: true, + latestVersion: 'next' + } + } return { isUpdateAvailable: isStaging ? true : isUpdateAvailable === 1, latestVersion From b1acfba791f604a01e72f5e270129d441361c4a0 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 6 Aug 2022 10:22:39 +0000 Subject: [PATCH 008/332] Add Todos --- TODO.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index be0d3d48f..a9c12319c 100644 --- a/TODO.md +++ b/TODO.md @@ -1,5 +1,6 @@ -- RDE Application DNS check not working -- Check DNS configurations for app/service/coolify with RDE and local engines +- RDE Application DNS check not working - check +- Check DNS configurations for app/service/coolify with RDE and local engines - check +- Random local ssh port for each remote engine # Low From 424195880b448dbe81fa69460a7689ba884c73c9 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 6 Aug 2022 10:23:51 +0000 Subject: [PATCH 009/332] migration: local ssh port --- .../migrations/20220806102340_rde_ssh_local_port/migration.sql | 2 ++ apps/api/prisma/schema.prisma | 1 + 2 files changed, 3 insertions(+) create mode 100644 apps/api/prisma/migrations/20220806102340_rde_ssh_local_port/migration.sql diff --git a/apps/api/prisma/migrations/20220806102340_rde_ssh_local_port/migration.sql b/apps/api/prisma/migrations/20220806102340_rde_ssh_local_port/migration.sql new file mode 100644 index 000000000..ae4c39846 --- /dev/null +++ b/apps/api/prisma/migrations/20220806102340_rde_ssh_local_port/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "DestinationDocker" ADD COLUMN "sshLocalPort" INTEGER; diff --git a/apps/api/prisma/schema.prisma b/apps/api/prisma/schema.prisma index 61ea5ca7f..7d50b63b8 100644 --- a/apps/api/prisma/schema.prisma +++ b/apps/api/prisma/schema.prisma @@ -215,6 +215,7 @@ model DestinationDocker { updatedAt DateTime @updatedAt sshKeyId String? sshKey SshKey? @relation(fields: [sshKeyId], references: [id]) + sshLocalPort Int? application Application[] database Database[] service Service[] From bafb792e499d11d4995845fd764369767dc665c3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 7 Aug 2022 12:17:59 +0200 Subject: [PATCH 010/332] Update FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index ddd313869..632a4655d 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ open_collective: coollabsio +github: coollabsio From 76d134fcda52e1dd222b11cea3f19c255cc2fe2f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 7 Aug 2022 12:42:20 +0000 Subject: [PATCH 011/332] fix: rde local ports --- apps/api/src/lib/common.ts | 34 +++++++++++++------ .../routes/api/v1/destinations/handlers.ts | 30 +++------------- apps/ui/src/lib/components/Setting.svelte | 1 - 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index 330f93e47..de6fa47a9 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -476,9 +476,28 @@ export const supportedDatabaseTypesAndVersions = [ }, { name: 'couchdb', fancyName: 'CouchDB', baseImage: 'bitnami/couchdb', versions: ['3.2.2'] } ]; + +export async function getFreeSSHLocalPort(id: string): Promise { + const { default: getPort, portNumbers } = await import('get-port'); + const { remoteIpAddress, sshLocalPort } = await prisma.destinationDocker.findUnique({ where: { id } }) + if (sshLocalPort) { + return Number(sshLocalPort) + } + const ports = await prisma.destinationDocker.findMany({ where: { sshLocalPort: { not: null }, remoteIpAddress: { not: remoteIpAddress } } }) + const alreadyConfigured = await prisma.destinationDocker.findFirst({ where: { remoteIpAddress, id: { not: id }, sshLocalPort: { not: null } } }) + if (alreadyConfigured?.sshLocalPort) { + await prisma.destinationDocker.update({ where: { id }, data: { sshLocalPort: alreadyConfigured.sshLocalPort } }) + return Number(alreadyConfigured.sshLocalPort) + } + const availablePort = await getPort({ port: portNumbers(10000, 10100), exclude: ports.map(p => p.sshLocalPort) }) + await prisma.destinationDocker.update({ where: { id }, data: { sshLocalPort: Number(availablePort) } }) + return Number(availablePort) +} + export async function createRemoteEngineConfiguration(id: string) { const homedir = os.homedir(); const sshKeyFile = `/tmp/id_rsa-${id}` + const localPort = await getFreeSSHLocalPort(id); const { sshKey: { privateKey }, remoteIpAddress, remotePort, remoteUser } = await prisma.destinationDocker.findFirst({ where: { id }, include: { sshKey: true } }) await fs.writeFile(sshKeyFile, decrypt(privateKey) + '\n', { encoding: 'utf8', mode: 400 }) // Needed for remote docker compose @@ -488,24 +507,23 @@ export async function createRemoteEngineConfiguration(id: string) { } await asyncExecShell(`SSH_AUTH_SOCK=/tmp/ssh-agent.pid ssh-add -q ${sshKeyFile}`) - const { stdout: numberOfSSHTunnelsRunning } = await asyncExecShell(`ps ax | grep 'ssh -o StrictHostKeyChecking no -fNL 11122:localhost:${remotePort}' | grep -v grep | wc -l`) + const { stdout: numberOfSSHTunnelsRunning } = await asyncExecShell(`ps ax | grep 'ssh -F /dev/null -o StrictHostKeyChecking no -fNL ${localPort}:localhost:${remotePort}' | grep -v grep | wc -l`) if (numberOfSSHTunnelsRunning !== '' && Number(numberOfSSHTunnelsRunning.trim()) == 0) { try { - await asyncExecShell(`SSH_AUTH_SOCK=/tmp/ssh-agent.pid ssh -o "StrictHostKeyChecking no" -fNL 11122:localhost:${remotePort} ${remoteUser}@${remoteIpAddress}`) + await asyncExecShell(`SSH_AUTH_SOCK=/tmp/ssh-agent.pid ssh -F /dev/null -o "StrictHostKeyChecking no" -fNL ${localPort}:localhost:${remotePort} ${remoteUser}@${remoteIpAddress}`) - } catch(error){ + } catch (error) { console.log(error) } } - const config = sshConfig.parse('') const found = config.find({ Host: remoteIpAddress }) if (!found) { config.append({ Host: remoteIpAddress, Hostname: 'localhost', - Port: '11122', + Port: Number(localPort), User: remoteUser, IdentityFile: sshKeyFile, StrictHostKeyChecking: 'no' @@ -516,11 +534,7 @@ export async function createRemoteEngineConfiguration(id: string) { } catch (error) { await fs.mkdir(`${homedir}/.ssh/`) } - - await fs.writeFile(`${homedir}/.ssh/config`, sshConfig.stringify(config)) - - return - + return await fs.writeFile(`${homedir}/.ssh/config`, sshConfig.stringify(config)) } export async function executeDockerCmd({ dockerId, command }: { dockerId: string, command: string }) { let { remoteEngine, remoteIpAddress, engine } = await prisma.destinationDocker.findUnique({ where: { id: dockerId } }) diff --git a/apps/api/src/routes/api/v1/destinations/handlers.ts b/apps/api/src/routes/api/v1/destinations/handlers.ts index 7662d474c..11b790316 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, decrypt, errorHandler, executeDockerCmd, listSettings, prisma, startTraefikProxy, stopTraefikProxy } from '../../../../lib/common'; +import { asyncExecShell, createRemoteEngineConfiguration, decrypt, errorHandler, executeDockerCmd, listSettings, prisma, startTraefikProxy, stopTraefikProxy } from '../../../../lib/common'; import { checkContainer } from '../../../../lib/docker'; import type { OnlyId } from '../../../../types'; @@ -30,7 +30,7 @@ export async function listDestinations(request: FastifyRequest destinations } } catch ({ status, message }) { - console.log({status, message}) + console.log({ status, message }) return errorHandler({ status, message }) } } @@ -209,32 +209,10 @@ export async function assignSSHKey(request: FastifyRequest) { export async function verifyRemoteDockerEngine(request: FastifyRequest, reply: FastifyReply) { try { const { id } = request.params; - const homedir = os.homedir(); - - const { sshKey: { privateKey }, remoteIpAddress, remotePort, remoteUser, network } = await prisma.destinationDocker.findFirst({ where: { id }, include: { sshKey: true } }) - - await fs.writeFile(`/tmp/id_rsa_verification_${id}`, decrypt(privateKey) + '\n', { encoding: 'utf8', mode: 400 }) + await createRemoteEngineConfiguration(id); + const { remoteIpAddress, remoteUser, network } = await prisma.destinationDocker.findFirst({ where: { id } }) const host = `ssh://${remoteUser}@${remoteIpAddress}` - - const config = sshConfig.parse('') - const found = config.find({ Host: remoteIpAddress }) - if (!found) { - config.append({ - Host: remoteIpAddress, - Port: remotePort.toString(), - User: remoteUser, - IdentityFile: `/tmp/id_rsa_verification_${id}`, - StrictHostKeyChecking: 'no' - }) - } - try { - await fs.stat(`${homedir}/.ssh/`) - } catch (error) { - await fs.mkdir(`${homedir}/.ssh/`) - } - await fs.writeFile(`${homedir}/.ssh/config`, sshConfig.stringify(config)) - const { stdout } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=${network}' --no-trunc --format "{{json .}}"`); if (!stdout) { diff --git a/apps/ui/src/lib/components/Setting.svelte b/apps/ui/src/lib/components/Setting.svelte index d1cf55dc0..eaaaf17e8 100644 --- a/apps/ui/src/lib/components/Setting.svelte +++ b/apps/ui/src/lib/components/Setting.svelte @@ -23,7 +23,6 @@ class="flex justify-center" >
Date: Mon, 8 Aug 2022 11:54:05 +0000 Subject: [PATCH 012/332] feat: persistent storage for all services --- apps/api/src/lib/common.ts | 26 +++ .../src/routes/api/v1/services/handlers.ts | 201 ++++++++---------- 2 files changed, 110 insertions(+), 117 deletions(-) diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index de6fa47a9..3a06d1d69 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -1622,4 +1622,30 @@ export async function cleanupDockerStorage(dockerId, lowDiskSpace, force) { //console.log(error); } } +} + +export function persistentVolumes(id, persistentStorage, config) { + const persistentVolume = + persistentStorage?.map((storage) => { + return `${id}${storage.path.replace(/\//gi, '-')}:${storage.path}`; + }) || []; + + const volumes = [config.volume, ...persistentVolume] + const composeVolumes = volumes.map((volume) => { + return { + [`${volume.split(':')[0]}`]: { + name: volume.split(':')[0] + } + }; + }); + const volumeMounts = Object.assign( + {}, + { + [config.volume.split(':')[0]]: { + name: config.volume.split(':')[0] + } + }, + ...composeVolumes + ); + return { volumes, volumeMounts } } \ No newline at end of file diff --git a/apps/api/src/routes/api/v1/services/handlers.ts b/apps/api/src/routes/api/v1/services/handlers.ts index 2af8baf0b..1dec25c54 100644 --- a/apps/api/src/routes/api/v1/services/handlers.ts +++ b/apps/api/src/routes/api/v1/services/handlers.ts @@ -2,7 +2,7 @@ import type { FastifyReply, FastifyRequest } from 'fastify'; import fs from 'fs/promises'; import yaml from 'js-yaml'; import bcrypt from 'bcryptjs'; -import { prisma, uniqueName, asyncExecShell, getServiceImage, configureServiceType, getServiceFromDB, getContainerUsage, removeService, isDomainConfigured, saveUpdateableFields, fixType, decrypt, encrypt, getServiceMainPort, createDirectories, ComposeFile, makeLabelForServices, getFreePublicPort, getDomain, errorHandler, generatePassword, isDev, stopTcpHttpProxy, supportedServiceTypesAndVersions, executeDockerCmd, listSettings, getFreeExposedPort, checkDomainsIsValidInDNS } from '../../../../lib/common'; +import { prisma, uniqueName, asyncExecShell, getServiceImage, configureServiceType, getServiceFromDB, getContainerUsage, removeService, isDomainConfigured, saveUpdateableFields, fixType, decrypt, encrypt, getServiceMainPort, createDirectories, ComposeFile, makeLabelForServices, getFreePublicPort, getDomain, errorHandler, generatePassword, isDev, stopTcpHttpProxy, supportedServiceTypesAndVersions, executeDockerCmd, listSettings, getFreeExposedPort, checkDomainsIsValidInDNS, persistentVolumes } from '../../../../lib/common'; import { day } from '../../../../lib/dayjs'; import { checkContainer, isContainerExited, removeContainer } from '../../../../lib/docker'; import cuid from 'cuid'; @@ -374,7 +374,7 @@ export async function checkService(request: FastifyRequest) { } if (otherFqdns && otherFqdns.length > 0) { for (const ofqdn of otherFqdns) { - found = await isDomainConfigured({ id, fqdn: ofqdn,remoteIpAddress }); + found = await isDomainConfigured({ id, fqdn: ofqdn, remoteIpAddress }); if (found) { throw { status: 500, message: `Domain ${getDomain(ofqdn).replace('www.', '')} is already in use!` } } @@ -685,6 +685,7 @@ async function startPlausibleAnalyticsService(request: FastifyRequest) { const { id } = request.params; const teamId = request.user.teamId; const service = await getServiceFromDB({ id, teamId }); - const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort } = + const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort, persistentStorage } = service; const network = destinationDockerId && destinationDocker.network; const port = getServiceMainPort('nocodb'); @@ -916,6 +922,7 @@ async function startNocodbService(request: FastifyRequest) { config.environmentVariables[secret.name] = secret.value; }); } + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config) const composeFile: ComposeFile = { version: '3.8', services: { @@ -923,7 +930,7 @@ async function startNocodbService(request: FastifyRequest) { container_name: id, image: config.image, networks: [network], - volumes: [config.volume], + volumes, environment: config.environmentVariables, restart: 'always', ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), @@ -943,15 +950,11 @@ async function startNocodbService(request: FastifyRequest) { external: true } }, - volumes: { - [config.volume.split(':')[0]]: { - name: config.volume.split(':')[0] - } - } + volumes: volumeMounts }; const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) return {} } catch ({ status, message }) { @@ -987,6 +990,7 @@ async function startMinioService(request: FastifyRequest) { fqdn, destinationDockerId, destinationDocker, + persistentStorage, exposePort, minio: { rootUser, rootUserPassword }, serviceSecret @@ -1016,6 +1020,7 @@ async function startMinioService(request: FastifyRequest) { config.environmentVariables[secret.name] = secret.value; }); } + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config) const composeFile: ComposeFile = { version: '3.8', services: { @@ -1025,7 +1030,7 @@ async function startMinioService(request: FastifyRequest) { command: `server /data --console-address ":${consolePort}"`, environment: config.environmentVariables, networks: [network], - volumes: [config.volume], + volumes, restart: 'always', ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), labels: makeLabelForServices('minio'), @@ -1044,15 +1049,11 @@ async function startMinioService(request: FastifyRequest) { external: true } }, - volumes: { - [config.volume.split(':')[0]]: { - name: config.volume.split(':')[0] - } - } + volumes: volumeMounts }; const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) await prisma.minio.update({ where: { serviceId: id }, data: { publicPort } }); return {} @@ -1113,28 +1114,8 @@ async function startVscodeService(request: FastifyRequest) { config.environmentVariables[secret.name] = secret.value; }); } + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config) - const volumes = - persistentStorage?.map((storage) => { - return `${id}${storage.path.replace(/\//gi, '-')}:${storage.path}`; - }) || []; - - const composeVolumes = volumes.map((volume) => { - return { - [`${volume.split(':')[0]}`]: { - name: volume.split(':')[0] - } - }; - }); - const volumeMounts = Object.assign( - {}, - { - [config.volume.split(':')[0]]: { - name: config.volume.split(':')[0] - } - }, - ...composeVolumes - ); const composeFile: ComposeFile = { version: '3.8', services: { @@ -1143,7 +1124,7 @@ async function startVscodeService(request: FastifyRequest) { image: config.image, environment: config.environmentVariables, networks: [network], - volumes: [config.volume, ...volumes], + volumes, restart: 'always', ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), labels: makeLabelForServices('vscodeServer'), @@ -1167,7 +1148,7 @@ async function startVscodeService(request: FastifyRequest) { const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) const changePermissionOn = persistentStorage.map((p) => p.path); @@ -1212,6 +1193,7 @@ async function startWordpressService(request: FastifyRequest) destinationDockerId, serviceSecret, destinationDocker, + persistentStorage, exposePort, wordpress: { mysqlDatabase, @@ -1260,6 +1242,9 @@ async function startWordpressService(request: FastifyRequest) config.wordpress.environmentVariables[secret.name] = secret.value; }); } + + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config.wordpress) + let composeFile: ComposeFile = { version: '3.8', services: { @@ -1267,7 +1252,7 @@ async function startWordpressService(request: FastifyRequest) container_name: id, image: config.wordpress.image, environment: config.wordpress.environmentVariables, - volumes: [config.wordpress.volume], + volumes, networks: [network], restart: 'always', ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), @@ -1287,11 +1272,7 @@ async function startWordpressService(request: FastifyRequest) external: true } }, - volumes: { - [config.wordpress.volume.split(':')[0]]: { - name: config.wordpress.volume.split(':')[0] - } - } + volumes: volumeMounts }; if (!ownMysql) { composeFile.services[id].depends_on = [`${id}-mysql`]; @@ -1319,7 +1300,7 @@ async function startWordpressService(request: FastifyRequest) const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) return {} @@ -1380,7 +1361,7 @@ async function startVaultwardenService(request: FastifyRequest const { id } = request.params; const teamId = request.user.teamId; const service = await getServiceFromDB({ id, teamId }); - const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort } = + const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort, persistentStorage } = service; const network = destinationDockerId && destinationDocker.network; @@ -1399,6 +1380,7 @@ async function startVaultwardenService(request: FastifyRequest config.environmentVariables[secret.name] = secret.value; }); } + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config) const composeFile: ComposeFile = { version: '3.8', services: { @@ -1407,7 +1389,7 @@ async function startVaultwardenService(request: FastifyRequest image: config.image, environment: config.environmentVariables, networks: [network], - volumes: [config.volume], + volumes, restart: 'always', ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), labels: makeLabelForServices('vaultWarden'), @@ -1426,16 +1408,12 @@ async function startVaultwardenService(request: FastifyRequest external: true } }, - volumes: { - [config.volume.split(':')[0]]: { - name: config.volume.split(':')[0] - } - } + volumes: volumeMounts }; const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) return {} @@ -1470,7 +1448,7 @@ async function startLanguageToolService(request: FastifyRequest) { const { id } = request.params; const teamId = request.user.teamId; const service = await getServiceFromDB({ id, teamId }); - const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort } = + const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort, persistentStorage } = service; const network = destinationDockerId && destinationDocker.network; const port = getServiceMainPort('n8n'); @@ -1580,6 +1555,7 @@ async function startN8nService(request: FastifyRequest) { config.environmentVariables[secret.name] = secret.value; }); } + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config) const composeFile: ComposeFile = { version: '3.8', services: { @@ -1587,7 +1563,7 @@ async function startN8nService(request: FastifyRequest) { container_name: id, image: config.image, networks: [network], - volumes: [config.volume], + volumes, environment: config.environmentVariables, restart: 'always', labels: makeLabelForServices('n8n'), @@ -1607,16 +1583,12 @@ async function startN8nService(request: FastifyRequest) { external: true } }, - volumes: { - [config.volume.split(':')[0]]: { - name: config.volume.split(':')[0] - } - } + volumes: volumeMounts }; const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) return {} @@ -1651,7 +1623,7 @@ async function startUptimekumaService(request: FastifyRequest) const { id } = request.params; const teamId = request.user.teamId; const service = await getServiceFromDB({ id, teamId }); - const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort } = + const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort, persistentStorage } = service; const network = destinationDockerId && destinationDocker.network; const port = getServiceMainPort('uptimekuma'); @@ -1669,6 +1641,7 @@ async function startUptimekumaService(request: FastifyRequest) config.environmentVariables[secret.name] = secret.value; }); } + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config) const composeFile: ComposeFile = { version: '3.8', services: { @@ -1676,7 +1649,7 @@ async function startUptimekumaService(request: FastifyRequest) container_name: id, image: config.image, networks: [network], - volumes: [config.volume], + volumes, environment: config.environmentVariables, restart: 'always', ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), @@ -1696,16 +1669,12 @@ async function startUptimekumaService(request: FastifyRequest) external: true } }, - volumes: { - [config.volume.split(':')[0]]: { - name: config.volume.split(':')[0] - } - } + volumes: volumeMounts }; const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) return {} @@ -1746,6 +1715,7 @@ async function startGhostService(request: FastifyRequest) { destinationDockerId, destinationDocker, serviceSecret, + persistentStorage, exposePort, fqdn, ghost: { @@ -1799,6 +1769,8 @@ async function startGhostService(request: FastifyRequest) { config.ghost.environmentVariables[secret.name] = secret.value; }); } + + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config.ghost) const composeFile: ComposeFile = { version: '3.8', services: { @@ -1806,7 +1778,7 @@ async function startGhostService(request: FastifyRequest) { container_name: id, image: config.ghost.image, networks: [network], - volumes: [config.ghost.volume], + volumes, environment: config.ghost.environmentVariables, restart: 'always', ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), @@ -1844,9 +1816,7 @@ async function startGhostService(request: FastifyRequest) { } }, volumes: { - [config.ghost.volume.split(':')[0]]: { - name: config.ghost.volume.split(':')[0] - }, + ...volumeMounts, [config.mariadb.volume.split(':')[0]]: { name: config.mariadb.volume.split(':')[0] } @@ -1855,7 +1825,7 @@ async function startGhostService(request: FastifyRequest) { const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) return {} @@ -1897,7 +1867,7 @@ async function startMeilisearchService(request: FastifyRequest const { meiliSearch: { masterKey } } = service; - const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort } = + const { type, version, destinationDockerId, destinationDocker, serviceSecret, exposePort, persistentStorage } = service; const network = destinationDockerId && destinationDocker.network; const port = getServiceMainPort('meilisearch'); @@ -1918,6 +1888,7 @@ async function startMeilisearchService(request: FastifyRequest config.environmentVariables[secret.name] = secret.value; }); } + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config) const composeFile: ComposeFile = { version: '3.8', services: { @@ -1928,7 +1899,7 @@ async function startMeilisearchService(request: FastifyRequest environment: config.environmentVariables, restart: 'always', ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), - volumes: [config.volume], + volumes, labels: makeLabelForServices('meilisearch'), deploy: { restart_policy: { @@ -1945,19 +1916,12 @@ async function startMeilisearchService(request: FastifyRequest external: true } }, - volumes: { - [config.volume.split(':')[0]]: { - name: config.volume.split(':')[0] - } - } + volumes: volumeMounts }; const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - - - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) - return {} } catch ({ status, message }) { return errorHandler({ status, message }) @@ -1996,6 +1960,7 @@ async function startUmamiService(request: FastifyRequest) { destinationDockerId, destinationDocker, serviceSecret, + persistentStorage, exposePort, umami: { umamiAdminPassword, @@ -2119,6 +2084,7 @@ async function startUmamiService(request: FastifyRequest) { FROM ${config.postgresql.image} COPY ./schema.postgresql.sql /docker-entrypoint-initdb.d/schema.postgresql.sql`; await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile); + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config.umami) const composeFile: ComposeFile = { version: '3.8', services: { @@ -2127,7 +2093,7 @@ async function startUmamiService(request: FastifyRequest) { image: config.umami.image, environment: config.umami.environmentVariables, networks: [network], - volumes: [], + volumes, restart: 'always', ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), labels: makeLabelForServices('umami'), @@ -2164,6 +2130,7 @@ async function startUmamiService(request: FastifyRequest) { } }, volumes: { + ...volumeMounts, [config.postgresql.volume.split(':')[0]]: { name: config.postgresql.volume.split(':')[0] } @@ -2171,11 +2138,8 @@ async function startUmamiService(request: FastifyRequest) { }; const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - - - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) - return {} } catch ({ status, message }) { return errorHandler({ status, message }) @@ -2221,6 +2185,7 @@ async function startHasuraService(request: FastifyRequest) { version, destinationDockerId, destinationDocker, + persistentStorage, serviceSecret, exposePort, hasura: { postgresqlUser, postgresqlPassword, postgresqlDatabase } @@ -2254,6 +2219,7 @@ async function startHasuraService(request: FastifyRequest) { }); } + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config.hasura) const composeFile: ComposeFile = { version: '3.8', services: { @@ -2262,7 +2228,7 @@ async function startHasuraService(request: FastifyRequest) { image: config.hasura.image, environment: config.hasura.environmentVariables, networks: [network], - volumes: [], + volumes, restart: 'always', labels: makeLabelForServices('hasura'), ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), @@ -2299,6 +2265,7 @@ async function startHasuraService(request: FastifyRequest) { } }, volumes: { + ...volumeMounts, [config.postgresql.volume.split(':')[0]]: { name: config.postgresql.volume.split(':')[0] } @@ -2307,7 +2274,7 @@ async function startHasuraService(request: FastifyRequest) { const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) return {} @@ -2357,6 +2324,7 @@ async function startFiderService(request: FastifyRequest) { destinationDockerId, destinationDocker, serviceSecret, + persistentStorage, exposePort, fider: { postgresqlUser, @@ -2412,7 +2380,7 @@ async function startFiderService(request: FastifyRequest) { config.fider.environmentVariables[secret.name] = secret.value; }); } - + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config.fider) const composeFile: ComposeFile = { version: '3.8', services: { @@ -2421,7 +2389,7 @@ async function startFiderService(request: FastifyRequest) { image: config.fider.image, environment: config.fider.environmentVariables, networks: [network], - volumes: [], + volumes, restart: 'always', labels: makeLabelForServices('fider'), ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), @@ -2458,6 +2426,7 @@ async function startFiderService(request: FastifyRequest) { } }, volumes: { + ...volumeMounts, [config.postgresql.volume.split(':')[0]]: { name: config.postgresql.volume.split(':')[0] } @@ -2466,7 +2435,7 @@ async function startFiderService(request: FastifyRequest) { const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) return {} @@ -2516,6 +2485,7 @@ async function startMoodleService(request: FastifyRequest) { destinationDockerId, destinationDocker, serviceSecret, + persistentStorage, exposePort, moodle: { defaultUsername, @@ -2565,7 +2535,7 @@ async function startMoodleService(request: FastifyRequest) { config.moodle.environmentVariables[secret.name] = secret.value; }); } - + const { volumes, volumeMounts } = persistentVolumes(id, persistentStorage, config.moodle) const composeFile: ComposeFile = { version: '3.8', services: { @@ -2574,7 +2544,7 @@ async function startMoodleService(request: FastifyRequest) { image: config.moodle.image, environment: config.moodle.environmentVariables, networks: [network], - volumes: [], + volumes, restart: 'always', labels: makeLabelForServices('moodle'), ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}), @@ -2613,9 +2583,7 @@ async function startMoodleService(request: FastifyRequest) { } }, volumes: { - [config.moodle.volume.split(':')[0]]: { - name: config.moodle.volume.split(':')[0] - }, + ...volumeMounts, [config.mariadb.volume.split(':')[0]]: { name: config.mariadb.volume.split(':')[0] } @@ -2625,11 +2593,9 @@ async function startMoodleService(request: FastifyRequest) { const composeFileDestination = `${workdir}/docker-compose.yaml`; await fs.writeFile(composeFileDestination, yaml.dump(composeFile)); - - //await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) + await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} pull` }) await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up --build -d` }) - return {} } catch ({ status, message }) { return errorHandler({ status, message }) @@ -2762,9 +2728,10 @@ export async function activateWordpressFtp(request: FastifyRequest Date: Mon, 8 Aug 2022 12:05:31 +0000 Subject: [PATCH 013/332] update TODOs --- TODO.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/TODO.md b/TODO.md index a9c12319c..e72027afc 100644 --- a/TODO.md +++ b/TODO.md @@ -1,7 +1,2 @@ -- RDE Application DNS check not working - check -- Check DNS configurations for app/service/coolify with RDE and local engines - check -- Random local ssh port for each remote engine - - # Low - Create previews model in Coolify DB \ No newline at end of file From 99bc37466426360006ff2e05efdb14ea7bbd8b5b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 8 Aug 2022 12:17:01 +0000 Subject: [PATCH 014/332] fix: empty remote destinations could be removed --- .../routes/api/v1/destinations/handlers.ts | 2 +- .../routes/destinations/[id]/__layout.svelte | 25 +++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/apps/api/src/routes/api/v1/destinations/handlers.ts b/apps/api/src/routes/api/v1/destinations/handlers.ts index 11b790316..3966ecab9 100644 --- a/apps/api/src/routes/api/v1/destinations/handlers.ts +++ b/apps/api/src/routes/api/v1/destinations/handlers.ts @@ -54,7 +54,7 @@ export async function getDestination(request: FastifyRequest) { const teamId = request.user?.teamId; const destination = await prisma.destinationDocker.findFirst({ where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } }, - include: { sshKey: true } + include: { sshKey: true, application: true, service: true, database: true } }); if (!destination && id !== 'new') { throw { status: 404, message: `Destination not found.` }; diff --git a/apps/ui/src/routes/destinations/[id]/__layout.svelte b/apps/ui/src/routes/destinations/[id]/__layout.svelte index d97c547bc..a653c17aa 100644 --- a/apps/ui/src/routes/destinations/[id]/__layout.svelte +++ b/apps/ui/src/routes/destinations/[id]/__layout.svelte @@ -58,8 +58,10 @@ import DeleteIcon from '$lib/components/DeleteIcon.svelte'; const { id } = $page.params; - + const isDestinationDeletable = destination.application.length === 0 && destination.database.length === 0 && destination.service.length === 0 + async function deleteDestination(destination: any) { + if (!isDestinationDeletable) return const sure = confirm($t('application.confirm_to_delete', { name: destination.name })); if (sure) { try { @@ -70,20 +72,29 @@ } } } + function deletable() { + if (!isDestinationDeletable) { + return "Please delete all resources before deleting this." + } + if ($appSession.isAdmin) { + return $t('destination.delete_destination') + } else { + return $t('destination.permission_denied_delete_destination') + } + } {#if id !== 'new'} {/if} From 9eeef96c075e6b86ec2be36a7df113a5fa1d07cb Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 8 Aug 2022 12:22:10 +0000 Subject: [PATCH 015/332] Changing license --- LICENSE | 862 +++++++++++++------------------------------------------- 1 file changed, 201 insertions(+), 661 deletions(-) diff --git a/LICENSE b/LICENSE index 29ebfa545..86c87eba2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,661 +1,201 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. \ No newline at end of file + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [2022] [Andras Bacsai] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file From 92de957ae71b0d72e143ff6a7ce3e399c6f71296 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 8 Aug 2022 12:24:08 +0000 Subject: [PATCH 016/332] fix issue templates --- .github/ISSUE_TEMPLATE/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3338ead6a..4642a8549 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -5,4 +5,4 @@ contact_links: about: Reach out to us on discord or our github discussions page. - name: 🙋‍♂️ Service request url: https://feedback.coolify.io/ - about: want to request a new service? for e.g wordpress, hasura, appwrite etc... + about: Want to request a new service or build pack? For example Wordpress, Hasura, Appwrite, Angular etc... From 839e8179fe3481f2d5f2d72a8c51c835ab65eae8 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 8 Aug 2022 12:24:49 +0000 Subject: [PATCH 017/332] move files from root --- docker-compose-dev.yaml => others/docker-compose-dev.yaml | 0 docker-compose-traefik.yaml => others/docker-compose-traefik.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docker-compose-dev.yaml => others/docker-compose-dev.yaml (100%) rename docker-compose-traefik.yaml => others/docker-compose-traefik.yaml (100%) diff --git a/docker-compose-dev.yaml b/others/docker-compose-dev.yaml similarity index 100% rename from docker-compose-dev.yaml rename to others/docker-compose-dev.yaml diff --git a/docker-compose-traefik.yaml b/others/docker-compose-traefik.yaml similarity index 100% rename from docker-compose-traefik.yaml rename to others/docker-compose-traefik.yaml From 4049af6220a6eff29ae89a2239cdda010c0099f2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 9 Aug 2022 15:28:26 +0000 Subject: [PATCH 018/332] ui: redesign a lot --- TODO.md | 8 +- apps/api/package.json | 2 +- apps/ui/package.json | 3 +- apps/ui/src/app.d.ts | 1 + apps/ui/src/app.html | 2 +- apps/ui/src/lib/common.ts | 18 ++- .../lib/components/CopyPasswordField.svelte | 6 +- apps/ui/src/lib/components/Toast.svelte | 52 ++++++ apps/ui/src/lib/components/Toasts.svelte | 22 +++ .../src/lib/components/UpdateAvailable.svelte | 13 +- apps/ui/src/lib/components/Usage.svelte | 20 ++- apps/ui/src/lib/locales/en.json | 18 +-- apps/ui/src/lib/locales/fr.json | 16 +- apps/ui/src/lib/store.ts | 31 ++++ apps/ui/src/routes/__layout.svelte | 4 +- .../routes/applications/[id]/_Secret.svelte | 33 ++-- .../routes/applications/[id]/_Storage.svelte | 27 +++- .../routes/applications/[id]/__layout.svelte | 7 +- .../configuration/_GithubRepositories.svelte | 6 +- .../configuration/_GitlabRepositories.svelte | 5 +- .../src/routes/applications/[id]/index.svelte | 40 ++--- .../routes/applications/[id]/previews.svelte | 6 +- .../routes/applications/[id]/secrets.svelte | 8 +- apps/ui/src/routes/applications/index.svelte | 6 +- .../[id]/_Databases/_Databases.svelte | 14 +- apps/ui/src/routes/databases/index.svelte | 31 ++-- .../destinations/[id]/_LocalDocker.svelte | 39 +++-- .../src/routes/destinations/[id]/_New.svelte | 4 +- .../destinations/[id]/_RemoteDocker.svelte | 48 ++++-- apps/ui/src/routes/destinations/index.svelte | 4 +- apps/ui/src/routes/iam/index.svelte | 51 +++--- apps/ui/src/routes/iam/team/[id]/index.svelte | 14 +- .../src/routes/services/[id]/_Secret.svelte | 13 +- .../services/[id]/_Services/_Services.svelte | 29 +++- .../src/routes/services/[id]/_Storage.svelte | 22 ++- apps/ui/src/routes/services/index.svelte | 31 ++-- apps/ui/src/routes/settings/global.svelte | 20 ++- apps/ui/src/routes/settings/ssh-keys.svelte | 7 +- .../ui/src/routes/sources/[id]/_Github.svelte | 16 +- .../ui/src/routes/sources/[id]/_Gitlab.svelte | 44 +++--- apps/ui/src/routes/sources/[id]/_New.svelte | 6 +- apps/ui/src/routes/sources/index.svelte | 4 +- apps/ui/src/tailwind.css | 8 +- apps/ui/tailwind.config.cjs | 35 +++- package.json | 20 +-- pnpm-lock.yaml | 149 +++++++++--------- 46 files changed, 625 insertions(+), 338 deletions(-) create mode 100644 apps/ui/src/lib/components/Toast.svelte create mode 100644 apps/ui/src/lib/components/Toasts.svelte diff --git a/TODO.md b/TODO.md index e72027afc..bb0730f10 100644 --- a/TODO.md +++ b/TODO.md @@ -1,2 +1,6 @@ -# Low -- Create previews model in Coolify DB \ No newline at end of file +- Destination/new is not working? +- Check GitLab new repo +- Services new empty secret errors +- Services new empty storage errors +- New SSH key modal redesign +- Change license every package.json \ No newline at end of file diff --git a/apps/api/package.json b/apps/api/package.json index 32a012685..006c03a99 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -1,5 +1,5 @@ { - "name": "coolify-api", + "name": "api", "description": "Coolify's Fastify API", "license": "AGPL-3.0", "scripts": { diff --git a/apps/ui/package.json b/apps/ui/package.json index 10b2d5219..123632795 100644 --- a/apps/ui/package.json +++ b/apps/ui/package.json @@ -1,5 +1,5 @@ { - "name": "coolify-ui", + "name": "ui", "description": "Coolify's SvelteKit UI", "license": "AGPL-3.0", "scripts": { @@ -41,6 +41,7 @@ "@sveltejs/adapter-static": "1.0.0-next.37", "@zerodevx/svelte-toast": "0.7.2", "cuid": "2.1.8", + "daisyui": "2.22.0", "js-cookie": "3.0.1", "p-limit": "4.0.0", "svelte-select": "4.4.7", diff --git a/apps/ui/src/app.d.ts b/apps/ui/src/app.d.ts index ed5f4e197..ebc7c2668 100644 --- a/apps/ui/src/app.d.ts +++ b/apps/ui/src/app.d.ts @@ -21,4 +21,5 @@ declare namespace App { } declare const GITPOD_WORKSPACE_URL: string + \ No newline at end of file diff --git a/apps/ui/src/app.html b/apps/ui/src/app.html index af82b3042..16d104bc7 100644 --- a/apps/ui/src/app.html +++ b/apps/ui/src/app.html @@ -1,5 +1,5 @@ - + diff --git a/apps/ui/src/lib/common.ts b/apps/ui/src/lib/common.ts index e0396f19c..f45cf6a52 100644 --- a/apps/ui/src/lib/common.ts +++ b/apps/ui/src/lib/common.ts @@ -1,4 +1,4 @@ -import { toast } from '@zerodevx/svelte-toast'; +import { addToast } from '$lib/store'; export const supportedServiceTypesAndVersions = [ { @@ -167,12 +167,20 @@ export const asyncSleep = (delay: number) => export function errorNotification(error: any): void { if (error.message) { if (error.message === 'Cannot read properties of undefined (reading \'postMessage\')') { - toast.push('Currently there is background process in progress. Please try again later.'); - return; + return addToast({ + message: 'Currently there is background process in progress. Please try again later.', + type: 'error', + }); } - toast.push(error.message); + addToast({ + message: error.message, + type: 'error', + }); } else { - toast.push('Ooops, something is not okay, are you okay?'); + addToast({ + message: 'Ooops, something is not okay, are you okay?', + type: 'error', + }); } console.error(JSON.stringify(error)); } diff --git a/apps/ui/src/lib/components/CopyPasswordField.svelte b/apps/ui/src/lib/components/CopyPasswordField.svelte index 103065601..12033c7ba 100644 --- a/apps/ui/src/lib/components/CopyPasswordField.svelte +++ b/apps/ui/src/lib/components/CopyPasswordField.svelte @@ -1,5 +1,6 @@ diff --git a/apps/ui/src/lib/components/Toast.svelte b/apps/ui/src/lib/components/Toast.svelte new file mode 100644 index 000000000..cfda1d4d5 --- /dev/null +++ b/apps/ui/src/lib/components/Toast.svelte @@ -0,0 +1,52 @@ + + +
+ {#if type === 'success'} + + {:else if type === 'error'} + + {:else if type === 'info'} + + {/if} + +
diff --git a/apps/ui/src/lib/components/Toasts.svelte b/apps/ui/src/lib/components/Toasts.svelte new file mode 100644 index 000000000..2fdec7190 --- /dev/null +++ b/apps/ui/src/lib/components/Toasts.svelte @@ -0,0 +1,22 @@ + + +{#if $toasts} +
+ +
+{/if} + + diff --git a/apps/ui/src/lib/components/UpdateAvailable.svelte b/apps/ui/src/lib/components/UpdateAvailable.svelte index 4171a1c5f..9076f7da7 100644 --- a/apps/ui/src/lib/components/UpdateAvailable.svelte +++ b/apps/ui/src/lib/components/UpdateAvailable.svelte @@ -1,7 +1,7 @@ @@ -132,7 +144,7 @@
{usage?.disk.usedGb}GB
-
diff --git a/apps/ui/src/lib/locales/en.json b/apps/ui/src/lib/locales/en.json index df84a976b..b913c0658 100644 --- a/apps/ui/src/lib/locales/en.json +++ b/apps/ui/src/lib/locales/en.json @@ -88,7 +88,7 @@ "removing": "Removing...", "remove_domain": "Remove domain", "public_port_range": "Public Port Range", - "public_port_range_explainer": "Ports used to expose databases/services/internal services.
Add them to your firewall (if applicable).

You can specify a range of ports, eg: 9000-9100", + "public_port_range_explainer": "Ports used to expose databases/services/internal services.
Add them to your firewall (if applicable).

You can specify a range of ports, eg: 9000-9100", "no_actions_available": "No actions available", "admin_api_key": "Admin API key" }, @@ -144,8 +144,8 @@ }, "preview": { "need_during_buildtime": "Need during buildtime?", - "setup_secret_app_first": "You can add secrets to PR/MR deployments. Please add secrets to the application first.
Useful for creating staging environments.", - "values_overwriting_app_secrets": "These values overwrite application secrets in PR/MR deployments. Useful for creating staging environments.", + "setup_secret_app_first": "You can add secrets to PR/MR deployments. Please add secrets to the application first.
Useful for creating staging environments.", + "values_overwriting_app_secrets": "These values overwrite application secrets in PR/MR deployments. Useful for creating staging environments.", "redeploy": "Redeploy", "no_previews_available": "No previews available" }, @@ -194,14 +194,14 @@ "application": "Application", "url_fqdn": "URL (FQDN)", "domain_fqdn": "Domain (FQDN)", - "https_explainer": "If you specify https, the application will be accessible only over https. SSL certificate will be generated for you.
If you specify www, the application will be redirected (302) from non-www and vice versa.

To modify the domain, you must first stop the application.

You must set your DNS to point to the server IP in advance.", + "https_explainer": "If you specify https, the application will be accessible only over https. SSL certificate will be generated for you.
If you specify www, the application will be redirected (302) from non-www and vice versa.

To modify the domain, you must first stop the application.

You must set your DNS to point to the server IP in advance.", "ssl_www_and_non_www": "Generate SSL for www and non-www?", - "ssl_explainer": "It will generate certificates for both www and non-www.
You need to have both DNS entries set in advance.

Useful if you expect to have visitors on both.", + "ssl_explainer": "It will generate certificates for both www and non-www.
You need to have both DNS entries set in advance.

Useful if you expect to have visitors on both.", "install_command": "Install Command", "build_command": "Build Command", "start_command": "Start Command", - "directory_to_use_explainer": "Directory to use as the base for all commands.
Could be useful with monorepos.", - "publish_directory_explainer": "Directory containing all the assets for deployment.
For example: dist,_site or public.", + "directory_to_use_explainer": "Directory to use as the base for all commands.
Could be useful with monorepos.", + "publish_directory_explainer": "Directory containing all the assets for deployment.
For example: dist,_site or public.", "features": "Features", "enable_automatic_deployment": "Enable Automatic Deployment", "enable_auto_deploy_webhooks": "Enable automatic deployment through webhooks.", @@ -306,7 +306,7 @@ "change_language": "Change Language", "permission_denied": "You do not have permission to do this. \\nAsk an admin to modify your permissions.", "domain_removed": "Domain removed", - "ssl_explainer": "If you specify https, Coolify will be accessible only over https. SSL certificate will be generated for you.
If you specify www, Coolify will be redirected (302) from non-www and vice versa.

WARNING: If you change an already set domain, it will brake webhooks and other integrations! You need to manually update them.", + "ssl_explainer": "If you specify https, Coolify will be accessible only over https. SSL certificate will be generated for you.
If you specify www, Coolify will be redirected (302) from non-www and vice versa.

WARNING: If you change an already set domain, it will brake webhooks and other integrations! You need to manually update them.", "must_remove_domain_before_changing": "Must remove the domain before you can change this setting.", "registration_allowed": "Registration allowed?", "registration_allowed_explainer": "Allow further registrations to the application.
It's turned off after the first registration.", @@ -314,7 +314,7 @@ "credential_stat_explainer": "Credentials for stats page.", "auto_update_enabled": "Auto update enabled?", "auto_update_enabled_explainer": "Enable automatic updates for Coolify. It will be done automatically behind the scenes, if there is no build process running.", - "generate_www_non_www_ssl": "It will generate certificates for both www and non-www.
You need to have both DNS entries set in advance.", + "generate_www_non_www_ssl": "It will generate certificates for both www and non-www.
You need to have both DNS entries set in advance.", "is_dns_check_enabled": "DNS check enabled?", "is_dns_check_enabled_explainer": "You can disable DNS check before creating SSL certificates.

Turning it off is useful when Coolify is behind a reverse proxy or tunnel." }, diff --git a/apps/ui/src/lib/locales/fr.json b/apps/ui/src/lib/locales/fr.json index 242ac6fce..418f72526 100644 --- a/apps/ui/src/lib/locales/fr.json +++ b/apps/ui/src/lib/locales/fr.json @@ -50,7 +50,7 @@ "delete_application": "Supprimer l'application", "deployment_queued": "Déploiement en file d'attente.", "destination": "Destination", - "directory_to_use_explainer": "Répertoire à utiliser comme base pour toutes les commandes.
Pourrait être utile avec monorepos.", + "directory_to_use_explainer": "Répertoire à utiliser comme base pour toutes les commandes.
Pourrait être utile avec monorepos.", "dns_not_set_error": "DNS non défini ou propagé pour {{domain}}.

Veuillez vérifier vos paramètres DNS.", "dns_not_set_partial_error": "DNS non défini", "domain_already_in_use": "Le domaine {{domain}} est déjà utilisé.", @@ -65,7 +65,7 @@ "features": "Caractéristiques", "git_repository": "Dépôt Git", "git_source": "Source Git", - "https_explainer": "Si vous spécifiez https, l'application sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.
Si vous spécifiez www, l'application sera redirigée (302) à partir de non-www et vice versa \n.

Pour modifier le domaine, vous devez d'abord arrêter l'application.

Vous devez configurer, en avance, votre DNS pour pointer vers l'IP du serveur.", + "https_explainer": "Si vous spécifiez https, l'application sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.
Si vous spécifiez www, l'application sera redirigée (302) à partir de non-www et vice versa \n.

Pour modifier le domaine, vous devez d'abord arrêter l'application.

Vous devez configurer, en avance, votre DNS pour pointer vers l'IP du serveur.", "install_command": "Commande d'installation", "logs": "Journaux des applications", "no_applications_found": "Aucune application trouvée", @@ -78,11 +78,11 @@ "need_during_buildtime": "Besoin pendant la build ?", "no_previews_available": "Aucun aperçu disponible", "redeploy": "Redéployer", - "setup_secret_app_first": "Vous pouvez ajouter des secrets aux déploiements PR/MR. \nVeuillez d'abord ajouter des secrets à l'application. \n
Utile pour créer des environnements de mise en scène.", - "values_overwriting_app_secrets": "Ces valeurs remplacent les secrets d'application dans les déploiements PR/MR. \nUtile pour créer des environnements de mise en scène." + "setup_secret_app_first": "Vous pouvez ajouter des secrets aux déploiements PR/MR. \nVeuillez d'abord ajouter des secrets à l'application. \n
Utile pour créer des environnements de mise en scène.", + "values_overwriting_app_secrets": "Ces valeurs remplacent les secrets d'application dans les déploiements PR/MR. \nUtile pour créer des environnements de mise en scène." }, "previews": "Aperçus", - "publish_directory_explainer": "Répertoire contenant tous les actifs à déployer. \n
Par exemple : dist,_site ou public.", + "publish_directory_explainer": "Répertoire contenant tous les actifs à déployer. \n
Par exemple : dist,_site ou public.", "rebuild_application": "Re-build l'application", "secret": "secrets", "secrets": { @@ -91,7 +91,7 @@ "use_isbuildsecret": "Utiliser isBuildSecret" }, "settings_saved": "Paramètres sauvegardés.", - "ssl_explainer": "Il générera des certificats pour www et non-www. \n
Vous devez avoir les deux entrées DNS définies à l'avance.

Utile si vous prévoyez d'avoir des visiteurs sur les deux.", + "ssl_explainer": "Il générera des certificats pour www et non-www. \n
Vous devez avoir les deux entrées DNS définies à l'avance.

Utile si vous prévoyez d'avoir des visiteurs sur les deux.", "ssl_www_and_non_www": "Générer SSL pour www et non-www ?", "start_command": "Démarrer la commande", "stop_application": "Arrêter l'application", @@ -181,7 +181,7 @@ "path": "Chemin", "port": "Port", "public_port_range": "Gamme de ports publics", - "public_port_range_explainer": "Ports utilisés pour exposer les bases de données/services/services internes.
Ajoutez-les à votre pare-feu (le cas échéant).

Vous pouvez spécifier une plage de ports, par exemple : 9000-9100", + "public_port_range_explainer": "Ports utilisés pour exposer les bases de données/services/services internes.
Ajoutez-les à votre pare-feu (le cas échéant).

Vous pouvez spécifier une plage de ports, par exemple : 9000-9100", "publish_directory": "Publier le répertoire", "remove": "Retirer", "remove_domain": "Supprimer le domaine", @@ -266,7 +266,7 @@ "permission_denied": "Vous n'avez pas la permission de faire cela. \n\\nDemandez à un administrateur de modifier vos autorisations.", "registration_allowed": "Inscription autorisée ?", "registration_allowed_explainer": "Autoriser d'autres inscriptions à l'application. \n
Il est désactivé après la première inscription.", - "ssl_explainer": "Si vous spécifiez https, Coolify sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.
Si vous spécifiez www, Coolify sera redirigé (302) à partir de non-www et vice versa." + "ssl_explainer": "Si vous spécifiez https, Coolify sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.
Si vous spécifiez www, Coolify sera redirigé (302) à partir de non-www et vice versa." }, "source": { "application_id": "ID d'application", diff --git a/apps/ui/src/lib/store.ts b/apps/ui/src/lib/store.ts index 627885385..9b77a7e8b 100644 --- a/apps/ui/src/lib/store.ts +++ b/apps/ui/src/lib/store.ts @@ -17,6 +17,11 @@ interface AppSession { gitlab: string | null, } } +interface AddToast { + type?: "info" | "success" | "error", + message: string, + timeout?: number | undefined + } export const loginEmail: Writable = writable() export const appSession: Writable = writable({ ipv4: null, @@ -74,4 +79,30 @@ export const setLocation = (resource: any) => { } else { location.set(resource.fqdn) } +} + +export const toasts: any = writable([]) + +export const dismissToast = (id: number) => { + toasts.update((all: any) => all.filter((t: any) => t.id !== id)) +} + +export const addToast = (toast: AddToast) => { + // Create a unique ID so we can easily find/remove it + // if it is dismissible/has a timeout. + const id = Math.floor(Math.random() * 10000) + + // Setup some sensible defaults for a toast. + const defaults = { + id, + type: 'info', + timeout: 2000, + } + + // Push the toast to the top of the list of toasts + const t = { ...defaults, ...toast } + toasts.update((all: any) => [t, ...all]) + + // If toast is dismissible, dismiss it after "timeout" amount of time. + if (t.timeout) setTimeout(() => dismissToast(id), t.timeout) } \ No newline at end of file diff --git a/apps/ui/src/routes/__layout.svelte b/apps/ui/src/routes/__layout.svelte index 4df7f920b..b785d10c3 100644 --- a/apps/ui/src/routes/__layout.svelte +++ b/apps/ui/src/routes/__layout.svelte @@ -86,6 +86,7 @@ import PageLoader from '$lib/components/PageLoader.svelte'; import { errorNotification } from '$lib/common'; import { appSession } from '$lib/store'; + import Toasts from '$lib/components/Toasts.svelte'; if (userId) $appSession.userId = userId; if (teamId) $appSession.teamId = teamId; @@ -110,7 +111,8 @@ {/if} - + + {#if $navigating}
diff --git a/apps/ui/src/routes/applications/[id]/_Secret.svelte b/apps/ui/src/routes/applications/[id]/_Secret.svelte index 52a2e2e77..fda9e33e6 100644 --- a/apps/ui/src/routes/applications/[id]/_Secret.svelte +++ b/apps/ui/src/routes/applications/[id]/_Secret.svelte @@ -12,8 +12,8 @@ import { del } from '$lib/api'; import { errorNotification } from '$lib/common'; import CopyPasswordField from '$lib/components/CopyPasswordField.svelte'; + import { addToast } from '$lib/store'; import { t } from '$lib/translations'; - import { toast } from '@zerodevx/svelte-toast'; import { createEventDispatcher } from 'svelte'; import { saveSecret } from './utils'; @@ -28,7 +28,10 @@ value = ''; isBuildSecret = false; } - toast.push('Secret removed.'); + addToast({ + message: 'Secret removed.', + type: 'success' + }); } catch (error) { return errorNotification(error); } @@ -36,6 +39,7 @@ async function createSecret(isNew: any) { try { + if (!name || !value) return await saveSecret({ isNew, name, @@ -51,9 +55,12 @@ isBuildSecret = false; } dispatch('refresh'); - toast.push('Secret saved.'); + addToast({ + message: 'Secret removed.', + type: 'success' + }); } catch (error) { - console.log(error) + console.log(error); return errorNotification(error); } } @@ -71,7 +78,10 @@ isNewSecret, applicationId: id }); - toast.push('Secret saved.'); + addToast({ + message: 'Secret removed.', + type: 'success' + }); } } } @@ -100,8 +110,7 @@ /> -
-
+ {#if isNewSecret}
-
{:else}
- +
{#if !isPRMRSecret}
-
diff --git a/apps/ui/src/routes/applications/[id]/_Storage.svelte b/apps/ui/src/routes/applications/[id]/_Storage.svelte index 803b1ed9d..76d20c2c3 100644 --- a/apps/ui/src/routes/applications/[id]/_Storage.svelte +++ b/apps/ui/src/routes/applications/[id]/_Storage.svelte @@ -11,6 +11,7 @@ import { toast } from '@zerodevx/svelte-toast'; import { t } from '$lib/translations'; import { errorNotification } from '$lib/common'; + import { addToast } from '$lib/store'; const { id } = $page.params; const dispatch = createEventDispatcher(); @@ -30,8 +31,17 @@ storage.path = null; storage.id = null; } - if (newStorage) toast.push($t('application.storage.storage_saved')); - else toast.push($t('application.storage.storage_updated')); + if (newStorage) { + addToast({ + message: $t('application.storage.storage_saved'), + type: 'success' + }); + } else { + addToast({ + message: $t('application.storage.storage_updated'), + type: 'success' + }); + } } catch (error) { return errorNotification(error); } @@ -40,7 +50,10 @@ try { await del(`/applications/${id}/storages`, { path: storage.path }); dispatch('refresh'); - toast.push($t('application.storage.storage_deleted')); + addToast({ + message: $t('application.storage.storage_deleted'), + type: 'success' + }); } catch (error) { return errorNotification(error); } @@ -58,17 +71,19 @@ {#if isNew}
-
{:else}
- +
-
diff --git a/apps/ui/src/routes/applications/[id]/__layout.svelte b/apps/ui/src/routes/applications/[id]/__layout.svelte index 8d1f52015..bb9a81ba5 100644 --- a/apps/ui/src/routes/applications/[id]/__layout.svelte +++ b/apps/ui/src/routes/applications/[id]/__layout.svelte @@ -60,7 +60,7 @@ import { toast } from '@zerodevx/svelte-toast'; import { onDestroy, onMount } from 'svelte'; import { t } from '$lib/translations'; - import { appSession, disabledButton, status, location, setLocation } from '$lib/store'; + import { appSession, disabledButton, status, location, setLocation, addToast } from '$lib/store'; import { errorNotification, handlerNotFoundLoad } from '$lib/common'; import Loading from '$lib/components/Loading.svelte'; @@ -80,7 +80,10 @@ async function handleDeploySubmit() { try { const { buildId } = await post(`/applications/${id}/deploy`, { ...application }); - toast.push($t('application.deployment_queued')); + addToast({ + message: $t('application.deployment_queued'), + type: 'success' + }); if ($page.url.pathname.startsWith(`/applications/${id}/logs/build`)) { return window.location.assign(`/applications/${id}/logs/build?buildId=${buildId}`); } else { diff --git a/apps/ui/src/routes/applications/[id]/configuration/_GithubRepositories.svelte b/apps/ui/src/routes/applications/[id]/configuration/_GithubRepositories.svelte index cff6769d0..95a307ef7 100644 --- a/apps/ui/src/routes/applications/[id]/configuration/_GithubRepositories.svelte +++ b/apps/ui/src/routes/applications/[id]/configuration/_GithubRepositories.svelte @@ -190,11 +190,11 @@
{$t('forms.save')}
diff --git a/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte b/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte index a91ebcc27..02fa103bc 100644 --- a/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte +++ b/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte @@ -413,11 +413,10 @@
{#if tryAgain} diff --git a/apps/ui/src/routes/applications/[id]/index.svelte b/apps/ui/src/routes/applications/[id]/index.svelte index 05cc368c6..229a45d8e 100644 --- a/apps/ui/src/routes/applications/[id]/index.svelte +++ b/apps/ui/src/routes/applications/[id]/index.svelte @@ -35,13 +35,14 @@ import { get, post } from '$lib/api'; import cuid from 'cuid'; import { browser } from '$app/env'; - import { appSession, disabledButton, setLocation, status } from '$lib/store'; + import { addToast, appSession, disabledButton, setLocation, status } from '$lib/store'; import { t } from '$lib/translations'; import { errorNotification, getDomain, notNodeDeployments, staticDeployments } from '$lib/common'; import Setting from './_Setting.svelte'; const { id } = $page.params; - $: isDisabled = !$appSession.isAdmin || $status.application.isRunning || $status.application.initialLoading; + $: isDisabled = + !$appSession.isAdmin || $status.application.isRunning || $status.application.initialLoading; let domainEl: HTMLInputElement; @@ -138,7 +139,10 @@ branch: application.branch, projectId: application.projectId }); - return toast.push($t('application.settings_saved')); + return addToast({ + message: $t('application.settings_saved'), + type: 'success' + }); } catch (error) { if (name === 'debug') { debug = !debug; @@ -169,10 +173,13 @@ exposePort: application.exposePort }); await post(`/applications/${id}`, { ...application }); - setLocation(application) + setLocation(application); $disabledButton = false; forceSave = false; - return toast.push('Configurations saved.'); + addToast({ + message: 'Configuration saved.', + type: 'success', + }); } catch (error) { console.log(error); //@ts-ignore @@ -215,7 +222,10 @@ async function isDNSValid(domain: any, isWWW: any) { try { await get(`/applications/${id}/check?domain=${domain}`); - toast.push('DNS configuration is valid.'); + addToast({ + message: 'DNS configuration is valid.', + type: 'success' + }); isWWW ? (isWWWDomainOK = true) : (isNonWWWDomainOK = true); return true; } catch (error) { @@ -312,29 +322,21 @@
{$t('general')}
{#if $appSession.isAdmin} {$t('forms.save')} {/if}
- +