Merge pull request #335 from coollabsio/arm

v2.4.3 - ARM!

.env.template

@@ -2,4 +2,5 @@ COOLIFY_APP_ID=
 COOLIFY_SECRET_KEY=12341234123412341234123412341234
 COOLIFY_DATABASE_URL=file:../db/dev.db
 COOLIFY_SENTRY_DSN=
-COOLIFY_IS_ON="docker"
+COOLIFY_IS_ON="docker"
+COOLIFY_WHITE_LABELED="false"

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn lint-staged
+pnpm lint-staged

CONTRIBUTING.md

@@ -16,7 +16,7 @@ First of all, thank you for considering to contribute to my project! It means a
 - Push to your fork repo
 - Create a pull request: https://github.com/coollabsio/compare
 - Write a proper description
-- Click "Change to draft"
+- Open the pull request to review
 
 # How to start after you set up your local fork?
 
@@ -29,7 +29,8 @@ You need to have [Docker Engine](https://docs.docker.com/engine/install/) instal
 - Copy `.env.template` to `.env` and set the `COOLIFY_APP_ID` environment variable to something cool.
 - Install dependencies with `pnpm install`.
 - Need to create a local SQlite database with `pnpm db:push`.
-  - This will apply all migrations and seed the database at `db/dev.db`.
+  - This will apply all migrations at `db/dev.db`.
+- Seed the database with base entities with `pnpm db:seed`
 - You can start coding after starting `pnpm dev`.
 
 ## Database migrations

Dockerfile

@@ -1,31 +1,42 @@
-FROM node:16.14.0-alpine
+FROM node:16.14.2-alpine as install
-RUN apk add --no-cache g++ cmake make python3
-WORKDIR /app
-COPY package*.json .
-RUN yarn install
-COPY . .
-RUN yarn build
-
-FROM node:16.14.0-alpine
 WORKDIR /app
 
-LABEL coolify.managed true
+RUN apk add --no-cache curl
-
-RUN apk add --no-cache git openssh-client curl jq cmake sqlite
-
 RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6
 RUN pnpm add -g pnpm
 
-RUN curl -fsSL "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz" | tar -xzvf - docker/docker -C . --strip-components 1 && mv docker /usr/bin/docker
+COPY package*.json .
-RUN mkdir -p ~/.docker/cli-plugins/
+RUN pnpm install
-RUN curl -SL https://github.com/docker/compose/releases/download/v2.2.2/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
+
-RUN chmod +x ~/.docker/cli-plugins/docker-compose
+FROM node:16.14.2-alpine
+ARG TARGETPLATFORM
+
+WORKDIR /app
+
+ENV PRISMA_QUERY_ENGINE_BINARY=/app/prisma-engines/query-engine \
+  PRISMA_MIGRATION_ENGINE_BINARY=/app/prisma-engines/migration-engine \
+  PRISMA_INTROSPECTION_ENGINE_BINARY=/app/prisma-engines/introspection-engine \
+  PRISMA_FMT_BINARY=/app/prisma-engines/prisma-fmt \
+  PRISMA_CLI_QUERY_ENGINE_TYPE=binary \
+  PRISMA_CLIENT_ENGINE_TYPE=binary
+  
+COPY --from=coollabsio/prisma-engine:latest /prisma-engines/query-engine /prisma-engines/migration-engine /prisma-engines/introspection-engine /prisma-engines/prisma-fmt /app/prisma-engines/
+
+COPY --from=install /app/node_modules ./node_modules
+COPY . .
+
+RUN apk add --no-cache git git-lfs openssh-client curl jq cmake sqlite openssl
+RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6
+RUN pnpm add -g pnpm
+RUN mkdir -p ~/.docker/cli-plugins/
+RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-20.10.9 -o /usr/bin/docker
+RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.3.4 -o ~/.docker/cli-plugins/docker-compose
+RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker
+
+RUN pnpm prisma generate
+RUN pnpm build
+
 
-COPY --from=0 /app/docker-compose.yaml .
-COPY --from=0 /app/build .
-COPY --from=0 /app/package.json .
-COPY --from=0 /app/node_modules ./node_modules
-COPY --from=0 /app/prisma ./prisma
 
 EXPOSE 3000
 CMD ["pnpm", "start"]

README.md

@@ -6,7 +6,7 @@ An open-source & self-hostable Heroku / Netlify alternative.
 
 https://demo.coolify.io/
 
-(If it is unresponsible, that means someone overloaded the server. 🙃)
+(If it is unresponsive, that means someone overloaded the server. 🙃)
 
 ## How to install
 

data/build-prisma-engine.sh

@@ -0,0 +1 @@
+nohup docker build -t coollabsio/prisma-engine:<arm64/amd64> --push . &

data/haproxy-http.Dockerfile

@@ -0,0 +1,6 @@
+FROM haproxytech/haproxy-alpine:2.5
+RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe
+
+COPY haproxy/haproxy.cfg-http.template /usr/local/etc/haproxy/haproxy.cfg
+COPY haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
+COPY haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 

data/haproxy-tcp.Dockerfile

@@ -0,0 +1,6 @@
+FROM haproxytech/haproxy-alpine:2.5
+RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe
+
+COPY haproxy/haproxy.cfg-tcp.template /usr/local/etc/haproxy/haproxy.cfg
+COPY haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
+COPY haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 

data/haproxy.Dockerfile

@@ -0,0 +1,6 @@
+FROM haproxytech/haproxy-alpine:2.5
+RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe
+
+COPY haproxy/haproxy.cfg.template /usr/local/etc/haproxy/haproxy.cfg
+COPY haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
+COPY haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 

data/haproxy/haproxy.cfg-http.template

@@ -4,10 +4,10 @@ global
 defaults 
   mode http
   log global
-  timeout http-request 60s
+  timeout http-request 120s
-  timeout connect 10s
+  timeout connect 20s
-  timeout client 60s
+  timeout client 120s
-  timeout server 60s
+  timeout server 120s
 
 frontend "${APP}"
   mode http

data/haproxy/haproxy.cfg.template

@@ -5,10 +5,10 @@ global
 defaults 
   mode http
   log global
-  timeout http-request 60s
+  timeout http-request 120s
-  timeout connect 10s
+  timeout connect 20s
-  timeout client 60s
+  timeout client 120s
-  timeout server 60s
+  timeout server 120s
 
 userlist haproxy-dataplaneapi 
   user admin insecure-password "${HAPROXY_PASSWORD}"

data/prisma-engine.Dockerfile

@@ -0,0 +1,10 @@
+FROM rust:1.58.1-alpine3.14 as prisma
+WORKDIR /prisma
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+RUN apk --no-cache add openssl direnv git musl-dev openssl-dev build-base perl protoc
+RUN git clone --depth=1 --branch=3.11.x https://github.com/prisma/prisma-engines.git /prisma 
+RUN cargo build --release
+
+FROM alpine
+WORKDIR /prisma-engines
+COPY --from=prisma /prisma/target/release/query-engine /prisma/target/release/migration-engine /prisma/target/release/introspection-engine /prisma/target/release/prisma-fmt /prisma-engines/

haproxy-http.Dockerfile

@@ -1,6 +0,0 @@
-FROM haproxytech/haproxy-alpine:2.5
-RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe
-
-COPY data/haproxy/haproxy.cfg-http.template /usr/local/etc/haproxy/haproxy.cfg
-COPY data/haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
-COPY data/haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 

haproxy-tcp.Dockerfile

@@ -1,6 +0,0 @@
-FROM haproxytech/haproxy-alpine:2.5
-RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe
-
-COPY data/haproxy/haproxy.cfg-tcp.template /usr/local/etc/haproxy/haproxy.cfg
-COPY data/haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
-COPY data/haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 

haproxy.Dockerfile

@@ -1,6 +0,0 @@
-FROM haproxytech/haproxy-alpine:2.5
-RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe
-
-COPY data/haproxy/haproxy.cfg.template /usr/local/etc/haproxy/haproxy.cfg
-COPY data/haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
-COPY data/haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 

package.json

@@ -1,14 +1,14 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.2.3",
+	"version": "2.4.3",
 	"license": "AGPL-3.0",
 	"scripts": {
-		"dev": "docker-compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev",
+		"dev": "docker-compose -f docker-compose-dev.yaml up -d && cross-env NODE_ENV=development & svelte-kit dev",
 		"dev:stop": "docker-compose -f docker-compose-dev.yaml down",
 		"dev:logs": "docker-compose -f docker-compose-dev.yaml logs -f --tail 10",
 		"studio": "npx prisma studio",
-		"start": "npx prisma migrate deploy && npx prisma generate && npx prisma db seed && node index.js",
+		"start": "npx prisma migrate deploy && npx prisma generate && npx prisma db seed && node build/index.js",
 		"build": "svelte-kit build",
 		"preview": "svelte-kit preview",
 		"check": "svelte-check --tsconfig ./tsconfig.json",
@@ -17,26 +17,26 @@
 		"db:push": "prisma db push && prisma generate",
 		"db:seed": "prisma db seed",
 		"db:migrate": "COOLIFY_DATABASE_URL=file:../db/migration.db prisma migrate dev --skip-seed --name",
-		"release:staging": "cross-var docker build -t coollabsio/coolify:$npm_package_version . && docker push coollabsio/coolify:$npm_package_version",
+		"release:production:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest --push .",
-		"release:pre": "cross-var docker build -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest .",
+		"release:staging:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version --push .",
-		"release:coolify": "cross-var yarn release:pre && docker push coollabsio/coolify:$npm_package_version && docker push coollabsio/coolify:latest",
+		"release:staging:amd": "cross-var docker build --platform linux/amd64 -t coollabsio/coolify:$npm_package_version --push .",
-		"release:haproxy": "docker build -f haproxy.Dockerfile -t coollabsio/coolify-haproxy-alpine:1.0.0 -t coollabsio/coolify-haproxy-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-alpine",
+		"release:haproxy": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-alpine:latest -t coollabsio/coolify-haproxy-alpine:1.1.0 -f haproxy.Dockerfile --push .",
-		"release:haproxy:tcp": "docker build -f haproxy-tcp.Dockerfile -t coollabsio/coolify-haproxy-tcp-alpine:1.0.0 -t coollabsio/coolify-haproxy-tcp-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-tcp-alpine",
+		"release:haproxy:tcp": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-tcp-alpine:latest -t coollabsio/coolify-haproxy-tcp-alpine:1.1.0 -f haproxy-tcp.Dockerfile --push .",
-		"release:haproxy:http": "docker build -f haproxy-http.Dockerfile -t coollabsio/coolify-haproxy-http-alpine:1.0.0 -t coollabsio/coolify-haproxy-http-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-http-alpine",
+		"release:haproxy:http": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-http-alpine:latest -t coollabsio/coolify-haproxy-http-alpine:1.1.0 -f haproxy-http.Dockerfile --push .",
 		"prepare": "husky install"
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-node": "1.0.0-next.73",
-		"@sveltejs/kit": "1.0.0-next.303",
+		"@sveltejs/kit": "1.0.0-next.310",
-		"@types/bcrypt": "5.0.0",
 		"@types/js-cookie": "3.0.1",
-		"@types/js-yaml": "^4.0.5",
+		"@types/js-yaml": "4.0.5",
 		"@types/node": "17.0.23",
 		"@types/node-forge": "1.0.1",
 		"@typescript-eslint/eslint-plugin": "4.31.1",
 		"@typescript-eslint/parser": "4.31.1",
 		"@zerodevx/svelte-toast": "0.7.1",
 		"autoprefixer": "10.4.4",
+		"cross-env": "7.0.3",
 		"cross-var": "1.1.0",
 		"eslint": "7.32.0",
 		"eslint-config-prettier": "8.5.0",
@@ -44,14 +44,14 @@
 		"husky": "7.0.4",
 		"lint-staged": "12.3.7",
 		"postcss": "8.4.12",
-		"prettier": "2.6.1",
+		"prettier": "2.6.2",
-		"prettier-plugin-svelte": "2.6.0",
+		"prettier-plugin-svelte": "2.7.0",
 		"prettier-plugin-tailwindcss": "0.1.8",
 		"prisma": "3.11.1",
-		"svelte": "3.46.4",
+		"svelte": "3.47.0",
-		"svelte-check": "2.4.6",
+		"svelte-check": "2.6.0",
-		"svelte-preprocess": "4.10.4",
+		"svelte-preprocess": "4.10.5",
-		"svelte-select": "^4.4.7",
+		"svelte-select": "4.4.7",
 		"tailwindcss": "3.0.23",
 		"ts-node": "10.7.0",
 		"tslib": "2.3.1",
@@ -61,26 +61,26 @@
 	"dependencies": {
 		"@iarna/toml": "2.2.5",
 		"@prisma/client": "3.11.1",
-		"@sentry/node": "6.19.2",
+		"@sentry/node": "6.19.6",
-		"bcrypt": "5.0.1",
+		"bcryptjs": "^2.4.3",
-		"bullmq": "1.78.1",
+		"bullmq": "1.79.0",
 		"compare-versions": "4.1.3",
 		"cookie": "0.4.2",
-		"cooltipz-css": "^2.1.0",
 		"cuid": "2.1.8",
 		"dayjs": "1.11.0",
 		"dockerode": "3.3.1",
 		"dotenv-extended": "2.9.0",
 		"generate-password": "1.7.0",
 		"get-port": "6.1.2",
-		"got": "12.0.2",
+		"got": "12.0.3",
 		"js-cookie": "3.0.1",
 		"js-yaml": "4.1.0",
 		"jsonwebtoken": "8.5.1",
-		"mustache": "^4.2.0",
+		"mustache": "4.2.0",
-		"node-forge": "1.3.0",
+		"node-forge": "1.3.1",
+		"p-limit": "4.0.0",
 		"svelte-kit-cookie-session": "2.1.2",
-		"tailwindcss-scrollbar": "^0.1.0",
+		"tailwindcss-scrollbar": "0.1.0",
 		"unique-names-generator": "4.7.1"
 	},
 	"prisma": {

prisma/migrations/20220402135305_python/migration.sql

@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "Application" ADD COLUMN "pythonModule" TEXT;
+ALTER TABLE "Application" ADD COLUMN "pythonVariable" TEXT;
+ALTER TABLE "Application" ADD COLUMN "pythonWSGI" TEXT;

prisma/migrations/20220402210645_meilisearch/migration.sql

@@ -0,0 +1,12 @@
+-- CreateTable
+CREATE TABLE "MeiliSearch" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "masterKey" TEXT NOT NULL,
+    "serviceId" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "MeiliSearch_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "MeiliSearch_serviceId_key" ON "MeiliSearch"("serviceId");

prisma/migrations/20220405151428_wordpress_sftp/migration.sql

@@ -0,0 +1,29 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Wordpress" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "extraConfig" TEXT,
+    "tablePrefix" TEXT,
+    "mysqlUser" TEXT NOT NULL,
+    "mysqlPassword" TEXT NOT NULL,
+    "mysqlRootUser" TEXT NOT NULL,
+    "mysqlRootUserPassword" TEXT NOT NULL,
+    "mysqlDatabase" TEXT,
+    "mysqlPublicPort" INTEGER,
+    "ftpEnabled" BOOLEAN NOT NULL DEFAULT false,
+    "ftpUser" TEXT,
+    "ftpPassword" TEXT,
+    "ftpPublicPort" INTEGER,
+    "ftpHostKey" TEXT,
+    "ftpHostKeyPrivate" TEXT,
+    "serviceId" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Wordpress_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_Wordpress" ("createdAt", "extraConfig", "id", "mysqlDatabase", "mysqlPassword", "mysqlPublicPort", "mysqlRootUser", "mysqlRootUserPassword", "mysqlUser", "serviceId", "tablePrefix", "updatedAt") SELECT "createdAt", "extraConfig", "id", "mysqlDatabase", "mysqlPassword", "mysqlPublicPort", "mysqlRootUser", "mysqlRootUserPassword", "mysqlUser", "serviceId", "tablePrefix", "updatedAt" FROM "Wordpress";
+DROP TABLE "Wordpress";
+ALTER TABLE "new_Wordpress" RENAME TO "Wordpress";
+CREATE UNIQUE INDEX "Wordpress_serviceId_key" ON "Wordpress"("serviceId");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

prisma/migrations/20220407220809_unique_storage_fix/migration.sql

@@ -0,0 +1,5 @@
+-- DropIndex
+DROP INDEX "ApplicationPersistentStorage_path_key";
+
+-- DropIndex
+DROP INDEX "ApplicationPersistentStorage_applicationId_key";

prisma/schema.prisma

@@ -1,5 +1,6 @@
 generator client {
   provider = "prisma-client-js"
+  binaryTargets = ["linux-musl"]
 }
 
 datasource db {
@@ -87,6 +88,9 @@ model Application {
   baseDirectory       String?
   publishDirectory    String?
   phpModules          String?
+  pythonWSGI          String?
+  pythonModule        String?
+  pythonVariable      String?
   createdAt           DateTime                       @default(now())
   updatedAt           DateTime                       @updatedAt
   settings            ApplicationSettings?
@@ -114,8 +118,8 @@ model ApplicationSettings {
 model ApplicationPersistentStorage {
   id            String      @id @default(cuid())
   application   Application @relation(fields: [applicationId], references: [id])
-  applicationId String      @unique
+  applicationId String      
-  path          String      @unique
+  path          String      
   createdAt     DateTime    @default(now())
   updatedAt     DateTime    @updatedAt
 
@@ -280,6 +284,7 @@ model Service {
   wordpress           Wordpress?
   ghost               Ghost?
   serviceSecret       ServiceSecret[]
+  meiliSearch         MeiliSearch?
 }
 
 model PlausibleAnalytics {
@@ -328,6 +333,12 @@ model Wordpress {
   mysqlRootUserPassword String
   mysqlDatabase         String?
   mysqlPublicPort       Int?
+  ftpEnabled            Boolean  @default(false)
+  ftpUser               String?
+  ftpPassword           String?
+  ftpPublicPort         Int?
+  ftpHostKey            String?
+  ftpHostKeyPrivate     String?
   serviceId             String   @unique
   service               Service  @relation(fields: [serviceId], references: [id])
   createdAt             DateTime @default(now())
@@ -349,3 +360,12 @@ model Ghost {
   createdAt               DateTime @default(now())
   updatedAt               DateTime @updatedAt
 }
+
+model MeiliSearch {
+  id        String   @id @default(cuid())
+  masterKey String
+  serviceId String   @unique
+  service   Service  @relation(fields: [serviceId], references: [id])
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}

src/app.d.ts

@@ -15,18 +15,20 @@ declare namespace App {
 		readOnly: boolean;
 		source: string;
 		settings: string;
+		database: Record<string, any>;
+		versions: string;
+		privatePort: string;
 	}
 }
 
 interface SessionData {
+	whiteLabeled: boolean;
 	version?: string;
 	userId?: string | null;
 	teamId?: string | null;
 	permission?: string;
 	isAdmin?: boolean;
 	expires?: string | null;
-	gitlabToken?: string | null;
-	ghToken?: string | null;
 }
 
 type DateTimeFormatOptions = {

src/app.html

@@ -2,7 +2,6 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<link rel="icon" href="/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<title>Coolify</title>
 		%svelte.head%

src/hooks.ts

@@ -7,6 +7,8 @@ import { version } from '$lib/common';
 import cookie from 'cookie';
 import { dev } from '$app/env';
 
+const whiteLabeled = process.env['COOLIFY_WHITE_LABELED'] === 'true';
+
 export const handle = handleSession(
 	{
 		secret: process.env['COOLIFY_SECRET_KEY'],
@@ -71,6 +73,7 @@ export const handle = handleSession(
 export const getSession: GetSession = function ({ locals }) {
 	return {
 		version,
+		whiteLabeled,
 		...locals.session.data
 	};
 };

src/lib/api.ts

@@ -1,9 +1,17 @@
-async function send({ method, path, data = {}, headers, timeout = 30000 }) {
+// TODO: Make this functions generic
+
+async function send({
+	method,
+	path,
+	data = {},
+	headers,
+	timeout = 30000
+}): Promise<Record<string, unknown>> {
 	const controller = new AbortController();
 	const id = setTimeout(() => controller.abort(), timeout);
 	const opts = { method, headers: {}, body: null, signal: controller.signal };
 	if (Object.keys(data).length > 0) {
-		let parsedData = data;
+		const parsedData = data;
 		for (const [key, value] of Object.entries(data)) {
 			if (value === '') {
 				parsedData[key] = null;
@@ -43,18 +51,33 @@ async function send({ method, path, data = {}, headers, timeout = 30000 }) {
 	return responseData;
 }
 
-export function get(path, headers = {}): Promise<any> {
+export function get(
+	path: string,
+	headers: Record<string, unknown>
+): Promise<Record<string, unknown>> {
 	return send({ method: 'GET', path, headers });
 }
 
-export function del(path, data = {}, headers = {}): Promise<any> {
+export function del(
+	path: string,
+	data: Record<string, unknown>,
+	headers: Record<string, unknown>
+): Promise<Record<string, unknown>> {
 	return send({ method: 'DELETE', path, data, headers });
 }
 
-export function post(path, data, headers = {}): Promise<any> {
+export function post(
+	path: string,
+	data: Record<string, unknown>,
+	headers: Record<string, unknown>
+): Promise<Record<string, unknown>> {
 	return send({ method: 'POST', path, data, headers });
 }
 
-export function put(path, data, headers = {}): Promise<any> {
+export function put(
+	path: string,
+	data: Record<string, unknown>,
+	headers: Record<string, unknown>
+): Promise<Record<string, unknown>> {
 	return send({ method: 'PUT', path, data, headers });
 }

src/lib/buildPacks/common.ts

@@ -100,6 +100,7 @@ export const setDefaultConfiguration = async (data) => {
 		if (buildPack === 'static') port = 80;
 		else if (buildPack === 'node') port = 3000;
 		else if (buildPack === 'php') port = 80;
+		else if (buildPack === 'python') port = 8000;
 	}
 	if (!installCommand) installCommand = template?.installCommand || 'yarn install';
 	if (!startCommand) startCommand = template?.startCommand || 'yarn start';
@@ -123,20 +124,13 @@ export const setDefaultConfiguration = async (data) => {
 
 export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId) {
 	try {
-		// TODO: Write full .dockerignore for all deployments!!
 		if (buildPack === 'php') {
-			await fs.writeFile(
-				`${workdir}/.htaccess`,
-				`
-        RewriteEngine On
-        RewriteBase /
-        RewriteCond %{REQUEST_FILENAME} !-d
-        RewriteCond %{REQUEST_FILENAME} !-f
-        RewriteRule ^(.+)$ index.php [QSA,L]
-        `
-			);
 			await fs.writeFile(`${workdir}/entrypoint.sh`, `chown -R 1000 /app`);
-			saveBuildLog({ line: 'Copied default configuration file for PHP.', buildId, applicationId });
+			await saveBuildLog({
+				line: 'Copied default configuration file for PHP.',
+				buildId,
+				applicationId
+			});
 		} else if (staticDeployments.includes(buildPack)) {
 			await fs.writeFile(
 				`${workdir}/nginx.conf`,
@@ -190,7 +184,7 @@ export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, ap
             }
             `
 			);
-			saveBuildLog({ line: 'Copied default configuration file.', buildId, applicationId });
+			await saveBuildLog({ line: 'Copied default configuration file.', buildId, applicationId });
 		}
 	} catch (error) {
 		console.log(error);

src/lib/buildPacks/docker.ts

@@ -26,14 +26,17 @@ export default async function ({
 		if (secrets.length > 0) {
 			secrets.forEach((secret) => {
 				if (secret.isBuildSecret) {
-					if (pullmergeRequestId) {
+					if (
-						if (secret.isPRMRSecret) {
+						(pullmergeRequestId && secret.isPRMRSecret) ||
-							Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						(!pullmergeRequestId && !secret.isPRMRSecret)
-						}
+					) {
-					} else {
+						Dockerfile.unshift(`ARG ${secret.name}=${secret.value}`);
-						if (!secret.isPRMRSecret) {
+
-							Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.forEach((line, index) => {
-						}
+							if (line.startsWith('FROM')) {
+								Dockerfile.splice(index + 1, 0, `ARG ${secret.name}`);
+							}
+						});
 					}
 				}
 			});

src/lib/buildPacks/index.ts

@@ -12,6 +12,7 @@ import php from './php';
 import rust from './rust';
 import astro from './static';
 import eleventy from './static';
+import python from './python';
 
 export {
 	node,
@@ -27,5 +28,6 @@ export {
 	php,
 	rust,
 	astro,
-	eleventy
+	eleventy,
+	python
 };

src/lib/buildPacks/nextjs.ts

@@ -23,11 +23,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 			if (secret.isBuildSecret) {
 				if (pullmergeRequestId) {
 					if (secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				} else {
 					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				}
 			}

src/lib/buildPacks/node.ts

@@ -24,11 +24,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 			if (secret.isBuildSecret) {
 				if (pullmergeRequestId) {
 					if (secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				} else {
 					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				}
 			}

src/lib/buildPacks/nuxtjs.ts

@@ -23,11 +23,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 			if (secret.isBuildSecret) {
 				if (pullmergeRequestId) {
 					if (secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				} else {
 					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				}
 			}

src/lib/buildPacks/php.ts

@@ -1,23 +1,45 @@
 import { buildImage } from '$lib/docker';
 import { promises as fs } from 'fs';
 
-const createDockerfile = async (data, image): Promise<void> => {
+const createDockerfile = async (data, image, htaccessFound): Promise<void> => {
 	const { workdir, baseDirectory } = data;
 	const Dockerfile: Array<string> = [];
+	let composerFound = false;
+	try {
+		await fs.readFile(`${workdir}${baseDirectory || ''}/composer.json`);
+		composerFound = true;
+	} catch (error) {}
+
 	Dockerfile.push(`FROM ${image}`);
 	Dockerfile.push(`LABEL coolify.image=true`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`COPY .${baseDirectory || ''} /app`);
-	Dockerfile.push(`COPY /.htaccess .`);
+	if (htaccessFound) {
+		Dockerfile.push(`COPY .${baseDirectory || ''}/.htaccess ./`);
+	}
+	if (composerFound) {
+		Dockerfile.push(`RUN composer install`);
+	}
+
 	Dockerfile.push(`COPY /entrypoint.sh /opt/docker/provision/entrypoint.d/30-entrypoint.sh`);
 	Dockerfile.push(`EXPOSE 80`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
+	const { workdir, baseDirectory } = data;
 	try {
-		const image = 'webdevops/php-nginx';
+		let htaccessFound = false;
-		await createDockerfile(data, image);
+		try {
+			await fs.readFile(`${workdir}${baseDirectory || ''}/.htaccess`);
+			htaccessFound = true;
+		} catch (e) {
+			//
+		}
+		const image = htaccessFound
+			? 'webdevops/php-apache:8.0-alpine'
+			: 'webdevops/php-nginx:8.0-alpine';
+		await createDockerfile(data, image, htaccessFound);
 		await buildImage(data);
 	} catch (error) {
 		throw error;

src/lib/buildPacks/python.ts

@@ -0,0 +1,71 @@
+import { buildImage } from '$lib/docker';
+import { promises as fs } from 'fs';
+
+const createDockerfile = async (data, image): Promise<void> => {
+	const {
+		workdir,
+		port,
+		baseDirectory,
+		secrets,
+		pullmergeRequestId,
+		pythonWSGI,
+		pythonModule,
+		pythonVariable
+	} = data;
+	const Dockerfile: Array<string> = [];
+	Dockerfile.push(`FROM ${image}`);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
+	if (secrets.length > 0) {
+		secrets.forEach((secret) => {
+			if (secret.isBuildSecret) {
+				if (pullmergeRequestId) {
+					if (secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				} else {
+					if (!secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				}
+			}
+		});
+	}
+	if (pythonWSGI?.toLowerCase() === 'gunicorn') {
+		Dockerfile.push(`RUN pip install gunicorn`);
+	} else if (pythonWSGI?.toLowerCase() === 'uwsgi') {
+		Dockerfile.push(`RUN apk add --no-cache uwsgi-python3`);
+		// Dockerfile.push(`RUN pip install --no-cache-dir uwsgi`)
+	}
+
+	try {
+		await fs.stat(`${workdir}${baseDirectory || ''}/requirements.txt`);
+		Dockerfile.push(`COPY .${baseDirectory || ''}/requirements.txt ./`);
+		Dockerfile.push(`RUN pip install --no-cache-dir -r .${baseDirectory || ''}/requirements.txt`);
+	} catch (e) {
+		//
+	}
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
+	Dockerfile.push(`EXPOSE ${port}`);
+	if (pythonWSGI?.toLowerCase() === 'gunicorn') {
+		Dockerfile.push(`CMD gunicorn -w=4 -b=0.0.0.0:8000 ${pythonModule}:${pythonVariable}`);
+	} else if (pythonWSGI?.toLowerCase() === 'uwsgi') {
+		Dockerfile.push(
+			`CMD uwsgi --master -p 4 --http-socket 0.0.0.0:8000 --uid uwsgi --plugins python3 --protocol uwsgi --wsgi ${pythonModule}:${pythonVariable}`
+		);
+	} else {
+		Dockerfile.push(`CMD python ${pythonModule}`);
+	}
+
+	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
+};
+
+export default async function (data) {
+	try {
+		const image = 'python:3-alpine';
+		await createDockerfile(data, image);
+		await buildImage(data);
+	} catch (error) {
+		throw error;
+	}
+}

src/lib/buildPacks/static.ts

@@ -22,11 +22,11 @@ const createDockerfile = async (data, image): Promise<void> => {
 			if (secret.isBuildSecret) {
 				if (pullmergeRequestId) {
 					if (secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				} else {
 					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				}
 			}

src/lib/common.ts

@@ -12,7 +12,8 @@ import { version as currentVersion } from '../../package.json';
 import dayjs from 'dayjs';
 import Cookie from 'cookie';
 import os from 'os';
-import cuid from 'cuid';
+import type { RequestEvent } from '@sveltejs/kit/types/internal';
+import type { Job } from 'bullmq';
 
 try {
 	if (!dev) {
@@ -45,30 +46,32 @@ const customConfig: Config = {
 
 export const version = currentVersion;
 export const asyncExecShell = util.promisify(child.exec);
-export const asyncSleep = (delay) => new Promise((resolve) => setTimeout(resolve, delay));
+export const asyncSleep = (delay: number): Promise<unknown> =>
+	new Promise((resolve) => setTimeout(resolve, delay));
 export const sentry = Sentry;
 
-export const uniqueName = () => uniqueNamesGenerator(customConfig);
+export const uniqueName = (): string => uniqueNamesGenerator(customConfig);
 
-export const saveBuildLog = async ({ line, buildId, applicationId }) => {
+export const saveBuildLog = async ({
-	const addTimestamp = `${generateTimestamp()} ${line}`;
+	line,
-	return await buildLogQueue.add(buildId, { buildId, line: addTimestamp, applicationId });
+	buildId,
-};
+	applicationId
-
+}: {
-export const isTeamIdTokenAvailable = (request) => {
+	line: string;
-	const cookie = request.headers.cookie
+	buildId: string;
-		?.split(';')
+	applicationId: string;
-		.map((s) => s.trim())
+}): Promise<Job> => {
-		.find((s) => s.startsWith('teamId='))
+	if (line) {
-		?.split('=')[1];
+		if (line.includes('ghs_')) {
-	if (!cookie) {
+			const regex = /ghs_.*@/g;
-		return getTeam(request);
+			line = line.replace(regex, '<SENSITIVE_DATA_DELETED>@');
-	} else {
+		}
-		return cookie;
+		const addTimestamp = `${generateTimestamp()} ${line}`;
+		return await buildLogQueue.add(buildId, { buildId, line: addTimestamp, applicationId });
 	}
 };
 
-export const getTeam = (event) => {
+export const getTeam = (event: RequestEvent): string | null => {
 	const cookies = Cookie.parse(event.request.headers.get('cookie'));
 	if (cookies?.teamId) {
 		return cookies.teamId;
@@ -78,9 +81,18 @@ export const getTeam = (event) => {
 	return null;
 };
 
-export const getUserDetails = async (event, isAdminRequired = true) => {
+export const getUserDetails = async (
+	event: RequestEvent,
+	isAdminRequired = true
+): Promise<{
+	teamId: string;
+	userId: string;
+	permission: string;
+	status: number;
+	body: { message: string };
+}> => {
 	const teamId = getTeam(event);
-	const userId = event.locals.session.data.userId || null;
+	const userId = event?.locals?.session?.data?.userId || null;
 	const { permission = 'read' } = await db.prisma.permission.findFirst({
 		where: { teamId, userId },
 		select: { permission: true },
@@ -95,6 +107,7 @@ export const getUserDetails = async (event, isAdminRequired = true) => {
 			message: 'OK'
 		}
 	};
+
 	if (isAdminRequired && permission !== 'admin' && permission !== 'owner') {
 		payload.status = 401;
 		payload.body.message =
@@ -104,11 +117,11 @@ export const getUserDetails = async (event, isAdminRequired = true) => {
 	return payload;
 };
 
-export function getEngine(engine) {
+export function getEngine(engine: string): string {
 	return engine === '/var/run/docker.sock' ? 'unix:///var/run/docker.sock' : engine;
 }
 
-export async function removeContainer(id, engine) {
+export async function removeContainer(id: string, engine: string): Promise<void> {
 	const host = getEngine(engine);
 	try {
 		const { stdout } = await asyncExecShell(
@@ -124,14 +137,25 @@ export async function removeContainer(id, engine) {
 	}
 }
 
-export const removeDestinationDocker = async ({ id, engine }) => {
+export const removeDestinationDocker = async ({
+	id,
+	engine
+}: {
+	id: string;
+	engine: string;
+}): Promise<void> => {
 	return await removeContainer(id, engine);
 };
 
-export const createDirectories = async ({ repository, buildId }) => {
+export const createDirectories = async ({
-	const dashedRepository = dashify(repository);
+	repository,
-	const repodir = `/tmp/build-sources/${dashedRepository}/`;
+	buildId
-	const workdir = `/tmp/build-sources/${dashedRepository}/${buildId}`;
+}: {
+	repository: string;
+	buildId: string;
+}): Promise<{ workdir: string; repodir: string }> => {
+	const repodir = `/tmp/build-sources/${repository}/`;
+	const workdir = `/tmp/build-sources/${repository}/${buildId}`;
 
 	await asyncExecShell(`mkdir -p ${workdir}`);
 
@@ -141,20 +165,10 @@ export const createDirectories = async ({ repository, buildId }) => {
 	};
 };
 
-export function generateTimestamp() {
+export function generateTimestamp(): string {
 	return `${dayjs().format('HH:mm:ss.SSS')} `;
 }
 
-export function getDomain(domain) {
+export function getDomain(domain: string): string {
 	return domain?.replace('https://', '').replace('http://', '');
 }
-
-export function dashify(str: string, options?: any): string {
-	if (typeof str !== 'string') return str;
-	return str
-		.trim()
-		.replace(/\W/g, (m) => (/[À-ž]/.test(m) ? m : '-'))
-		.replace(/^-+|-+$/g, '')
-		.replace(/-{2,}/g, (m) => (options && options.condense ? '-' : m))
-		.toLowerCase();
-}

src/lib/components/DatabaseLinks.svelte

@@ -0,0 +1,25 @@
+<script>
+	export let database;
+	import Clickhouse from './svg/databases/Clickhouse.svelte';
+	import CouchDb from './svg/databases/CouchDB.svelte';
+	import MongoDb from './svg/databases/MongoDB.svelte';
+	import MySql from './svg/databases/MySQL.svelte';
+	import PostgreSql from './svg/databases/PostgreSQL.svelte';
+	import Redis from './svg/databases/Redis.svelte';
+</script>
+
+<span class="relative">
+	{#if database.type === 'clickhouse'}
+		<Clickhouse />
+	{:else if database.type === 'couchdb'}
+		<CouchDb />
+	{:else if database.type === 'mongodb'}
+		<MongoDb />
+	{:else if database.type === 'mysql'}
+		<MySql />
+	{:else if database.type === 'postgresql'}
+		<PostgreSql />
+	{:else if database.type === 'redis'}
+		<Redis />
+	{/if}
+</span>

src/lib/components/ServiceLinks.svelte

@@ -0,0 +1,55 @@
+<script>
+	export let service;
+	import Ghost from './svg/services/Ghost.svelte';
+	import LanguageTool from './svg/services/LanguageTool.svelte';
+	import MinIo from './svg/services/MinIO.svelte';
+	import N8n from './svg/services/N8n.svelte';
+	import NocoDb from './svg/services/NocoDB.svelte';
+	import PlausibleAnalytics from './svg/services/PlausibleAnalytics.svelte';
+	import UptimeKuma from './svg/services/UptimeKuma.svelte';
+	import VaultWarden from './svg/services/VaultWarden.svelte';
+	import VsCodeServer from './svg/services/VSCodeServer.svelte';
+	import Wordpress from './svg/services/Wordpress.svelte';
+</script>
+
+{#if service.type === 'plausibleanalytics'}
+	<a href="https://plausible.io" target="_blank">
+		<PlausibleAnalytics />
+	</a>
+{:else if service.type === 'nocodb'}
+	<a href="https://nocodb.com" target="_blank">
+		<NocoDb />
+	</a>
+{:else if service.type === 'minio'}
+	<a href="https://min.io" target="_blank">
+		<MinIo />
+	</a>
+{:else if service.type === 'vscodeserver'}
+	<a href="https://coder.com" target="_blank">
+		<VsCodeServer />
+	</a>
+{:else if service.type === 'wordpress'}
+	<a href="https://wordpress.org" target="_blank">
+		<Wordpress />
+	</a>
+{:else if service.type === 'vaultwarden'}
+	<a href="https://github.com/dani-garcia/vaultwarden" target="_blank">
+		<VaultWarden />
+	</a>
+{:else if service.type === 'languagetool'}
+	<a href="https://languagetool.org/dev" target="_blank">
+		<LanguageTool />
+	</a>
+{:else if service.type === 'n8n'}
+	<a href="https://n8n.io" target="_blank">
+		<N8n />
+	</a>
+{:else if service.type === 'uptimekuma'}
+	<a href="https://github.com/louislam/uptime-kuma" target="_blank">
+		<UptimeKuma />
+	</a>
+{:else if service.type === 'ghost'}
+	<a href="https://ghost.org" target="_blank">
+		<Ghost />
+	</a>
+{/if}

src/lib/components/Setting.svelte

@@ -7,6 +7,7 @@
 	export let isCenter = true;
 	export let disabled = false;
 	export let dataTooltip = null;
+	export let loading = false;
 </script>
 
 <div class="flex items-center py-4 pr-8">
@@ -26,9 +27,10 @@
 		on:click
 		aria-pressed="false"
 		class="relative mx-20 inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out"
-		class:opacity-50={disabled}
+		class:opacity-50={disabled || loading}
-		class:bg-green-600={setting}
+		class:bg-green-600={!loading && setting}
-		class:bg-stone-700={!setting}
+		class:bg-stone-700={!loading && !setting}
+		class:bg-yellow-500={loading}
 	>
 		<span class="sr-only">Use setting</span>
 		<span
@@ -40,6 +42,7 @@
 				class=" absolute inset-0 flex h-full w-full items-center justify-center transition-opacity duration-200 ease-in"
 				class:opacity-0={setting}
 				class:opacity-100={!setting}
+				class:animate-spin={loading}
 				aria-hidden="true"
 			>
 				<svg class="h-3 w-3 bg-white text-red-600" fill="none" viewBox="0 0 12 12">
@@ -57,6 +60,7 @@
 				aria-hidden="true"
 				class:opacity-100={setting}
 				class:opacity-0={!setting}
+				class:animate-spin={loading}
 			>
 				<svg class="h-3 w-3 bg-white text-green-600" fill="currentColor" viewBox="0 0 12 12">
 					<path

src/lib/components/common.ts

@@ -19,7 +19,7 @@ export const staticDeployments = [
 	'astro',
 	'eleventy'
 ];
-export const notNodeDeployments = ['php', 'docker', 'rust'];
+export const notNodeDeployments = ['php', 'docker', 'rust', 'python'];
 
 export function getDomain(domain) {
 	return domain?.replace('https://', '').replace('http://', '');
@@ -37,3 +37,148 @@ export function dashify(str: string, options?: any): string {
 		.replace(/-{2,}/g, (m) => (options && options.condense ? '-' : m))
 		.toLowerCase();
 }
+
+export function changeQueryParams(buildId) {
+	const queryParams = new URLSearchParams(window.location.search);
+	queryParams.set('buildId', buildId);
+	return history.pushState(null, null, '?' + queryParams.toString());
+}
+
+export const supportedDatabaseTypesAndVersions = [
+	{
+		name: 'mongodb',
+		fancyName: 'MongoDB',
+		baseImage: 'bitnami/mongodb',
+		versions: ['5.0', '4.4', '4.2']
+	},
+	{ name: 'mysql', fancyName: 'MySQL', baseImage: 'bitnami/mysql', versions: ['8.0', '5.7'] },
+	{
+		name: 'postgresql',
+		fancyName: 'PostgreSQL',
+		baseImage: 'bitnami/postgresql',
+		versions: ['14.2.0', '13.6.0', '12.10.0	', '11.15.0', '10.20.0']
+	},
+	{
+		name: 'redis',
+		fancyName: 'Redis',
+		baseImage: 'bitnami/redis',
+		versions: ['6.2', '6.0', '5.0']
+	},
+	{ name: 'couchdb', fancyName: 'CouchDB', baseImage: 'bitnami/couchdb', versions: ['3.2.1'] }
+];
+export const supportedServiceTypesAndVersions = [
+	{
+		name: 'plausibleanalytics',
+		fancyName: 'Plausible Analytics',
+		baseImage: 'plausible/analytics',
+		images: ['bitnami/postgresql:13.2.0', 'yandex/clickhouse-server:21.3.2.5'],
+		versions: ['latest', 'stable'],
+		recommendedVersion: 'stable',
+		ports: {
+			main: 8000
+		}
+	},
+	{
+		name: 'nocodb',
+		fancyName: 'NocoDB',
+		baseImage: 'nocodb/nocodb',
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 8080
+		}
+	},
+	{
+		name: 'minio',
+		fancyName: 'MinIO',
+		baseImage: 'minio/minio',
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 9001
+		}
+	},
+	{
+		name: 'vscodeserver',
+		fancyName: 'VSCode Server',
+		baseImage: 'codercom/code-server',
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 8080
+		}
+	},
+	{
+		name: 'wordpress',
+		fancyName: 'Wordpress',
+		baseImage: 'wordpress',
+		images: ['bitnami/mysql:5.7'],
+		versions: ['latest', 'php8.1', 'php8.0', 'php7.4', 'php7.3'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 80
+		}
+	},
+	{
+		name: 'vaultwarden',
+		fancyName: 'Vaultwarden',
+		baseImage: 'vaultwarden/server',
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 80
+		}
+	},
+	{
+		name: 'languagetool',
+		fancyName: 'LanguageTool',
+		baseImage: 'silviof/docker-languagetool',
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 8010
+		}
+	},
+	{
+		name: 'n8n',
+		fancyName: 'n8n',
+		baseImage: 'n8nio/n8n',
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 5678
+		}
+	},
+	{
+		name: 'uptimekuma',
+		fancyName: 'Uptime Kuma',
+		baseImage: 'louislam/uptime-kuma',
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 3001
+		}
+	},
+	{
+		name: 'ghost',
+		fancyName: 'Ghost',
+		baseImage: 'bitnami/ghost',
+		images: ['bitnami/mariadb'],
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 2368
+		}
+	},
+	{
+		name: 'meilisearch',
+		fancyName: 'Meilisearch',
+		baseImage: 'getmeili/meilisearch',
+		images: [],
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 7700
+		}
+	}
+];

src/lib/components/svg/services/MeiliSearch.svelte

@@ -0,0 +1,45 @@
+<script lang="ts">
+	export let isAbsolute = false;
+</script>
+
+<svg
+	viewBox="0 0 127 74"
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	xmlns="http://www.w3.org/2000/svg"
+	><path
+		d="M.825 73.993l23.244-59.47A21.85 21.85 0 0144.42.625h14.014L35.19 60.096a21.85 21.85 0 01-20.352 13.897H.825z"
+		fill="url(#meilisearch_logo_svg__paint0_linear_0_6)"
+	/><path
+		d="M34.925 73.993l23.243-59.47A21.85 21.85 0 0178.52.626h14.013L69.29 60.096a21.85 21.85 0 01-20.351 13.897H34.925z"
+		fill="url(#meilisearch_logo_svg__paint1_linear_0_6)"
+	/><path
+		d="M69.026 73.993l23.244-59.47A21.85 21.85 0 01112.621.626h14.014l-23.244 59.47a21.851 21.851 0 01-20.352 13.897H69.026z"
+		fill="url(#meilisearch_logo_svg__paint2_linear_0_6)"
+	/><defs
+		><linearGradient
+			id="meilisearch_logo_svg__paint0_linear_0_6"
+			x1="126.635"
+			y1="-4.978"
+			x2="0.825"
+			y2="66.098"
+			gradientUnits="userSpaceOnUse"
+			><stop stop-color="#FF5CAA" /><stop offset="1" stop-color="#FF4E62" /></linearGradient
+		><linearGradient
+			id="meilisearch_logo_svg__paint1_linear_0_6"
+			x1="126.635"
+			y1="-4.978"
+			x2="0.825"
+			y2="66.098"
+			gradientUnits="userSpaceOnUse"
+			><stop stop-color="#FF5CAA" /><stop offset="1" stop-color="#FF4E62" /></linearGradient
+		><linearGradient
+			id="meilisearch_logo_svg__paint2_linear_0_6"
+			x1="126.635"
+			y1="-4.978"
+			x2="0.825"
+			y2="66.098"
+			gradientUnits="userSpaceOnUse"
+			><stop stop-color="#FF5CAA" /><stop offset="1" stop-color="#FF4E62" /></linearGradient
+		></defs
+	></svg
+>

src/lib/components/templates.ts

@@ -146,6 +146,13 @@ export function findBuildPack(pack, packageManager = 'npm') {
 			port: 80
 		};
 	}
+	if (pack === 'python') {
+		return {
+			...metaData,
+			startCommand: null,
+			port: 8000
+		};
+	}
 	return {
 		name: 'node',
 		fancyName: 'Node.js',
@@ -249,9 +256,18 @@ export const buildPacks = [
 		fancyName: 'Rust',
 		hoverColor: 'hover:bg-pink-700',
 		color: 'bg-pink-700'
+	},
+	{
+		name: 'python',
+		fancyName: 'Python',
+		hoverColor: 'hover:bg-green-700',
+		color: 'bg-green-700'
 	}
 ];
 export const scanningTemplates = {
+	'@sveltejs/kit': {
+		buildPack: 'nodejs'
+	},
 	astro: {
 		buildPack: 'astro'
 	},

src/lib/crypto.ts

@@ -1,13 +1,13 @@
 import crypto from 'crypto';
 const algorithm = 'aes-256-ctr';
 
-export const base64Encode = (text: string) => {
+export const base64Encode = (text: string): string => {
 	return Buffer.from(text).toString('base64');
 };
-export const base64Decode = (text: string) => {
+export const base64Decode = (text: string): string => {
 	return Buffer.from(text, 'base64').toString('ascii');
 };
-export const encrypt = (text: string) => {
+export const encrypt = (text: string): string => {
 	if (text) {
 		const iv = crypto.randomBytes(16);
 		const cipher = crypto.createCipheriv(algorithm, process.env['COOLIFY_SECRET_KEY'], iv);
@@ -19,7 +19,7 @@ export const encrypt = (text: string) => {
 	}
 };
 
-export const decrypt = (hashString: string) => {
+export const decrypt = (hashString: string): string => {
 	if (hashString) {
 		const hash: Hash = JSON.parse(hashString);
 		const decipher = crypto.createDecipheriv(

src/lib/database/applications.ts

@@ -1,14 +1,35 @@
 import { decrypt, encrypt } from '$lib/crypto';
 import { asyncExecShell, getEngine } from '$lib/common';
 
-import { getDomain, removeDestinationDocker } from '$lib/common';
+import { removeDestinationDocker } from '$lib/common';
 import { prisma } from './common';
 
-export async function listApplications(teamId) {
+import type {
-	return await prisma.application.findMany({ where: { teams: { some: { id: teamId } } } });
+	DestinationDocker,
+	GitSource,
+	Secret,
+	ApplicationSettings,
+	Application,
+	ApplicationPersistentStorage
+} from '@prisma/client';
+
+export async function listApplications(teamId: string): Promise<Application[]> {
+	if (teamId === '0') {
+		return await prisma.application.findMany({ include: { teams: true } });
+	}
+	return await prisma.application.findMany({
+		where: { teams: { some: { id: teamId } } },
+		include: { teams: true }
+	});
 }
 
-export async function newApplication({ name, teamId }) {
+export async function newApplication({
+	name,
+	teamId
+}: {
+	name: string;
+	teamId: string;
+}): Promise<Application> {
 	return await prisma.application.create({
 		data: {
 			name,
@@ -18,34 +39,17 @@ export async function newApplication({ name, teamId }) {
 	});
 }
 
-export async function importApplication({
+export async function removeApplication({
-	name,
+	id,
-	teamId,
+	teamId
-	fqdn,
+}: {
-	port,
+	id: string;
-	buildCommand,
+	teamId: string;
-	startCommand,
+}): Promise<void> {
-	installCommand
+	const { destinationDockerId, destinationDocker } = await prisma.application.findUnique({
-}) {
-	return await prisma.application.create({
-		data: {
-			name,
-			fqdn,
-			port,
-			buildCommand,
-			startCommand,
-			installCommand,
-			teams: { connect: { id: teamId } }
-		}
-	});
-}
-
-export async function removeApplication({ id, teamId }) {
-	const { fqdn, destinationDockerId, destinationDocker } = await prisma.application.findUnique({
 		where: { id },
 		include: { destinationDocker: true }
 	});
-	const domain = getDomain(fqdn);
 	if (destinationDockerId) {
 		const host = getEngine(destinationDocker.engine);
 		const { stdout: containers } = await asyncExecShell(
@@ -56,7 +60,6 @@ export async function removeApplication({ id, teamId }) {
 			for (const container of containersArray) {
 				const containerObj = JSON.parse(container);
 				const id = containerObj.ID;
-				const preview = containerObj.Image.split('-')[1];
 				await removeDestinationDocker({ id, engine: destinationDocker.engine });
 			}
 		}
@@ -67,12 +70,30 @@ export async function removeApplication({ id, teamId }) {
 	await prisma.build.deleteMany({ where: { applicationId: id } });
 	await prisma.secret.deleteMany({ where: { applicationId: id } });
 	await prisma.applicationPersistentStorage.deleteMany({ where: { applicationId: id } });
-	await prisma.application.deleteMany({ where: { id, teams: { some: { id: teamId } } } });
+	if (teamId === '0') {
+		await prisma.application.deleteMany({ where: { id } });
+	} else {
+		await prisma.application.deleteMany({ where: { id, teams: { some: { id: teamId } } } });
+	}
 }
 
-export async function getApplicationWebhook({ projectId, branch }) {
+export async function getApplicationWebhook({
+	projectId,
+	branch
+}: {
+	projectId: number;
+	branch: string;
+}): Promise<
+	Application & {
+		destinationDocker: DestinationDocker;
+		settings: ApplicationSettings;
+		gitSource: GitSource;
+		secrets: Secret[];
+		persistentStorage: ApplicationPersistentStorage[];
+	}
+> {
 	try {
-		let application = await prisma.application.findFirst({
+		const application = await prisma.application.findFirst({
 			where: { projectId, branch, settings: { autodeploy: true } },
 			include: {
 				destinationDocker: true,
@@ -121,25 +142,40 @@ export async function getApplicationWebhook({ projectId, branch }) {
 		throw { status: 404, body: { message: e.message } };
 	}
 }
-export async function getApplicationById({ id }) {
-	const body = await prisma.application.findFirst({
-		where: { id },
-		include: { destinationDocker: true }
-	});
 
-	return { ...body };
+export async function getApplication({ id, teamId }: { id: string; teamId: string }): Promise<
-}
+	Application & {
-export async function getApplication({ id, teamId }) {
+		destinationDocker: DestinationDocker;
-	let body = await prisma.application.findFirst({
+		settings: ApplicationSettings;
-		where: { id, teams: { some: { id: teamId } } },
+		gitSource: GitSource;
-		include: {
+		secrets: Secret[];
-			destinationDocker: true,
+		persistentStorage: ApplicationPersistentStorage[];
-			settings: true,
+	}
-			gitSource: { include: { githubApp: true, gitlabApp: true } },
+> {
-			secrets: true,
+	let body;
-			persistentStorage: true
+	if (teamId === '0') {
-		}
+		body = await prisma.application.findFirst({
-	});
+			where: { id },
+			include: {
+				destinationDocker: true,
+				settings: true,
+				gitSource: { include: { githubApp: true, gitlabApp: true } },
+				secrets: true,
+				persistentStorage: true
+			}
+		});
+	} else {
+		body = await prisma.application.findFirst({
+			where: { id, teams: { some: { id: teamId } } },
+			include: {
+				destinationDocker: true,
+				settings: true,
+				gitSource: { include: { githubApp: true, gitlabApp: true } },
+				secrets: true,
+				persistentStorage: true
+			}
+		});
+	}
 
 	if (body?.gitSource?.githubApp?.clientSecret) {
 		body.gitSource.githubApp.clientSecret = decrypt(body.gitSource.githubApp.clientSecret);
@@ -170,7 +206,14 @@ export async function configureGitRepository({
 	projectId,
 	webhookToken,
 	autodeploy
-}) {
+}: {
+	id: string;
+	repository: string;
+	branch: string;
+	projectId: number;
+	webhookToken: string;
+	autodeploy: boolean;
+}): Promise<void> {
 	if (webhookToken) {
 		const encryptedWebhookToken = encrypt(webhookToken);
 		await prisma.application.update({
@@ -200,7 +243,10 @@ export async function configureGitRepository({
 	}
 }
 
-export async function configureBuildPack({ id, buildPack }) {
+export async function configureBuildPack({
+	id,
+	buildPack
+}: Pick<Application, 'id' | 'buildPack'>): Promise<Application> {
 	return await prisma.application.update({ where: { id }, data: { buildPack } });
 }
 
@@ -214,11 +260,29 @@ export async function configureApplication({
 	buildCommand,
 	startCommand,
 	baseDirectory,
-	publishDirectory
+	publishDirectory,
-}) {
+	pythonWSGI,
+	pythonModule,
+	pythonVariable
+}: {
+	id: string;
+	buildPack: string;
+	name: string;
+	fqdn: string;
+	port: number;
+	installCommand: string;
+	buildCommand: string;
+	startCommand: string;
+	baseDirectory: string;
+	publishDirectory: string;
+	pythonWSGI: string;
+	pythonModule: string;
+	pythonVariable: string;
+}): Promise<Application> {
 	return await prisma.application.update({
 		where: { id },
 		data: {
+			name,
 			buildPack,
 			fqdn,
 			port,
@@ -227,16 +291,31 @@ export async function configureApplication({
 			startCommand,
 			baseDirectory,
 			publishDirectory,
-			name
+			pythonWSGI,
+			pythonModule,
+			pythonVariable
 		}
 	});
 }
 
-export async function checkDoubleBranch(branch, projectId) {
+export async function checkDoubleBranch(branch: string, projectId: number): Promise<boolean> {
 	const applications = await prisma.application.findMany({ where: { branch, projectId } });
 	return applications.length > 1;
 }
-export async function setApplicationSettings({ id, debug, previews, dualCerts, autodeploy }) {
+
+export async function setApplicationSettings({
+	id,
+	debug,
+	previews,
+	dualCerts,
+	autodeploy
+}: {
+	id: string;
+	debug: boolean;
+	previews: boolean;
+	dualCerts: boolean;
+	autodeploy: boolean;
+}): Promise<Application & { destinationDocker: DestinationDocker }> {
 	return await prisma.application.update({
 		where: { id },
 		data: { settings: { update: { debug, previews, dualCerts, autodeploy } } },
@@ -244,29 +323,6 @@ export async function setApplicationSettings({ id, debug, previews, dualCerts, a
 	});
 }
 
-export async function createBuild({
+export async function getPersistentStorage(id: string): Promise<ApplicationPersistentStorage[]> {
-	id,
-	applicationId,
-	destinationDockerId,
-	gitSourceId,
-	githubAppId,
-	gitlabAppId,
-	type
-}) {
-	return await prisma.build.create({
-		data: {
-			id,
-			applicationId,
-			destinationDockerId,
-			gitSourceId,
-			githubAppId,
-			gitlabAppId,
-			status: 'running',
-			type
-		}
-	});
-}
-
-export async function getPersistentStorage(id) {
 	return await prisma.applicationPersistentStorage.findMany({ where: { applicationId: id } });
 }

src/lib/database/checks.ts

@@ -1,7 +1,16 @@
 import { getDomain } from '$lib/common';
 import { prisma } from './common';
+import type { Application, ServiceSecret, DestinationDocker, Secret } from '@prisma/client';
 
-export async function isBranchAlreadyUsed({ repository, branch, id }) {
+export async function isBranchAlreadyUsed({
+	repository,
+	branch,
+	id
+}: {
+	id: string;
+	repository: string;
+	branch: string;
+}): Promise<Application> {
 	const application = await prisma.application.findUnique({
 		where: { id },
 		include: { gitSource: true }
@@ -11,18 +20,42 @@ export async function isBranchAlreadyUsed({ repository, branch, id }) {
 	});
 }
 
-export async function isDockerNetworkExists({ network }) {
+export async function isDockerNetworkExists({
+	network
+}: {
+	network: string;
+}): Promise<DestinationDocker> {
 	return await prisma.destinationDocker.findFirst({ where: { network } });
 }
 
-export async function isServiceSecretExists({ id, name }) {
+export async function isServiceSecretExists({
+	id,
+	name
+}: {
+	id: string;
+	name: string;
+}): Promise<ServiceSecret> {
 	return await prisma.serviceSecret.findFirst({ where: { name, serviceId: id } });
 }
-export async function isSecretExists({ id, name, isPRMRSecret }) {
+export async function isSecretExists({
+	id,
+	name,
+	isPRMRSecret
+}: {
+	id: string;
+	name: string;
+	isPRMRSecret: boolean;
+}): Promise<Secret> {
 	return await prisma.secret.findFirst({ where: { name, applicationId: id, isPRMRSecret } });
 }
 
-export async function isDomainConfigured({ id, fqdn }) {
+export async function isDomainConfigured({
+	id,
+	fqdn
+}: {
+	id: string;
+	fqdn: string;
+}): Promise<boolean> {
 	const domain = getDomain(fqdn);
 	const nakedDomain = domain.replace('www.', '');
 	const foundApp = await prisma.application.findFirst({
@@ -55,6 +88,5 @@ export async function isDomainConfigured({ id, fqdn }) {
 		},
 		select: { fqdn: true }
 	});
-	if (foundApp || foundService || coolifyFqdn) return true;
+	return !!(foundApp || foundService || coolifyFqdn);
-	return false;
 }

src/lib/database/common.ts

@@ -1,12 +1,16 @@
 import { dev } from '$app/env';
 import { sentry } from '$lib/common';
+import {
+	supportedDatabaseTypesAndVersions,
+	supportedServiceTypesAndVersions
+} from '$lib/components/common';
 import * as Prisma from '@prisma/client';
 import { default as ProdPrisma } from '@prisma/client';
-import type { PrismaClientOptions } from '@prisma/client/runtime';
+import type { Database, DatabaseSettings } from '@prisma/client';
 import generator from 'generate-password';
 import forge from 'node-forge';
 
-export function generatePassword(length = 24) {
+export function generatePassword(length = 24): string {
 	return generator.generate({
 		length,
 		numbers: true,
@@ -26,8 +30,14 @@ export const prisma = new PrismaClient({
 	rejectOnNotFound: false
 });
 
-export function ErrorHandler(e) {
+export function ErrorHandler(e: {
-	if (e! instanceof Error) {
+	stdout?;
+	message?: string;
+	status?: number;
+	name?: string;
+	error?: string;
+}): { status: number; body: { message: string; error: string } } {
+	if (e && e instanceof Error) {
 		e = new Error(e.toString());
 	}
 	let truncatedError = e;
@@ -35,8 +45,7 @@ export function ErrorHandler(e) {
 		truncatedError = e.stdout;
 	}
 	if (e.message?.includes('docker run')) {
-		let truncatedArray = [];
+		const truncatedArray: string[] = truncatedError.message.split('-').filter((line) => {
-		truncatedArray = truncatedError.message.split('-').filter((line) => {
 			if (!line.startsWith('e ')) {
 				return line;
 			}
@@ -46,7 +55,9 @@ export function ErrorHandler(e) {
 	if (e.message?.includes('git clone')) {
 		truncatedError.message = 'git clone failed';
 	}
-	sentry.captureException(truncatedError);
+	if (!e.message?.includes('Coolify Proxy is not running')) {
+		sentry.captureException(truncatedError);
+	}
 	const payload = {
 		status: truncatedError.status || 500,
 		body: {
@@ -62,11 +73,11 @@ export function ErrorHandler(e) {
 			payload.body.message = 'Already exists. Choose another name.';
 		}
 	}
-	// console.error(e)
 	return payload;
 }
+
 export async function generateSshKeyPair(): Promise<{ publicKey: string; privateKey: string }> {
-	return await new Promise(async (resolve, reject) => {
+	return await new Promise((resolve, reject) => {
 		forge.pki.rsa.generateKeyPair({ bits: 4096, workers: -1 }, function (err, keys) {
 			if (keys) {
 				resolve({
@@ -80,153 +91,93 @@ export async function generateSshKeyPair(): Promise<{ publicKey: string; private
 	});
 }
 
-export const supportedDatabaseTypesAndVersions = [
+export function getVersions(type: string): string[] {
-	{
-		name: 'mongodb',
-		fancyName: 'MongoDB',
-		baseImage: 'bitnami/mongodb',
-		versions: ['5.0.5', '4.4.11', '4.2.18', '4.0.27']
-	},
-	{ name: 'mysql', fancyName: 'MySQL', baseImage: 'bitnami/mysql', versions: ['8.0.27', '5.7.36'] },
-	{
-		name: 'postgresql',
-		fancyName: 'PostgreSQL',
-		baseImage: 'bitnami/postgresql',
-		versions: ['14.1.0', '13.5.0', '12.9.0', '11.14.0', '10.19.0', '9.6.24']
-	},
-	{
-		name: 'redis',
-		fancyName: 'Redis',
-		baseImage: 'bitnami/redis',
-		versions: ['6.2.6', '6.0.16', '5.0.14']
-	},
-	{ name: 'couchdb', fancyName: 'CouchDB', baseImage: 'bitnami/couchdb', versions: ['3.2.1'] }
-];
-export const supportedServiceTypesAndVersions = [
-	{
-		name: 'plausibleanalytics',
-		fancyName: 'Plausible Analytics',
-		baseImage: 'plausible/analytics',
-		images: ['bitnami/postgresql:13.2.0', 'yandex/clickhouse-server:21.3.2.5'],
-		versions: ['latest'],
-		ports: {
-			main: 8000
-		}
-	},
-	{
-		name: 'nocodb',
-		fancyName: 'NocoDB',
-		baseImage: 'nocodb/nocodb',
-		versions: ['latest'],
-		ports: {
-			main: 8080
-		}
-	},
-	{
-		name: 'minio',
-		fancyName: 'MinIO',
-		baseImage: 'minio/minio',
-		versions: ['latest'],
-		ports: {
-			main: 9001
-		}
-	},
-	{
-		name: 'vscodeserver',
-		fancyName: 'VSCode Server',
-		baseImage: 'codercom/code-server',
-		versions: ['latest'],
-		ports: {
-			main: 8080
-		}
-	},
-	{
-		name: 'wordpress',
-		fancyName: 'Wordpress',
-		baseImage: 'wordpress',
-		images: ['bitnami/mysql:5.7'],
-		versions: ['latest', 'php8.1', 'php8.0', 'php7.4', 'php7.3'],
-		ports: {
-			main: 80
-		}
-	},
-	{
-		name: 'vaultwarden',
-		fancyName: 'Vaultwarden',
-		baseImage: 'vaultwarden/server',
-		versions: ['latest'],
-		ports: {
-			main: 80
-		}
-	},
-	{
-		name: 'languagetool',
-		fancyName: 'LanguageTool',
-		baseImage: 'silviof/docker-languagetool',
-		versions: ['latest'],
-		ports: {
-			main: 8010
-		}
-	},
-	{
-		name: 'n8n',
-		fancyName: 'n8n',
-		baseImage: 'n8nio/n8n',
-		versions: ['latest'],
-		ports: {
-			main: 5678
-		}
-	},
-	{
-		name: 'uptimekuma',
-		fancyName: 'Uptime Kuma',
-		baseImage: 'louislam/uptime-kuma',
-		versions: ['latest'],
-		ports: {
-			main: 3001
-		}
-	},
-	{
-		name: 'ghost',
-		fancyName: 'Ghost',
-		baseImage: 'bitnami/ghost',
-		images: ['bitnami/mariadb'],
-		versions: ['latest'],
-		ports: {
-			main: 2368
-		}
-	}
-];
-
-export function getVersions(type) {
 	const found = supportedDatabaseTypesAndVersions.find((t) => t.name === type);
 	if (found) {
 		return found.versions;
 	}
 	return [];
 }
-export function getDatabaseImage(type) {
+
+export function getDatabaseImage(type: string): string {
 	const found = supportedDatabaseTypesAndVersions.find((t) => t.name === type);
 	if (found) {
 		return found.baseImage;
 	}
 	return '';
 }
-export function getServiceImage(type) {
+
+export function getServiceImage(type: string): string {
 	const found = supportedServiceTypesAndVersions.find((t) => t.name === type);
 	if (found) {
 		return found.baseImage;
 	}
 	return '';
 }
-export function getServiceImages(type) {
+
+export function getServiceImages(type: string): string[] {
 	const found = supportedServiceTypesAndVersions.find((t) => t.name === type);
 	if (found) {
 		return found.images;
 	}
 	return [];
 }
-export function generateDatabaseConfiguration(database) {
+
+export function generateDatabaseConfiguration(database: Database & { settings: DatabaseSettings }):
+	| {
+			volume: string;
+			image: string;
+			ulimits: Record<string, unknown>;
+			privatePort: number;
+			environmentVariables: {
+				MYSQL_DATABASE: string;
+				MYSQL_PASSWORD: string;
+				MYSQL_ROOT_USER: string;
+				MYSQL_USER: string;
+				MYSQL_ROOT_PASSWORD: string;
+			};
+	  }
+	| {
+			volume: string;
+			image: string;
+			ulimits: Record<string, unknown>;
+			privatePort: number;
+			environmentVariables: {
+				MONGODB_ROOT_USER: string;
+				MONGODB_ROOT_PASSWORD: string;
+			};
+	  }
+	| {
+			volume: string;
+			image: string;
+			ulimits: Record<string, unknown>;
+			privatePort: number;
+			environmentVariables: {
+				POSTGRESQL_USERNAME: string;
+				POSTGRESQL_PASSWORD: string;
+				POSTGRESQL_DATABASE: string;
+			};
+	  }
+	| {
+			volume: string;
+			image: string;
+			ulimits: Record<string, unknown>;
+			privatePort: number;
+			environmentVariables: {
+				REDIS_AOF_ENABLED: string;
+				REDIS_PASSWORD: string;
+			};
+	  }
+	| {
+			volume: string;
+			image: string;
+			ulimits: Record<string, unknown>;
+			privatePort: number;
+			environmentVariables: {
+				COUCHDB_PASSWORD: string;
+				COUCHDB_USER: string;
+			};
+	  } {
 	const {
 		id,
 		dbUser,
@@ -241,7 +192,6 @@ export function generateDatabaseConfiguration(database) {
 	const baseImage = getDatabaseImage(type);
 	if (type === 'mysql') {
 		return {
-			// url: `mysql://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 3306}/${defaultDatabase}`,
 			privatePort: 3306,
 			environmentVariables: {
 				MYSQL_USER: dbUser,
@@ -256,7 +206,6 @@ export function generateDatabaseConfiguration(database) {
 		};
 	} else if (type === 'mongodb') {
 		return {
-			// url: `mongodb://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 27017}/${defaultDatabase}`,
 			privatePort: 27017,
 			environmentVariables: {
 				MONGODB_ROOT_USER: rootUser,
@@ -268,9 +217,9 @@ export function generateDatabaseConfiguration(database) {
 		};
 	} else if (type === 'postgresql') {
 		return {
-			// url: `psql://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 5432}/${defaultDatabase}`,
 			privatePort: 5432,
 			environmentVariables: {
+				POSTGRESQL_POSTGRES_PASSWORD: rootUserPassword,
 				POSTGRESQL_PASSWORD: dbUserPassword,
 				POSTGRESQL_USERNAME: dbUser,
 				POSTGRESQL_DATABASE: defaultDatabase
@@ -281,7 +230,6 @@ export function generateDatabaseConfiguration(database) {
 		};
 	} else if (type === 'redis') {
 		return {
-			// url: `redis://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 6379}/${defaultDatabase}`,
 			privatePort: 6379,
 			environmentVariables: {
 				REDIS_PASSWORD: dbUserPassword,
@@ -293,7 +241,6 @@ export function generateDatabaseConfiguration(database) {
 		};
 	} else if (type === 'couchdb') {
 		return {
-			// url: `couchdb://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 5984}/${defaultDatabase}`,
 			privatePort: 5984,
 			environmentVariables: {
 				COUCHDB_PASSWORD: dbUserPassword,
@@ -304,18 +251,4 @@ export function generateDatabaseConfiguration(database) {
 			ulimits: {}
 		};
 	}
-	// } else if (type === 'clickhouse') {
-	//     return {
-	//         url: `clickhouse://${dbUser}:${dbUserPassword}@${id}:${port}/${defaultDatabase}`,
-	//         privatePort: 9000,
-	//         image: `bitnami/clickhouse-server:${version}`,
-	//         volume: `${id}-${type}-data:/var/lib/clickhouse`,
-	//         ulimits: {
-	// 			nofile: {
-	// 				soft: 262144,
-	// 				hard: 262144
-	// 			}
-	// 		}
-	//     }
-	// }
 }

src/lib/database/databases.ts

@@ -1,15 +1,28 @@
 import { decrypt, encrypt } from '$lib/crypto';
-import * as db from '$lib/database';
 import cuid from 'cuid';
 import { generatePassword } from '.';
-import { prisma, ErrorHandler } from './common';
+import { prisma } from './common';
-import getPort, { portNumbers } from 'get-port';
 import { asyncExecShell, getEngine, removeContainer } from '$lib/common';
+import type { Database, DatabaseSettings, DestinationDocker } from '@prisma/client';
 
-export async function listDatabases(teamId) {
+export async function listDatabases(teamId: string): Promise<Database[]> {
-	return await prisma.database.findMany({ where: { teams: { some: { id: teamId } } } });
+	if (teamId === '0') {
+		return await prisma.database.findMany({ include: { teams: true } });
+	} else {
+		return await prisma.database.findMany({
+			where: { teams: { some: { id: teamId } } },
+			include: { teams: true }
+		});
+	}
 }
-export async function newDatabase({ name, teamId }) {
+
+export async function newDatabase({
+	name,
+	teamId
+}: {
+	name: string;
+	teamId: string;
+}): Promise<Database> {
 	const dbUser = cuid();
 	const dbUserPassword = encrypt(generatePassword());
 	const rootUser = cuid();
@@ -30,25 +43,44 @@ export async function newDatabase({ name, teamId }) {
 	});
 }
 
-export async function getDatabase({ id, teamId }) {
+export async function getDatabase({
-	const body = await prisma.database.findFirst({
+	id,
-		where: { id, teams: { some: { id: teamId } } },
+	teamId
-		include: { destinationDocker: true, settings: true }
+}: {
-	});
+	id: string;
-
+	teamId: string;
+}): Promise<Database & { destinationDocker: DestinationDocker; settings: DatabaseSettings }> {
+	let body;
+	if (teamId === '0') {
+		body = await prisma.database.findFirst({
+			where: { id },
+			include: { destinationDocker: true, settings: true }
+		});
+	} else {
+		body = await prisma.database.findFirst({
+			where: { id, teams: { some: { id: teamId } } },
+			include: { destinationDocker: true, settings: true }
+		});
+	}
 	if (body.dbUserPassword) body.dbUserPassword = decrypt(body.dbUserPassword);
 	if (body.rootUserPassword) body.rootUserPassword = decrypt(body.rootUserPassword);
 
-	return { ...body };
+	return body;
 }
 
-export async function removeDatabase({ id }) {
+export async function removeDatabase({ id }: { id: string }): Promise<void> {
 	await prisma.databaseSettings.deleteMany({ where: { databaseId: id } });
 	await prisma.database.delete({ where: { id } });
 	return;
 }
 
-export async function configureDatabaseType({ id, type }) {
+export async function configureDatabaseType({
+	id,
+	type
+}: {
+	id: string;
+	type: string;
+}): Promise<Database> {
 	return await prisma.database.update({
 		where: { id },
 		data: { type }
@@ -64,7 +96,7 @@ export async function setDatabase({
 	version?: string;
 	isPublic?: boolean;
 	appendOnly?: boolean;
-}) {
+}): Promise<Database> {
 	return await prisma.database.update({
 		where: { id },
 		data: {
@@ -82,7 +114,16 @@ export async function updateDatabase({
 	rootUser,
 	rootUserPassword,
 	version
-}) {
+}: {
+	id: string;
+	name: string;
+	defaultDatabase: string;
+	dbUser: string;
+	dbUserPassword: string;
+	rootUser: string;
+	rootUserPassword: string;
+	version: string;
+}): Promise<Database> {
 	const encryptedDbUserPassword = dbUserPassword && encrypt(dbUserPassword);
 	const encryptedRootUserPassword = rootUserPassword && encrypt(rootUserPassword);
 	return await prisma.database.update({
@@ -99,7 +140,9 @@ export async function updateDatabase({
 	});
 }
 
-export async function stopDatabase(database) {
+export async function stopDatabase(
+	database: Database & { destinationDocker: DestinationDocker }
+): Promise<boolean> {
 	let everStarted = false;
 	const {
 		id,
@@ -122,3 +165,43 @@ export async function stopDatabase(database) {
 	}
 	return everStarted;
 }
+
+export async function updatePasswordInDb(database, user, newPassword, isRoot) {
+	const {
+		id,
+		type,
+		rootUser,
+		rootUserPassword,
+		dbUser,
+		dbUserPassword,
+		defaultDatabase,
+		destinationDockerId,
+		destinationDocker: { engine }
+	} = database;
+	if (destinationDockerId) {
+		const host = getEngine(engine);
+		if (type === 'mysql') {
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker exec ${id} mysql -u ${rootUser} -p${rootUserPassword} -e \"ALTER USER '${user}'@'%' IDENTIFIED WITH caching_sha2_password BY '${newPassword}';\"`
+			);
+		} else if (type === 'postgresql') {
+			if (isRoot) {
+				await asyncExecShell(
+					`DOCKER_HOST=${host} docker exec ${id} psql postgresql://postgres:${rootUserPassword}@${id}:5432/${defaultDatabase} -c "ALTER role postgres WITH PASSWORD '${newPassword}'"`
+				);
+			} else {
+				await asyncExecShell(
+					`DOCKER_HOST=${host} docker exec ${id} psql postgresql://${dbUser}:${dbUserPassword}@${id}:5432/${defaultDatabase} -c "ALTER role ${user} WITH PASSWORD '${newPassword}'"`
+				);
+			}
+		} else if (type === 'mongodb') {
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker exec ${id} mongo 'mongodb://${rootUser}:${rootUserPassword}@${id}:27017/admin?readPreference=primary&ssl=false' --eval "db.changeUserPassword('${user}','${newPassword}')"`
+			);
+		} else if (type === 'redis') {
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker exec ${id} redis-cli -u redis://${dbUserPassword}@${id}:6379 --raw CONFIG SET requirepass ${newPassword}`
+			);
+		}
+	}
+}

src/lib/database/destinations.ts

@@ -1,27 +1,53 @@
 import { asyncExecShell, getEngine } from '$lib/common';
-import { decrypt, encrypt } from '$lib/crypto';
 import { dockerInstance } from '$lib/docker';
 import { startCoolifyProxy } from '$lib/haproxy';
 import { getDatabaseImage } from '.';
 import { prisma } from './common';
+import type { DestinationDocker, Service, Application, Prisma } from '@prisma/client';
+import type { CreateDockerDestination } from '$lib/types/destinations';
 
-export async function listDestinations(teamId) {
+type DestinationConfigurationObject = {
-	return await prisma.destinationDocker.findMany({ where: { teams: { some: { id: teamId } } } });
+	id: string;
+	destinationId: string;
+};
+
+type FindDestinationFromTeam = {
+	id: string;
+	teamId: string;
+};
+
+export async function listDestinations(teamId: string): Promise<DestinationDocker[]> {
+	if (teamId === '0') {
+		return await prisma.destinationDocker.findMany({ include: { teams: true } });
+	}
+	return await prisma.destinationDocker.findMany({
+		where: { teams: { some: { id: teamId } } },
+		include: { teams: true }
+	});
 }
 
-export async function configureDestinationForService({ id, destinationId }) {
+export async function configureDestinationForService({
+	id,
+	destinationId
+}: DestinationConfigurationObject): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
 		data: { destinationDocker: { connect: { id: destinationId } } }
 	});
 }
-export async function configureDestinationForApplication({ id, destinationId }) {
+export async function configureDestinationForApplication({
+	id,
+	destinationId
+}: DestinationConfigurationObject): Promise<Application> {
 	return await prisma.application.update({
 		where: { id },
 		data: { destinationDocker: { connect: { id: destinationId } } }
 	});
 }
-export async function configureDestinationForDatabase({ id, destinationId }) {
+export async function configureDestinationForDatabase({
+	id,
+	destinationId
+}: DestinationConfigurationObject): Promise<void> {
 	await prisma.database.update({
 		where: { id },
 		data: { destinationDocker: { connect: { id: destinationId } } }
@@ -38,13 +64,16 @@ export async function configureDestinationForDatabase({ id, destinationId }) {
 		const host = getEngine(engine);
 		if (type && version) {
 			const baseImage = getDatabaseImage(type);
-			asyncExecShell(
+			asyncExecShell(`DOCKER_HOST=${host} docker pull ${baseImage}:${version}`);
-				`DOCKER_HOST=${host} docker pull ${baseImage}:${version} && echo "FROM ${baseImage}:${version}" | docker build --label coolify.image="true" -t "${baseImage}:${version}" -`
-			);
 		}
 	}
 }
-export async function updateDestination({ id, name, engine, network }) {
+export async function updateDestination({
+	id,
+	name,
+	engine,
+	network
+}: Pick<DestinationDocker, 'id' | 'name' | 'engine' | 'network'>): Promise<DestinationDocker> {
 	return await prisma.destinationDocker.update({ where: { id }, data: { name, engine, network } });
 }
 
@@ -54,13 +83,8 @@ export async function newRemoteDestination({
 	engine,
 	network,
 	isCoolifyProxyUsed,
-	remoteEngine,
+	remoteEngine
-	ipAddress,
+}: CreateDockerDestination): Promise<string> {
-	user,
-	port,
-	sshPrivateKey
-}) {
-	const encryptedPrivateKey = encrypt(sshPrivateKey);
 	const destination = await prisma.destinationDocker.create({
 		data: {
 			name,
@@ -68,16 +92,18 @@ export async function newRemoteDestination({
 			engine,
 			network,
 			isCoolifyProxyUsed,
-			remoteEngine,
+			remoteEngine
-			ipAddress,
-			user,
-			port,
-			sshPrivateKey: encryptedPrivateKey
 		}
 	});
 	return destination.id;
 }
-export async function newLocalDestination({ name, teamId, engine, network, isCoolifyProxyUsed }) {
+export async function newLocalDestination({
+	name,
+	teamId,
+	engine,
+	network,
+	isCoolifyProxyUsed
+}: CreateDockerDestination): Promise<string> {
 	const host = getEngine(engine);
 	const docker = dockerInstance({ destinationDocker: { engine, network } });
 	const found = await docker.engine.listNetworks({ filters: { name: [`^${network}$`] } });
@@ -95,18 +121,14 @@ export async function newLocalDestination({ name, teamId, engine, network, isCoo
 			(destination) => destination.network !== network && destination.isCoolifyProxyUsed === true
 		);
 		if (proxyConfigured) {
-			if (proxyConfigured.isCoolifyProxyUsed) {
+			isCoolifyProxyUsed = !!proxyConfigured.isCoolifyProxyUsed;
-				isCoolifyProxyUsed = true;
-			} else {
-				isCoolifyProxyUsed = false;
-			}
 		}
 		await prisma.destinationDocker.updateMany({ where: { engine }, data: { isCoolifyProxyUsed } });
 	}
 	if (isCoolifyProxyUsed) await startCoolifyProxy(engine);
 	return destination.id;
 }
-export async function removeDestination({ id }) {
+export async function removeDestination({ id }: Pick<DestinationDocker, 'id'>): Promise<void> {
 	const destination = await prisma.destinationDocker.delete({ where: { id } });
 	if (destination.isCoolifyProxyUsed) {
 		const host = getEngine(destination.engine);
@@ -123,22 +145,39 @@ export async function removeDestination({ id }) {
 	}
 }
 
-export async function getDestination({ id, teamId }) {
+export async function getDestination({
-	let destination = await prisma.destinationDocker.findFirst({
+	id,
-		where: { id, teams: { some: { id: teamId } } }
+	teamId
-	});
+}: FindDestinationFromTeam): Promise<DestinationDocker & { sshPrivateKey?: string }> {
-	if (destination.remoteEngine) {
+	let destination;
-		destination.sshPrivateKey = decrypt(destination.sshPrivateKey);
+	if (teamId === '0') {
+		destination = await prisma.destinationDocker.findFirst({
+			where: { id }
+		});
+	} else {
+		destination = await prisma.destinationDocker.findFirst({
+			where: { id, teams: { some: { id: teamId } } }
+		});
 	}
+
 	return destination;
 }
-export async function getDestinationByApplicationId({ id, teamId }) {
+export async function getDestinationByApplicationId({
+	id,
+	teamId
+}: FindDestinationFromTeam): Promise<DestinationDocker> {
 	return await prisma.destinationDocker.findFirst({
 		where: { application: { some: { id } }, teams: { some: { id: teamId } } }
 	});
 }
 
-export async function setDestinationSettings({ engine, isCoolifyProxyUsed }) {
+export async function setDestinationSettings({
+	engine,
+	isCoolifyProxyUsed
+}: {
+	engine: string;
+	isCoolifyProxyUsed: boolean;
+}): Promise<Prisma.BatchPayload> {
 	return await prisma.destinationDocker.updateMany({
 		where: { engine },
 		data: { isCoolifyProxyUsed }

src/lib/database/gitSources.ts

@@ -1,27 +1,44 @@
 import { decrypt, encrypt } from '$lib/crypto';
 import { prisma } from './common';
+import type { GithubApp, GitlabApp, GitSource, Prisma, Application } from '@prisma/client';
 
-export async function listSources(teamId) {
+export async function listSources(
+	teamId: string | Prisma.StringFilter
+): Promise<(GitSource & { githubApp?: GithubApp; gitlabApp?: GitlabApp })[]> {
+	if (teamId === '0') {
+		return await prisma.gitSource.findMany({
+			include: { githubApp: true, gitlabApp: true, teams: true }
+		});
+	}
 	return await prisma.gitSource.findMany({
 		where: { teams: { some: { id: teamId } } },
-		include: { githubApp: true, gitlabApp: true }
+		include: { githubApp: true, gitlabApp: true, teams: true }
 	});
 }
 
-export async function newSource({ name, teamId, type, htmlUrl, apiUrl, organization }) {
+export async function newSource({
+	name,
+	teamId,
+	type,
+	htmlUrl,
+	apiUrl,
+	organization
+}: {
+	name: string;
+	teamId: string;
+	type: string;
+	htmlUrl: string;
+	apiUrl: string;
+	organization: string;
+}): Promise<GitSource> {
 	return await prisma.gitSource.create({
 		data: {
-			teams: { connect: { id: teamId } },
 			name,
-			type,
+			teams: { connect: { id: teamId } }
-			htmlUrl,
-			apiUrl,
-			organization
 		}
 	});
 }
-export async function removeSource({ id }) {
+export async function removeSource({ id }: { id: string }): Promise<void> {
-	// TODO: Disconnect application with this sourceId! Maybe not needed?
 	const source = await prisma.gitSource.delete({
 		where: { id },
 		include: { githubApp: true, gitlabApp: true }
@@ -30,11 +47,25 @@ export async function removeSource({ id }) {
 	if (source.gitlabAppId) await prisma.gitlabApp.delete({ where: { id: source.gitlabAppId } });
 }
 
-export async function getSource({ id, teamId }) {
+export async function getSource({
-	let body = await prisma.gitSource.findFirst({
+	id,
-		where: { id, teams: { some: { id: teamId } } },
+	teamId
-		include: { githubApp: true, gitlabApp: true }
+}: {
-	});
+	id: string;
+	teamId: string;
+}): Promise<GitSource & { githubApp: GithubApp; gitlabApp: GitlabApp }> {
+	let body;
+	if (teamId === '0') {
+		body = await prisma.gitSource.findFirst({
+			where: { id },
+			include: { githubApp: true, gitlabApp: true }
+		});
+	} else {
+		body = await prisma.gitSource.findFirst({
+			where: { id, teams: { some: { id: teamId } } },
+			include: { githubApp: true, gitlabApp: true }
+		});
+	}
 	if (body?.githubApp?.clientSecret)
 		body.githubApp.clientSecret = decrypt(body.githubApp.clientSecret);
 	if (body?.githubApp?.webhookSecret)
@@ -43,29 +74,62 @@ export async function getSource({ id, teamId }) {
 	if (body?.gitlabApp?.appSecret) body.gitlabApp.appSecret = decrypt(body.gitlabApp.appSecret);
 	return body;
 }
-export async function addSource({ id, appId, teamId, oauthId, groupName, appSecret }) {
+export async function addGitHubSource({ id, teamId, type, name, htmlUrl, apiUrl }) {
+	await prisma.gitSource.update({ where: { id }, data: { type, name, htmlUrl, apiUrl } });
+	return await prisma.githubApp.create({
+		data: {
+			teams: { connect: { id: teamId } },
+			gitSource: { connect: { id } }
+		}
+	});
+}
+export async function addGitLabSource({
+	id,
+	teamId,
+	type,
+	name,
+	htmlUrl,
+	apiUrl,
+	oauthId,
+	appId,
+	appSecret,
+	groupName
+}) {
 	const encrptedAppSecret = encrypt(appSecret);
+	await prisma.gitSource.update({ where: { id }, data: { type, apiUrl, htmlUrl, name } });
 	return await prisma.gitlabApp.create({
 		data: {
 			teams: { connect: { id: teamId } },
 			appId,
 			oauthId,
 			groupName,
-			appSecret: encrptedAppSecret,
+			appSecret: encryptedAppSecret,
 			gitSource: { connect: { id } }
 		}
 	});
 }
 
-export async function configureGitsource({ id, gitSourceId }) {
+export async function configureGitsource({
+	id,
+	gitSourceId
+}: {
+	id: string;
+	gitSourceId: string;
+}): Promise<Application> {
 	return await prisma.application.update({
 		where: { id },
 		data: { gitSource: { connect: { id: gitSourceId } } }
 	});
 }
-export async function updateGitsource({ id, name }) {
+export async function updateGitsource({
+	id,
+	name
+}: {
+	id: string;
+	name: string;
+}): Promise<GitSource> {
 	return await prisma.gitSource.update({
 		where: { id },
-		data: { name }
+		data: { name, htmlUrl, apiUrl }
 	});
 }

src/lib/database/github.ts

@@ -1,7 +1,15 @@
 import { decrypt, encrypt } from '$lib/crypto';
 import { prisma } from './common';
+import type { GithubApp } from '@prisma/client';
 
-export async function addInstallation({ gitSourceId, installation_id }) {
+// TODO: We should change installation_id to be camelCase
+export async function addInstallation({
+	gitSourceId,
+	installation_id
+}: {
+	gitSourceId: string;
+	installation_id: string;
+}): Promise<GithubApp> {
 	const source = await prisma.gitSource.findUnique({
 		where: { id: gitSourceId },
 		include: { githubApp: true }
@@ -12,8 +20,12 @@ export async function addInstallation({ gitSourceId, installation_id }) {
 	});
 }
 
-export async function getUniqueGithubApp({ githubAppId }) {
+export async function getUniqueGithubApp({
-	let body = await prisma.githubApp.findUnique({ where: { id: githubAppId } });
+	githubAppId
+}: {
+	githubAppId: string;
+}): Promise<GithubApp> {
+	const body = await prisma.githubApp.findUnique({ where: { id: githubAppId } });
 	if (body.privateKey) body.privateKey = decrypt(body.privateKey);
 	return body;
 }
@@ -26,7 +38,15 @@ export async function createGithubApp({
 	pem,
 	webhook_secret,
 	state
-}) {
+}: {
+	id: number;
+	client_id: string;
+	slug: string;
+	client_secret: string;
+	pem: string;
+	webhook_secret: string;
+	state: string;
+}): Promise<GithubApp> {
 	const encryptedClientSecret = encrypt(client_secret);
 	const encryptedWebhookSecret = encrypt(webhook_secret);
 	const encryptedPem = encrypt(pem);

src/lib/database/gitlab.ts

@@ -1,7 +1,14 @@
 import { encrypt } from '$lib/crypto';
 import { generateSshKeyPair, prisma } from './common';
+import type { GitlabApp } from '@prisma/client';
 
-export async function updateDeployKey({ id, deployKeyId }) {
+export async function updateDeployKey({
+	id,
+	deployKeyId
+}: {
+	id: string;
+	deployKeyId: number;
+}): Promise<GitlabApp> {
 	const application = await prisma.application.findUnique({
 		where: { id },
 		include: { gitSource: { include: { gitlabApp: true } } }
@@ -11,14 +18,24 @@ export async function updateDeployKey({ id, deployKeyId }) {
 		data: { deployKeyId }
 	});
 }
-export async function getSshKey({ id }) {
+export async function getSshKey({
+	id
+}: {
+	id: string;
+}): Promise<{ status: number; body: { publicKey: string } }> {
 	const application = await prisma.application.findUnique({
 		where: { id },
 		include: { gitSource: { include: { gitlabApp: true } } }
 	});
 	return { status: 200, body: { publicKey: application.gitSource.gitlabApp.publicSshKey } };
 }
-export async function generateSshKey({ id }) {
+export async function generateSshKey({
+	id
+}: {
+	id: string;
+}): Promise<
+	{ status: number; body: { publicKey: string } } | { status: number; body?: undefined }
+> {
 	const application = await prisma.application.findUnique({
 		where: { id },
 		include: { gitSource: { include: { gitlabApp: true } } }

src/lib/database/logs.ts

@@ -1,6 +1,13 @@
+import type { BuildLog } from '@prisma/client';
 import { prisma, ErrorHandler } from './common';
 
-export async function listLogs({ buildId, last = 0 }) {
+export async function listLogs({
+	buildId,
+	last = 0
+}: {
+	buildId: string;
+	last: number;
+}): Promise<BuildLog[] | { status: number; body: { message: string; error: string } }> {
 	try {
 		const body = await prisma.buildLog.findMany({
 			where: { buildId, time: { gt: last } },

src/lib/database/secrets.ts

@@ -1,7 +1,8 @@
 import { encrypt, decrypt } from '$lib/crypto';
 import { prisma } from './common';
+import type { ServiceSecret, Secret, Prisma } from '@prisma/client';
 
-export async function listServiceSecrets(serviceId: string) {
+export async function listServiceSecrets(serviceId: string): Promise<ServiceSecret[]> {
 	let secrets = await prisma.serviceSecret.findMany({
 		where: { serviceId },
 		orderBy: { createdAt: 'desc' }
@@ -14,7 +15,7 @@ export async function listServiceSecrets(serviceId: string) {
 	return secrets;
 }
 
-export async function listSecrets(applicationId: string) {
+export async function listSecrets(applicationId: string): Promise<Secret[]> {
 	let secrets = await prisma.secret.findMany({
 		where: { applicationId },
 		orderBy: { createdAt: 'desc' }
@@ -27,20 +28,48 @@ export async function listSecrets(applicationId: string) {
 	return secrets;
 }
 
-export async function createServiceSecret({ id, name, value }) {
+export async function createServiceSecret({
+	id,
+	name,
+	value
+}: {
+	id: string;
+	name: string;
+	value: string;
+}): Promise<ServiceSecret> {
 	value = encrypt(value);
 	return await prisma.serviceSecret.create({
 		data: { name, value, service: { connect: { id } } }
 	});
 }
-export async function createSecret({ id, name, value, isBuildSecret, isPRMRSecret }) {
+export async function createSecret({
+	id,
+	name,
+	value,
+	isBuildSecret,
+	isPRMRSecret
+}: {
+	id: string;
+	name: string;
+	value: string;
+	isBuildSecret: boolean;
+	isPRMRSecret: boolean;
+}): Promise<Secret> {
 	value = encrypt(value);
 	return await prisma.secret.create({
 		data: { name, value, isBuildSecret, isPRMRSecret, application: { connect: { id } } }
 	});
 }
 
-export async function updateServiceSecret({ id, name, value }) {
+export async function updateServiceSecret({
+	id,
+	name,
+	value
+}: {
+	id: string;
+	name: string;
+	value: string;
+}): Promise<Prisma.BatchPayload | ServiceSecret> {
 	value = encrypt(value);
 	const found = await prisma.serviceSecret.findFirst({ where: { serviceId: id, name } });
 
@@ -55,7 +84,19 @@ export async function updateServiceSecret({ id, name, value }) {
 		});
 	}
 }
-export async function updateSecret({ id, name, value, isBuildSecret, isPRMRSecret }) {
+export async function updateSecret({
+	id,
+	name,
+	value,
+	isBuildSecret,
+	isPRMRSecret
+}: {
+	id: string;
+	name: string;
+	value: string;
+	isBuildSecret: boolean;
+	isPRMRSecret: boolean;
+}): Promise<Prisma.BatchPayload | Secret> {
 	value = encrypt(value);
 	const found = await prisma.secret.findFirst({ where: { applicationId: id, name, isPRMRSecret } });
 
@@ -71,10 +112,22 @@ export async function updateSecret({ id, name, value, isBuildSecret, isPRMRSecre
 	}
 }
 
-export async function removeServiceSecret({ id, name }) {
+export async function removeServiceSecret({
+	id,
+	name
+}: {
+	id: string;
+	name: string;
+}): Promise<Prisma.BatchPayload> {
 	return await prisma.serviceSecret.deleteMany({ where: { serviceId: id, name } });
 }
 
-export async function removeSecret({ id, name }) {
+export async function removeSecret({
+	id,
+	name
+}: {
+	id: string;
+	name: string;
+}): Promise<Prisma.BatchPayload> {
 	return await prisma.secret.deleteMany({ where: { applicationId: id, name } });
 }

src/lib/database/services.ts

@@ -1,30 +1,53 @@
-import { asyncExecShell, getEngine } from '$lib/common';
 import { decrypt, encrypt } from '$lib/crypto';
+import type { Minio, Service } from '@prisma/client';
 import cuid from 'cuid';
 import { generatePassword } from '.';
 import { prisma } from './common';
 
-export async function listServices(teamId) {
+export async function listServices(teamId: string): Promise<Service[]> {
-	return await prisma.service.findMany({ where: { teams: { some: { id: teamId } } } });
+	if (teamId === '0') {
+		return await prisma.service.findMany({ include: { teams: true } });
+	} else {
+		return await prisma.service.findMany({
+			where: { teams: { some: { id: teamId } } },
+			include: { teams: true }
+		});
+	}
 }
 
-export async function newService({ name, teamId }) {
+export async function newService({
+	name,
+	teamId
+}: {
+	name: string;
+	teamId: string;
+}): Promise<Service> {
 	return await prisma.service.create({ data: { name, teams: { connect: { id: teamId } } } });
 }
 
-export async function getService({ id, teamId }) {
+export async function getService({ id, teamId }: { id: string; teamId: string }): Promise<Service> {
-	const body = await prisma.service.findFirst({
+	let body;
-		where: { id, teams: { some: { id: teamId } } },
+	const include = {
-		include: {
+		destinationDocker: true,
-			destinationDocker: true,
+		plausibleAnalytics: true,
-			plausibleAnalytics: true,
+		minio: true,
-			minio: true,
+		vscodeserver: true,
-			vscodeserver: true,
+		wordpress: true,
-			wordpress: true,
+		ghost: true,
-			ghost: true,
+		serviceSecret: true,
-			serviceSecret: true
+		meiliSearch: true
-		}
+	};
-	});
+	if (teamId === '0') {
+		body = await prisma.service.findFirst({
+			where: { id },
+			include
+		});
+	} else {
+		body = await prisma.service.findFirst({
+			where: { id, teams: { some: { id: teamId } } },
+			include
+		});
+	}
 
 	if (body.plausibleAnalytics?.postgresqlPassword)
 		body.plausibleAnalytics.postgresqlPassword = decrypt(
@@ -50,17 +73,29 @@ export async function getService({ id, teamId }) {
 		body.ghost.mariadbRootUserPassword = decrypt(body.ghost.mariadbRootUserPassword);
 	if (body.ghost?.defaultPassword) body.ghost.defaultPassword = decrypt(body.ghost.defaultPassword);
 
+	if (body.meiliSearch?.masterKey) body.meiliSearch.masterKey = decrypt(body.meiliSearch.masterKey);
+
 	if (body?.serviceSecret.length > 0) {
 		body.serviceSecret = body.serviceSecret.map((s) => {
 			s.value = decrypt(s.value);
 			return s;
 		});
 	}
+	if (body.wordpress?.ftpPassword) {
+		body.wordpress.ftpPassword = decrypt(body.wordpress.ftpPassword);
+	}
+	const settings = await prisma.setting.findFirst();
 
-	return { ...body };
+	return { ...body, settings };
 }
 
-export async function configureServiceType({ id, type }) {
+export async function configureServiceType({
+	id,
+	type
+}: {
+	id: string;
+	type: string;
+}): Promise<void> {
 	if (type === 'plausibleanalytics') {
 		const password = encrypt(generatePassword());
 		const postgresqlUser = cuid();
@@ -142,7 +177,7 @@ export async function configureServiceType({ id, type }) {
 			}
 		});
 	} else if (type === 'ghost') {
-		const defaultEmail = `${cuid()}@coolify.io`;
+		const defaultEmail = `${cuid()}@example.com`;
 		const defaultPassword = encrypt(generatePassword());
 		const mariadbUser = cuid();
 		const mariadbPassword = encrypt(generatePassword());
@@ -165,55 +200,169 @@ export async function configureServiceType({ id, type }) {
 				}
 			}
 		});
+	} else if (type === 'meilisearch') {
+		const masterKey = encrypt(generatePassword(32));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				meiliSearch: { create: { masterKey } }
+			}
+		});
 	}
 }
-export async function setServiceVersion({ id, version }) {
+
+export async function setServiceVersion({
+	id,
+	version
+}: {
+	id: string;
+	version: string;
+}): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
 		data: { version }
 	});
 }
 
-export async function setServiceSettings({ id, dualCerts }) {
+export async function setServiceSettings({
+	id,
+	dualCerts
+}: {
+	id: string;
+	dualCerts: boolean;
+}): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
 		data: { dualCerts }
 	});
 }
 
-export async function updatePlausibleAnalyticsService({ id, fqdn, email, username, name }) {
+export async function updatePlausibleAnalyticsService({
+	id,
+	fqdn,
+	email,
+	username,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+	email: string;
+	username: string;
+}): Promise<void> {
 	await prisma.plausibleAnalytics.update({ where: { serviceId: id }, data: { email, username } });
 	await prisma.service.update({ where: { id }, data: { name, fqdn } });
 }
-export async function updateService({ id, fqdn, name }) {
+
+export async function updateService({
+	id,
+	fqdn,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+}): Promise<Service> {
 	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
 }
-export async function updateLanguageToolService({ id, fqdn, name }) {
+
+export async function updateLanguageToolService({
+	id,
+	fqdn,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+}): Promise<Service> {
 	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
 }
-export async function updateVaultWardenService({ id, fqdn, name }) {
+
+export async function updateMeiliSearchService({
+	id,
+	fqdn,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+}): Promise<Service> {
 	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
 }
-export async function updateVsCodeServer({ id, fqdn, name }) {
+
+export async function updateVaultWardenService({
+	id,
+	fqdn,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+}): Promise<Service> {
 	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
 }
-export async function updateWordpress({ id, fqdn, name, mysqlDatabase, extraConfig }) {
+
+export async function updateVsCodeServer({
+	id,
+	fqdn,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+}): Promise<Service> {
+	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
+}
+
+export async function updateWordpress({
+	id,
+	fqdn,
+	name,
+	mysqlDatabase,
+	extraConfig
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+	mysqlDatabase: string;
+	extraConfig: string;
+}): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
 		data: { fqdn, name, wordpress: { update: { mysqlDatabase, extraConfig } } }
 	});
 }
-export async function updateMinioService({ id, publicPort }) {
+
+export async function updateMinioService({
+	id,
+	publicPort
+}: {
+	id: string;
+	publicPort: number;
+}): Promise<Minio> {
 	return await prisma.minio.update({ where: { serviceId: id }, data: { publicPort } });
 }
-export async function updateGhostService({ id, fqdn, name, mariadbDatabase }) {
+
+export async function updateGhostService({
+	id,
+	fqdn,
+	name,
+	mariadbDatabase
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+	mariadbDatabase: string;
+}): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
 		data: { fqdn, name, ghost: { update: { mariadbDatabase } } }
 	});
 }
 
-export async function removeService({ id }) {
+export async function removeService({ id }: { id: string }): Promise<void> {
+	await prisma.meiliSearch.deleteMany({ where: { serviceId: id } });
 	await prisma.ghost.deleteMany({ where: { serviceId: id } });
 	await prisma.plausibleAnalytics.deleteMany({ where: { serviceId: id } });
 	await prisma.minio.deleteMany({ where: { serviceId: id } });

src/lib/database/settings.ts

@@ -1,8 +1,9 @@
 import { decrypt } from '$lib/crypto';
 import { prisma } from './common';
+import type { Setting } from '@prisma/client';
 
-export async function listSettings() {
+export async function listSettings(): Promise<Setting> {
-	let settings = await prisma.setting.findFirst({});
+	const settings = await prisma.setting.findFirst({});
 	if (settings.proxyPassword) settings.proxyPassword = decrypt(settings.proxyPassword);
 	return settings;
 }

src/lib/database/teams.ts

@@ -1,9 +1,10 @@
+import type { Team, Permission } from '@prisma/client';
 import { prisma } from './common';
 
-export async function listTeams() {
+export async function listTeams(): Promise<Team[]> {
 	return await prisma.team.findMany();
 }
-export async function newTeam({ name, userId }) {
+export async function newTeam({ name, userId }: { name: string; userId: string }): Promise<Team> {
 	return await prisma.team.create({
 		data: {
 			name,
@@ -12,7 +13,11 @@ export async function newTeam({ name, userId }) {
 		}
 	});
 }
-export async function getMyTeams({ userId }) {
+export async function getMyTeams({
+	userId
+}: {
+	userId: string;
+}): Promise<(Permission & { team: Team & { _count: { users: number } } })[]> {
 	return await prisma.permission.findMany({
 		where: { userId },
 		include: { team: { include: { _count: { select: { users: true } } } } }

src/lib/database/users.ts

@@ -1,16 +1,30 @@
 import cuid from 'cuid';
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 
 import { prisma } from './common';
 import { asyncExecShell, uniqueName } from '$lib/common';
-
 import * as db from '$lib/database';
 import { startCoolifyProxy } from '$lib/haproxy';
-export async function hashPassword(password: string) {
+import type { User } from '@prisma/client';
+
+export async function hashPassword(password: string): Promise<string> {
 	const saltRounds = 15;
 	return bcrypt.hash(password, saltRounds);
 }
-export async function login({ email, password, isLogin }) {
+
+export async function login({
+	email,
+	password,
+	isLogin
+}: {
+	email: string;
+	password: string;
+	isLogin: boolean;
+}): Promise<{
+	status: number;
+	headers: { 'Set-Cookie': string };
+	body: { userId: string; teamId: string; permission: string; isAdmin: boolean };
+}> {
 	const users = await prisma.user.count();
 	const userFound = await prisma.user.findUnique({
 		where: { email },
@@ -32,26 +46,42 @@ export async function login({ email, password, isLogin }) {
 	if (users === 0) {
 		await prisma.setting.update({ where: { id }, data: { isRegistrationEnabled: false } });
 		// Create default network & start Coolify Proxy
-		asyncExecShell(`docker network create --attachable coolify`)
+		await asyncExecShell(`docker network create --attachable coolify`);
-			.then(() => {
+		await startCoolifyProxy('/var/run/docker.sock');
-				console.log('Network created');
-			})
-			.catch(() => {
-				console.log('Network already exists.');
-			});
-
-		startCoolifyProxy('/var/run/docker.sock')
-			.then(() => {
-				console.log('Coolify Proxy started.');
-			})
-			.catch((err) => {
-				console.log(err);
-			});
 		uid = '0';
 	}
 
 	if (userFound) {
 		if (userFound.type === 'email') {
+			if (userFound.password === 'RESETME') {
+				const hashedPassword = await hashPassword(password);
+				if (userFound.updatedAt < new Date(Date.now() - 1000 * 60 * 10)) {
+					await prisma.user.update({
+						where: { email: userFound.email },
+						data: { password: 'RESETTIMEOUT' }
+					});
+					throw {
+						error: 'Password reset link has expired. Please request a new one.'
+					};
+				} else {
+					await prisma.user.update({
+						where: { email: userFound.email },
+						data: { password: hashedPassword }
+					});
+					return {
+						status: 200,
+						headers: {
+							'Set-Cookie': `teamId=${uid}; HttpOnly; Path=/; Max-Age=15778800;`
+						},
+						body: {
+							userId: userFound.id,
+							teamId: userFound.id,
+							permission: userFound.permission,
+							isAdmin: true
+						}
+					};
+				}
+			}
 			const passwordMatch = await bcrypt.compare(password, userFound.password);
 			if (!passwordMatch) {
 				throw {
@@ -124,6 +154,6 @@ export async function login({ email, password, isLogin }) {
 	};
 }
 
-export async function getUser({ userId }) {
+export async function getUser({ userId }: { userId: string }): Promise<User> {
 	return await prisma.user.findUnique({ where: { id: userId } });
 }

src/lib/docker.ts

@@ -27,11 +27,11 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 			if (secret.isBuildSecret) {
 				if (pullmergeRequestId) {
 					if (secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				} else {
 					if (!secret.isPRMRSecret) {
-						Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
 					}
 				}
 			}
@@ -88,12 +88,12 @@ export async function buildImage({
 	debug = false
 }) {
 	if (isCache) {
-		saveBuildLog({ line: `Building cache image started.`, buildId, applicationId });
+		await saveBuildLog({ line: `Building cache image started.`, buildId, applicationId });
 	} else {
-		saveBuildLog({ line: `Building image started.`, buildId, applicationId });
+		await saveBuildLog({ line: `Building image started.`, buildId, applicationId });
 	}
 	if (!debug && isCache) {
-		saveBuildLog({
+		await saveBuildLog({
 			line: `Debug turned off. To see more details, allow it in the configuration.`,
 			buildId,
 			applicationId
@@ -126,13 +126,17 @@ export async function streamEvents({ stream, docker, buildId, applicationId, deb
 			if (err) reject(err);
 			resolve(res);
 		}
-		function onProgress(event) {
+		async function onProgress(event) {
 			if (event.error) {
 				reject(event.error);
 			} else if (event.stream) {
 				if (event.stream !== '\n') {
 					if (debug)
-						saveBuildLog({ line: `${event.stream.replace('\n', '')}`, buildId, applicationId });
+						await saveBuildLog({
+							line: `${event.stream.replace('\n', '')}`,
+							buildId,
+							applicationId
+						});
 				}
 			}
 		}

src/lib/form.ts

@@ -1,5 +1,6 @@
 import { toast } from '@zerodevx/svelte-toast';
-export function errorNotification(message: string) {
+
+export function errorNotification(message: string): void {
 	console.error(message);
 	if (typeof message !== 'string') {
 		toast.push('Ooops, something is not okay, are you okay?');
@@ -30,7 +31,7 @@ export function enhance(
 		e.preventDefault();
 
 		let body = new FormData(form);
-		let parsedData = body;
+		const parsedData = body;
 
 		body.forEach((data, key) => {
 			if (data === '' || data === null) parsedData.delete(key);

src/lib/haproxy/configuration.ts

@@ -1,15 +1,13 @@
 import { dev } from '$app/env';
-import got from 'got';
+import got, { type Got } from 'got';
-import mustache from 'mustache';
-import crypto from 'crypto';
-
 import * as db from '$lib/database';
 import { checkContainer, checkHAProxy } from '.';
 import { asyncExecShell, getDomain, getEngine } from '$lib/common';
+import { supportedServiceTypesAndVersions } from '$lib/components/common';
 
 const url = dev ? 'http://localhost:5555' : 'http://coolify-haproxy:5555';
 
-let template = `program api 
+const template = `program api 
   command /usr/bin/dataplaneapi -f /usr/local/etc/haproxy/dataplaneapi.hcl --userlist haproxy-dataplaneapi
   no option start-on-reload
 	
@@ -33,6 +31,7 @@ frontend http
   bind :80
   bind :443 ssl crt /usr/local/etc/haproxy/ssl/ alpn h2,http/1.1
   acl is_certbot path_beg /.well-known/acme-challenge/
+
   {{#applications}}
   {{#isHttps}}
   http-request redirect scheme https code ${
@@ -43,6 +42,7 @@ frontend http
 		dev ? 302 : 301
 	} if { req.hdr(host) -i {{redirectTo}} }
   {{/applications}}
+
   {{#services}}
   {{#isHttps}}
   http-request redirect scheme https code ${
@@ -53,6 +53,7 @@ frontend http
 		dev ? 302 : 301
 	} if { req.hdr(host) -i {{redirectTo}} }
   {{/services}}
+
   {{#coolify}}
   {{#isHttps}}
   http-request redirect scheme https code ${
@@ -63,6 +64,7 @@ frontend http
 		dev ? 302 : 301
 	} if { req.hdr(host) -i {{redirectTo}} }
   {{/coolify}}
+
   use_backend backend-certbot if is_certbot
   use_backend %[req.hdr(host),lower]
 
@@ -82,6 +84,13 @@ backend backend-certbot
 # updatedAt={{updatedAt}}
 backend {{domain}}
   option forwardfor
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
   server {{id}} {{id}}:{{port}}
 {{/isRunning}}
 {{/applications}}
@@ -91,6 +100,13 @@ backend {{domain}}
 # updatedAt={{updatedAt}}
 backend {{domain}}
   option forwardfor
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
   server {{id}} {{id}}:{{port}}
 {{/isRunning}}
 {{/services}}
@@ -99,10 +115,18 @@ backend {{domain}}
 backend {{domain}}
   option forwardfor
   option httpchk GET /undead.json
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
   server {{id}} {{id}}:{{port}} check fall 10
 {{/coolify}}
 `;
-export async function haproxyInstance() {
+
+export async function haproxyInstance(): Promise<Got> {
 	const { proxyPassword } = await db.listSettings();
 	return got.extend({
 		prefixUrl: url,
@@ -111,36 +135,96 @@ export async function haproxyInstance() {
 	});
 }
 
-export async function configureHAProxy() {
+export async function configureHAProxy(): Promise<void> {
 	const haproxy = await haproxyInstance();
+	await checkHAProxy(haproxy);
 
-	try {
+	const data = {
-		await checkHAProxy(haproxy);
+		applications: [],
-	} catch (error) {
+		services: [],
-		return 'Error: HAProxy is not running';
+		coolify: []
+	};
+	const applications = await db.prisma.application.findMany({
+		include: { destinationDocker: true, settings: true }
+	});
+	for (const application of applications) {
+		const {
+			fqdn,
+			id,
+			port,
+			destinationDocker,
+			destinationDockerId,
+			settings: { previews },
+			updatedAt
+		} = application;
+		if (destinationDockerId) {
+			const { engine, network } = destinationDocker;
+			const isRunning = await checkContainer(engine, id);
+			if (fqdn) {
+				const domain = getDomain(fqdn);
+				const isHttps = fqdn.startsWith('https://');
+				const isWWW = fqdn.includes('www.');
+				const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
+				if (isRunning) {
+					data.applications.push({
+						id,
+						port: port || 3000,
+						domain,
+						isRunning,
+						isHttps,
+						redirectValue,
+						redirectTo: isWWW ? domain.replace('www.', '') : 'www.' + domain,
+						updatedAt: updatedAt.getTime()
+					});
+				}
+				if (previews) {
+					const host = getEngine(engine);
+					const { stdout } = await asyncExecShell(
+						`DOCKER_HOST=${host} docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"`
+					);
+					const containers = stdout
+						.trim()
+						.split('\n')
+						.filter((a) => a)
+						.map((c) => c.replace(/"/g, ''));
+					if (containers.length > 0) {
+						for (const container of containers) {
+							const previewDomain = `${container.split('-')[1]}.${domain}`;
+							data.applications.push({
+								id: container,
+								port: port || 3000,
+								domain: previewDomain,
+								isRunning,
+								isHttps,
+								redirectValue,
+								redirectTo: isWWW ? previewDomain.replace('www.', '') : 'www.' + previewDomain,
+								updatedAt: updatedAt.getTime()
+							});
+						}
+					}
+				}
+			}
+		}
 	}
+	const services = await db.prisma.service.findMany({
+		include: {
+			destinationDocker: true,
+			minio: true,
+			plausibleAnalytics: true,
+			vscodeserver: true,
+			wordpress: true,
+			ghost: true
+		}
+	});
 
-	try {
+	for (const service of services) {
-		const data = {
+		const { fqdn, id, type, destinationDocker, destinationDockerId, updatedAt } = service;
-			applications: [],
+		if (destinationDockerId) {
-			services: [],
+			const { engine } = destinationDocker;
-			coolify: []
+			const found = supportedServiceTypesAndVersions.find((a) => a.name === type);
-		};
+			if (found) {
-		const applications = await db.prisma.application.findMany({
+				const port = found.ports.main;
-			include: { destinationDocker: true, settings: true }
+				const publicPort = service[type]?.publicPort;
-		});
-		for (const application of applications) {
-			const {
-				fqdn,
-				id,
-				port,
-				destinationDocker,
-				destinationDockerId,
-				settings: { previews },
-				updatedAt
-			} = application;
-			if (destinationDockerId) {
-				const { engine, network } = destinationDocker;
 				const isRunning = await checkContainer(engine, id);
 				if (fqdn) {
 					const domain = getDomain(fqdn);
@@ -148,62 +232,41 @@ export async function configureHAProxy() {
 					const isWWW = fqdn.includes('www.');
 					const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
 					if (isRunning) {
-						data.applications.push({
+						data.services.push({
 							id,
-							port: port || 3000,
+							port,
+							publicPort,
 							domain,
 							isRunning,
 							isHttps,
 							redirectValue,
-							redirectTo: isWWW ? domain : 'www.' + domain,
+							redirectTo: isWWW ? domain.replace('www.', '') : 'www.' + domain,
 							updatedAt: updatedAt.getTime()
 						});
 					}
-					if (previews) {
-						const host = getEngine(engine);
-						const { stdout } = await asyncExecShell(
-							`DOCKER_HOST=${host} docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"`
-						);
-						const containers = stdout
-							.trim()
-							.split('\n')
-							.filter((a) => a)
-							.map((c) => c.replace(/"/g, ''));
-						if (containers.length > 0) {
-							for (const container of containers) {
-								let previewDomain = `${container.split('-')[1]}.${domain}`;
-								data.applications.push({
-									id: container,
-									port: port || 3000,
-									domain: previewDomain,
-									isRunning,
-									isHttps,
-									redirectValue,
-									redirectTo: isWWW ? previewDomain : 'www.' + previewDomain,
-									updatedAt: updatedAt.getTime()
-								});
-							}
-						}
-					}
 				}
 			}
 		}
-		const services = await db.prisma.service.findMany({
+	}
-			include: {
+	const { fqdn } = await db.prisma.setting.findFirst();
-				destinationDocker: true,
+	if (fqdn) {
-				minio: true,
+		const domain = getDomain(fqdn);
-				plausibleAnalytics: true,
+		const isHttps = fqdn.startsWith('https://');
-				vscodeserver: true,
+		const isWWW = fqdn.includes('www.');
-				wordpress: true,
+		const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
-				ghost: true
+		data.coolify.push({
-			}
+			id: dev ? 'host.docker.internal' : 'coolify',
+			port: 3000,
+			domain,
+			isHttps,
+			redirectValue,
+			redirectTo: isWWW ? domain.replace('www.', '') : 'www.' + domain
 		});
-
 		for (const service of services) {
 			const { fqdn, id, type, destinationDocker, destinationDockerId, updatedAt } = service;
 			if (destinationDockerId) {
 				const { engine } = destinationDocker;
-				const found = db.supportedServiceTypesAndVersions.find((a) => a.name === type);
+				const found = supportedServiceTypesAndVersions.find((a) => a.name === type);
 				if (found) {
 					const port = found.ports.main;
 					const publicPort = service[type]?.publicPort;
@@ -222,7 +285,7 @@ export async function configureHAProxy() {
 								isRunning,
 								isHttps,
 								redirectValue,
-								redirectTo: isWWW ? domain : 'www.' + domain,
+								redirectTo: isWWW ? domain.replace('www.', '') : 'www.' + domain,
 								updatedAt: updatedAt.getTime()
 							});
 						}
@@ -230,37 +293,5 @@ export async function configureHAProxy() {
 				}
 			}
 		}
-		const { fqdn } = await db.prisma.setting.findFirst();
-		if (fqdn) {
-			const domain = getDomain(fqdn);
-			const isHttps = fqdn.startsWith('https://');
-			const isWWW = fqdn.includes('www.');
-			const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
-			data.coolify.push({
-				id: dev ? 'host.docker.internal' : 'coolify',
-				port: 3000,
-				domain,
-				isHttps,
-				redirectValue,
-				redirectTo: isWWW ? domain : 'www.' + domain
-			});
-		}
-		const output = mustache.render(template, data);
-		const newHash = crypto.createHash('md5').update(output).digest('hex');
-		const { proxyHash, id } = await db.listSettings();
-		if (proxyHash !== newHash) {
-			await db.prisma.setting.update({ where: { id }, data: { proxyHash: newHash } });
-			await haproxy.post(`v2/services/haproxy/configuration/raw`, {
-				searchParams: {
-					skip_version: true
-				},
-				body: output,
-				headers: {
-					'Content-Type': 'text/plain'
-				}
-			});
-		}
-	} catch (error) {
-		throw error;
 	}
 }

src/lib/haproxy/index.ts

@@ -1,7 +1,8 @@
 import { dev } from '$app/env';
 import { asyncExecShell, getEngine } from '$lib/common';
-import got from 'got';
+import got, { type Got, type Response } from 'got';
 import * as db from '$lib/database';
+import type { DestinationDocker } from '@prisma/client';
 
 const url = dev ? 'http://localhost:5555' : 'http://coolify-haproxy:5555';
 
@@ -9,7 +10,7 @@ export const defaultProxyImage = `coolify-haproxy-alpine:latest`;
 export const defaultProxyImageTcp = `coolify-haproxy-tcp-alpine:latest`;
 export const defaultProxyImageHttp = `coolify-haproxy-http-alpine:latest`;
 
-export async function haproxyInstance() {
+export async function haproxyInstance(): Promise<Got> {
 	const { proxyPassword } = await db.listSettings();
 	return got.extend({
 		prefixUrl: url,
@@ -17,6 +18,7 @@ export async function haproxyInstance() {
 		password: proxyPassword
 	});
 }
+
 export async function getRawConfiguration(): Promise<RawHaproxyConfiguration> {
 	return await (await haproxyInstance()).get(`v2/services/haproxy/configuration/raw`).json();
 }
@@ -43,17 +45,14 @@ export async function getNextTransactionId(): Promise<string> {
 	return newTransaction.id;
 }
 
-export async function completeTransaction(transactionId) {
+export async function completeTransaction(transactionId: string): Promise<Response<string>> {
 	const haproxy = await haproxyInstance();
 	return await haproxy.put(`v2/services/haproxy/transactions/${transactionId}`);
 }
-export async function deleteProxy({ id }) {
+
+export async function deleteProxy({ id }: { id: string }): Promise<void> {
 	const haproxy = await haproxyInstance();
-	try {
+	await checkHAProxy(haproxy);
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return 'Error: HAProxy is not running';
-	}
 
 	let transactionId;
 	try {
@@ -81,11 +80,12 @@ export async function deleteProxy({ id }) {
 	}
 }
 
-export async function reloadHaproxy(engine) {
+export async function reloadHaproxy(engine: string): Promise<{ stdout: string; stderr: string }> {
 	const host = getEngine(engine);
 	return await asyncExecShell(`DOCKER_HOST=${host} docker exec coolify-haproxy kill -HUP 1`);
 }
-export async function checkHAProxy(haproxy?: any) {
+
+export async function checkHAProxy(haproxy?: Got): Promise<void> {
 	if (!haproxy) haproxy = await haproxyInstance();
 	try {
 		await haproxy.get('v2/info');
@@ -97,7 +97,10 @@ export async function checkHAProxy(haproxy?: any) {
 	}
 }
 
-export async function stopTcpHttpProxy(destinationDocker, publicPort) {
+export async function stopTcpHttpProxy(
+	destinationDocker: DestinationDocker,
+	publicPort: number
+): Promise<{ stdout: string; stderr: string } | Error> {
 	const { engine } = destinationDocker;
 	const host = getEngine(engine);
 	const containerName = `haproxy-for-${publicPort}`;
@@ -112,7 +115,13 @@ export async function stopTcpHttpProxy(destinationDocker, publicPort) {
 		return error;
 	}
 }
-export async function startTcpProxy(destinationDocker, id, publicPort, privatePort) {
+export async function startTcpProxy(
+	destinationDocker: DestinationDocker,
+	id: string,
+	publicPort: number,
+	privatePort: number,
+	volume?: string
+): Promise<{ stdout: string; stderr: string } | Error> {
 	const { network, engine } = destinationDocker;
 	const host = getEngine(engine);
 
@@ -127,14 +136,22 @@ export async function startTcpProxy(destinationDocker, id, publicPort, privatePo
 			);
 			const ip = JSON.parse(Config)[0].Gateway;
 			return await asyncExecShell(
-				`DOCKER_HOST=${host} docker run --restart always -e PORT=${publicPort} -e APP=${id} -e PRIVATE_PORT=${privatePort} --add-host 'host.docker.internal:host-gateway' --add-host 'host.docker.internal:${ip}' --network ${network} -p ${publicPort}:${publicPort} --name ${containerName} -d coollabsio/${defaultProxyImageTcp}`
+				`DOCKER_HOST=${host} docker run --restart always -e PORT=${publicPort} -e APP=${id} -e PRIVATE_PORT=${privatePort} --add-host 'host.docker.internal:host-gateway' --add-host 'host.docker.internal:${ip}' --network ${network} -p ${publicPort}:${publicPort} --name ${containerName} ${
+					volume ? `-v ${volume}` : ''
+				} -d coollabsio/${defaultProxyImageTcp}`
 			);
 		}
 	} catch (error) {
 		return error;
 	}
 }
-export async function startHttpProxy(destinationDocker, id, publicPort, privatePort) {
+
+export async function startHttpProxy(
+	destinationDocker: DestinationDocker,
+	id: string,
+	publicPort: number,
+	privatePort: number
+): Promise<{ stdout: string; stderr: string } | Error> {
 	const { network, engine } = destinationDocker;
 	const host = getEngine(engine);
 
@@ -156,7 +173,8 @@ export async function startHttpProxy(destinationDocker, id, publicPort, privateP
 		return error;
 	}
 }
-export async function startCoolifyProxy(engine) {
+
+export async function startCoolifyProxy(engine: string): Promise<void> {
 	const host = getEngine(engine);
 	const found = await checkContainer(engine, 'coolify-haproxy');
 	const { proxyPassword, proxyUser, id } = await db.listSettings();
@@ -172,7 +190,8 @@ export async function startCoolifyProxy(engine) {
 	}
 	await configureNetworkCoolifyProxy(engine);
 }
-export async function checkContainer(engine, container) {
+
+export async function checkContainer(engine: string, container: string): Promise<boolean> {
 	const host = getEngine(engine);
 	let containerFound = false;
 
@@ -182,7 +201,7 @@ export async function checkContainer(engine, container) {
 		);
 		const parsedStdout = JSON.parse(stdout);
 		const status = parsedStdout.Status;
-		const isRunning = status === 'running' ? true : false;
+		const isRunning = status === 'running';
 		if (status === 'exited' || status === 'created') {
 			await asyncExecShell(`DOCKER_HOST="${host}" docker rm ${container}`);
 		}
@@ -195,7 +214,9 @@ export async function checkContainer(engine, container) {
 	return containerFound;
 }
 
-export async function stopCoolifyProxy(engine) {
+export async function stopCoolifyProxy(
+	engine: string
+): Promise<{ stdout: string; stderr: string } | Error> {
 	const host = getEngine(engine);
 	const found = await checkContainer(engine, 'coolify-haproxy');
 	await db.setDestinationSettings({ engine, isCoolifyProxyUsed: false });
@@ -212,16 +233,12 @@ export async function stopCoolifyProxy(engine) {
 	}
 }
 
-export async function configureNetworkCoolifyProxy(engine) {
+export async function configureNetworkCoolifyProxy(engine: string): Promise<void> {
 	const host = getEngine(engine);
 	const destinations = await db.prisma.destinationDocker.findMany({ where: { engine } });
-	destinations.forEach(async (destination) => {
+	for (const destination of destinations) {
-		try {
+		await asyncExecShell(
-			await asyncExecShell(
+			`DOCKER_HOST="${host}" docker network connect ${destination.network} coolify-haproxy`
-				`DOCKER_HOST="${host}" docker network connect ${destination.network} coolify-haproxy`
+		);
-			);
+	}
-		} catch (err) {
-			// TODO: handle error
-		}
-	});
 }

src/lib/importers/github.ts

@@ -2,50 +2,55 @@ import { asyncExecShell, saveBuildLog } from '$lib/common';
 import got from 'got';
 import jsonwebtoken from 'jsonwebtoken';
 import * as db from '$lib/database';
-import { ErrorHandler } from '$lib/database';
 
 export default async function ({
 	applicationId,
-	debug,
 	workdir,
 	githubAppId,
 	repository,
+	apiUrl,
+	htmlUrl,
 	branch,
 	buildId
-}): Promise<any> {
+}: {
-	try {
+	applicationId: string;
-		saveBuildLog({ line: 'GitHub importer started.', buildId, applicationId });
+	workdir: string;
-		const { privateKey, appId, installationId } = await db.getUniqueGithubApp({ githubAppId });
+	githubAppId: string;
-		const githubPrivateKey = privateKey.replace(/\\n/g, '\n').replace(/"/g, '');
+	repository: string;
+	apiUrl: string;
+	htmlUrl: string;
+	branch: string;
+	buildId: string;
+}): Promise<string> {
+	const url = htmlUrl.replace('https://', '').replace('http://', '');
+	await saveBuildLog({ line: 'GitHub importer started.', buildId, applicationId });
+	const { privateKey, appId, installationId } = await db.getUniqueGithubApp({ githubAppId });
+	const githubPrivateKey = privateKey.replace(/\\n/g, '\n').replace(/"/g, '');
 
-		const payload = {
+	const payload = {
-			iat: Math.round(new Date().getTime() / 1000),
+		iat: Math.round(new Date().getTime() / 1000),
-			exp: Math.round(new Date().getTime() / 1000 + 60),
+		exp: Math.round(new Date().getTime() / 1000 + 60),
-			iss: appId
+		iss: appId
-		};
+	};
-		const jwtToken = jsonwebtoken.sign(payload, githubPrivateKey, {
+	const jwtToken = jsonwebtoken.sign(payload, githubPrivateKey, {
-			algorithm: 'RS256'
+		algorithm: 'RS256'
-		});
+	});
-		const { token } = await got
+	const { token } = await got
-			.post(`https://api.github.com/app/installations/${installationId}/access_tokens`, {
+		.post(`${apiUrl}/app/installations/${installationId}/access_tokens`, {
-				headers: {
+			headers: {
-					Authorization: `Bearer ${jwtToken}`,
+				Authorization: `Bearer ${jwtToken}`,
-					Accept: 'application/vnd.github.machine-man-preview+json'
+				Accept: 'application/vnd.github.machine-man-preview+json'
-				}
+			}
-			})
+		})
-			.json();
+		.json();
-		saveBuildLog({
+	await saveBuildLog({
-			line: `Cloning ${repository}:${branch} branch.`,
+		line: `Cloning ${repository}:${branch} branch.`,
-			buildId,
+		buildId,
-			applicationId
+		applicationId
-		});
+	});
-		await asyncExecShell(
+	await asyncExecShell(
-			`git clone -q -b ${branch} https://x-access-token:${token}@github.com/${repository}.git ${workdir}/ && cd ${workdir} && git submodule update --init --recursive && cd ..`
+		`git clone -q -b ${branch} https://x-access-token:${token}@${url}/${repository}.git ${workdir}/ && cd ${workdir} && git submodule update --init --recursive && git lfs pull && cd .. `
-		);
+	);
-		const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
+	const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
-		return commit.replace('\n', '');
+	return commit.replace('\n', '');
-	} catch (error) {
-		console.log({ error });
-		return ErrorHandler(error);
-	}
 }

src/lib/importers/gitlab.ts

@@ -1,28 +1,37 @@
 import { asyncExecShell, saveBuildLog } from '$lib/common';
-import { ErrorHandler } from '$lib/database';
 
 export default async function ({
 	applicationId,
-	debug,
 	workdir,
 	repodir,
+	htmlUrl,
 	repository,
 	branch,
 	buildId,
 	privateSshKey
-}): Promise<any> {
+}: {
-	saveBuildLog({ line: 'GitLab importer started.', buildId, applicationId });
+	applicationId: string;
+	workdir: string;
+	repository: string;
+	htmlUrl: string;
+	branch: string;
+	buildId: string;
+	repodir: string;
+	privateSshKey: string;
+}): Promise<string> {
+	const url = htmlUrl.replace('https://', '').replace('http://', '').replace(/\/$/, '');
+	await saveBuildLog({ line: 'GitLab importer started.', buildId, applicationId });
 	await asyncExecShell(`echo '${privateSshKey}' > ${repodir}/id.rsa`);
 	await asyncExecShell(`chmod 600 ${repodir}/id.rsa`);
 
-	saveBuildLog({
+	await saveBuildLog({
 		line: `Cloning ${repository}:${branch} branch.`,
 		buildId,
 		applicationId
 	});
 
 	await asyncExecShell(
-		`git clone -q -b ${branch} git@gitlab.com:${repository}.git --config core.sshCommand="ssh -q -i ${repodir}id.rsa -o StrictHostKeyChecking=no" ${workdir}/ && cd ${workdir}/ && git submodule update --init --recursive && cd ..`
+		`git clone -q -b ${branch} git@${url}:${repository}.git --config core.sshCommand="ssh -q -i ${repodir}id.rsa -o StrictHostKeyChecking=no" ${workdir}/ && cd ${workdir}/ && git submodule update --init --recursive && git lfs pull && cd .. `
 	);
 	const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
 	return commit.replace('\n', '');

src/lib/letsencrypt/index.ts

@@ -3,9 +3,11 @@ import { checkContainer, reloadHaproxy } from '$lib/haproxy';
 import * as db from '$lib/database';
 import { dev } from '$app/env';
 import cuid from 'cuid';
+import fs from 'fs/promises';
 import getPort, { portNumbers } from 'get-port';
+import { supportedServiceTypesAndVersions } from '$lib/components/common';
 
-export async function letsEncrypt(domain, id = null, isCoolify = false) {
+export async function letsEncrypt(domain: string, id?: string, isCoolify = false): Promise<void> {
 	try {
 		const data = await db.prisma.setting.findFirst();
 		const { minPort, maxPort } = data;
@@ -96,7 +98,7 @@ export async function letsEncrypt(domain, id = null, isCoolify = false) {
 	}
 }
 
-export async function generateSSLCerts() {
+export async function generateSSLCerts(): Promise<void> {
 	const ssls = [];
 	const applications = await db.prisma.application.findMany({
 		include: { destinationDocker: true, settings: true },
@@ -129,7 +131,7 @@ export async function generateSSLCerts() {
 						.map((c) => c.replace(/"/g, ''));
 					if (containers.length > 0) {
 						for (const container of containers) {
-							let previewDomain = `${container.split('-')[1]}.${domain}`;
+							const previewDomain = `${container.split('-')[1]}.${domain}`;
 							if (isHttps) ssls.push({ domain: previewDomain, id, isCoolify: false });
 						}
 					}
@@ -160,7 +162,7 @@ export async function generateSSLCerts() {
 					type,
 					destinationDocker: { engine }
 				} = service;
-				const found = db.supportedServiceTypesAndVersions.find((a) => a.name === type);
+				const found = supportedServiceTypesAndVersions.find((a) => a.name === type);
 				if (found) {
 					const domain = getDomain(fqdn);
 					const isHttps = fqdn.startsWith('https://');
@@ -181,12 +183,41 @@ export async function generateSSLCerts() {
 		if (isHttps) ssls.push({ domain, id: 'coolify', isCoolify: true });
 	}
 	if (ssls.length > 0) {
+		const sslDir = dev ? '/tmp/ssl' : '/app/ssl';
+		if (dev) {
+			try {
+				await asyncExecShell(`mkdir -p ${sslDir}`);
+			} catch (error) {
+				//
+			}
+		}
+		const files = await fs.readdir(sslDir);
+		let certificates = [];
+		if (files.length > 0) {
+			for (const file of files) {
+				file.endsWith('.pem') && certificates.push(file.replace(/\.pem$/, ''));
+			}
+		}
 		for (const ssl of ssls) {
 			if (!dev) {
-				console.log('Checking SSL for', ssl.domain);
+				if (
-				await letsEncrypt(ssl.domain, ssl.id, ssl.isCoolify);
+					certificates.includes(ssl.domain) ||
+					certificates.includes(ssl.domain.replace('www.', ''))
+				) {
+					console.log(`Certificate for ${ssl.domain} already exists`);
+				} else {
+					console.log('Generating SSL for', ssl.domain);
+					await letsEncrypt(ssl.domain, ssl.id, ssl.isCoolify);
+				}
 			} else {
-				console.log('Checking SSL for', ssl.domain);
+				if (
+					certificates.includes(ssl.domain) ||
+					certificates.includes(ssl.domain.replace('www.', ''))
+				) {
+					console.log(`Certificate for ${ssl.domain} already exists`);
+				} else {
+					console.log('Generating SSL for', ssl.domain);
+				}
 			}
 		}
 	}

src/lib/queues/builder.ts

@@ -20,30 +20,22 @@ import {
 	setDefaultConfiguration
 } from '$lib/buildPacks/common';
 import yaml from 'js-yaml';
+import type { Job } from 'bullmq';
+import type { BuilderJob } from '$lib/types/builderJob';
 
-export default async function (job) {
+import type { ComposeFile } from '$lib/types/composeFile';
-	/*
+
-	Edge cases:
+export default async function (job: Job<BuilderJob, void, string>): Promise<void> {
-	1 - Change build pack and redeploy, what should happen?
+	const {
-  */
-	let {
 		id: applicationId,
 		repository,
-		branch,
-		buildPack,
 		name,
 		destinationDocker,
 		destinationDockerId,
 		gitSource,
 		build_id: buildId,
 		configHash,
-		port,
-		installCommand,
-		buildCommand,
-		startCommand,
 		fqdn,
-		baseDirectory,
-		publishDirectory,
 		projectId,
 		secrets,
 		phpModules,
@@ -51,14 +43,27 @@ export default async function (job) {
 		pullmergeRequestId = null,
 		sourceBranch = null,
 		settings,
-		persistentStorage
+		persistentStorage,
+		pythonWSGI,
+		pythonModule,
+		pythonVariable
+	} = job.data;
+	let {
+		branch,
+		buildPack,
+		port,
+		installCommand,
+		buildCommand,
+		startCommand,
+		baseDirectory,
+		publishDirectory
 	} = job.data;
 	const { debug } = settings;
 
 	await asyncSleep(500);
 	await db.prisma.build.updateMany({
 		where: {
-			status: 'queued',
+			status: { in: ['queued', 'running'] },
 			id: { not: buildId },
 			applicationId,
 			createdAt: { lt: new Date(new Date().getTime() - 60 * 60 * 1000) }
@@ -67,7 +72,7 @@ export default async function (job) {
 	});
 	let imageId = applicationId;
 	let domain = getDomain(fqdn);
-	let volumes =
+	const volumes =
 		persistentStorage?.map((storage) => {
 			return `${applicationId}${storage.path.replace(/\//gi, '-')}:${
 				buildPack !== 'docker' ? '/app' : ''
@@ -103,7 +108,7 @@ export default async function (job) {
 		publishDirectory = configuration.publishDirectory;
 		baseDirectory = configuration.baseDirectory;
 
-		let commit = await importers[gitSource.type]({
+		const commit = await importers[gitSource.type]({
 			applicationId,
 			debug,
 			workdir,
@@ -114,6 +119,7 @@ export default async function (job) {
 			branch,
 			buildId,
 			apiUrl: gitSource.apiUrl,
+			htmlUrl: gitSource.htmlUrl,
 			projectId,
 			deployKeyId: gitSource.gitlabApp?.deployKeyId || null,
 			privateSshKey: decrypt(gitSource.gitlabApp?.privateSshKey) || null
@@ -127,7 +133,7 @@ export default async function (job) {
 		}
 
 		try {
-			db.prisma.build.update({ where: { id: buildId }, data: { commit } });
+			await db.prisma.build.update({ where: { id: buildId }, data: { commit } });
 		} catch (err) {
 			console.log(err);
 		}
@@ -157,7 +163,7 @@ export default async function (job) {
 				});
 				deployNeeded = true;
 				if (configHash) {
-					saveBuildLog({ line: 'Configuration changed.', buildId, applicationId });
+					await saveBuildLog({ line: 'Configuration changed.', buildId, applicationId });
 				}
 			} else {
 				deployNeeded = false;
@@ -200,16 +206,17 @@ export default async function (job) {
 					startCommand,
 					baseDirectory,
 					secrets,
-					phpModules
+					phpModules,
+					pythonWSGI,
+					pythonModule,
+					pythonVariable
 				});
 			else {
-				saveBuildLog({ line: `Build pack ${buildPack} not found`, buildId, applicationId });
+				await saveBuildLog({ line: `Build pack ${buildPack} not found`, buildId, applicationId });
 				throw new Error(`Build pack ${buildPack} not found.`);
 			}
-			deployNeeded = true;
 		} else {
-			deployNeeded = false;
+			await saveBuildLog({ line: 'Nothing changed.', buildId, applicationId });
-			saveBuildLog({ line: 'Nothing changed.', buildId, applicationId });
 		}
 
 		// Deploy to Docker Engine
@@ -259,15 +266,7 @@ export default async function (job) {
 			//
 		}
 		try {
-			saveBuildLog({ line: 'Deployment started.', buildId, applicationId });
+			await saveBuildLog({ line: 'Deployment started.', buildId, applicationId });
-			// for await (const volume of volumes) {
-			// 	const id = volume.split(':')[0];
-			// 	try {
-			// 		await asyncExecShell(`DOCKER_HOST=${host} docker volume inspect ${id}`);
-			// 	} catch (error) {
-			// 		await asyncExecShell(`DOCKER_HOST=${host} docker volume create ${id}`);
-			// 	}
-			// }
 			const composeVolumes = volumes.map((volume) => {
 				return {
 					[`${volume.split(':')[0]}`]: {
@@ -275,7 +274,7 @@ export default async function (job) {
 					}
 				};
 			});
-			const compose = {
+			const composeFile: ComposeFile = {
 				version: '3.8',
 				services: {
 					[imageId]: {
@@ -284,7 +283,7 @@ export default async function (job) {
 						volumes,
 						env_file: envFound ? [`${workdir}/.env`] : [],
 						networks: [docker.network],
-						labels: labels,
+						labels,
 						depends_on: [],
 						restart: 'always'
 					}
@@ -296,23 +295,16 @@ export default async function (job) {
 				},
 				volumes: Object.assign({}, ...composeVolumes)
 			};
-			await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(compose));
+			await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(composeFile));
 			await asyncExecShell(
 				`DOCKER_HOST=${host} docker compose --project-directory ${workdir} up -d`
 			);
-
+			await saveBuildLog({ line: 'Deployment successful!', buildId, applicationId });
-			// const { stderr } = await asyncExecShell(
-			// 	`DOCKER_HOST=${host} docker run ${envFound && `--env-file=${workdir}/.env`} ${labels.join(
-			// 		' '
-			// 	)} --name ${imageId} --network ${docker.network} --restart always ${volumes.length > 0 ? volumes : ''
-			// 	} -d ${applicationId}:${tag}`
-			// );
-			saveBuildLog({ line: 'Deployment successful!', buildId, applicationId });
 		} catch (error) {
-			saveBuildLog({ line: error, buildId, applicationId });
+			await saveBuildLog({ line: error, buildId, applicationId });
 			sentry.captureException(error);
 			throw new Error(error);
 		}
-		saveBuildLog({ line: 'Proxy will be updated shortly.', buildId, applicationId });
+		await saveBuildLog({ line: 'Proxy will be updated shortly.', buildId, applicationId });
 	}
 }

src/lib/queues/cleanup.ts

@@ -1,8 +1,6 @@
-import { dev } from '$app/env';
 import { asyncExecShell, getEngine, version } from '$lib/common';
 import { prisma } from '$lib/database';
-import { defaultProxyImageHttp, defaultProxyImageTcp } from '$lib/haproxy';
+export default async function (): Promise<void> {
-export default async function () {
 	const destinationDockers = await prisma.destinationDocker.findMany();
 	for (const destinationDocker of destinationDockers) {
 		const host = getEngine(destinationDocker.engine);

src/lib/queues/index.ts

@@ -1,11 +1,8 @@
 import * as Bullmq from 'bullmq';
-import { default as ProdBullmq, Job, QueueEvents, QueueScheduler } from 'bullmq';
+import { default as ProdBullmq, QueueScheduler } from 'bullmq';
-import cuid from 'cuid';
 import { dev } from '$app/env';
 import { prisma } from '$lib/database';
-
 import builder from './builder';
-import logger from './logger';
 import cleanup from './cleanup';
 import proxy from './proxy';
 import ssl from './ssl';
@@ -28,7 +25,7 @@ const connectionOptions = {
 	}
 };
 
-const cron = async () => {
+const cron = async (): Promise<void> => {
 	new QueueScheduler('proxy', connectionOptions);
 	new QueueScheduler('cleanup', connectionOptions);
 	new QueueScheduler('ssl', connectionOptions);
@@ -89,18 +86,6 @@ const cron = async () => {
 	await queue.ssl.add('ssl', {}, { repeat: { every: dev ? 10000 : 60000 } });
 	if (!dev) await queue.cleanup.add('cleanup', {}, { repeat: { every: 300000 } });
 	await queue.sslRenew.add('sslRenew', {}, { repeat: { every: 1800000 } });
-
-	const events = {
-		proxy: new QueueEvents('proxy', { ...connectionOptions }),
-		ssl: new QueueEvents('ssl', { ...connectionOptions })
-	};
-
-	events.proxy.on('completed', (data) => {
-		// console.log(data)
-	});
-	events.ssl.on('completed', (data) => {
-		// console.log(data)
-	});
 };
 cron().catch((error) => {
 	console.log('cron failed to start');
@@ -118,10 +103,14 @@ buildWorker.on('completed', async (job: Bullmq.Job) => {
 	try {
 		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'success' } });
 	} catch (error) {
+		setTimeout(async () => {
+			await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'success' } });
+		}, 1234);
 		console.log(error);
 	} finally {
 		const workdir = `/tmp/build-sources/${job.data.repository}/${job.data.build_id}`;
 		if (!dev) await asyncExecShell(`rm -fr ${workdir}`);
+		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'success' } });
 	}
 	return;
 });
@@ -130,17 +119,21 @@ buildWorker.on('failed', async (job: Bullmq.Job, failedReason) => {
 	try {
 		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'failed' } });
 	} catch (error) {
+		setTimeout(async () => {
+			await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'failed' } });
+		}, 1234);
 		console.log(error);
 	} finally {
 		const workdir = `/tmp/build-sources/${job.data.repository}`;
 		if (!dev) await asyncExecShell(`rm -fr ${workdir}`);
+		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'failed' } });
 	}
-	saveBuildLog({
+	await saveBuildLog({
 		line: 'Failed to deploy!',
 		buildId: job.data.build_id,
 		applicationId: job.data.id
 	});
-	saveBuildLog({
+	await saveBuildLog({
 		line: `Reason: ${failedReason.toString()}`,
 		buildId: job.data.build_id,
 		applicationId: job.data.id
@@ -149,9 +142,5 @@ buildWorker.on('failed', async (job: Bullmq.Job, failedReason) => {
 
 const buildLogQueueName = 'log_queue';
 const buildLogQueue = new Queue(buildLogQueueName, connectionOptions);
-const buildLogWorker = new Worker(buildLogQueueName, async (job) => await logger(job), {
-	concurrency: 1,
-	...connectionOptions
-});
 
 export { buildQueue, buildLogQueue };

src/lib/queues/logger.ts

@@ -1,7 +1,8 @@
 import { prisma } from '$lib/database';
 import { dev } from '$app/env';
+import type { Job } from 'bullmq';
 
-export default async function (job) {
+export default async function (job: Job): Promise<void> {
 	const { line, applicationId, buildId } = job.data;
 	if (dev) console.debug(`[${applicationId}] ${line}`);
 	await prisma.buildLog.create({ data: { line, buildId, time: Number(job.id), applicationId } });

src/lib/queues/proxy.ts

@@ -1,11 +1,13 @@
 import { ErrorHandler } from '$lib/database';
 import { configureHAProxy } from '$lib/haproxy/configuration';
 
-export default async function () {
+export default async function (): Promise<void | {
+	status: number;
+	body: { message: string; error: string };
+}> {
 	try {
 		return await configureHAProxy();
 	} catch (error) {
-		console.log(error.response?.body || error);
 		return ErrorHandler(error.response?.body || error);
 	}
 }

src/lib/queues/ssl.ts

@@ -1,6 +1,6 @@
 import { generateSSLCerts } from '$lib/letsencrypt';
 
-export default async function () {
+export default async function (): Promise<void> {
 	try {
 		return await generateSSLCerts();
 	} catch (error) {

src/lib/queues/sslrenewal.ts

@@ -1,13 +1,9 @@
 import { asyncExecShell } from '$lib/common';
 import { reloadHaproxy } from '$lib/haproxy';
 
-export default async function () {
+export default async function (): Promise<void> {
-	try {
+	await asyncExecShell(
-		await asyncExecShell(
+		`docker run --rm --name certbot-renewal -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs renew`
-			`docker run --rm --name certbot-renewal -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs renew`
+	);
-		);
+	await reloadHaproxy('unix:///var/run/docker.sock');
-		await reloadHaproxy('unix:///var/run/docker.sock');
-	} catch (error) {
-		throw error;
-	}
 }

src/lib/store.ts

@@ -1,6 +1,7 @@
-import { writable } from 'svelte/store';
+import { writable, type Writable } from 'svelte/store';
 
-export const gitTokens = writable({
+export const gitTokens: Writable<{ githubToken: string | null; gitlabToken: string | null }> =
-	githubToken: null,
+	writable({
-	gitlabToken: null
+		githubToken: null,
-});
+		gitlabToken: null
+	});

src/lib/types/builderJob.ts

@@ -0,0 +1,51 @@
+import type { DestinationDocker, GithubApp, GitlabApp, GitSource, Secret } from '@prisma/client';
+
+export type BuilderJob = {
+	build_id: string;
+	type: BuildType;
+	id: string;
+	name: string;
+	fqdn: string;
+	repository: string;
+	configHash: unknown;
+	branch: string;
+	buildPack: BuildPackName;
+	projectId: number;
+	port: number;
+	installCommand: string;
+	buildCommand?: string;
+	startCommand?: string;
+	baseDirectory: string;
+	publishDirectory: string;
+	phpModules: string;
+	pythonWSGI: string;
+	pythonModule: string;
+	pythonVariable: string;
+	createdAt: string;
+	updatedAt: string;
+	destinationDockerId: string;
+	destinationDocker: DestinationDocker;
+	gitSource: GitSource & { githubApp?: GithubApp; gitlabApp?: GitlabApp };
+	settings: BuilderJobSettings;
+	secrets: Secret[];
+	persistentStorage: { path: string }[];
+	pullmergeRequestId?: unknown;
+	sourceBranch?: string;
+};
+
+// TODO: Add the other build types
+export type BuildType = 'manual';
+
+// TODO: Add the other buildpack names
+export type BuildPackName = 'node' | 'docker';
+
+export type BuilderJobSettings = {
+	id: string;
+	applicationId: string;
+	dualCerts: boolean;
+	debug: boolean;
+	previews: boolean;
+	autodeploy: boolean;
+	createdAt: string;
+	updatedAt: string;
+};

src/lib/types/composeFile.ts

@@ -0,0 +1,53 @@
+export type ComposeFile = {
+	version: ComposerFileVersion;
+	services: Record<string, ComposeFileService>;
+	networks: Record<string, ComposeFileNetwork>;
+	volumes?: Record<string, ComposeFileVolume>;
+};
+
+export type ComposeFileService = {
+	container_name: string;
+	image?: string;
+	networks: string[];
+	environment?: Record<string, unknown>;
+	volumes?: string[];
+	ulimits?: unknown;
+	labels?: string[];
+	env_file?: string[];
+	extra_hosts?: string[];
+	restart: ComposeFileRestartOption;
+	depends_on?: string[];
+	command?: string;
+	build?: {
+		context: string;
+		dockerfile: string;
+		args?: Record<string, unknown>;
+	};
+};
+
+export type ComposerFileVersion =
+	| '3.8'
+	| '3.7'
+	| '3.6'
+	| '3.5'
+	| '3.4'
+	| '3.3'
+	| '3.2'
+	| '3.1'
+	| '3.0'
+	| '2.4'
+	| '2.3'
+	| '2.2'
+	| '2.1'
+	| '2.0';
+
+export type ComposeFileRestartOption = 'no' | 'always' | 'on-failure' | 'unless-stopped';
+
+export type ComposeFileNetwork = {
+	external: boolean;
+};
+
+export type ComposeFileVolume = {
+	external?: boolean;
+	name?: string;
+};

src/lib/types/destinations.ts

@@ -0,0 +1,8 @@
+export type CreateDockerDestination = {
+	name: string;
+	engine: string;
+	remoteEngine: boolean;
+	network: string;
+	isCoolifyProxyUsed: boolean;
+	teamId: string;
+};

src/routes/__layout.svelte

@@ -12,7 +12,7 @@
 		if (!session.userId) {
 			return {};
 		}
-		const endpoint = `/teams.json`;
+		const endpoint = `/dashboard.json`;
 		const res = await fetch(endpoint);
 
 		if (res.ok) {
@@ -134,13 +134,18 @@
 
 <svelte:head>
 	<title>Coolify</title>
+	{#if !$session.whiteLabeled}
+		<link rel="icon" href="/favicon.png" />
+	{/if}
 </svelte:head>
 <SvelteToast options={{ intro: { y: -64 }, duration: 3000, pausable: true }} />
 {#if $session.userId}
 	<nav class="nav-main">
 		<div class="flex h-screen w-full flex-col items-center transition-all duration-100">
-			<div class="my-4 h-10 w-10"><img src="/favicon.png" alt="coolLabs logo" /></div>
+			{#if !$session.whiteLabeled}
-			<div class="flex flex-col space-y-4 py-2">
+				<div class="my-4 h-10 w-10"><img src="/favicon.png" alt="coolLabs logo" /></div>
+			{/if}
+			<div class="flex flex-col space-y-4 py-2" class:mt-2={$session.whiteLabeled}>
 				<a
 					sveltekit:prefetch
 					href="/"
@@ -171,7 +176,7 @@
 				<a
 					sveltekit:prefetch
 					href="/applications"
-					class="icons tooltip-right bg-coolgray-200 hover:text-green-500"
+					class="icons tooltip-green-500 tooltip-right bg-coolgray-200 hover:text-green-500"
 					class:text-green-500={$page.url.pathname.startsWith('/applications') ||
 						$page.url.pathname.startsWith('/new/application')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/applications') ||
@@ -199,7 +204,7 @@
 				<a
 					sveltekit:prefetch
 					href="/sources"
-					class="icons tooltip-right bg-coolgray-200 hover:text-orange-500"
+					class="icons tooltip-orange-500 tooltip-right bg-coolgray-200 hover:text-orange-500"
 					class:text-orange-500={$page.url.pathname.startsWith('/sources') ||
 						$page.url.pathname.startsWith('/new/source')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/sources') ||
@@ -229,7 +234,7 @@
 				<a
 					sveltekit:prefetch
 					href="/destinations"
-					class="icons tooltip-right bg-coolgray-200 hover:text-sky-500"
+					class="icons tooltip-sky-500 tooltip-right bg-coolgray-200 hover:text-sky-500"
 					class:text-sky-500={$page.url.pathname.startsWith('/destinations') ||
 						$page.url.pathname.startsWith('/new/destination')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/destinations') ||
@@ -264,7 +269,7 @@
 				<a
 					sveltekit:prefetch
 					href="/databases"
-					class="icons tooltip-right bg-coolgray-200 hover:text-purple-500"
+					class="icons tooltip-purple-500 tooltip-right bg-coolgray-200 hover:text-purple-500"
 					class:text-purple-500={$page.url.pathname.startsWith('/databases') ||
 						$page.url.pathname.startsWith('/new/database')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/databases') ||
@@ -291,7 +296,7 @@
 				<a
 					sveltekit:prefetch
 					href="/services"
-					class="icons tooltip-right bg-coolgray-200 hover:text-pink-500"
+					class="icons tooltip-pink-500 tooltip-right bg-coolgray-200 hover:text-pink-500"
 					class:text-pink-500={$page.url.pathname.startsWith('/services') ||
 						$page.url.pathname.startsWith('/new/service')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/services') ||
@@ -312,7 +317,6 @@
 						<path d="M7 18a4.6 4.4 0 0 1 0 -9a5 4.5 0 0 1 11 2h1a3.5 3.5 0 0 1 0 7h-12" />
 					</svg>
 				</a>
-				<div class="border-t border-stone-700" />
 			</div>
 			<div class="flex-1" />
 
@@ -344,7 +348,7 @@
 							{:else if updateStatus.success === null}
 								<svg
 									xmlns="http://www.w3.org/2000/svg"
-									class="w-8 h-9"
+									class="h-9 w-8"
 									viewBox="0 0 24 24"
 									stroke-width="1.5"
 									stroke="currentColor"
@@ -359,7 +363,7 @@
 									<line x1="16" y1="12" x2="12" y2="8" />
 								</svg>
 							{:else if updateStatus.success}
-								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" class="w-8 h-9"
+								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" class="h-9 w-8"
 									><path
 										fill="#DD2E44"
 										d="M11.626 7.488c-.112.112-.197.247-.268.395l-.008-.008L.134 33.141l.011.011c-.208.403.14 1.223.853 1.937.713.713 1.533 1.061 1.936.853l.01.01L28.21 24.735l-.008-.009c.147-.07.282-.155.395-.269 1.562-1.562-.971-6.627-5.656-11.313-4.687-4.686-9.752-7.218-11.315-5.656z"
@@ -404,7 +408,7 @@
 									/></svg
 								>
 							{:else}
-								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" class="w-8 h-9"
+								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" class="h-9 w-8"
 									><path
 										fill="#FFCC4D"
 										d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"
@@ -430,13 +434,12 @@
 			<div class="flex flex-col space-y-4 py-2">
 				<a
 					sveltekit:prefetch
-					href="/teams"
+					href="/iam"
-					class="icons tooltip-right bg-coolgray-200 hover:text-cyan-500"
+					class="icons tooltip-fuchsia-500 tooltip-right bg-coolgray-200 hover:text-fuchsia-500"
-					class:text-cyan-500={$page.url.pathname.startsWith('/teams')}
+					class:text-fuchsia-500={$page.url.pathname.startsWith('/iam')}
-					class:bg-coolgray-500={$page.url.pathname.startsWith('/teams')}
+					class:bg-coolgray-500={$page.url.pathname.startsWith('/iam')}
-					data-tooltip="Teams"
+					data-tooltip="IAM"
-				>
+					><svg
-					<svg
 						xmlns="http://www.w3.org/2000/svg"
 						class="h-8 w-8"
 						viewBox="0 0 24 24"
@@ -453,11 +456,12 @@
 						<path d="M21 21v-2a4 4 0 0 0 -3 -3.85" />
 					</svg>
 				</a>
+
 				{#if $session.teamId === '0'}
 					<a
 						sveltekit:prefetch
 						href="/settings"
-						class="icons tooltip-right bg-coolgray-200 hover:text-yellow-500"
+						class="icons tooltip-yellow-500 tooltip-right bg-coolgray-200 hover:text-yellow-500"
 						class:text-yellow-500={$page.url.pathname.startsWith('/settings')}
 						class:bg-coolgray-500={$page.url.pathname.startsWith('/settings')}
 						data-tooltip="Settings"
@@ -480,8 +484,9 @@
 						</svg>
 					</a>
 				{/if}
+
 				<div
-					class="icons tooltip-right bg-coolgray-200 hover:text-red-500"
+					class="icons tooltip-red-500 tooltip-right bg-coolgray-200 hover:text-red-500"
 					data-tooltip="Logout"
 					on:click={logout}
 				>
@@ -514,8 +519,14 @@
 			</div>
 		</div>
 	</nav>
+	{#if $session.whiteLabeled}
+		<span class="fixed  bottom-0 left-[50px] z-50 m-2 px-4 text-xs text-stone-700"
+			>Powered by <a href="https://coolify.io" target="_blank">Coolify</a></span
+		>
+	{/if}
+
 	<select
-		class="fixed right-0 bottom-0 z-50 m-2 w-64 bg-opacity-30 p-2 px-4"
+		class="fixed right-0 bottom-0 z-50 m-2 w-64 bg-opacity-30 p-2 px-4 hover:bg-opacity-100"
 		bind:value={selectedTeamId}
 		on:change={switchTeam}
 	>

src/routes/applications/[id]/__layout.svelte

@@ -88,7 +88,6 @@
 		try {
 			const { buildId } = await post(`/applications/${id}/deploy.json`, { ...application });
 			toast.push('Deployment queued.');
-			console.log($page.url);
 			if ($page.url.pathname.startsWith(`/applications/${id}/logs/build`)) {
 				return window.location.assign(`/applications/${id}/logs/build?buildId=${buildId}`);
 			} else {
@@ -255,9 +254,9 @@
 				class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/secrets`}
 			>
 				<button
-					title="Secrets"
+					title="Secret"
 					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
-					data-tooltip="Secrets"
+					data-tooltip="Secret"
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"

src/routes/applications/[id]/configuration/_GitlabRepositories.svelte

@@ -243,9 +243,7 @@
 
 		const url = `/applications/${id}/configuration/repository.json`;
 		try {
-			const repository = `${selected.group.full_path.replace('-personal', '')}/${
+			const repository = selected.project.path_with_namespace;
-				selected.project.name
-			}`;
 			await post(url, {
 				repository,
 				branch: selected.branch.name,

src/routes/applications/[id]/configuration/buildpack.svelte

@@ -81,6 +81,9 @@
 				);
 				const indexHtml = files.find((file) => file.name === 'index.html' && file.type === 'blob');
 				const indexPHP = files.find((file) => file.name === 'index.php' && file.type === 'blob');
+				const composerPHP = files.find(
+					(file) => file.name === 'composer.json' && file.type === 'blob'
+				);
 
 				if (yarnLock) packageManager = 'yarn';
 				if (pnpmLock) packageManager = 'pnpm';
@@ -103,7 +106,7 @@
 					foundConfig = findBuildPack('python');
 				} else if (indexHtml) {
 					foundConfig = findBuildPack('static', packageManager);
-				} else if (indexPHP) {
+				} else if (indexPHP || composerPHP) {
 					foundConfig = findBuildPack('php');
 				} else {
 					foundConfig = findBuildPack('node', packageManager);
@@ -127,6 +130,9 @@
 				);
 				const indexHtml = files.find((file) => file.name === 'index.html' && file.type === 'file');
 				const indexPHP = files.find((file) => file.name === 'index.php' && file.type === 'file');
+				const composerPHP = files.find(
+					(file) => file.name === 'composer.json' && file.type === 'file'
+				);
 
 				if (yarnLock) packageManager = 'yarn';
 				if (pnpmLock) packageManager = 'pnpm';
@@ -146,7 +152,7 @@
 					foundConfig = findBuildPack('python');
 				} else if (indexHtml) {
 					foundConfig = findBuildPack('static', packageManager);
-				} else if (indexPHP) {
+				} else if (indexPHP || composerPHP) {
 					foundConfig = findBuildPack('php');
 				} else {
 					foundConfig = findBuildPack('node', packageManager);

src/routes/applications/[id]/configuration/destination.svelte

@@ -29,7 +29,7 @@
 <script lang="ts">
 	import type Prisma from '@prisma/client';
 
-	import { page } from '$app/stores';
+	import { page, session } from '$app/stores';
 	import { errorNotification } from '$lib/form';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
@@ -39,6 +39,16 @@
 
 	export let destinations: Prisma.DestinationDocker[];
 
+	const ownDestinations = destinations.filter((destination) => {
+		if (destination.teams[0].id === $session.teamId) {
+			return destination;
+		}
+	});
+	const otherDestinations = destinations.filter((destination) => {
+		if (destination.teams[0].id !== $session.teamId) {
+			return destination;
+		}
+	});
 	async function handleSubmit(destinationId) {
 		try {
 			await post(`/applications/${id}/configuration/destination.json`, { destinationId });
@@ -52,8 +62,8 @@
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">Configure Destination</div>
 </div>
-<div class="flex justify-center">
+<div class="flex flex-col justify-center">
-	{#if !destinations || destinations.length === 0}
+	{#if !destinations || ownDestinations.length === 0}
 		<div class="flex-col">
 			<div class="pb-2">No configurable Destination found</div>
 			<div class="flex justify-center">
@@ -75,8 +85,23 @@
 			</div>
 		</div>
 	{:else}
-		<div class="flex flex-wrap justify-center">
+		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
-			{#each destinations as destination}
+			{#each ownDestinations as destination}
+				<div class="p-2">
+					<form on:submit|preventDefault={() => handleSubmit(destination.id)}>
+						<button type="submit" class="box-selection hover:bg-sky-700 font-bold">
+							<div class="font-bold text-xl text-center truncate">{destination.name}</div>
+							<div class="text-center truncate">{destination.network}</div>
+						</button>
+					</form>
+				</div>
+			{/each}
+		</div>
+		{#if otherDestinations.length > 0 && $session.teamId === '0'}
+			<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Destinations</div>
+		{/if}
+		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
+			{#each otherDestinations as destination}
 				<div class="p-2">
 					<form on:submit|preventDefault={() => handleSubmit(destination.id)}>
 						<button type="submit" class="box-selection hover:bg-sky-700 font-bold">

src/routes/applications/[id]/configuration/source.svelte

@@ -29,7 +29,7 @@
 <script lang="ts">
 	import type Prisma from '@prisma/client';
 
-	import { page } from '$app/stores';
+	import { page, session } from '$app/stores';
 	import { errorNotification } from '$lib/form';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
@@ -46,6 +46,17 @@
 			(source.type === 'github' && source.githubAppId && source.githubApp.installationId) ||
 			(source.type === 'gitlab' && source.gitlabAppId)
 	);
+	const ownSources = filteredSources.filter((source) => {
+		if (source.teams[0].id === $session.teamId) {
+			return source;
+		}
+	});
+	const otherSources = filteredSources.filter((source) => {
+		if (source.teams[0].id !== $session.teamId) {
+			return source;
+		}
+	});
+
 	async function handleSubmit(gitSourceId) {
 		try {
 			await post(`/applications/${id}/configuration/source.json`, { gitSourceId });
@@ -54,17 +65,21 @@
 			return errorNotification(error);
 		}
 	}
+	async function newSource() {
+		const { id } = await post('/sources/new', {});
+		return await goto(`/sources/${id}`, { replaceState: true });
+	}
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">Select a Git Source</div>
 </div>
 <div class="flex flex-col justify-center">
-	{#if !filteredSources || filteredSources.length === 0}
+	{#if !filteredSources || ownSources.length === 0}
 		<div class="flex-col">
-			<div class="pb-2">No configurable Git Source found</div>
+			<div class="pb-2 text-center">No configurable Git Source found</div>
 			<div class="flex justify-center">
-				<a href="/new/source" sveltekit:prefetch class="add-icon bg-orange-600 hover:bg-orange-500">
+				<button on:click={newSource} class="add-icon bg-orange-600 hover:bg-orange-500">
 					<svg
 						class="w-6"
 						xmlns="http://www.w3.org/2000/svg"
@@ -78,12 +93,39 @@
 							d="M12 6v6m0 0v6m0-6h6m-6 0H6"
 						/></svg
 					>
-				</a>
+				</button>
 			</div>
 		</div>
 	{:else}
-		<div class="flex flex-wrap justify-center">
+		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
-			{#each filteredSources as source}
+			{#each ownSources as source}
+				<div class="p-2">
+					<form on:submit|preventDefault={() => handleSubmit(source.id)}>
+						<button
+							disabled={source.gitlabApp && !source.gitlabAppId}
+							type="submit"
+							class="disabled:opacity-95 bg-coolgray-200 disabled:text-white box-selection hover:bg-orange-700 group"
+							class:border-red-500={source.gitlabApp && !source.gitlabAppId}
+							class:border-0={source.gitlabApp && !source.gitlabAppId}
+							class:border-l-4={source.gitlabApp && !source.gitlabAppId}
+						>
+							<div class="font-bold text-xl text-center truncate">{source.name}</div>
+							{#if source.gitlabApp && !source.gitlabAppId}
+								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+									Configuration missing
+								</div>
+							{/if}
+						</button>
+					</form>
+				</div>
+			{/each}
+		</div>
+
+		{#if otherSources.length > 0 && $session.teamId === '0'}
+			<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Sources</div>
+		{/if}
+		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
+			{#each otherSources as source}
 				<div class="p-2">
 					<form on:submit|preventDefault={() => handleSubmit(source.id)}>
 						<button

src/routes/applications/[id]/delete.json.ts

@@ -14,6 +14,7 @@ export const del: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
+		console.log(error);
 		return ErrorHandler(error);
 	}
 };

src/routes/applications/[id]/index.json.ts

@@ -5,6 +5,7 @@ import { checkContainer } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 import jsonwebtoken from 'jsonwebtoken';
 import { get as getRequest } from '$lib/api';
+import { setDefaultConfiguration } from '$lib/buildPacks/common';
 
 export const get: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
@@ -52,12 +53,23 @@ export const post: RequestHandler = async (event) => {
 		buildCommand,
 		startCommand,
 		baseDirectory,
-		publishDirectory
+		publishDirectory,
+		pythonWSGI,
+		pythonModule,
+		pythonVariable
 	} = await event.request.json();
-
 	if (port) port = Number(port);
 
 	try {
+		const defaultConfiguration = await setDefaultConfiguration({
+			buildPack,
+			port,
+			installCommand,
+			startCommand,
+			buildCommand,
+			publishDirectory,
+			baseDirectory
+		});
 		await db.configureApplication({
 			id,
 			buildPack,
@@ -68,7 +80,11 @@ export const post: RequestHandler = async (event) => {
 			buildCommand,
 			startCommand,
 			baseDirectory,
-			publishDirectory
+			publishDirectory,
+			pythonWSGI,
+			pythonModule,
+			pythonVariable,
+			...defaultConfiguration
 		});
 		return { status: 201 };
 	} catch (error) {

src/routes/applications/[id]/index.svelte

@@ -38,6 +38,7 @@
 	import { page, session } from '$app/stores';
 	import { errorNotification } from '$lib/form';
 	import { onMount } from 'svelte';
+	import Select from 'svelte-select';
 
 	import Explainer from '$lib/components/Explainer.svelte';
 	import Setting from '$lib/components/Setting.svelte';
@@ -57,6 +58,23 @@
 	let previews = application.settings.previews;
 	let dualCerts = application.settings.dualCerts;
 	let autodeploy = application.settings.autodeploy;
+
+	let wsgis = [
+		{
+			value: 'None',
+			label: 'None'
+		},
+		{
+			value: 'Gunicorn',
+			label: 'Gunicorn'
+		}
+		// },
+		// {
+		// 	value: 'uWSGI',
+		// 	label: 'uWSGI'
+		// }
+	];
+
 	if (browser && window.location.hostname === 'demo.coolify.io' && !application.fqdn) {
 		application.fqdn = `http://${cuid()}.demo.coolify.io`;
 	}
@@ -111,7 +129,7 @@
 			await post(`/applications/${id}.json`, { ...application });
 			return window.location.reload();
 		} catch ({ error }) {
-			if (error.startsWith('DNS not set')) {
+			if (error?.startsWith('DNS not set')) {
 				forceSave = true;
 			}
 			return errorNotification(error);
@@ -119,12 +137,19 @@
 			loading = false;
 		}
 	}
+	async function selectWSGI(event) {
+		application.pythonWSGI = event.detail.value;
+	}
 </script>
 
 <div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+	<div class="-mb-5 flex-col">
-		{application.name}
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+			Configuration
+		</div>
+		<span class="text-xs">{application.name} </span>
 	</div>
+
 	{#if application.fqdn}
 		<a
 			href={application.fqdn}
@@ -282,14 +307,14 @@
 		<div class="grid grid-flow-row gap-2 px-10">
 			<div class="grid grid-cols-2">
 				<div class="flex-col">
-					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100">Domain (FQDN)</label>
+					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100">URL (FQDN)</label>
 					{#if browser && window.location.hostname === 'demo.coolify.io'}
 						<Explainer
-							text="<span class='text-white font-bold'>You can use the predefined random domain name or enter your own domain name.</span>"
+							text="<span class='text-white font-bold'>You can use the predefined random url name or enter your own domain name.</span>"
 						/>
 					{/if}
 					<Explainer
-						text="If you specify <span class='text-green-500 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-green-500 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>"
+						text="If you specify <span class='text-green-500 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-green-500 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the url, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>"
 					/>
 				</div>
 				<input
@@ -315,6 +340,39 @@
 					on:click={() => !isRunning && changeSettings('dualCerts')}
 				/>
 			</div>
+			{#if application.buildPack === 'python'}
+				<div class="grid grid-cols-2 items-center">
+					<label for="pythonModule" class="text-base font-bold text-stone-100">WSGI</label>
+					<div class="custom-select-wrapper">
+						<Select id="wsgi" items={wsgis} on:select={selectWSGI} value={application.pythonWSGI} />
+					</div>
+				</div>
+
+				<div class="grid grid-cols-2 items-center">
+					<label for="pythonModule" class="text-base font-bold text-stone-100">Module</label>
+					<input
+						readonly={!$session.isAdmin}
+						name="pythonModule"
+						id="pythonModule"
+						required
+						bind:value={application.pythonModule}
+						placeholder={application.pythonWSGI?.toLowerCase() !== 'gunicorn' ? 'main.py' : 'main'}
+					/>
+				</div>
+				{#if application.pythonWSGI?.toLowerCase() === 'gunicorn'}
+					<div class="grid grid-cols-2 items-center">
+						<label for="pythonVariable" class="text-base font-bold text-stone-100">Variable</label>
+						<input
+							readonly={!$session.isAdmin}
+							name="pythonVariable"
+							id="pythonVariable"
+							required
+							bind:value={application.pythonVariable}
+							placeholder="default: app"
+						/>
+					</div>
+				{/if}
+			{/if}
 			{#if !staticDeployments.includes(application.buildPack)}
 				<div class="grid grid-cols-2 items-center">
 					<label for="port" class="text-base font-bold text-stone-100">Port</label>
@@ -323,7 +381,7 @@
 						name="port"
 						id="port"
 						bind:value={application.port}
-						placeholder="default: 3000"
+						placeholder={application.buildPack === 'python' ? '8000' : '3000'}
 					/>
 				</div>
 			{/if}

src/routes/applications/[id]/logs/build/index.svelte

@@ -21,7 +21,7 @@
 
 <script lang="ts">
 	import { page } from '$app/stores';
-	import { dateOptions, getDomain } from '$lib/components/common';
+	import { changeQueryParams, dateOptions, getDomain } from '$lib/components/common';
 
 	import BuildLog from './_BuildLog.svelte';
 	import { get } from '$lib/api';
@@ -79,16 +79,81 @@
 			noMoreBuilds = true;
 		}
 	}
-	async function loadBuild(build) {
+	function loadBuild(build) {
 		buildId = build;
-		await goto(`/applications/${id}/logs/build?buildId=${buildId}`);
+		return changeQueryParams(buildId);
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
+<div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
+	<div class="-mb-5 flex-col">
-		Build logs of <a href={application.fqdn} target="_blank">{getDomain(application.fqdn)}</a>
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">Build Logs</div>
+		<span class="text-xs">{application.name} </span>
 	</div>
+
+	{#if application.fqdn}
+		<a
+			href={application.fqdn}
+			target="_blank"
+			class="icons tooltip-bottom flex items-center bg-transparent text-sm"
+			><svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<path d="M11 7h-5a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-5" />
+				<line x1="10" y1="14" x2="20" y2="4" />
+				<polyline points="15 4 20 4 20 9" />
+			</svg></a
+		>
+	{/if}
+	<a
+		href="{application.gitSource.htmlUrl}/{application.repository}/tree/{application.branch}"
+		target="_blank"
+		class="w-10"
+	>
+		{#if application.gitSource?.type === 'gitlab'}
+			<svg viewBox="0 0 128 128" class="icons">
+				<path
+					fill="#FC6D26"
+					d="M126.615 72.31l-7.034-21.647L105.64 7.76c-.716-2.206-3.84-2.206-4.556 0l-13.94 42.903H40.856L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664 1.385 72.31a4.792 4.792 0 001.74 5.358L64 121.894l60.874-44.227a4.793 4.793 0 001.74-5.357"
+				/><path fill="#E24329" d="M64 121.894l23.144-71.23H40.856L64 121.893z" /><path
+					fill="#FC6D26"
+					d="M64 121.894l-23.144-71.23H8.42L64 121.893z"
+				/><path
+					fill="#FCA326"
+					d="M8.42 50.663L1.384 72.31a4.79 4.79 0 001.74 5.357L64 121.894 8.42 50.664z"
+				/><path
+					fill="#E24329"
+					d="M8.42 50.663h32.436L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664z"
+				/><path fill="#FC6D26" d="M64 121.894l23.144-71.23h32.437L64 121.893z" /><path
+					fill="#FCA326"
+					d="M119.58 50.663l7.035 21.647a4.79 4.79 0 01-1.74 5.357L64 121.894l55.58-71.23z"
+				/><path
+					fill="#E24329"
+					d="M119.58 50.663H87.145l13.94-42.902c.717-2.206 3.84-2.206 4.557 0l13.94 42.903z"
+				/>
+			</svg>
+		{:else if application.gitSource?.type === 'github'}
+			<svg viewBox="0 0 128 128" class="icons">
+				<g fill="#ffffff"
+					><path
+						fill-rule="evenodd"
+						clip-rule="evenodd"
+						d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
+					/><path
+						d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
+					/></g
+				>
+			</svg>
+		{/if}
+	</a>
 </div>
 <div class="block flex-row justify-start space-x-2 px-5 pt-6 sm:px-10 md:flex">
 	<div class="mb-4 min-w-[16rem] space-y-2 md:mb-0 ">
@@ -130,9 +195,14 @@
 				</div>
 			{/each}
 		</div>
-		<div class="flex space-x-2">
+		{#if !noMoreBuilds}
-			<button disabled={noMoreBuilds} class="w-full" on:click={loadMoreBuilds}>Load More</button>
+			{#if buildCount > 5}
-		</div>
+				<div class="flex space-x-2">
+					<button disabled={noMoreBuilds} class="w-full" on:click={loadMoreBuilds}>Load More</button
+					>
+				</div>
+			{/if}
+		{/if}
 	</div>
 	<div class="flex-1 md:w-96">
 		{#if buildId}

src/routes/applications/[id]/logs/index.svelte

@@ -68,16 +68,83 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
+<div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
+	<div class="-mb-5 flex-col">
-		Application logs of <a href={application.fqdn} target="_blank">{getDomain(application.fqdn)}</a>
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+			Application Logs
+		</div>
+		<span class="text-xs">{application.name} </span>
 	</div>
+
+	{#if application.fqdn}
+		<a
+			href={application.fqdn}
+			target="_blank"
+			class="icons tooltip-bottom flex items-center bg-transparent text-sm"
+			><svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<path d="M11 7h-5a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-5" />
+				<line x1="10" y1="14" x2="20" y2="4" />
+				<polyline points="15 4 20 4 20 9" />
+			</svg></a
+		>
+	{/if}
+	<a
+		href="{application.gitSource.htmlUrl}/{application.repository}/tree/{application.branch}"
+		target="_blank"
+		class="w-10"
+	>
+		{#if application.gitSource?.type === 'gitlab'}
+			<svg viewBox="0 0 128 128" class="icons">
+				<path
+					fill="#FC6D26"
+					d="M126.615 72.31l-7.034-21.647L105.64 7.76c-.716-2.206-3.84-2.206-4.556 0l-13.94 42.903H40.856L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664 1.385 72.31a4.792 4.792 0 001.74 5.358L64 121.894l60.874-44.227a4.793 4.793 0 001.74-5.357"
+				/><path fill="#E24329" d="M64 121.894l23.144-71.23H40.856L64 121.893z" /><path
+					fill="#FC6D26"
+					d="M64 121.894l-23.144-71.23H8.42L64 121.893z"
+				/><path
+					fill="#FCA326"
+					d="M8.42 50.663L1.384 72.31a4.79 4.79 0 001.74 5.357L64 121.894 8.42 50.664z"
+				/><path
+					fill="#E24329"
+					d="M8.42 50.663h32.436L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664z"
+				/><path fill="#FC6D26" d="M64 121.894l23.144-71.23h32.437L64 121.893z" /><path
+					fill="#FCA326"
+					d="M119.58 50.663l7.035 21.647a4.79 4.79 0 01-1.74 5.357L64 121.894l55.58-71.23z"
+				/><path
+					fill="#E24329"
+					d="M119.58 50.663H87.145l13.94-42.902c.717-2.206 3.84-2.206 4.557 0l13.94 42.903z"
+				/>
+			</svg>
+		{:else if application.gitSource?.type === 'github'}
+			<svg viewBox="0 0 128 128" class="icons">
+				<g fill="#ffffff"
+					><path
+						fill-rule="evenodd"
+						clip-rule="evenodd"
+						d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
+					/><path
+						d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
+					/></g
+				>
+			</svg>
+		{/if}
+	</a>
 </div>
 <div class="flex flex-row justify-center space-x-2 px-10 pt-6">
 	{#if logs.length === 0}
 		<div class="text-xl font-bold tracking-tighter">Waiting for the logs...</div>
 	{:else}
-		<div class="relative">
+		<div class="relative w-full">
 			<LoadingLogs />
 			<div class="flex justify-end sticky top-0 p-2">
 				<button
@@ -105,7 +172,7 @@
 				</button>
 			</div>
 			<div
-				class="font-mono leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
+				class="font-mono w-full leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
 				bind:this={logsEl}
 			>
 				<div class="px-2">

src/routes/applications/[id]/previews/index.svelte

@@ -11,7 +11,6 @@
 				}
 			};
 		}
-
 		return {
 			status: res.status,
 			error: new Error(`Could not load ${endpoint}`)
@@ -50,14 +49,88 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
+<div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
+	<div class="-mb-5 flex-col">
-		Previews for <a href={application.fqdn} target="_blank">{getDomain(application.fqdn)}</a>
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+			Preview Deployments
+		</div>
+		<span class="text-xs">{application.name} </span>
 	</div>
-</div>
 
-{#if applicationSecrets.length !== 0}
+	{#if application.fqdn}
-	<div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
+		<a
+			href={application.fqdn}
+			target="_blank"
+			class="icons tooltip-bottom flex items-center bg-transparent text-sm"
+			><svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<path d="M11 7h-5a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-5" />
+				<line x1="10" y1="14" x2="20" y2="4" />
+				<polyline points="15 4 20 4 20 9" />
+			</svg></a
+		>
+	{/if}
+	<a
+		href="{application.gitSource.htmlUrl}/{application.repository}/tree/{application.branch}"
+		target="_blank"
+		class="w-10"
+	>
+		{#if application.gitSource?.type === 'gitlab'}
+			<svg viewBox="0 0 128 128" class="icons">
+				<path
+					fill="#FC6D26"
+					d="M126.615 72.31l-7.034-21.647L105.64 7.76c-.716-2.206-3.84-2.206-4.556 0l-13.94 42.903H40.856L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664 1.385 72.31a4.792 4.792 0 001.74 5.358L64 121.894l60.874-44.227a4.793 4.793 0 001.74-5.357"
+				/><path fill="#E24329" d="M64 121.894l23.144-71.23H40.856L64 121.893z" /><path
+					fill="#FC6D26"
+					d="M64 121.894l-23.144-71.23H8.42L64 121.893z"
+				/><path
+					fill="#FCA326"
+					d="M8.42 50.663L1.384 72.31a4.79 4.79 0 001.74 5.357L64 121.894 8.42 50.664z"
+				/><path
+					fill="#E24329"
+					d="M8.42 50.663h32.436L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664z"
+				/><path fill="#FC6D26" d="M64 121.894l23.144-71.23h32.437L64 121.893z" /><path
+					fill="#FCA326"
+					d="M119.58 50.663l7.035 21.647a4.79 4.79 0 01-1.74 5.357L64 121.894l55.58-71.23z"
+				/><path
+					fill="#E24329"
+					d="M119.58 50.663H87.145l13.94-42.902c.717-2.206 3.84-2.206 4.557 0l13.94 42.903z"
+				/>
+			</svg>
+		{:else if application.gitSource?.type === 'github'}
+			<svg viewBox="0 0 128 128" class="icons">
+				<g fill="#ffffff"
+					><path
+						fill-rule="evenodd"
+						clip-rule="evenodd"
+						d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
+					/><path
+						d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
+					/></g
+				>
+			</svg>
+		{/if}
+	</a>
+</div>
+<div class="mx-auto max-w-6xl px-6 pt-4">
+	<div class="flex justify-center py-4 text-center">
+		<Explainer
+			customClass="w-full"
+			text={applicationSecrets.length === 0
+				? "You can add secrets to PR/MR deployments. Please add secrets to the application first. <br>Useful for creating <span class='text-green-500 font-bold'>staging</span> environments."
+				: "These values overwrite application secrets in PR/MR deployments. <br>Useful for creating <span class='text-green-500 font-bold'>staging</span> environments."}
+		/>
+	</div>
+	{#if applicationSecrets.length !== 0}
 		<table class="mx-auto border-separate text-left">
 			<thead>
 				<tr class="h-12">
@@ -84,16 +157,9 @@
 				{/each}
 			</tbody>
 		</table>
-	</div>
+	{/if}
-{/if}
-<div class="flex justify-center py-4 text-center">
-	<Explainer
-		customClass="w-full"
-		text={applicationSecrets.length === 0
-			? "You can add secrets to PR/MR deployments. Please add secrets to the application first. <br>Useful for creating <span class='text-green-500 font-bold'>staging</span> environments."
-			: "These values overwrite application secrets in PR/MR deployments. Useful for creating <span class='text-green-500 font-bold'>staging</span> environments."}
-	/>
 </div>
+
 <div class="mx-auto max-w-4xl py-10">
 	<div class="flex flex-wrap justify-center space-x-2">
 		{#if containers.length > 0}

src/routes/applications/[id]/secrets/_BatchSecrets.svelte

@@ -0,0 +1,48 @@
+<script>
+	export let secrets;
+	export let refreshSecrets;
+	export let id;
+
+	import { saveSecret } from './utils';
+	import pLimit from 'p-limit';
+	import { createEventDispatcher } from 'svelte';
+	const dispatch = createEventDispatcher();
+
+	let batchSecrets = '';
+	function setBatchValue(event) {
+		batchSecrets = event.target?.value;
+	}
+	const limit = pLimit(1);
+	async function getValues(e) {
+		e.preventDefault();
+		const eachValuePair = batchSecrets.split('\n');
+		const batchSecretsPairs = eachValuePair
+			.filter((secret) => !secret.startsWith('#') && secret)
+			.map((secret) => {
+				const [name, value] = secret.split('=');
+				const cleanValue = value?.replaceAll('"', '') || '';
+				return {
+					name,
+					value: cleanValue,
+					isNew: !secrets.find((secret) => name === secret.name)
+				};
+			});
+
+		await Promise.all(
+			batchSecretsPairs.map(({ name, value, isNew }) =>
+				limit(() => saveSecret({ name, value, applicationId: id, isNew }))
+			)
+		);
+		batchSecrets = '';
+		refreshSecrets();
+	}
+</script>
+
+<h2 class="title my-6 font-bold">Paste .env file</h2>
+<form on:submit|preventDefault={getValues} class="mb-12 w-full">
+	<textarea bind:value={batchSecrets} class="mb-2 min-h-[200px] w-full" />
+	<button
+		class="bg-green-600 hover:bg-green-500 disabled:text-white disabled:opacity-40"
+		type="submit">Batch add secrets</button
+	>
+</form>

src/routes/applications/[id]/secrets/_Secret.svelte

@@ -9,11 +9,12 @@
 	if (isPRMRSecret) value = PRMRSecret.value;
 
 	import { page } from '$app/stores';
-	import { del, post } from '$lib/api';
+	import { del } from '$lib/api';
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import { errorNotification } from '$lib/form';
 	import { toast } from '@zerodevx/svelte-toast';
 	import { createEventDispatcher } from 'svelte';
+	import { saveSecret } from './utils';
 
 	const dispatch = createEventDispatcher();
 	const { id } = $page.params;
@@ -30,31 +31,41 @@
 			return errorNotification(error);
 		}
 	}
-	async function saveSecret(isNew = false) {
+
-		if (!name) return errorNotification('Name is required.');
+	async function createSecret(isNew) {
-		if (!value) return errorNotification('Value is required.');
+		await saveSecret({
-		try {
+			isNew,
-			await post(`/applications/${id}/secrets.json`, {
+			name,
-				name,
+			value,
-				value,
+			isBuildSecret,
-				isBuildSecret,
+			isPRMRSecret,
-				isPRMRSecret,
+			isNewSecret,
-				isNew
+			applicationId: id
-			});
+		});
-			dispatch('refresh');
-			if (isNewSecret) {
-				name = '';
-				value = '';
-				isBuildSecret = false;
-			}
-			toast.push('Secret saved.');
-		} catch ({ error }) {
-			return errorNotification(error);
-		}
-	}
-	function setSecretValue() {
 		if (isNewSecret) {
+			name = '';
+			value = '';
+			isBuildSecret = false;
+		}
+		dispatch('refresh');
+		toast.push('Secret saved');
+	}
+
+	async function setSecretValue() {
+		if (!isPRMRSecret) {
 			isBuildSecret = !isBuildSecret;
+			if (!isNewSecret) {
+				await saveSecret({
+					isNew: isNewSecret,
+					name,
+					value,
+					isBuildSecret,
+					isPRMRSecret,
+					isNewSecret,
+					applicationId: id
+				});
+				toast.push('Secret saved');
+			}
 		}
 	}
 </script>
@@ -89,9 +100,9 @@
 		class="relative inline-flex h-6 w-11 flex-shrink-0 rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out"
 		class:bg-green-600={isBuildSecret}
 		class:bg-stone-700={!isBuildSecret}
-		class:opacity-50={!isNewSecret}
+		class:opacity-50={isPRMRSecret}
-		class:cursor-not-allowed={!isNewSecret}
+		class:cursor-not-allowed={isPRMRSecret}
-		class:cursor-pointer={isNewSecret}
+		class:cursor-pointer={!isPRMRSecret}
 	>
 		<span class="sr-only">Use isBuildSecret</span>
 		<span
@@ -133,12 +144,14 @@
 <td>
 	{#if isNewSecret}
 		<div class="flex items-center justify-center">
-			<button class="bg-green-600 hover:bg-green-500" on:click={() => saveSecret(true)}>Add</button>
+			<button class="bg-green-600 hover:bg-green-500" on:click={() => createSecret(true)}
+				>Add</button
+			>
 		</div>
 	{:else}
 		<div class="flex flex-row justify-center space-x-2">
 			<div class="flex items-center justify-center">
-				<button class="" on:click={() => saveSecret(false)}>Set</button>
+				<button class="" on:click={() => createSecret(false)}>Set</button>
 			</div>
 			{#if !isPRMRSecret}
 				<div class="flex justify-center items-end">

src/routes/applications/[id]/secrets/index.json.ts

@@ -1,10 +1,10 @@
-import { getTeam, getUserDetails } from '$lib/common';
+import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
-	const { teamId, status, body } = await getUserDetails(event);
+	const { status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
@@ -24,7 +24,7 @@ export const get: RequestHandler = async (event) => {
 };
 
 export const post: RequestHandler = async (event) => {
-	const { teamId, status, body } = await getUserDetails(event);
+	const { status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
@@ -53,7 +53,7 @@ export const post: RequestHandler = async (event) => {
 	}
 };
 export const del: RequestHandler = async (event) => {
-	const { teamId, status, body } = await getUserDetails(event);
+	const { status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;

src/routes/applications/[id]/secrets/index.svelte

@@ -22,25 +22,118 @@
 <script lang="ts">
 	export let secrets;
 	export let application;
+	import pLimit from 'p-limit';
 	import Secret from './_Secret.svelte';
-	import { getDomain } from '$lib/components/common';
 	import { page } from '$app/stores';
 	import { get } from '$lib/api';
+	import { saveSecret } from './utils';
+	import { toast } from '@zerodevx/svelte-toast';
 
+	const limit = pLimit(1);
 	const { id } = $page.params;
 
+	let batchSecrets = '';
 	async function refreshSecrets() {
 		const data = await get(`/applications/${id}/secrets.json`);
 		secrets = [...data.secrets];
 	}
+	async function getValues(e) {
+		e.preventDefault();
+		const eachValuePair = batchSecrets.split('\n');
+		const batchSecretsPairs = eachValuePair
+			.filter((secret) => !secret.startsWith('#') && secret)
+			.map((secret) => {
+				const [name, value] = secret.split('=');
+				const cleanValue = value?.replaceAll('"', '') || '';
+				return {
+					name,
+					value: cleanValue,
+					isNew: !secrets.find((secret) => name === secret.name)
+				};
+			});
+
+		await Promise.all(
+			batchSecretsPairs.map(({ name, value, isNew }) =>
+				limit(() => saveSecret({ name, value, applicationId: id, isNew }))
+			)
+		);
+		batchSecrets = '';
+		await refreshSecrets();
+		toast.push('Secrets saved');
+	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
+<div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
+	<div class="-mb-5 flex-col">
-		Secrets for <a href={application.fqdn} target="_blank">{getDomain(application.fqdn)}</a>
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">Secrets</div>
+		<span class="text-xs">{application.name} </span>
 	</div>
+
+	{#if application.fqdn}
+		<a
+			href={application.fqdn}
+			target="_blank"
+			class="icons tooltip-bottom flex items-center bg-transparent text-sm"
+			><svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<path d="M11 7h-5a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-5" />
+				<line x1="10" y1="14" x2="20" y2="4" />
+				<polyline points="15 4 20 4 20 9" />
+			</svg></a
+		>
+	{/if}
+	<a
+		href="{application.gitSource.htmlUrl}/{application.repository}/tree/{application.branch}"
+		target="_blank"
+		class="w-10"
+	>
+		{#if application.gitSource?.type === 'gitlab'}
+			<svg viewBox="0 0 128 128" class="icons">
+				<path
+					fill="#FC6D26"
+					d="M126.615 72.31l-7.034-21.647L105.64 7.76c-.716-2.206-3.84-2.206-4.556 0l-13.94 42.903H40.856L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664 1.385 72.31a4.792 4.792 0 001.74 5.358L64 121.894l60.874-44.227a4.793 4.793 0 001.74-5.357"
+				/><path fill="#E24329" d="M64 121.894l23.144-71.23H40.856L64 121.893z" /><path
+					fill="#FC6D26"
+					d="M64 121.894l-23.144-71.23H8.42L64 121.893z"
+				/><path
+					fill="#FCA326"
+					d="M8.42 50.663L1.384 72.31a4.79 4.79 0 001.74 5.357L64 121.894 8.42 50.664z"
+				/><path
+					fill="#E24329"
+					d="M8.42 50.663h32.436L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664z"
+				/><path fill="#FC6D26" d="M64 121.894l23.144-71.23h32.437L64 121.893z" /><path
+					fill="#FCA326"
+					d="M119.58 50.663l7.035 21.647a4.79 4.79 0 01-1.74 5.357L64 121.894l55.58-71.23z"
+				/><path
+					fill="#E24329"
+					d="M119.58 50.663H87.145l13.94-42.902c.717-2.206 3.84-2.206 4.557 0l13.94 42.903z"
+				/>
+			</svg>
+		{:else if application.gitSource?.type === 'github'}
+			<svg viewBox="0 0 128 128" class="icons">
+				<g fill="#ffffff"
+					><path
+						fill-rule="evenodd"
+						clip-rule="evenodd"
+						d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
+					/><path
+						d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
+					/></g
+				>
+			</svg>
+		{/if}
+	</a>
 </div>
-<div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
+<div class="mx-auto max-w-6xl px-6 pt-4">
 	<table class="mx-auto border-separate text-left">
 		<thead>
 			<tr class="h-12">
@@ -68,4 +161,12 @@
 			</tr>
 		</tbody>
 	</table>
+	<h2 class="title my-6 font-bold">Paste .env file</h2>
+	<form on:submit|preventDefault={getValues} class="mb-12 w-full">
+		<textarea bind:value={batchSecrets} class="mb-2 min-h-[200px] w-full" />
+		<button
+			class="bg-green-600 hover:bg-green-500 disabled:text-white disabled:opacity-40"
+			type="submit">Batch add secrets</button
+		>
+	</form>
 </div>

src/routes/applications/[id]/secrets/utils.ts

@@ -0,0 +1,42 @@
+import { toast } from '@zerodevx/svelte-toast';
+import { errorNotification } from '$lib/form';
+import { post } from '$lib/api';
+
+type Props = {
+	isNew: boolean;
+	name: string;
+	value: string;
+	isBuildSecret?: boolean;
+	isPRMRSecret?: boolean;
+	isNewSecret?: boolean;
+	applicationId: string;
+};
+
+export async function saveSecret({
+	isNew,
+	name,
+	value,
+	isBuildSecret,
+	isPRMRSecret,
+	isNewSecret,
+	applicationId
+}: Props): Promise<void> {
+	if (!name) return errorNotification('Name is required.');
+	if (!value) return errorNotification('Value is required.');
+	try {
+		await post(`/applications/${applicationId}/secrets.json`, {
+			name,
+			value,
+			isBuildSecret,
+			isPRMRSecret,
+			isNew: isNew || false
+		});
+		if (isNewSecret) {
+			name = '';
+			value = '';
+			isBuildSecret = false;
+		}
+	} catch ({ error }) {
+		return errorNotification(error);
+	}
+}

src/routes/applications/[id]/storage/index.svelte

@@ -36,12 +36,77 @@
 	}
 </script>
 
-<div class="flex space-x-1 p-6 font-bold">
+<div class="flex items-center space-x-2 p-5 px-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">
+	<div class="-mb-5 flex-col">
-		Persistent storage for <a href={application.fqdn} target="_blank"
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
-			>{getDomain(application.fqdn)}</a
+			Persistent Storage
-		>
+		</div>
+		<span class="text-xs">{application.name} </span>
 	</div>
+
+	{#if application.fqdn}
+		<a
+			href={application.fqdn}
+			target="_blank"
+			class="icons tooltip-bottom flex items-center bg-transparent text-sm"
+			><svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<path d="M11 7h-5a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-5" />
+				<line x1="10" y1="14" x2="20" y2="4" />
+				<polyline points="15 4 20 4 20 9" />
+			</svg></a
+		>
+	{/if}
+	<a
+		href="{application.gitSource.htmlUrl}/{application.repository}/tree/{application.branch}"
+		target="_blank"
+		class="w-10"
+	>
+		{#if application.gitSource?.type === 'gitlab'}
+			<svg viewBox="0 0 128 128" class="icons">
+				<path
+					fill="#FC6D26"
+					d="M126.615 72.31l-7.034-21.647L105.64 7.76c-.716-2.206-3.84-2.206-4.556 0l-13.94 42.903H40.856L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664 1.385 72.31a4.792 4.792 0 001.74 5.358L64 121.894l60.874-44.227a4.793 4.793 0 001.74-5.357"
+				/><path fill="#E24329" d="M64 121.894l23.144-71.23H40.856L64 121.893z" /><path
+					fill="#FC6D26"
+					d="M64 121.894l-23.144-71.23H8.42L64 121.893z"
+				/><path
+					fill="#FCA326"
+					d="M8.42 50.663L1.384 72.31a4.79 4.79 0 001.74 5.357L64 121.894 8.42 50.664z"
+				/><path
+					fill="#E24329"
+					d="M8.42 50.663h32.436L26.916 7.76c-.717-2.206-3.84-2.206-4.557 0L8.42 50.664z"
+				/><path fill="#FC6D26" d="M64 121.894l23.144-71.23h32.437L64 121.893z" /><path
+					fill="#FCA326"
+					d="M119.58 50.663l7.035 21.647a4.79 4.79 0 01-1.74 5.357L64 121.894l55.58-71.23z"
+				/><path
+					fill="#E24329"
+					d="M119.58 50.663H87.145l13.94-42.902c.717-2.206 3.84-2.206 4.557 0l13.94 42.903z"
+				/>
+			</svg>
+		{:else if application.gitSource?.type === 'github'}
+			<svg viewBox="0 0 128 128" class="icons">
+				<g fill="#ffffff"
+					><path
+						fill-rule="evenodd"
+						clip-rule="evenodd"
+						d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
+					/><path
+						d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
+					/></g
+				>
+			</svg>
+		{/if}
+	</a>
 </div>
 
 <div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">

src/routes/applications/_Application.svelte

@@ -1,66 +0,0 @@
-<script lang="ts">
-	export let application;
-	import Rust from '$lib/components/svg/applications/Rust.svelte';
-	import Nodejs from '$lib/components/svg/applications/Nodejs.svelte';
-	import React from '$lib/components/svg/applications/React.svelte';
-	import Svelte from '$lib/components/svg/applications/Svelte.svelte';
-	import Vuejs from '$lib/components/svg/applications/Vuejs.svelte';
-	import PHP from '$lib/components/svg/applications/PHP.svelte';
-	import Python from '$lib/components/svg/applications/Python.svelte';
-	import Static from '$lib/components/svg/applications/Static.svelte';
-	import Nestjs from '$lib/components/svg/applications/Nestjs.svelte';
-	import Nuxtjs from '$lib/components/svg/applications/Nuxtjs.svelte';
-	import Nextjs from '$lib/components/svg/applications/Nextjs.svelte';
-	import Gatsby from '$lib/components/svg/applications/Gatsby.svelte';
-	import Docker from '$lib/components/svg/applications/Docker.svelte';
-	import Astro from '$lib/components/svg/applications/Astro.svelte';
-	import Eleventy from '$lib/components/svg/applications/Eleventy.svelte';
-
-	const buildPack = application?.buildPack?.toLowerCase();
-</script>
-
-<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
-	<div class="box-selection group relative hover:bg-green-600">
-		{#if buildPack === 'rust'}
-			<Rust />
-		{:else if buildPack === 'node'}
-			<Nodejs />
-		{:else if buildPack === 'react'}
-			<React />
-		{:else if buildPack === 'svelte'}
-			<Svelte />
-		{:else if buildPack === 'vuejs'}
-			<Vuejs />
-		{:else if buildPack === 'php'}
-			<PHP />
-		{:else if buildPack === 'python'}
-			<Python />
-		{:else if buildPack === 'static'}
-			<Static />
-		{:else if buildPack === 'nestjs'}
-			<Nestjs />
-		{:else if buildPack === 'nuxtjs'}
-			<Nuxtjs />
-		{:else if buildPack === 'nextjs'}
-			<Nextjs />
-		{:else if buildPack === 'gatsby'}
-			<Gatsby />
-		{:else if buildPack === 'docker'}
-			<Docker />
-		{:else if buildPack === 'astro'}
-			<Astro />
-		{:else if buildPack === 'eleventy'}
-			<Eleventy />
-		{/if}
-
-		<div class="truncate text-center text-xl font-bold">{application.name}</div>
-		{#if application.fqdn}
-			<div class="truncate text-center">{application.fqdn}</div>
-		{/if}
-		{#if !application.gitSourceId || !application.destinationDockerId}
-			<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
-				Configuration missing
-			</div>
-		{/if}
-	</div>
-</a>

src/routes/applications/index.svelte

@@ -1,13 +1,40 @@
 <script lang="ts">
 	export let applications: Array<Application>;
 	import { session } from '$app/stores';
-	import Application from './_Application.svelte';
 	import { post } from '$lib/api';
 	import { goto } from '$app/navigation';
+
+	import Rust from '$lib/components/svg/applications/Rust.svelte';
+	import Nodejs from '$lib/components/svg/applications/Nodejs.svelte';
+	import React from '$lib/components/svg/applications/React.svelte';
+	import Svelte from '$lib/components/svg/applications/Svelte.svelte';
+	import Vuejs from '$lib/components/svg/applications/Vuejs.svelte';
+	import PHP from '$lib/components/svg/applications/PHP.svelte';
+	import Python from '$lib/components/svg/applications/Python.svelte';
+	import Static from '$lib/components/svg/applications/Static.svelte';
+	import Nestjs from '$lib/components/svg/applications/Nestjs.svelte';
+	import Nuxtjs from '$lib/components/svg/applications/Nuxtjs.svelte';
+	import Nextjs from '$lib/components/svg/applications/Nextjs.svelte';
+	import Gatsby from '$lib/components/svg/applications/Gatsby.svelte';
+	import Docker from '$lib/components/svg/applications/Docker.svelte';
+	import Astro from '$lib/components/svg/applications/Astro.svelte';
+	import Eleventy from '$lib/components/svg/applications/Eleventy.svelte';
+	import { getDomain } from '$lib/components/common';
+
 	async function newApplication() {
 		const { id } = await post('/applications/new', {});
 		return await goto(`/applications/${id}`, { replaceState: true });
 	}
+	const ownApplications = applications.filter((application) => {
+		if (application.teams[0].id === $session.teamId) {
+			return application;
+		}
+	});
+	const otherApplications = applications.filter((application) => {
+		if (application.teams[0].id !== $session.teamId) {
+			return application;
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -30,14 +57,125 @@
 		</div>
 	{/if}
 </div>
-<div class="flex flex-wrap justify-center">
+<div class="flex flex-col flex-wrap justify-center">
-	{#if !applications || applications.length === 0}
+	{#if !applications || ownApplications.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No applications found</div>
 		</div>
-	{:else}
+	{/if}
-		{#each applications as application}
+	{#if ownApplications.length > 0 || otherApplications.length > 0}
-			<Application {application} />
+		<div class="flex flex-col">
-		{/each}
+			<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
+				{#each ownApplications as application}
+					<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
+						<div class="box-selection group relative hover:bg-green-600">
+							{#if application.buildPack}
+								{#if application.buildPack.toLowerCase() === 'rust'}
+									<Rust />
+								{:else if application.buildPack.toLowerCase() === 'node'}
+									<Nodejs />
+								{:else if application.buildPack.toLowerCase() === 'react'}
+									<React />
+								{:else if application.buildPack.toLowerCase() === 'svelte'}
+									<Svelte />
+								{:else if application.buildPack.toLowerCase() === 'vuejs'}
+									<Vuejs />
+								{:else if application.buildPack.toLowerCase() === 'php'}
+									<PHP />
+								{:else if application.buildPack.toLowerCase() === 'python'}
+									<Python />
+								{:else if application.buildPack.toLowerCase() === 'static'}
+									<Static />
+								{:else if application.buildPack.toLowerCase() === 'nestjs'}
+									<Nestjs />
+								{:else if application.buildPack.toLowerCase() === 'nuxtjs'}
+									<Nuxtjs />
+								{:else if application.buildPack.toLowerCase() === 'nextjs'}
+									<Nextjs />
+								{:else if application.buildPack.toLowerCase() === 'gatsby'}
+									<Gatsby />
+								{:else if application.buildPack.toLowerCase() === 'docker'}
+									<Docker />
+								{:else if application.buildPack.toLowerCase() === 'astro'}
+									<Astro />
+								{:else if application.buildPack.toLowerCase() === 'eleventy'}
+									<Eleventy />
+								{/if}
+							{/if}
+
+							<div class="truncate text-center text-xl font-bold">{application.name}</div>
+							{#if $session.teamId === '0' && otherApplications.length > 0}
+								<div class="truncate text-center">Team {application.teams[0].name}</div>
+							{/if}
+							{#if application.fqdn}
+								<div class="truncate text-center">{getDomain(application.fqdn) || ''}</div>
+							{/if}
+							{#if !application.gitSourceId || !application.destinationDockerId || !application.fqdn}
+								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
+									Configuration missing
+								</div>
+							{/if}
+						</div>
+					</a>
+				{/each}
+			</div>
+			{#if otherApplications.length > 0 && $session.teamId === '0'}
+				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Applications</div>
+				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
+					{#each otherApplications as application}
+						<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
+							<div class="box-selection group relative hover:bg-green-600">
+								{#if application.buildPack}
+									{#if application.buildPack.toLowerCase() === 'rust'}
+										<Rust />
+									{:else if application.buildPack.toLowerCase() === 'node'}
+										<Nodejs />
+									{:else if application.buildPack.toLowerCase() === 'react'}
+										<React />
+									{:else if application.buildPack.toLowerCase() === 'svelte'}
+										<Svelte />
+									{:else if application.buildPack.toLowerCase() === 'vuejs'}
+										<Vuejs />
+									{:else if application.buildPack.toLowerCase() === 'php'}
+										<PHP />
+									{:else if application.buildPack.toLowerCase() === 'python'}
+										<Python />
+									{:else if application.buildPack.toLowerCase() === 'static'}
+										<Static />
+									{:else if application.buildPack.toLowerCase() === 'nestjs'}
+										<Nestjs />
+									{:else if application.buildPack.toLowerCase() === 'nuxtjs'}
+										<Nuxtjs />
+									{:else if application.buildPack.toLowerCase() === 'nextjs'}
+										<Nextjs />
+									{:else if application.buildPack.toLowerCase() === 'gatsby'}
+										<Gatsby />
+									{:else if application.buildPack.toLowerCase() === 'docker'}
+										<Docker />
+									{:else if application.buildPack.toLowerCase() === 'astro'}
+										<Astro />
+									{:else if application.buildPack.toLowerCase() === 'eleventy'}
+										<Eleventy />
+									{/if}
+								{/if}
+
+								<div class="truncate text-center text-xl font-bold">{application.name}</div>
+								{#if $session.teamId === '0'}
+									<div class="truncate text-center">Team {application.teams[0].name}</div>
+								{/if}
+								{#if application.fqdn}
+									<div class="truncate text-center">{getDomain(application.fqdn) || ''}</div>
+								{/if}
+								{#if !application.gitSourceId || !application.destinationDockerId || !application.fqdn}
+									<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
+										Configuration missing
+									</div>
+								{/if}
+							</div>
+						</a>
+					{/each}
+				</div>
+			{/if}
+		</div>
 	{/if}
 </div>

src/routes/dashboard.json.ts

@@ -1,4 +1,4 @@
-import { getTeam, getUserDetails } from '$lib/common';
+import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -9,23 +9,28 @@ export const get: RequestHandler = async (event) => {
 
 	try {
 		const applicationsCount = await db.prisma.application.count({
-			where: { teams: { some: { id: teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
 		});
 		const sourcesCount = await db.prisma.gitSource.count({
-			where: { teams: { some: { id: teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
 		});
 		const destinationsCount = await db.prisma.destinationDocker.count({
-			where: { teams: { some: { id: teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
 		});
 		const teamsCount = await db.prisma.permission.count({ where: { userId } });
 		const databasesCount = await db.prisma.database.count({
-			where: { teams: { some: { id: teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
 		});
 		const servicesCount = await db.prisma.service.count({
-			where: { teams: { some: { id: teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
+		});
+		const teams = await db.prisma.permission.findMany({
+			where: { userId },
+			include: { team: { include: { _count: { select: { users: true } } } } }
 		});
 		return {
 			body: {
+				teams,
 				applicationsCount,
 				sourcesCount,
 				destinationsCount,

src/routes/databases/[id]/_Databases/_Databases.svelte

@@ -2,6 +2,8 @@
 	export let database;
 	export let privatePort;
 	export let settings;
+	export let isRunning;
+
 	import { page, session } from '$app/stores';
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import Setting from '$lib/components/Setting.svelte';
@@ -15,27 +17,39 @@
 	import { browser } from '$app/env';
 	import { post } from '$lib/api';
 	import { getDomain } from '$lib/components/common';
+	import { toast } from '@zerodevx/svelte-toast';
 
 	const { id } = $page.params;
+
 	let loading = false;
+	let publicLoading = false;
+
 	let isPublic = database.settings.isPublic || false;
 	let appendOnly = database.settings.appendOnly;
 
-	let databaseDefault = database.defaultDatabase;
+	let databaseDefault;
-	let databaseDbUser = database.dbUser;
+	let databaseDbUser;
-	let databaseDbUserPassword = database.dbUserPassword;
+	let databaseDbUserPassword;
-	if (database.type === 'mongodb') {
+
-		databaseDefault = '?readPreference=primary&ssl=false';
+	generateDbDetails();
-		databaseDbUser = database.rootUser;
+
-		databaseDbUserPassword = database.rootUserPassword;
+	function generateDbDetails() {
-	} else if (database.type === 'redis') {
+		databaseDefault = database.defaultDatabase;
-		databaseDefault = '';
+		databaseDbUser = database.dbUser;
-		databaseDbUser = '';
+		databaseDbUserPassword = database.dbUserPassword;
+		if (database.type === 'mongodb') {
+			databaseDefault = '?readPreference=primary&ssl=false';
+			databaseDbUser = database.rootUser;
+			databaseDbUserPassword = database.rootUserPassword;
+		} else if (database.type === 'redis') {
+			databaseDefault = '';
+			databaseDbUser = '';
+		}
 	}
-	let databaseUrl = generateUrl();
+	$: databaseUrl = generateUrl();
 
 	function generateUrl() {
-		return browser
+		return (databaseUrl = browser
 			? `${database.type}://${
 					databaseDbUser ? databaseDbUser + ':' : ''
 			  }${databaseDbUserPassword}@${
@@ -45,32 +59,50 @@
 							: window.location.hostname
 						: database.id
 			  }:${isPublic ? database.publicPort : privatePort}/${databaseDefault}`
-			: 'Loading...';
+			: 'Loading...');
 	}
 
 	async function changeSettings(name) {
+		if (publicLoading || !isRunning) return;
+		publicLoading = true;
+		let data = {
+			isPublic,
+			appendOnly
+		};
 		if (name === 'isPublic') {
-			isPublic = !isPublic;
+			data.isPublic = !isPublic;
 		}
 		if (name === 'appendOnly') {
-			appendOnly = !appendOnly;
+			data.appendOnly = !appendOnly;
 		}
 		try {
-			const { publicPort } = await post(`/databases/${id}/settings.json`, { isPublic, appendOnly });
+			const { publicPort } = await post(`/databases/${id}/settings.json`, {
+				isPublic: data.isPublic,
+				appendOnly: data.appendOnly
+			});
+			isPublic = data.isPublic;
+			appendOnly = data.appendOnly;
+			databaseUrl = generateUrl();
 			if (isPublic) {
 				database.publicPort = publicPort;
 			}
-			databaseUrl = generateUrl();
 		} catch ({ error }) {
 			return errorNotification(error);
+		} finally {
+			publicLoading = false;
 		}
 	}
 	async function handleSubmit() {
 		try {
-			await post(`/databases/${id}.json`, { ...database });
+			loading = true;
-			return window.location.reload();
+			await post(`/databases/${id}.json`, { ...database, isRunning });
+			generateDbDetails();
+			databaseUrl = generateUrl();
+			toast.push('Settings saved.');
 		} catch ({ error }) {
 			return errorNotification(error);
+		} finally {
+			loading = false;
 		}
 	}
 </script>
@@ -142,21 +174,21 @@
 					readonly
 					disabled
 					name="publicPort"
-					value={isPublic ? database.publicPort : privatePort}
+					value={publicLoading ? 'Loading...' : isPublic ? database.publicPort : privatePort}
 				/>
 			</div>
 		</div>
 		<div class="grid grid-flow-row gap-2">
 			{#if database.type === 'mysql'}
-				<MySql bind:database />
+				<MySql bind:database {isRunning} />
 			{:else if database.type === 'postgresql'}
-				<PostgreSql bind:database />
+				<PostgreSql bind:database {isRunning} />
 			{:else if database.type === 'mongodb'}
-				<MongoDb {database} />
+				<MongoDb bind:database {isRunning} />
 			{:else if database.type === 'redis'}
-				<Redis {database} />
+				<Redis bind:database {isRunning} />
 			{:else if database.type === 'couchdb'}
-				<CouchDb bind:database />
+				<CouchDb {database} />
 			{/if}
 			<div class="grid grid-cols-2 items-center px-10 pb-8">
 				<label for="url" class="text-base font-bold text-stone-100">Connection String</label>
@@ -168,7 +200,7 @@
 					name="url"
 					readonly
 					disabled
-					value={databaseUrl}
+					value={publicLoading || loading ? 'Loading...' : generateUrl()}
 				/>
 			</div>
 		</div>
@@ -179,10 +211,12 @@
 	<div class="px-10 pb-10">
 		<div class="grid grid-cols-2 items-center">
 			<Setting
+				loading={publicLoading}
 				bind:setting={isPublic}
 				on:click={() => changeSettings('isPublic')}
 				title="Set it public"
 				description="Your database will be reachable over the internet. <br>Take security seriously in this case!"
+				disabled={!isRunning}
 			/>
 		</div>
 		{#if database.type === 'redis'}

src/routes/databases/[id]/_Databases/_MongoDB.svelte

@@ -1,6 +1,8 @@
 <script>
 	export let database;
+	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import Explainer from '$lib/components/Explainer.svelte';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -21,13 +23,14 @@
 	<div class="grid grid-cols-2 items-center">
 		<label for="rootUserPassword" class="text-base font-bold text-stone-100">Root's Password</label>
 		<CopyPasswordField
+			disabled={!isRunning}
+			readonly={!isRunning}
 			placeholder="Generated automatically after start"
 			isPasswordField={true}
-			readonly
-			disabled
 			id="rootUserPassword"
 			name="rootUserPassword"
-			value={database.rootUserPassword}
+			bind:value={database.rootUserPassword}
 		/>
+		<Explainer text="Could be changed while the database is running." />
 	</div>
 </div>

src/routes/databases/[id]/_Databases/_MySQL.svelte

@@ -1,6 +1,8 @@
 <script>
 	export let database;
+	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import Explainer from '$lib/components/Explainer.svelte';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -33,14 +35,15 @@
 	<div class="grid grid-cols-2 items-center">
 		<label for="dbUserPassword" class="text-base font-bold text-stone-100">Password</label>
 		<CopyPasswordField
-			readonly
+			disabled={!isRunning}
-			disabled
+			readonly={!isRunning}
 			placeholder="Generated automatically after start"
 			isPasswordField
 			id="dbUserPassword"
 			name="dbUserPassword"
-			value={database.dbUserPassword}
+			bind:value={database.dbUserPassword}
 		/>
+		<Explainer text="Could be changed while the database is running." />
 	</div>
 	<div class="grid grid-cols-2 items-center">
 		<label for="rootUser" class="text-base font-bold text-stone-100">Root User</label>
@@ -56,13 +59,14 @@
 	<div class="grid grid-cols-2 items-center">
 		<label for="rootUserPassword" class="text-base font-bold text-stone-100">Root's Password</label>
 		<CopyPasswordField
-			readonly
+			disabled={!isRunning}
-			disabled
+			readonly={!isRunning}
 			placeholder="Generated automatically after start"
 			isPasswordField
 			id="rootUserPassword"
 			name="rootUserPassword"
-			value={database.rootUserPassword}
+			bind:value={database.rootUserPassword}
 		/>
+		<Explainer text="Could be changed while the database is running." />
 	</div>
 </div>

src/routes/databases/[id]/_Databases/_PostgreSQL.svelte

@@ -1,6 +1,8 @@
 <script>
 	export let database;
+	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import Explainer from '$lib/components/Explainer.svelte';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -19,6 +21,19 @@
 			bind:value={database.defaultDatabase}
 		/>
 	</div>
+	<div class="grid grid-cols-2 items-center">
+		<label for="rootUser" class="text-base font-bold text-stone-100"
+			>Root (postgres) User Password</label
+		>
+		<CopyPasswordField
+			disabled={!isRunning}
+			readonly={!isRunning}
+			placeholder="Generated automatically after start"
+			id="rootUserPassword"
+			name="rootUserPassword"
+			bind:value={database.rootUserPassword}
+		/>
+	</div>
 	<div class="grid grid-cols-2 items-center">
 		<label for="dbUser" class="text-base font-bold text-stone-100">User</label>
 		<CopyPasswordField
@@ -33,13 +48,14 @@
 	<div class="grid grid-cols-2 items-center">
 		<label for="dbUserPassword" class="text-base font-bold text-stone-100">Password</label>
 		<CopyPasswordField
-			readonly
+			disabled={!isRunning}
-			disabled
+			readonly={!isRunning}
 			placeholder="Generated automatically after start"
 			isPasswordField
 			id="dbUserPassword"
 			name="dbUserPassword"
-			value={database.dbUserPassword}
+			bind:value={database.dbUserPassword}
 		/>
+		<Explainer text="Could be changed while the database is running." />
 	</div>
 </div>