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-24 13:10:05 +02:00
parent 17badf95dc
commit c578fa63e5
3 changed files with 94 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/api/src/lib/services.ts
View File

@@ -60,6 +60,7 @@ export async function getTemplates() {
"variables": [
{
"id": "$$config_weblate_site_domain",
"main":"$$id",
"name": "WEBLATE_SITE_DOMAIN",
"label": "Weblate Domain",
"defaultValue": "$$generate_domain",
@@ -67,6 +68,7 @@ export async function getTemplates() {
},
{
"id": "$$secret_weblate_admin_password",
"main":"$$id",
"name": "WEBLATE_ADMIN_PASSWORD",
"label": "Weblate Admin Password",
"defaultValue": "$$generate_password",
@@ -84,6 +86,7 @@ export async function getTemplates() {
},
{
"id": "$$config_postgres_user",
"main":"$$id-postgresql",
"name": "POSTGRES_USER",
"label": "PostgreSQL User",
"defaultValue": "$$generate_username",
@@ -91,6 +94,7 @@ export async function getTemplates() {
},
{
"id": "$$secret_postgres_password",
"main":"$$id-postgresql",
"name": "POSTGRES_PASSWORD",
"label": "PostgreSQL Password",
"defaultValue": "$$generate_password(32)",
@@ -112,6 +116,7 @@ export async function getTemplates() {
},
{
"id": "$$config_postgres_db",
"main":"$$id-postgresql",
"name": "POSTGRES_DB",
"label": "PostgreSQL Database",
"defaultValue": "weblate",
@@ -700,7 +705,7 @@ export async function getTemplates() {
{
"id": "$$config__app_influxdb_host",
"name": "_APP_INFLUXDB_HOST",
"label": "",
"label": "InfluxDB | _APP_INFLUXDB_HOST",
"defaultValue": "$$id-influxdb",
"description": ""
},
@@ -818,7 +823,7 @@ export async function getTemplates() {
},
{
"id": "$$config__app_redis_host",
"name": "_APP_REDIS_HOST",
"name": "Redis | _APP_REDIS_HOST",
"label": "",
"defaultValue": "$$id-redis",
"description": ""
@@ -846,7 +851,7 @@ export async function getTemplates() {
},
{
"id": "$$config__app_db_host",
"name": "_APP_DB_HOST",
"name": "MariaDB | _APP_DB_HOST",
"label": "",
"defaultValue": "$$id-mariadb",
"description": ""

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

@@ -125,6 +125,7 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
name: value.name,
image: value.image,
environment: [],
fqdns: [],
proxy: {}
}
if (value.environment?.length > 0) {
@@ -134,14 +135,14 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
const label = variable?.label
const description = variable?.description
const defaultValue = variable?.defaultValue
const main = variable?.main || '$$id'
const extras = variable?.extras
if (envValue.startsWith('$$config') || extras?.isVisibleOnUI) {
if (envValue.startsWith('$$config_coolify')) {
continue
console.log({ envValue, envKey })
}
parsedTemplate[realKey].environment.push(
{ name: envKey, value: envValue, label, description, defaultValue, extras }
{ name: envKey, value: envValue, main, label, description, defaultValue, extras }
)
}
}
@@ -154,7 +155,7 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
if (variable) {
const { name, label, description, defaultValue, extras } = variable
const found = await prisma.serviceSetting.findFirst({ where: { variableName: proxyValue.domain } })
parsedTemplate[realKey].environment.push(
parsedTemplate[realKey].fqdns.push(
{ name, value: found.value || '', label, description, defaultValue, extras }
)
}
@@ -163,6 +164,7 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
}
}
}
} else {
parsedTemplate = foundTemplate
}