Merge pull request #719 from coollabsio/next

v3.11.4
2022-11-09 14:20:23 +01:00 · 2022-11-09 14:20:23 +01:00 · c365a44e01
commit c365a44e01
parent 139aa7a0fc e94f450bf0
5 changed files with 22 additions and 39 deletions
--- a/apps/api/devTemplates.yaml
+++ b/apps/api/devTemplates.yaml
@ -1664,7 +1664,6 @@
  services:
    $$id:
      name: Umami
-      documentation: "Official docs are [here](https://umami.is/docs/getting-started)"
      depends_on:
        - $$id-postgresql
      image: "ghcr.io/umami-software/umami:$$core_version"
@ -1678,7 +1677,6 @@
        - "3000"
    $$id-postgresql:
      name: PostgreSQL
-      documentation: "Official docs are [here](https://umami.is/docs/getting-started)"
      depends_on: []
      image: "postgres:12-alpine"
      volumes:
@ -1873,7 +1871,6 @@
  services:
    $$id:
      name: Umami
-      documentation: "Official docs are [here](https://umami.is/docs/getting-started)"
      depends_on:
        - $$id-postgresql
      image: "ghcr.io/umami-software/umami:$$core_version"
@ -1887,7 +1884,6 @@
        - "3000"
    $$id-postgresql:
      name: PostgreSQL
-      documentation: "Official docs are [here](https://umami.is/docs/getting-started)"
      depends_on: []
      image: "postgres:12-alpine"
      volumes:
@ -2080,7 +2076,7 @@
  services:
    $$id:
      name: MeiliSearch
-      documentation: "https://docs.meilisearch.com/"
+      documentation: https://docs.meilisearch.com/
      depends_on: []
      image: "getmeili/meilisearch:$$core_version"
      volumes:
@ -2102,7 +2098,7 @@
 - templateVersion: 1.0.0
  ignore: true
  defaultVersion: latest
-  documentation: https://ghost.org/resources/
+  documentation: https://docs.ghost.org
  type: ghost-mariadb
  name: Ghost
  subname: (MariaDB)
@ -2114,7 +2110,6 @@
  services:
    $$id:
      name: Ghost
-      documentation: "Taken from https://docs.ghost.org/"
      depends_on:
        - $$id-mariadb
      image: "bitnami/ghost:$$core_version"
@ -2220,7 +2215,7 @@
      description: ""
 - templateVersion: 1.0.0
  defaultVersion: "5.22"
-  documentation: https://ghost.org/resources/
+  documentation: https://docs.ghost.org
  type: ghost-only
  name: Ghost
  subname: (without Database)
@ -2229,7 +2224,6 @@
  services:
    $$id:
      name: Ghost
-      documentation: "Taken from https://docs.ghost.org/"
      image: "ghost:$$core_version"
      volumes:
        - "$$id-ghost:/var/lib/ghost/content"
@ -2285,7 +2279,7 @@
      required: true
 - templateVersion: 1.0.0
  defaultVersion: "5.22"
-  documentation: https://ghost.org/resources/
+  documentation: https://docs.ghost.org
  type: ghost-mysql
  name: Ghost
  subname: (MySQL)
@ -2294,7 +2288,6 @@
  services:
    $$id:
      name: Ghost
-      documentation: "Taken from https://docs.ghost.org/"
      depends_on:
        - $$id-mysql
      image: "ghost:$$core_version"
@ -2375,7 +2368,6 @@
  services:
    $$id:
      name: WordPress
-      documentation: " Taken from https://docs.docker.com/compose/wordpress/"
      depends_on:
        - $$id-mysql
      image: "wordpress:$$core_version"
@ -2466,7 +2458,6 @@
  services:
    $$id:
      name: WordPress
-      documentation: "Taken from https://docs.docker.com/compose/wordpress/"
      image: "wordpress:$$core_version"
      volumes:
        - "$$id-wordpress-data:/var/www/html"
@ -2540,7 +2531,6 @@
  services:
    $$id:
      name: VSCode Server
-      documentation: "Taken from https://github.com/coder/code-server/. "
      depends_on: []
      image: "codercom/code-server:$$core_version"
      volumes:
@ -2572,7 +2562,6 @@
    $$id:
      name: MinIO
      command: "server /data --console-address :9001"
-      documentation: "Taken from https://docs.min.io/docs/minio-docker-quickstart-guide.html"
      depends_on: []
      image: "minio/minio:$$core_version"
      volumes:
@ -2632,7 +2621,6 @@
    $$id:
      name: Fider
      image: "getfider/fider:$$core_version"
-      documentation: "Taken from https://hub.docker.com/r/getfider/fider/"
      depends_on:
        - $$id-postgresql
      environment:
@ -2652,7 +2640,6 @@
        - "3000"
    $$id-postgresql:
      name: PostgreSQL
