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

updates

Browse Source
This commit is contained in:
Andras Bacsai
2022-10-21 20:54:33 +02:00
parent 5d60b5eb8b
commit 55fc3920fc
3 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
const extras = variable?.extras
if (envValue.startsWith('$$config') || extras?.isVisibleOnUI) {
if (envValue.startsWith('$$config_coolify')) {
console.log({envValue,envKey})
console.log({ envValue, envKey })
}
parsedTemplate[realKey].environment.push(
{ name: envKey, value: envValue, label, description, defaultValue, extras }
@@ -146,13 +146,13 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
}
}
// TODO: seconday domains are not working - kinda working
if (value?.proxy?.traefik?.configurations) {
for (const proxyValue of value.proxy.traefik.configurations) {
if (value?.proxy && value.proxy.length > 0) {
for (const proxyValue of value.proxy) {
if (proxyValue.domain) {
const variable = foundTemplate.variables.find(v => v.id === proxyValue.domain)
const variable = foundTemplate.variables.find(v => v.id === proxyValue.domain)
if (variable) {
const { name, label, description, defaultValue, extras } = variable
const found = await prisma.serviceSetting.findFirst({where: {variableName: proxyValue.domain}})
const { name, label, description, defaultValue, extras } = variable
const found = await prisma.serviceSetting.findFirst({ where: { variableName: proxyValue.domain } })
parsedTemplate[realKey].environment.push(
{ name, value: found.value || '', label, description, defaultValue, extras }
)

4
apps/api/src/routes/webhooks/traefik/handlers.ts
View File

@@ -384,8 +384,8 @@ export async function traefikConfiguration(request, reply) {
for (const oneService of Object.keys(found.services)) {
const isProxyConfiguration = found.services[oneService].proxy;
if (isProxyConfiguration) {
const { proxy: { traefik: { configurations } } } = found.services[oneService];
for (const configuration of configurations) {
const { proxy } = found.services[oneService];
for (const configuration of proxy) {
const publicPort = service[type]?.publicPort;
if (fqdn) {
data.services.push({