Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #719 from coollabsio/next

Browse Source 
v3.11.4
This commit is contained in:
Andras Bacsai 2022-11-09 14:20:23 +01:00 committed by GitHub
commit c365a44e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/api/devTemplates.yaml
View File

@ -1664,7 +1664,6 @@
services: services:
$$id: $$id:
name: Umami name: Umami
documentation: "Official docs are [here](https://umami.is/docs/getting-started)"
depends_on: depends_on:
- $$id-postgresql - $$id-postgresql
image: "ghcr.io/umami-software/umami:$$core_version" image: "ghcr.io/umami-software/umami:$$core_version"
@ -1678,7 +1677,6 @@
- "3000" - "3000"
$$id-postgresql: $$id-postgresql:
name: PostgreSQL name: PostgreSQL
documentation: "Official docs are [here](https://umami.is/docs/getting-started)"
depends_on: [] depends_on: []
image: "postgres:12-alpine" image: "postgres:12-alpine"
volumes: volumes:
@ -1873,7 +1871,6 @@
services: services:
$$id: $$id:
name: Umami name: Umami
documentation: "Official docs are [here](https://umami.is/docs/getting-started)"
depends_on: depends_on:
- $$id-postgresql - $$id-postgresql
image: "ghcr.io/umami-software/umami:$$core_version" image: "ghcr.io/umami-software/umami:$$core_version"
@ -1887,7 +1884,6 @@
- "3000" - "3000"
$$id-postgresql: $$id-postgresql:
name: PostgreSQL name: PostgreSQL
documentation: "Official docs are [here](https://umami.is/docs/getting-started)"
depends_on: [] depends_on: []
image: "postgres:12-alpine" image: "postgres:12-alpine"
volumes: volumes:
@ -2080,7 +2076,7 @@
services: services:
$$id: $$id:
name: MeiliSearch name: MeiliSearch
documentation: "https://docs.meilisearch.com/" documentation: https://docs.meilisearch.com/
depends_on: [] depends_on: []
image: "getmeili/meilisearch:$$core_version" image: "getmeili/meilisearch:$$core_version"
volumes: volumes:
@ -2102,7 +2098,7 @@
- templateVersion: 1.0.0 - templateVersion: 1.0.0
ignore: true ignore: true
defaultVersion: latest defaultVersion: latest
documentation: https://ghost.org/resources/ documentation: https://docs.ghost.org
type: ghost-mariadb type: ghost-mariadb
name: Ghost name: Ghost
subname: (MariaDB) subname: (MariaDB)
@ -2114,7 +2110,6 @@
services: services:
$$id: $$id:
name: Ghost name: Ghost
documentation: "Taken from https://docs.ghost.org/"
depends_on: depends_on:
- $$id-mariadb - $$id-mariadb
image: "bitnami/ghost:$$core_version" image: "bitnami/ghost:$$core_version"
@ -2220,7 +2215,7 @@
description: "" description: ""
- templateVersion: 1.0.0 - templateVersion: 1.0.0
defaultVersion: "5.22" defaultVersion: "5.22"
documentation: https://ghost.org/resources/ documentation: https://docs.ghost.org
type: ghost-only type: ghost-only
name: Ghost name: Ghost
subname: (without Database) subname: (without Database)
@ -2229,7 +2224,6 @@
services: services:
$$id: $$id:
name: Ghost name: Ghost
documentation: "Taken from https://docs.ghost.org/"
image: "ghost:$$core_version" image: "ghost:$$core_version"
volumes: volumes:
- "$$id-ghost:/var/lib/ghost/content" - "$$id-ghost:/var/lib/ghost/content"
@ -2285,7 +2279,7 @@
required: true required: true
- templateVersion: 1.0.0 - templateVersion: 1.0.0
defaultVersion: "5.22" defaultVersion: "5.22"
documentation: https://ghost.org/resources/ documentation: https://docs.ghost.org
type: ghost-mysql type: ghost-mysql
name: Ghost name: Ghost
subname: (MySQL) subname: (MySQL)
@ -2294,7 +2288,6 @@
services: services:
$$id: $$id:
name: Ghost name: Ghost
documentation: "Taken from https://docs.ghost.org/"
depends_on: depends_on:
- $$id-mysql - $$id-mysql
image: "ghost:$$core_version" image: "ghost:$$core_version"
@ -2375,7 +2368,6 @@
services: services:
$$id: $$id:
name: WordPress name: WordPress
documentation: " Taken from https://docs.docker.com/compose/wordpress/"
depends_on: depends_on:
- $$id-mysql - $$id-mysql
image: "wordpress:$$core_version" image: "wordpress:$$core_version"
@ -2466,7 +2458,6 @@
services: services:
$$id: $$id:
name: WordPress name: WordPress
documentation: "Taken from https://docs.docker.com/compose/wordpress/"
image: "wordpress:$$core_version" image: "wordpress:$$core_version"
volumes: volumes:
- "$$id-wordpress-data:/var/www/html" - "$$id-wordpress-data:/var/www/html"
@ -2540,7 +2531,6 @@
services: services:
$$id: $$id:
name: VSCode Server name: VSCode Server
documentation: "Taken from https://github.com/coder/code-server/. "
depends_on: [] depends_on: []
image: "codercom/code-server:$$core_version" image: "codercom/code-server:$$core_version"
volumes: volumes:
@ -2572,7 +2562,6 @@
$$id: $$id:
name: MinIO name: MinIO
command: "server /data --console-address :9001" command: "server /data --console-address :9001"
documentation: "Taken from https://docs.min.io/docs/minio-docker-quickstart-guide.html"
depends_on: [] depends_on: []
image: "minio/minio:$$core_version" image: "minio/minio:$$core_version"
volumes: volumes:
@ -2632,7 +2621,6 @@
$$id: $$id:
name: Fider name: Fider
image: "getfider/fider:$$core_version" image: "getfider/fider:$$core_version"
documentation: "Taken from https://hub.docker.com/r/getfider/fider/"
depends_on: depends_on:
- $$id-postgresql - $$id-postgresql
environment: environment:
@ -2652,7 +2640,6 @@
- "3000" - "3000"
$$id-postgresql: $$id-postgresql:
name: PostgreSQL name: PostgreSQL
documentation: "Taken from https://hub.docker.com/r/getfider/fider/"
depends_on: [] depends_on: []
image: "postgres:12-alpine" image: "postgres:12-alpine"
volumes: volumes:
@ -2755,7 +2742,6 @@
services: services:
$$id: $$id:
name: N8n name: N8n
documentation: "Taken from https://hub.docker.com/r/n8nio/n8n"
depends_on: [] depends_on: []
image: "n8nio/n8n:$$core_version" image: "n8nio/n8n:$$core_version"
volumes: volumes:
@ -2788,7 +2774,6 @@
services: services:
$$id: $$id:
name: Plausible Analytics name: Plausible Analytics
documentation: "Taken from https://plausible.io/"
command: >- command: >-
sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db
migrate && /entrypoint.sh db init-admin && /entrypoint.sh run" migrate && /entrypoint.sh db init-admin && /entrypoint.sh run"
@ -2810,7 +2795,6 @@
- "8000" - "8000"
$$id-postgresql: $$id-postgresql:
name: PostgreSQL name: PostgreSQL
documentation: "Taken from https://plausible.io/"
image: "bitnami/postgresql:13.2.0" image: "bitnami/postgresql:13.2.0"
volumes: volumes:
- "$$id-postgresql-data:/bitnami/postgresql" - "$$id-postgresql-data:/bitnami/postgresql"
@ -2820,7 +2804,6 @@
- POSTGRESQL_DATABASE=$$config_postgresql_database - POSTGRESQL_DATABASE=$$config_postgresql_database
$$id-clickhouse: $$id-clickhouse:
name: Clickhouse name: Clickhouse
documentation: "Taken from https://plausible.io/"
volumes: volumes:
- "$$id-clickhouse-data:/var/lib/clickhouse" - "$$id-clickhouse-data:/var/lib/clickhouse"
image: "yandex/clickhouse-server:21.3.2.5" image: "yandex/clickhouse-server:21.3.2.5"

