Features:
- Integrated the first service: [Plausible Analytics](https://plausible.io)!

Fixes:
- UI/UX fixes and new designs
This commit is contained in:
Andras Bacsai
2021-04-22 23:48:29 +02:00
committed by GitHub
parent f742c2a3e2
commit 3744c64459
32 changed files with 997 additions and 109 deletions

View File

@@ -23,9 +23,10 @@ module.exports = async function (fastify) {
}
])
const serverLogs = await ServerLog.find()
const services = await docker.engine.listServices()
let applications = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application' && r.Spec.Labels.configuration)
let databases = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'database' && r.Spec.Labels.configuration)
const dockerServices = await docker.engine.listServices()
let applications = dockerServices.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application' && r.Spec.Labels.configuration)
let databases = dockerServices.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'database' && r.Spec.Labels.configuration)
let services = dockerServices.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'service' && r.Spec.Labels.configuration)
applications = applications.map(r => {
if (JSON.parse(r.Spec.Labels.configuration)) {
const configuration = JSON.parse(r.Spec.Labels.configuration)
@@ -41,6 +42,11 @@ module.exports = async function (fastify) {
r.Spec.Labels.configuration = configuration
return r
})
services = services.map(r => {
const configuration = r.Spec.Labels.configuration ? JSON.parse(r.Spec.Labels.configuration) : null
r.Spec.Labels.configuration = configuration
return r
})
applications = [...new Map(applications.map(item => [item.Spec.Labels.configuration.publish.domain + item.Spec.Labels.configuration.publish.path, item])).values()]
return {
serverLogs,
@@ -49,6 +55,9 @@ module.exports = async function (fastify) {
},
databases: {
deployed: databases
},
services: {
deployed: services
}
}
} catch (error) {

View File

@@ -18,13 +18,15 @@ module.exports = async function (fastify) {
const database = (await docker.engine.listServices()).find(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'database' && JSON.parse(r.Spec.Labels.configuration).general.deployId === deployId)
if (database) {
const jsonEnvs = {}
for (const d of database.Spec.TaskTemplate.ContainerSpec.Env) {
const s = d.split('=')
jsonEnvs[s[0]] = s[1]
if (database.Spec.TaskTemplate.ContainerSpec.Env) {
for (const d of database.Spec.TaskTemplate.ContainerSpec.Env) {
const s = d.split('=')
jsonEnvs[s[0]] = s[1]
}
}
const payload = {
config: JSON.parse(database.Spec.Labels.configuration),
envs: jsonEnvs
envs: jsonEnvs || null
}
reply.code(200).send(payload)
} else {
@@ -39,7 +41,7 @@ module.exports = async function (fastify) {
body: {
type: 'object',
properties: {
type: { type: 'string', enum: ['mongodb', 'postgresql', 'mysql', 'couchdb'] }
type: { type: 'string', enum: ['mongodb', 'postgresql', 'mysql', 'couchdb', 'clickhouse'] }
},
required: ['type']
}
@@ -82,9 +84,11 @@ module.exports = async function (fastify) {
name: nickname
}
}
await execShellAsync(`mkdir -p ${configuration.general.workdir}`)
let generateEnvs = {}
let image = null
let volume = null
let ulimits = {}
if (type === 'mongodb') {
generateEnvs = {
MONGODB_ROOT_PASSWORD: passwords[0],
@@ -119,6 +123,15 @@ module.exports = async function (fastify) {
}
image = 'bitnami/mysql:8.0'
volume = `${configuration.general.deployId}-${type}-data:/bitnami/mysql/data`
} else if (type === 'clickhouse') {
image = 'yandex/clickhouse-server'
volume = `${configuration.general.deployId}-${type}-data:/var/lib/clickhouse`
ulimits = {
nofile: {
soft: 262144,
hard: 262144
}
}
}
const stack = {
@@ -129,6 +142,7 @@ module.exports = async function (fastify) {
networks: [`${docker.network}`],
environment: generateEnvs,
volumes: [volume],
ulimits,
deploy: {
replicas: 1,
update_config: {
@@ -160,12 +174,12 @@ module.exports = async function (fastify) {
}
}
}
await execShellAsync(`mkdir -p ${configuration.general.workdir}`)
await fs.writeFile(`${configuration.general.workdir}/stack.yml`, yaml.dump(stack))
await execShellAsync(
`cat ${configuration.general.workdir}/stack.yml | docker stack deploy -c - ${configuration.general.deployId}`
`cat ${configuration.general.workdir}/stack.yml | docker stack deploy -c - ${configuration.general.deployId}`
)
} catch (error) {
console.log(error)
await saveServerLog(error)
throw new Error(error)
}

View File

@@ -0,0 +1,15 @@
const { plausible, activateAdminUser } = require('../../../libs/services/plausible')
module.exports = async function (fastify) {
fastify.post('/plausible', async (request, reply) => {
let { email, userName, userPassword, baseURL } = request.body
const traefikURL = baseURL
baseURL = `https://${baseURL}`
await plausible({ email, userName, userPassword, baseURL, traefikURL })
return {}
})
fastify.patch('/plausible/activate', async (request, reply) => {
await activateAdminUser()
return 'OK'
})
}

View File

@@ -0,0 +1,27 @@
const { execShellAsync } = require('../../../libs/common')
const { docker } = require('../../../libs/docker')
module.exports = async function (fastify) {
fastify.get('/:serviceName', async (request, reply) => {
const { serviceName } = request.params
try {
const service = (await docker.engine.listServices()).find(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'service' && r.Spec.Labels.serviceName === serviceName && r.Spec.Name === `${serviceName}_${serviceName}`)
if (service) {
const payload = {
config: JSON.parse(service.Spec.Labels.configuration)
}
reply.code(200).send(payload)
} else {
throw new Error()
}
} catch (error) {
console.log(error)
throw new Error('No service found?')
}
})
fastify.delete('/:serviceName', async (request, reply) => {
const { serviceName } = request.params
await execShellAsync(`docker stack rm ${serviceName}`)
reply.code(200).send({})
})
}