Merge pull request #713 from coollabsio/next

fixes

.dockerignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+.pnpm-store
 build
 .svelte-kit
 package
@@ -9,4 +10,8 @@ package
 dist
 client
 apps/api/db/*.db
-local-serve
+local-serve
+apps/api/db/migration.db-journal
+apps/api/core*
+logs
+others/certificates

.github/workflows/staging-release.yml

@@ -6,34 +6,6 @@ on:
       - next
 
 jobs:
-  arm64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: "next"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: coollabsio/coolify:next-arm64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-arm64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-arm64,mode=max
   amd64:
     runs-on: ubuntu-latest
     steps:
@@ -64,7 +36,7 @@ jobs:
           cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-amd64,mode=max
   merge-manifest:
     runs-on: ubuntu-latest
-    needs: [arm64, amd64]
+    needs: [amd64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -79,7 +51,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Create & publish manifest
         run: |
-          docker manifest create coollabsio/coolify:next --amend coollabsio/coolify:next-amd64 --amend coollabsio/coolify:next-arm64
+          docker manifest create coollabsio/coolify:next --amend coollabsio/coolify:next-amd64
           docker manifest push coollabsio/coolify:next
       - uses: sarisia/actions-status-discord@v1
         if: always()

apps/api/devTemplates.yaml

@@ -786,6 +786,11 @@
       label: MariaDB | _APP_DB_USER
       defaultValue: user
       description: MariaDB server user name.
+    - id: "$$secret__app_db_root_pass"
+      name: MARIADB_ROOT_PASSWORD
+      label: MariaDB | MARIADB_ROOT_PASSWORD
+      defaultValue: "$$generate_hex(16)"
+      description: MariaDB server root user password.
     - id: "$$secret__app_db_pass"
       name: _APP_DB_PASS
       label: MariaDB | _APP_DB_PASS

apps/api/src/lib.ts

@@ -30,85 +30,92 @@ export async function migrateServicesToNewTemplate() {
             }
         })
         for (const service of services) {
-            const { id } = service
-            if (!service.type) {
-                continue;
-            }
-            let template = templates.find(t => fixType(t.type) === fixType(service.type));
-            if (template) {
-                template = JSON.parse(JSON.stringify(template).replaceAll('$$id', service.id))
-                if (service.type === 'plausibleanalytics' && service.plausibleAnalytics) await plausibleAnalytics(service, template)
-                if (service.type === 'fider' && service.fider) await fider(service, template)
-                if (service.type === 'minio' && service.minio) await minio(service, template)
-                if (service.type === 'vscodeserver' && service.vscodeserver) await vscodeserver(service, template)
-                if (service.type === 'wordpress' && service.wordpress) await wordpress(service, template)
-                if (service.type === 'ghost' && service.ghost) await ghost(service, template)
-                if (service.type === 'meilisearch' && service.meiliSearch) await meilisearch(service, template)
-                if (service.type === 'umami' && service.umami) await umami(service, template)
-                if (service.type === 'hasura' && service.hasura) await hasura(service, template)
-                if (service.type === 'glitchTip' && service.glitchTip) await glitchtip(service, template)
-                if (service.type === 'searxng' && service.searxng) await searxng(service, template)
-                if (service.type === 'weblate' && service.weblate) await weblate(service, template)
-                if (service.type === 'appwrite' && service.appwrite) await appwrite(service, template)
+            try {
+                const { id } = service
+                if (!service.type) {
+                    continue;
+                }
+                let template = templates.find(t => fixType(t.type) === fixType(service.type));
+                if (template) {
+                    template = JSON.parse(JSON.stringify(template).replaceAll('$$id', service.id))
+                    if (service.type === 'plausibleanalytics' && service.plausibleAnalytics) await plausibleAnalytics(service, template)
+                    if (service.type === 'fider' && service.fider) await fider(service, template)
+                    if (service.type === 'minio' && service.minio) await minio(service, template)
+                    if (service.type === 'vscodeserver' && service.vscodeserver) await vscodeserver(service, template)
+                    if (service.type === 'wordpress' && service.wordpress) await wordpress(service, template)
+                    if (service.type === 'ghost' && service.ghost) await ghost(service, template)
+                    if (service.type === 'meilisearch' && service.meiliSearch) await meilisearch(service, template)
+                    if (service.type === 'umami' && service.umami) await umami(service, template)
+                    if (service.type === 'hasura' && service.hasura) await hasura(service, template)
+                    if (service.type === 'glitchTip' && service.glitchTip) await glitchtip(service, template)
+                    if (service.type === 'searxng' && service.searxng) await searxng(service, template)
+                    if (service.type === 'weblate' && service.weblate) await weblate(service, template)
+                    if (service.type === 'appwrite' && service.appwrite) await appwrite(service, template)
 
-                await createVolumes(service, template);
+                    try {
+                        await createVolumes(service, template);
+                    } catch (error) {
+                        console.log(error)
+                    }
 
-                if (template.variables.length > 0) {
+                    if (template.variables.length > 0) {
+                        for (const variable of template.variables) {
+                            const { defaultValue } = variable;
+                            const regex = /^\$\$.*\((\d+)\)$/g;
+                            const length = Number(regex.exec(defaultValue)?.[1]) || undefined
+                            if (variable.defaultValue.startsWith('$$generate_password')) {
+                                variable.value = generatePassword({ length });
+                            } else if (variable.defaultValue.startsWith('$$generate_hex')) {
+                                variable.value = generatePassword({ length, isHex: true });
+                            } else if (variable.defaultValue.startsWith('$$generate_username')) {
+                                variable.value = cuid();
+                            } else {
+                                variable.value = variable.defaultValue || '';
+                            }
+                        }
+                    }
                     for (const variable of template.variables) {
-                        const { defaultValue } = variable;
-                        const regex = /^\$\$.*\((\d+)\)$/g;
-                        const length = Number(regex.exec(defaultValue)?.[1]) || undefined
-                        if (variable.defaultValue.startsWith('$$generate_password')) {
-                            variable.value = generatePassword({ length });
-                        } else if (variable.defaultValue.startsWith('$$generate_hex')) {
-                            variable.value = generatePassword({ length, isHex: true });
-                        } else if (variable.defaultValue.startsWith('$$generate_username')) {
-                            variable.value = cuid();
-                        } else {
-                            variable.value = variable.defaultValue || '';
-                        }
-                    }
-                }
-                for (const variable of template.variables) {
-                    if (variable.id.startsWith('$$secret_')) {
-                        const found = await prisma.serviceSecret.findFirst({ where: { name: variable.name, serviceId: id } })
-                        if (!found) {
-                            await prisma.serviceSecret.create({
-                                data: { name: variable.name, value: encrypt(variable.value) || '', service: { connect: { id } } }
-                            })
-                        }
+                        if (variable.id.startsWith('$$secret_')) {
+                            const found = await prisma.serviceSecret.findFirst({ where: { name: variable.name, serviceId: id } })
+                            if (!found) {
+                                await prisma.serviceSecret.create({
+                                    data: { name: variable.name, value: encrypt(variable.value) || '', service: { connect: { id } } }
+                                })
+                            }
 
-                    }
-                    if (variable.id.startsWith('$$config_')) {
-                        const found = await prisma.serviceSetting.findFirst({ where: { name: variable.name, serviceId: id } })
-                        if (!found) {
-                            await prisma.serviceSetting.create({
-                                data: { name: variable.name, value: variable.value.toString(), variableName: variable.id, service: { connect: { id } } }
-                            })
+                        }
+                        if (variable.id.startsWith('$$config_')) {
+                            const found = await prisma.serviceSetting.findFirst({ where: { name: variable.name, serviceId: id } })
+                            if (!found) {
+                                await prisma.serviceSetting.create({
+                                    data: { name: variable.name, value: variable.value.toString(), variableName: variable.id, service: { connect: { id } } }
+                                })
+                            }
                         }
                     }
-                }
-                for (const s of Object.keys(template.services)) {
-                    if (service.type === 'plausibleanalytics') {
-                        continue;
-                    }
-                    if (template.services[s].volumes) {
-                        for (const volume of template.services[s].volumes) {
-                            const [volumeName, path] = volume.split(':')
-                            if (!volumeName.startsWith('/')) {
-                                const found = await prisma.servicePersistentStorage.findFirst({ where: { volumeName, serviceId: id } })
-                                if (!found) {
-                                    await prisma.servicePersistentStorage.create({
-                                        data: { volumeName, path, containerId: s, predefined: true, service: { connect: { id } } }
-                                    });
+                    for (const s of Object.keys(template.services)) {
+                        if (service.type === 'plausibleanalytics') {
+                            continue;
+                        }
+                        if (template.services[s].volumes) {
+                            for (const volume of template.services[s].volumes) {
+                                const [volumeName, path] = volume.split(':')
+                                if (!volumeName.startsWith('/')) {
+                                    const found = await prisma.servicePersistentStorage.findFirst({ where: { volumeName, serviceId: id } })
+                                    if (!found) {
+                                        await prisma.servicePersistentStorage.create({
+                                            data: { volumeName, path, containerId: s, predefined: true, service: { connect: { id } } }
+                                        });
+                                    }
                                 }
                             }
                         }
                     }
+                    await prisma.service.update({ where: { id }, data: { templateVersion: template.templateVersion } })
                 }
-                await prisma.service.update({ where: { id }, data: { templateVersion: template.templateVersion } })
+            } catch (error) {
+                console.log(error)
             }
-
         }
     } catch (error) {
         console.log(error)

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.0';
+export const version = '3.11.1';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';

apps/api/src/routes/webhooks/traefik/handlers.ts

@@ -3,9 +3,9 @@ import { errorHandler, getDomain, isDev, prisma, executeDockerCmd, fixType } fro
 import { getTemplates } from "../../../lib/services";
 import { OnlyId } from "../../../types";
 
-function generateServices(id, containerId, port) {
+function generateServices(serviceId, containerId, port) {
 	return {
-		[`${id}-${port || 'default'}`]: {
+		[serviceId]: {
 			loadbalancer: {
 				servers: [
 					{
@@ -16,18 +16,18 @@ function generateServices(id, containerId, port) {
 		}
 	}
 }
-function generateRouters(id, domain, nakedDomain, pathPrefix, isHttps, isWWW, isDualCerts, isCustomSSL) {
+function generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, isDualCerts, isCustomSSL) {
 	let http: any = {
 		entrypoints: ['web'],
 		rule: `Host(\`${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
-		service: `${id}`,
+		service: `${serviceId}`,
 		priority: 2,
 		middlewares: []
 	}
 	let https: any = {
 		entrypoints: ['websecure'],
 		rule: `Host(\`${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
-		service: `${id}`,
+		service: `${serviceId}`,
 		priority: 2,
 		tls: {
 			certresolver: 'letsencrypt'
@@ -37,14 +37,14 @@ function generateRouters(id, domain, nakedDomain, pathPrefix, isHttps, isWWW, is
 	let httpWWW: any = {
 		entrypoints: ['web'],
 		rule: `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
-		service: `${id}`,
+		service: `${serviceId}`,
 		priority: 2,
 		middlewares: []
 	}
 	let httpsWWW: any = {
 		entrypoints: ['websecure'],
 		rule: `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
-		service: `${id}`,
+		service: `${serviceId}`,
 		priority: 2,
 		tls: {
 			certresolver: 'letsencrypt'
@@ -129,10 +129,10 @@ function generateRouters(id, domain, nakedDomain, pathPrefix, isHttps, isWWW, is
 		}
 	}
 	return {
-		[id]: { ...http },
-		[`${id}-secure`]: { ...https },
-		[`${id}-www`]: { ...httpWWW },
-		[`${id}-secure-www`]: { ...httpsWWW },
+		[serviceId]: { ...http },
+		[`${serviceId}-secure`]: { ...https },
+		[`${serviceId}-www`]: { ...httpWWW },
+		[`${serviceId}-secure-www`]: { ...httpsWWW },
 	}
 }
 export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote: boolean = false) {
@@ -310,9 +310,10 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 									const pathPrefix = '/'
 									const isCustomSSL = false;
 									const dualCerts = false;
+									const serviceId = `${id}-${port || 'default'}-${pathPrefix}`
 
-									traefik.http.routers = { ...traefik.http.routers, ...generateRouters(`${id}-${port || 'default'}`, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
-									traefik.http.services = { ...traefik.http.services, ...generateServices(id, containerId, port) }
+									traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+									traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, containerId, port) }
 								}
 							}
 						}
@@ -328,9 +329,9 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 					const isHttps = fqdn.startsWith('https://');
 					const isWWW = fqdn.includes('www.');
 					const pathPrefix = '/'
-
-					traefik.http.routers = { ...traefik.http.routers, ...generateRouters(`${id}-${port || 'default'}`, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
-					traefik.http.services = { ...traefik.http.services, ...generateServices(id, id, port) }
+					const serviceId = `${id}-${port || 'default'}-${pathPrefix}`
+					traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+					traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, id, port) }
 					if (previews) {
 						const { stdout } = await executeDockerCmd({ dockerId, command: `docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"` })
 						const containers = stdout
@@ -343,9 +344,9 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 								const previewDomain = `${container.split('-')[1]}.${domain}`;
 								const nakedDomain = previewDomain.replace(/^www\./, '');
 								const pathPrefix = '/'
-
-								traefik.http.routers = { ...traefik.http.routers, ...generateRouters(`${container}-${port || 'default'}`, previewDomain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
-								traefik.http.services = { ...traefik.http.services, ...generateServices(container, container, port) }
+								const serviceId = `${container}-${port || 'default'}-${pathPrefix}`
+								traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, previewDomain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+								traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, container, port) }
 							}
 						}
 					}
@@ -412,7 +413,7 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 								let port, pathPrefix, customDomain;
 								if (configuration) {
 									port = configuration?.port;
-									pathPrefix = configuration?.pathPrefix || null;
+									pathPrefix = configuration?.pathPrefix || '/';
 									customDomain = configuration?.domain
 								}
 								if (customDomain) {
@@ -425,8 +426,9 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 								const isHttps = fqdn.startsWith('https://');
 								const isWWW = fqdn.includes('www.');
 								const isCustomSSL = false;
-								traefik.http.routers = { ...traefik.http.routers, ...generateRouters(`${id}-${port || 'default'}`, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
-								traefik.http.services = { ...traefik.http.services, ...generateServices(id, id, port) }
+								const serviceId = `${oneService}-${port || 'default'}-${pathPrefix}`
+								traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+								traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, oneService, port) }
 							}
 						} else {
 							if (found.services[oneService].ports && found.services[oneService].ports.length > 0) {
@@ -441,9 +443,9 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 								const isWWW = fqdn.includes('www.');
 								const pathPrefix = '/'
 								const isCustomSSL = false
-								
-								traefik.http.routers = { ...traefik.http.routers, ...generateRouters(`${id}-${port || 'default'}`, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
-								traefik.http.services = { ...traefik.http.services, ...generateServices(id, id, port) }
+								const serviceId = `${oneService}-${port || 'default'}-${pathPrefix}`
+								traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+								traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, id, port) }
 							}
 						}
 					}
@@ -466,9 +468,9 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 			const port = 3000
 			const pathPrefix = '/'
 			const isCustomSSL = false
-
-			traefik.http.routers = { ...traefik.http.routers, ...generateRouters(`${id}-${port || 'default'}`, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
-			traefik.http.services = { ...traefik.http.services, ...generateServices(id, container, port) }
+			const serviceId = `${id}-${port || 'default'}-${pathPrefix}`
+			traefik.http.routers = { ...traefik.http.routers, ...generateRouters(serviceId, domain, nakedDomain, pathPrefix, isHttps, isWWW, dualCerts, isCustomSSL) }
+			traefik.http.services = { ...traefik.http.services, ...generateServices(serviceId, container, port) }
 		}
 	} catch (error) {
 		console.log(error)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.11.0",
+  "version": "3.11.1",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {
@@ -25,7 +25,7 @@
     "build:api": "NODE_ENV=production pnpm run --filter api build",
     "build:ui": "NODE_ENV=production pnpm run --filter ui build",
     "dockerlogin": "echo $DOCKER_PASS | docker login --username=$DOCKER_USER --password-stdin",
-    "release:staging:amd": "cross-var docker buildx build --platform linux/amd64 -t coollabsio/coolify:$npm_package_version --push .",
+    "release:staging:amd": "cross-var docker buildx build --platform linux/amd64 -t coollabsio/coolify:next --push .",
     "release:local": "rm -fr ./local-serve && mkdir ./local-serve && pnpm build && cp -Rp apps/api/build/* ./local-serve && cp -Rp apps/ui/build/ ./local-serve/public && cp -Rp apps/api/prisma/ ./local-serve/prisma && cp -Rp apps/api/package.json ./local-serve && env | grep '^COOLIFY_' > ./local-serve/.env && cd ./local-serve && pnpm install . && pnpm start"
   },
   "devDependencies": {