This commit is contained in:
Andras Bacsai 2022-11-03 15:17:31 +01:00
parent 9f3677b694
commit ba2db666aa
5 changed files with 18 additions and 12 deletions

View File

@ -6,9 +6,9 @@
$$id: $$id:
image: appsmith/appsmith-ce:$$core_version image: appsmith/appsmith-ce:$$core_version
environment: environment:
- APPSMITH_MAIL_ENABLED: $$config_appsmith_mail_enabled - APPSMITH_MAIL_ENABLED=$$config_appsmith_mail_enabled
- APPSMITH_DISABLE_TELEMETRY: $$config_appsmith_disable_telemetry - APPSMITH_DISABLE_TELEMETRY=$$config_appsmith_disable_telemetry
- APPSMITH_DISABLE_INTERCOM: $$config_appsmith_disable_intercom - APPSMITH_DISABLE_INTERCOM=$$config_appsmith_disable_intercom
volumes: volumes:
- $$id-stacks-data:/appsmith-stacks - $$id-stacks-data:/appsmith-stacks
ports: ports:
@ -17,17 +17,17 @@
- id: $$config_appsmith_mail_enabled - id: $$config_appsmith_mail_enabled
name: APPSMITH_MAIL_ENABLED name: APPSMITH_MAIL_ENABLED
label: Enable Mail label: Enable Mail
defaultValue: false defaultValue: 'false'
description: '' description: ''
- id: $$config_appsmith_disable_telemetry - id: $$config_appsmith_disable_telemetry
name: APPSMITH_DISABLE_TELEMETRY name: APPSMITH_DISABLE_TELEMETRY
label: Disable Telemetry label: Disable Telemetry
defaultValue: true defaultValue: 'true'
description: '' description: ''
- id: $$config_appsmith_disable_intercom - id: $$config_appsmith_disable_intercom
name: APPSMITH_DISABLE_INTERCOM name: APPSMITH_DISABLE_INTERCOM
label: Disable Intercom label: Disable Intercom
defaultValue: true defaultValue: 'true'
description: '' description: ''
documentation: https://hub.docker.com/r/zadam/trilium documentation: https://hub.docker.com/r/zadam/trilium
- templateVersion: 1.0.0 - templateVersion: 1.0.0

View File

@ -356,7 +356,7 @@ async function vscodeserver(service: any, template: any) {
} }
async function minio(service: any, template: any) { async function minio(service: any, template: any) {
const { rootUser, rootUserPassword, apiFqdn } = service.minio const { rootUser, rootUserPassword, apiFqdn } = service.minio
console.log(apiFqdn)
const secrets = [ const secrets = [
`MINIO_ROOT_PASSWORD@@@${rootUserPassword}`, `MINIO_ROOT_PASSWORD@@@${rootUserPassword}`,
] ]
@ -433,6 +433,11 @@ async function migrateSettings(settings: any[], service: any, template: any) {
for (const setting of settings) { for (const setting of settings) {
if (!setting) continue; if (!setting) continue;
let [name, value] = setting.split('@@@') let [name, value] = setting.split('@@@')
let minio = null
if (name === 'MINIO_SERVER_URL') {
minio = name
name = 'coolify_fqdn_minio_console'
}
if (!value || value === 'null') { if (!value || value === 'null') {
continue; continue;
} }
@ -440,9 +445,9 @@ async function migrateSettings(settings: any[], service: any, template: any) {
if (!variableName) { if (!variableName) {
variableName = `$$config_${name.toLowerCase()}` variableName = `$$config_${name.toLowerCase()}`
} }
// console.log('Migrating setting', name, value, 'for service', service.id, ', service name:', service.name, 'variableName: ', variableName) console.log('Migrating setting', name, value, 'for service', service.id, ', service name:', service.name, 'variableName: ', variableName)
await prisma.serviceSetting.findFirst({ where: { name, serviceId: service.id } }) || await prisma.serviceSetting.create({ data: { name, value, variableName, service: { connect: { id: service.id } } } }) await prisma.serviceSetting.findFirst({ where: { name: minio, serviceId: service.id } }) || await prisma.serviceSetting.create({ data: { name: minio, value, variableName, service: { connect: { id: service.id } } } })
} }
} }
async function migrateSecrets(secrets: any[], service: any) { async function migrateSecrets(secrets: any[], service: any) {

View File

@ -40,10 +40,11 @@ export async function refreshTags() {
try { try {
const { default: got } = await import('got') const { default: got } = await import('got')
try { try {
const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text()
if (isDev) { if (isDev) {
const tags = await fs.readFile('./devTags.json', 'utf8')
await fs.writeFile('./tags.json', tags) await fs.writeFile('./tags.json', tags)
} else { } else {
const tags = await got.get('https://get.coollabs.io/coolify/service-tags.json').text()
await fs.writeFile('/app/tags.json', tags) await fs.writeFile('/app/tags.json', tags)
} }
} catch (error) { } catch (error) {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long