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

fixes

Browse Source
This commit is contained in:
Andras Bacsai
2022-11-02 21:31:16 +01:00
parent a22f26c4c8
commit 845c40d23c
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/api/devTemplates.yaml
View File

@@ -2104,7 +2104,7 @@
volumes: volumes:
- '$$id-data-write:/files' - '$$id-data-write:/files'
environment: environment:
- MINIO_SERVER_URL=$$coolify_fqdn_minio_console - MINIO_SERVER_URL=$$config_coolify_fqdn_minio_console
- MINIO_BROWSER_REDIRECT_URL=$$config_minio_browser_redirect_url - MINIO_BROWSER_REDIRECT_URL=$$config_minio_browser_redirect_url
- MINIO_DOMAIN=$$config_minio_domain - MINIO_DOMAIN=$$config_minio_domain
- MINIO_ROOT_USER=$$config_minio_root_user - MINIO_ROOT_USER=$$config_minio_root_user
@@ -2114,10 +2114,10 @@
- '9001' - '9001'
proxy: proxy:
- port: '9000' - port: '9000'
domain: $$coolify_fqdn_minio_console domain: $$config_coolify_fqdn_minio_console
- port: '9001' - port: '9001'
variables: variables:
- id: $$coolify_fqdn_minio_console - id: $$config_coolify_fqdn_minio_console
name: MINIO_SERVER_URL name: MINIO_SERVER_URL
label: MinIO Server URL label: MinIO Server URL
defaultValue: '' defaultValue: ''

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

@@ -217,9 +217,6 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
for (const setting of service.serviceSetting) { for (const setting of service.serviceSetting) {
const { value, variableName } = setting const { value, variableName } = setting
const regex = new RegExp(`\\$\\$config_${variableName.replace('$$config_','')}\\"`, 'gi') const regex = new RegExp(`\\$\\$config_${variableName.replace('$$config_','')}\\"`, 'gi')
if (variableName.startsWith('$$config_coolify')) {
continue;
}
if (value === '$$generate_fqdn') { if (value === '$$generate_fqdn') {
strParsedTemplate = strParsedTemplate.replaceAll(regex, service.fqdn + "\"" || '' + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regex, service.fqdn + "\"" || '' + "\"")
} else if (value === '$$generate_domain') { } else if (value === '$$generate_domain') {
@@ -323,7 +320,7 @@ export async function saveServiceType(request: FastifyRequest<SaveServiceType>,
} }
} }
if (variable.id.startsWith('$$config_') || variable.id.startsWith('$$coolify_fqdn_')) { if (variable.id.startsWith('$$config_')) {
const found = await prisma.serviceSetting.findFirst({ where: { name: variable.name, serviceId: id } }) const found = await prisma.serviceSetting.findFirst({ where: { name: variable.name, serviceId: id } })
if (!found) { if (!found) {
await prisma.serviceSetting.create({ await prisma.serviceSetting.create({
@@ -483,7 +480,7 @@ export async function checkService(request: FastifyRequest<CheckService>) {
const { id } = request.params; const { id } = request.params;
let { fqdn, exposePort, forceSave, dualCerts, otherFqdn = false } = request.body; let { fqdn, exposePort, forceSave, dualCerts, otherFqdn = false } = request.body;
const domainsList = await prisma.serviceSetting.findMany({ where: { variableName: { startsWith: '$$coolify_fqdn' } } }) const domainsList = await prisma.serviceSetting.findMany({ where: { variableName: { startsWith: '$$config_coolify_fqdn' } } })
if (fqdn) fqdn = fqdn.toLowerCase(); if (fqdn) fqdn = fqdn.toLowerCase();
if (exposePort) exposePort = Number(exposePort); if (exposePort) exposePort = Number(exposePort);

2
apps/api/templates.json
View File

File diff suppressed because one or more lines are too long

2
apps/ui/src/routes/services/[id]/index.svelte
View File

@@ -87,7 +87,7 @@
exposePort: service.exposePort exposePort: service.exposePort
}); });
for (const setting of service.serviceSetting) { for (const setting of service.serviceSetting) {
if (setting.variableName?.startsWith('$$coolify_fqdn') && setting.value) { if (setting.variableName?.startsWith('$$config_coolify_fqdn') && setting.value) {
for (let field of formData) { for (let field of formData) {
const [key, value] = field; const [key, value] = field;
if (setting.name === key) { if (setting.name === key) {

6
apps/ui/src/routes/services/[id]/logs/index.svelte
View File

@@ -38,6 +38,12 @@
); );
if (newLogs.noContainer) { if (newLogs.noContainer) {
noContainer = true; noContainer = true;
logs = [];
if (logs.length > 0) {
clearInterval(loadLogsInterval);
selectedService = null;
}
return;
} else { } else {
noContainer = false; noContainer = false;
} }