mirror of
https://github.com/cupcakearmy/coolify.git
synced 2024-10-23 00:24:15 +02:00
fixes
This commit is contained in:
parent
a22f26c4c8
commit
845c40d23c
@ -2104,7 +2104,7 @@
|
||||
volumes:
|
||||
- '$$id-data-write:/files'
|
||||
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_DOMAIN=$$config_minio_domain
|
||||
- MINIO_ROOT_USER=$$config_minio_root_user
|
||||
@ -2114,10 +2114,10 @@
|
||||
- '9001'
|
||||
proxy:
|
||||
- port: '9000'
|
||||
domain: $$coolify_fqdn_minio_console
|
||||
domain: $$config_coolify_fqdn_minio_console
|
||||
- port: '9001'
|
||||
variables:
|
||||
- id: $$coolify_fqdn_minio_console
|
||||
- id: $$config_coolify_fqdn_minio_console
|
||||
name: MINIO_SERVER_URL
|
||||
label: MinIO Server URL
|
||||
defaultValue: ''
|
||||
|
@ -217,9 +217,6 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
|
||||
for (const setting of service.serviceSetting) {
|
||||
const { value, variableName } = setting
|
||||
const regex = new RegExp(`\\$\\$config_${variableName.replace('$$config_','')}\\"`, 'gi')
|
||||
if (variableName.startsWith('$$config_coolify')) {
|
||||
continue;
|
||||
}
|
||||
if (value === '$$generate_fqdn') {
|
||||
strParsedTemplate = strParsedTemplate.replaceAll(regex, service.fqdn + "\"" || '' + "\"")
|
||||
} 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 } })
|
||||
if (!found) {
|
||||
await prisma.serviceSetting.create({
|
||||
@ -483,7 +480,7 @@ export async function checkService(request: FastifyRequest<CheckService>) {
|
||||
const { id } = request.params;
|
||||
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 (exposePort) exposePort = Number(exposePort);
|
||||
|
File diff suppressed because one or more lines are too long
@ -87,7 +87,7 @@
|
||||
exposePort: service.exposePort
|
||||
});
|
||||
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) {
|
||||
const [key, value] = field;
|
||||
if (setting.name === key) {
|
||||
|
@ -38,6 +38,12 @@
|
||||
);
|
||||
if (newLogs.noContainer) {
|
||||
noContainer = true;
|
||||
logs = [];
|
||||
if (logs.length > 0) {
|
||||
clearInterval(loadLogsInterval);
|
||||
selectedService = null;
|
||||
}
|
||||
return;
|
||||
} else {
|
||||
noContainer = false;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user