mirror of
https://github.com/cupcakearmy/coolify.git
synced 2024-10-23 00:24:15 +02:00
fixes
This commit is contained in:
parent
99ff020f56
commit
a22f26c4c8
@ -1270,6 +1270,7 @@
|
||||
image: 'glitchtip/glitchtip:$$core_version'
|
||||
volumes: []
|
||||
environment:
|
||||
- PORT=$$config_port
|
||||
- GLITCHTIP_DOMAIN=$$config_glitchtip_domain
|
||||
- SECRET_KEY=$$secret_secret_key
|
||||
- DATABASE_URL=$$secret_database_url
|
||||
@ -1291,7 +1292,7 @@
|
||||
- DJANGO_SUPERUSER_USERNAME=$$config_django_superuser_username
|
||||
- CELERY_WORKER_CONCURRENCY=$$config_celery_worker_concurrency
|
||||
ports:
|
||||
- '8080'
|
||||
- '8000'
|
||||
$$id-worker:
|
||||
name: Celery Worker
|
||||
command: ./bin/run-celery-with-beat.sh
|
||||
@ -1327,7 +1328,7 @@
|
||||
$$id-postgresql:
|
||||
name: PostgreSQL
|
||||
depends_on: []
|
||||
image: 'postgres:12-alpine'
|
||||
image: 'postgres:14-alpine'
|
||||
volumes:
|
||||
- '$$id-postgresql-data:/var/lib/postgresql/data'
|
||||
environment:
|
||||
@ -1344,6 +1345,11 @@
|
||||
environment: []
|
||||
ports: []
|
||||
variables:
|
||||
- id: $$config_port
|
||||
name: PORT
|
||||
label: GlitchTip Port
|
||||
defaultValue: '8000'
|
||||
description: ''
|
||||
- id: $$config_celery_worker_concurrency
|
||||
main: $$id-worker
|
||||
name: CELERY_WORKER_CONCURRENCY
|
||||
|
@ -198,11 +198,9 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
parsedTemplate = foundTemplate
|
||||
}
|
||||
|
||||
let strParsedTemplate = JSON.stringify(parsedTemplate)
|
||||
|
||||
// replace $$id and $$workdir
|
||||
@ -223,7 +221,7 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
|
||||
continue;
|
||||
}
|
||||
if (value === '$$generate_fqdn') {
|
||||
strParsedTemplate = strParsedTemplate.replaceAll(regex, service.fqdn || '' + "\"")
|
||||
strParsedTemplate = strParsedTemplate.replaceAll(regex, service.fqdn + "\"" || '' + "\"")
|
||||
} else if (value === '$$generate_domain') {
|
||||
strParsedTemplate = strParsedTemplate.replaceAll(regex, getDomain(service.fqdn) + "\"")
|
||||
} else if (service.destinationDocker?.network && value === '$$generate_network') {
|
||||
|
@ -409,7 +409,7 @@ export async function traefikConfiguration(request, reply) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (found.services[oneService].ports) {
|
||||
if (found.services[oneService].ports && found.services[oneService].ports.length > 0) {
|
||||
let port = found.services[oneService].ports[0]
|
||||
const foundPortVariable = serviceSetting.find((a) => a.name.toLowerCase() === 'port')
|
||||
if (foundPortVariable) {
|
||||
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user