2
apps/api/src/lib/common.ts
View File

@ -17,7 +17,7 @@ import { day } from './dayjs';
import { saveBuildLog } from './buildPacks/common'; import { saveBuildLog } from './buildPacks/common';
import { scheduler } from './scheduler'; import { scheduler } from './scheduler';
export const version = '3.11.3'; export const version = '3.11.4';
export const isDev = process.env.NODE_ENV === 'development'; export const isDev = process.env.NODE_ENV === 'development';
const algorithm = 'aes-256-ctr'; const algorithm = 'aes-256-ctr';

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

@ -149,9 +149,11 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
} }
} }
parsedTemplate[realKey] = { parsedTemplate[realKey] = {
value,
name, name,
documentation: value.documentation || foundTemplate.documentation || 'https://docs.coollabs.io', documentation: value.documentation || foundTemplate.documentation || 'https://docs.coollabs.io',
image: value.image, image: value.image,
files: value?.files,
environment: [], environment: [],
fqdns: [], fqdns: [],
proxy: {} proxy: {}
@ -189,7 +191,7 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
const variable = foundTemplate.variables.find(v => v.id === proxyValue.domain) const variable = foundTemplate.variables.find(v => v.id === proxyValue.domain)
if (variable) { if (variable) {
const { id, name, label, description, defaultValue, required = false } = variable const { id, name, label, description, defaultValue, required = false } = variable
const found = await prisma.serviceSetting.findFirst({ where: { serviceId: service.id , variableName: proxyValue.domain } }) const found = await prisma.serviceSetting.findFirst({ where: { serviceId: service.id, variableName: proxyValue.domain } })
parsedTemplate[realKey].fqdns.push( parsedTemplate[realKey].fqdns.push(
{ id, name, value: found?.value || '', label, description, defaultValue, required } { id, name, value: found?.value || '', label, description, defaultValue, required }
) )
@ -208,7 +210,7 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
strParsedTemplate = strParsedTemplate.replaceAll('$$id', service.id) strParsedTemplate = strParsedTemplate.replaceAll('$$id', service.id)
strParsedTemplate = strParsedTemplate.replaceAll('$$core_version', service.version || foundTemplate.defaultVersion) strParsedTemplate = strParsedTemplate.replaceAll('$$core_version', service.version || foundTemplate.defaultVersion)
// replace $$fqdn // replace $$workdir
if (workdir) { if (workdir) {
strParsedTemplate = strParsedTemplate.replaceAll('$$workdir', workdir) strParsedTemplate = strParsedTemplate.replaceAll('$$workdir', workdir)
} }
@ -217,15 +219,15 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
if (service.serviceSetting.length > 0) { if (service.serviceSetting.length > 0) {
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 (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') {
strParsedTemplate = strParsedTemplate.replaceAll(regex, getDomain(service.fqdn) + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regex, getDomain(service.fqdn))
} else if (service.destinationDocker?.network && value === '$$generate_network') { } else if (service.destinationDocker?.network && value === '$$generate_network') {
strParsedTemplate = strParsedTemplate.replaceAll(regex, service.destinationDocker.network + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regex, service.destinationDocker.network)
} else { } else {
strParsedTemplate = strParsedTemplate.replaceAll(regex, value + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regex, value)
} }
} }
} }
@ -233,15 +235,13 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
// replace $$secret // replace $$secret
if (service.serviceSecret.length > 0) { if (service.serviceSecret.length > 0) {
for (const secret of service.serviceSecret) { for (const secret of service.serviceSecret) {
const { name, value } = secret let { name, value } = secret
const regexHashed = new RegExp(`\\$\\$hashed\\$\\$secret_${name}\\"`, 'gi') name = name.toLowerCase()
const regex = new RegExp(`\\$\\$secret_${name}\\"`, 'gi') const regexHashed = new RegExp(`\\$\\$hashed\\$\\$secret_${name}`, 'gi')
const regex = new RegExp(`\\$\\$secret_${name}`, 'gi')
if (value) { if (value) {
strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, bcrypt.hashSync(value.replaceAll("\"", "\\\""), 10) + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, bcrypt.hashSync(value.replaceAll("\"", "\\\""), 10))
strParsedTemplate = strParsedTemplate.replaceAll(regex, value.replaceAll("\"", "\\\"") + "\"") strParsedTemplate = strParsedTemplate.replaceAll(regex, value.replaceAll("\"", "\\\""))
} else {
strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, "\"")
strParsedTemplate = strParsedTemplate.replaceAll(regex, "\"")
} }
} }
} }

2
apps/api/templates.json
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "coolify", "name": "coolify",
"description": "An open-source & self-hostable Heroku / Netlify alternative.", "description": "An open-source & self-hostable Heroku / Netlify alternative.",
"version": "3.11.3", "version": "3.11.4",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": "github:coollabsio/coolify", "repository": "github:coollabsio/coolify",
"scripts": { "scripts": {