-      documentation: "Taken from https://hub.docker.com/r/getfider/fider/"
      depends_on: []
      image: "postgres:12-alpine"
      volumes:
@ -2755,7 +2742,6 @@
  services:
    $$id:
      name: N8n
-      documentation: "Taken from https://hub.docker.com/r/n8nio/n8n"
      depends_on: []
      image: "n8nio/n8n:$$core_version"
      volumes:
@ -2788,7 +2774,6 @@
  services:
    $$id:
      name: Plausible Analytics
-      documentation: "Taken from https://plausible.io/"
      command: >-
        sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db
        migrate && /entrypoint.sh db init-admin && /entrypoint.sh run"
@ -2810,7 +2795,6 @@
        - "8000"
    $$id-postgresql:
      name: PostgreSQL
-      documentation: "Taken from https://plausible.io/"
      image: "bitnami/postgresql:13.2.0"
      volumes:
        - "$$id-postgresql-data:/bitnami/postgresql"
@ -2820,7 +2804,6 @@
        - POSTGRESQL_DATABASE=$$config_postgresql_database
    $$id-clickhouse:
      name: Clickhouse
-      documentation: "Taken from https://plausible.io/"
      volumes:
        - "$$id-clickhouse-data:/var/lib/clickhouse"
      image: "yandex/clickhouse-server:21.3.2.5"
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@ -17,7 +17,7 @@ import { day } from './dayjs';
 import { saveBuildLog } from './buildPacks/common';
 import { scheduler } from './scheduler';

-export const version = '3.11.3';
+export const version = '3.11.4';
 export const isDev = process.env.NODE_ENV === 'development';

 const algorithm = 'aes-256-ctr';
--- a/apps/api/src/routes/api/v1/services/handlers.ts
+++ b/apps/api/src/routes/api/v1/services/handlers.ts
@ -149,9 +149,11 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
                    }
                }
                parsedTemplate[realKey] = {
+                    value,
                    name,
                    documentation: value.documentation || foundTemplate.documentation || 'https://docs.coollabs.io',
                    image: value.image,
+                    files: value?.files,
                    environment: [],
                    fqdns: [],
                    proxy: {}
@ -189,7 +191,7 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
                            const variable = foundTemplate.variables.find(v => v.id === proxyValue.domain)
                            if (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(
                                    { 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('$$core_version', service.version || foundTemplate.defaultVersion)

-        // replace $$fqdn
+        // replace $$workdir
        if (workdir) {
            strParsedTemplate = strParsedTemplate.replaceAll('$$workdir', workdir)
        }
@ -217,15 +219,15 @@ export async function parseAndFindServiceTemplates(service: any, workdir?: strin
        if (service.serviceSetting.length > 0) {
            for (const setting of service.serviceSetting) {
                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') {
-                    strParsedTemplate = strParsedTemplate.replaceAll(regex, service.fqdn + "\"" || '' + "\"")
+                    strParsedTemplate = strParsedTemplate.replaceAll(regex, service.fqdn || '')
                } 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') {
-                    strParsedTemplate = strParsedTemplate.replaceAll(regex, service.destinationDocker.network + "\"")
+                    strParsedTemplate = strParsedTemplate.replaceAll(regex, service.destinationDocker.network)
                } 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
        if (service.serviceSecret.length > 0) {
            for (const secret of service.serviceSecret) {
-                const { name, value } = secret
-                const regexHashed = new RegExp(`\\$\\$hashed\\$\\$secret_${name}\\"`, 'gi')
-                const regex = new RegExp(`\\$\\$secret_${name}\\"`, 'gi')
+                let { name, value } = secret
+                name = name.toLowerCase()
+                const regexHashed = new RegExp(`\\$\\$hashed\\$\\$secret_${name}`, 'gi')
+                const regex = new RegExp(`\\$\\$secret_${name}`, 'gi')
                if (value) {
-                    strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, bcrypt.hashSync(value.replaceAll("\"", "\\\""), 10) + "\"")
-                    strParsedTemplate = strParsedTemplate.replaceAll(regex, value.replaceAll("\"", "\\\"") + "\"")
-                } else {
-                    strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, "\"")
-                    strParsedTemplate = strParsedTemplate.replaceAll(regex, "\"")
+                    strParsedTemplate = strParsedTemplate.replaceAll(regexHashed, bcrypt.hashSync(value.replaceAll("\"", "\\\""), 10))
+                    strParsedTemplate = strParsedTemplate.replaceAll(regex, value.replaceAll("\"", "\\\""))
                }
            }
        }
--- a/apps/api/templates.json
+++ b/apps/api/templates.json
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "coolify",
  "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.11.3",
+  "version": "3.11.4",
  "license": "Apache-2.0",
  "repository": "github:coollabsio/coolify",
  "scripts": {