dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: service logs

Browse Source
This commit is contained in:
Andras Bacsai
2022-10-20 10:42:47 +02:00
parent b4f17ac3c6
commit 9f3732d35b
9 changed files with 105 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/api/src/lib.ts
View File

@@ -42,6 +42,7 @@ async function weblate(service: any) {
`WEBLATE_SITE_DOMAIN@@@$$generate_domain`,
`POSTGRES_USER@@@${postgresqlUser}`,
`POSTGRES_DATABASE@@@${postgresqlDatabase}`,
`POSTGRES_DB@@@${postgresqlDatabase}`,
`POSTGRES_HOST@@@$$id-postgres`,
`POSTGRES_PORT@@@5432`,
`REDIS_HOST@@@$$id-redis`,

24
apps/api/src/lib/services/handlers.ts
View File

@@ -725,18 +725,22 @@ export async function startService(request: FastifyRequest<ServiceStartStop>) {
}
// Generate files for builds
if (template.services[service].build) {
if (template.services[service]?.extras?.files?.length > 0) {
let Dockerfile = `
FROM ${template.services[service].image}`
for (const file of template.services[service].extras.files) {
const { source, destination, content } = file;
await fs.writeFile(source, content);
Dockerfile += `
COPY ./${path.basename(source)} ${destination}`
if (template.services[service]?.extras?.files?.length > 0) {
if (!template.services[service].build) {
template.services[service].build = {
context: workdir,
dockerfile: `Dockerfile.${service}`
}
await fs.writeFile(`${workdir}/Dockerfile.${service}`, Dockerfile);
}
let Dockerfile = `
FROM ${template.services[service].image}`
for (const file of template.services[service].extras.files) {
const { source, destination, content } = file;
await fs.writeFile(source, content);
Dockerfile += `
COPY ./${path.basename(source)} ${destination}`
}
await fs.writeFile(`${workdir}/Dockerfile.${service}`, Dockerfile);
}
}
const { volumeMounts } = persistentVolumes(id, persistentStorage, config)

34
apps/api/src/lib/templates.ts
View File

@@ -21,8 +21,8 @@ export default [
`WEBLATE_ADMIN_PASSWORD=$$secret_weblate_admin_password`,
`POSTGRES_PASSWORD=$$secret_postgres_password`,
`POSTGRES_USER=$$config_postgres_user`,
`POSTGRES_DATABASE=$$config_postgres_db`,
`POSTGRES_HOST=$$id-postgres`,
`POSTGRES_DATABASE=$$config_postgres_database`,
`POSTGRES_HOST=$$id-postgresql`,
`POSTGRES_PORT=5432`,
`REDIS_HOST=$$id-redis`,
],
@@ -59,7 +59,7 @@ export default [
{
"id": "$$config_weblate_site_domain",
"name": "WEBLATE_SITE_DOMAIN",
"label": "Weblate domain",
"label": "Weblate Domain",
"defaultValue": "$$generate_domain",
"description": "",
},
@@ -69,6 +69,9 @@ export default [
"label": "Weblate Admin Password",
"defaultValue": "$$generate_password",
"description": "",
"extras": {
"isVisibleOnUI": true,
}
},
{
"id": "$$config_postgres_user",
@@ -81,16 +84,23 @@ export default [
"id": "$$secret_postgres_password",
"name": "POSTGRES_PASSWORD",
"label": "PostgreSQL Password",
"defaultValue": "",
"defaultValue": "$$generate_password",
"description": "",
},
{
"id": "$$config_postgres_db",
"name": "POSTGRES_DB",
"label": "PostgreSQL Database",
"defaultValue": "hasura",
"defaultValue": "weblate",
"description": "",
},
{
"id": "$$config_postgres_database",
"name": "POSTGRES_DATABASE",
"label": "PostgreSQL Database",
"defaultValue": "$$config_postgres_db",
"description": ""
},
]
},
{
@@ -102,10 +112,6 @@ export default [
"services": {
"$$id": {
"name": "SearXNG",
"build": {
context: "$$workdir",
dockerfile: "Dockerfile.$$id"
},
"depends_on": [
"$$id-redis"
],
@@ -511,10 +517,6 @@ export default [
"$$id-postgresql": {
"name": "PostgreSQL",
"documentation": "Official docs are [here](https://umami.is/docs/getting-started)",
"build": {
context: "$$workdir",
dockerfile: "Dockerfile.$$id-postgresql"
},
"depends_on": [],
"image": "postgres:12-alpine",
"volumes": [
@@ -1371,10 +1373,6 @@ export default [
"$$id-clickhouse": {
"name": "Clickhouse",
"documentation": "Taken from https://plausible.io/",
"build": {
context: "$$workdir",
dockerfile: "Dockerfile.$$id-clickhouse"
},
"volumes": [
'$$id-clickhouse-data:/var/lib/clickhouse',
],
@@ -1455,7 +1453,7 @@ export default [
"defaultValue": "$$generate_password",
"description": "This is the admin password. Please change it.",
"extras": {
"isVisibleOnUI": true
"isVisibleOnUI": true,
}
},
{

15
apps/api/src/routes/api/v1/services/handlers.ts
View File

@@ -157,9 +157,9 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
const { name, value } = setting
const regex = new RegExp(`\\$\\$config_${name}\\"`, 'gi')
if (service.fqdn && value === '$$generate_fqdn') {
parsedTemplate = JSON.parse(JSON.stringify(parsedTemplate).replaceAll(regex, service.fqdn+ "\""))
parsedTemplate = JSON.parse(JSON.stringify(parsedTemplate).replaceAll(regex, service.fqdn + "\""))
} else if (service.fqdn && value === '$$generate_domain') {
parsedTemplate = JSON.parse(JSON.stringify(parsedTemplate).replaceAll(regex, getDomain(service.fqdn)+ "\""))
parsedTemplate = JSON.parse(JSON.stringify(parsedTemplate).replaceAll(regex, getDomain(service.fqdn) + "\""))
} else {
parsedTemplate = JSON.parse(JSON.stringify(parsedTemplate).replaceAll(regex, value + "\""))
@@ -363,7 +363,7 @@ export async function getServiceUsage(request: FastifyRequest<OnlyId>) {
}
export async function getServiceLogs(request: FastifyRequest<GetServiceLogs>) {
try {
const { id } = request.params;
const { id, containerId } = request.params;
let { since = 0 } = request.query
if (since !== 0) {
since = day(since).unix();
@@ -374,10 +374,8 @@ export async function getServiceLogs(request: FastifyRequest<GetServiceLogs>) {
});
if (destinationDockerId) {
try {
// const found = await checkContainer({ dockerId, container: id })
// if (found) {
const { default: ansi } = await import('strip-ansi')
const { stdout, stderr } = await executeDockerCmd({ dockerId, command: `docker logs --since ${since} --tail 5000 --timestamps ${id}` })
const { stdout, stderr } = await executeDockerCmd({ dockerId, command: `docker logs --since ${since} --tail 5000 --timestamps ${containerId}` })
const stripLogsStdout = stdout.toString().split('\n').map((l) => ansi(l)).filter((a) => a);
const stripLogsStderr = stderr.toString().split('\n').map((l) => ansi(l)).filter((a) => a);
const logs = stripLogsStderr.concat(stripLogsStdout)
@@ -385,7 +383,10 @@ export async function getServiceLogs(request: FastifyRequest<GetServiceLogs>) {
return { logs: sortedLogs }
// }
} catch (error) {
const { statusCode } = error;
const { statusCode, stderr } = error;
if (stderr.startsWith('Error: No such container')) {
return { logs: [], noContainer: true }
}
if (statusCode === 404) {
return {
logs: []

3
apps/api/src/routes/api/v1/services/index.ts
View File

@@ -70,7 +70,8 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
fastify.post<SaveServiceDestination>('/:id/configuration/destination', async (request, reply) => await saveServiceDestination(request, reply));
fastify.get<OnlyId>('/:id/usage', async (request) => await getServiceUsage(request));
fastify.get<GetServiceLogs>('/:id/logs', async (request) => await getServiceLogs(request));
// fastify.get<GetServiceLogs>('/:id/logs', async (request) => await getServiceLogs(request));
fastify.get<GetServiceLogs>('/:id/logs/:containerId', async (request) => await getServiceLogs(request));
fastify.post<ServiceStartStop>('/:id/start', async (request) => await startService(request));
fastify.post<ServiceStartStop>('/:id/:type/start', async (request) => await startService(request));

8
apps/api/src/routes/api/v1/services/types.ts
View File

@@ -15,9 +15,13 @@ export interface SaveServiceDestination extends OnlyId {
destinationId: string
}
}
export interface GetServiceLogs extends OnlyId {
export interface GetServiceLogs{
Params: {
id: string,
containerId: string
},
Querystring: {
since: number
since: number,
}
}
export interface SaveServiceSettings extends OnlyId {