Merge pull request #578 from coollabsio/next

v3.8.6

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
 		// Append -bullseye or -buster to pin to an OS version.
 		// Use -bullseye variants on local arm64/Apple Silicon.
 		"args": {
-			"VARIANT": "16-bullseye"
+			"VARIANT": "18-bullseye"
 		}
 	},
 	// Set *default* container specific settings.json values on container create.
@@ -23,9 +23,9 @@
 		"bradlc.vscode-tailwindcss"
 	],
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [3000],
+	"forwardPorts": [3000, 3001],
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "cp .env.template .env && pnpm install && pnpm db:push && pnpm db:seed",
+	"postCreateCommand": "cp apps/api/.env.example pps/api/.env && pnpm install && pnpm db:push && pnpm db:seed",
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "node",
 	"features": {

.github/workflows/production-release.yml

@@ -34,4 +34,4 @@ jobs:
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_CHANNEL }}
+          webhook: ${{ secrets.DISCORD_WEBHOOK_PROD_RELEASE_CHANNEL }}

.github/workflows/staging-release.yml

@@ -32,4 +32,4 @@ jobs:
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_CHANNEL }}
+          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL }}

.gitignore

@@ -11,4 +11,5 @@ dist
 client
 apps/api/db/*.db
 local-serve
-apps/api/db/migration.db-journal
+apps/api/db/migration.db-journal
+apps/api/core*

CODE_OF_CONDUCT.md

@@ -0,0 +1,94 @@
+# Citizen Code of Conduct
+
+## 1. Purpose
+
+A primary goal of Coolify is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+
+This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
+
+We invite all those who participate in Coolify to help us create safe and positive experiences for everyone.
+
+## 2. Open [Source/Culture/Tech] Citizenship
+
+A supplemental goal of this Code of Conduct is to increase open [source/culture/tech] citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
+
+Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
+
+If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
+
+## 3. Expected Behavior
+
+The following behaviors are expected and requested of all community members:
+
+ * Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
+ * Exercise consideration and respect in your speech and actions.
+ * Attempt collaboration before conflict.
+ * Refrain from demeaning, discriminatory, or harassing behavior and speech.
+ * Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
+ * Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
+
+## 4. Unacceptable Behavior
+
+The following behaviors are considered harassment and are unacceptable within our community:
+
+ * Violence, threats of violence or violent language directed against another person.
+ * Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
+ * Posting or displaying sexually explicit or violent material.
+ * Posting or threatening to post other people's personally identifying information ("doxing").
+ * Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
+ * Inappropriate photography or recording.
+ * Inappropriate physical contact. You should have someone's consent before touching them.
+ * Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
+ * Deliberate intimidation, stalking or following (online or in person).
+ * Advocating for, or encouraging, any of the above behavior.
+ * Sustained disruption of community events, including talks and presentations.
+
+## 5. Weapons Policy
+
+No weapons will be allowed at Coolify events, community spaces, or in other spaces covered by the scope of this Code of Conduct. Weapons include but are not limited to guns, explosives (including fireworks), and large knives such as those used for hunting or display, as well as any other item used for the purpose of causing injury or harm to others. Anyone seen in possession of one of these items will be asked to leave immediately, and will only be allowed to return without the weapon. Community members are further expected to comply with all state and local laws on this matter.
+
+## 6. Consequences of Unacceptable Behavior
+
+Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
+
+Anyone asked to stop unacceptable behavior is expected to comply immediately.
+
+If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
+
+## 7. Reporting Guidelines
+
+If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. hi@coollabs.io.
+
+
+
+Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
+
+## 8. Addressing Grievances
+
+If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify coollabsio with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies. 
+
+
+
+## 9. Scope
+
+We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues--online and in-person--as well as in all one-on-one communications pertaining to community business.
+
+This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
+
+## 10. Contact info
+
+hi@coollabs.io
+
+## 11. License and attribution
+
+The Citizen Code of Conduct is distributed by [Stumptown Syndicate](http://stumptownsyndicate.org) under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/). 
+
+Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
+
+_Revision 2.3. Posted 6 March 2017._
+
+_Revision 2.2. Posted 4 February 2016._
+
+_Revision 2.1. Posted 23 June 2014._
+
+_Revision 2.0, adopted by the [Stumptown Syndicate](http://stumptownsyndicate.org) board on 10 January 2013. Posted 17 March 2013._

CONTRIBUTING.md

@@ -2,7 +2,6 @@
 
 First of all, thank you for considering contributing to my project! It means a lot 💜.
 
-Contribution guide is for v2, not applicable for v3
 
 ## 🙋 Want to help?
 
@@ -17,13 +16,17 @@ This is a little list of what you can do to help the project:
 
 ## 👋 Introduction
 
-### Setup with github codespaces
+### Setup with Github codespaces
 
 If you have github codespaces enabled then you can just create a codespace and run `pnpm dev` to run your the dev environment. All the required dependencies and packages has been configured for you already.
 
+### Setup with Gitpod
+
+If you have a [Gitpod](https://gitpod.io), you can just create a workspace from this repository, run `pnpm install && pnpm db:push && pnpm db:seed` and then `pnpm dev`. All the required dependencies and packages has been configured for you already.
+
 ### Setup locally in your machine
 
-> 🔴 At the moment, Coolify **doesn't support Windows**. You must use Linux or MacOS. 💡 Although windows users can use github codespaces for development
+> 🔴 At the moment, Coolify **doesn't support Windows**. You must use Linux or MacOS. Consider using Gitpod or Github Codespaces.
 
 #### Recommended Pull Request Guideline
 
@@ -31,21 +34,38 @@ If you have github codespaces enabled then you can just create a codespace and r
 - Clone your fork repo to local
 - Create a new branch
 - Push to your fork repo
-- Create a pull request: https://github.com/coollabsio/compare
+- Create a pull request: https://github.com/coollabsio/coolify/compare
 - Write a proper description
 - Open the pull request to review against `next` branch
 
 ---
 
-# How to start after you set up your local fork?
+# 🧑‍💻 Developer contribution
+## Technical skills required
 
-Due to the lock file, this repository is best with [pnpm](https://pnpm.io). I recommend you try and use `pnpm` because it is cool and efficient!
+- **Languages**: Node.js / Javascript / Typescript
+- **Framework JS/TS**: [SvelteKit](https://kit.svelte.dev/) & [Fastify](https://www.fastify.io/)
+- **Database ORM**: [Prisma.io](https://www.prisma.io/)
+- **Docker Engine API**
 
-You need to have [Docker Engine](https://docs.docker.com/engine/install/) installed locally.
+---
 
-#### Steps for local setup
+## How to start after you set up your local fork?
 
-1. Copy `.env.template` to `.env` and set the `COOLIFY_APP_ID` environment variable to something cool.
+### Prerequisites
+1. Due to the lock file, this repository is best with [pnpm](https://pnpm.io). I recommend you try and use `pnpm` because it is cool and efficient!
+
+2. You need to have [Docker Engine](https://docs.docker.com/engine/install/) installed locally.
+3. You need to have [Docker Compose Plugin](https://docs.docker.com/compose/install/compose-plugin/) installed locally.
+4. You need to have [GIT LFS Support](https://git-lfs.github.com/) installed locally.
+
+Optional:
+
+4. To test Heroku buildpacks, you need [pack](https://github.com/buildpacks/pack) binary installed locally.
+
+### Steps for local setup
+
+1. Copy `apps/api/.env.template` to `apps/api/.env.template` and set the `COOLIFY_APP_ID` environment variable to something cool.
 2. Install dependencies with `pnpm install`.
 3. Need to create a local SQlite database with `pnpm db:push`.
 
@@ -54,28 +74,17 @@ You need to have [Docker Engine](https://docs.docker.com/engine/install/) instal
 4. Seed the database with base entities with `pnpm db:seed`
 5. You can start coding after starting `pnpm dev`.
 
-## 🧑‍💻 Developer contribution
+---
 
-### Technical skills required
-
-- **Languages**: Node.js / Javascript / Typescript
-- **Framework JS/TS**: Svelte / SvelteKit
-- **Database ORM**: Prisma.io
-- **Docker Engine**
-
-### Database migrations
+## Database migrations
 
 During development, if you change the database layout, you need to run `pnpm db:push` to migrate the database and create types for Prisma. You also need to restart the development process.
 
 If the schema is finalized, you need to create a migration file with `pnpm db:migrate <nameOfMigration>` where `nameOfMigration` is given by you. Make it sense. :)
 
-### Tricky parts
-
-- BullMQ, the queue system Coolify uses, cannot be hot reloaded. So if you change anything in the files related to it, you need to restart the development process. I'm actively looking for a different queue/scheduler library. I'm open to discussion!
-
 ---
 
-# How to add new services
+## How to add new services
 
 You can add any open-source and self-hostable software (service/application) to Coolify if the following statements are true:
 
@@ -95,14 +104,14 @@ There are 5 steps you should make on the backend side.
 
 > I will use [Umami](https://umami.is/) as an example service.
 
-### Create Prisma / database schema for the new service.
+### Create Prisma / Database schema for the new service.
 
 You only need to do this if you store passwords or any persistent configuration. Mostly it is required by all services, but there are some exceptions, like NocoDB.
 
 Update Prisma schema in [prisma/schema.prisma](prisma/schema.prisma).
 
 - Add new model with the new service name.
-- Make a relationshup with `Service` model.
+- Make a relationship with `Service` model.
 - In the `Service` model, the name of the new field should be with low-capital.
 - If the service needs a database, define a `publicPort` field to be able to make it's database public, example field name in case of PostgreSQL: `postgresqlPublicPort`. It should be a optional field.
 
@@ -110,13 +119,13 @@ If you are finished with the Prisma schema, you should update the database schem
 
 > You must restart the running development environment to be able to use the new model
 
-> If you use VSCode, you probably need to restart the `Typescript Language Server` to get the new types loaded in the running VSCode.
+> If you use VSCode/TLS, you probably need to restart the `Typescript Language Server` to get the new types loaded in the running environment.
 
 ### Add supported versions
 
 Supported versions are hardcoded into Coolify (for now).
 
-You need to update `supportedServiceTypesAndVersions` function at [src/lib/components/common.ts](src/lib/components/common.ts). Example JSON:
+You need to update `supportedServiceTypesAndVersions` function at [src/apps/api/src/lib/supportedVersions.ts](src/apps/api/src/lib/supportedVersions.ts). Example JSON:
 
 ```js
      {
@@ -139,12 +148,12 @@ You need to update `supportedServiceTypesAndVersions` function at [src/lib/compo
      }
 ```
 
-### Update global functions
+### Add required functions/properties
 
-1. Add the new service to the `include` variable in [src/lib/database/services.ts](src/lib/database/services.ts), so it will be included in all places in the database queries where it is required.
+1. Add the new service to the `includeServices` variable in [apps/api/src/lib/services/common.ts](apps/api/src/lib/services/common.ts), so it will be included in all places in the database queries where it is required.
 
 ```js
-const include: Prisma.ServiceInclude = {
+const include: any = {
 	destinationDocker: true,
 	persistentStorage: true,
 	serviceSecret: true,
@@ -158,7 +167,7 @@ const include: Prisma.ServiceInclude = {
 };
 ```
 
-2. Update the database update query with the new service type to `configureServiceType` function in [src/lib/database/services.ts](src/lib/database/services.ts). This function defines the automatically generated variables (passwords, users, etc.) and it's encryption process (if applicable).
+2. Update the database update query with the new service type to `configureServiceType` function in [apps/api/src/lib/services/common.ts](apps/api/src/lib/services/common.ts). This function defines the automatically generated variables (passwords, users, etc.) and it's encryption process (if applicable).
 
 ```js
 [...]
@@ -184,80 +193,46 @@ else if (type === 'umami') {
 	}
 ```
 
-3. Add decryption process for configurations and passwords to `getService` function in [src/lib/database/services.ts](src/lib/database/services.ts)
+3. Add field details to [apps/api/src/lib/services/serviceFields.ts](apps/api/src/lib/services/serviceFields.ts), so every component will know what to do with the values (decrypt/show it by default/readonly)
 
 ```js
-if (body.umami?.postgresqlPassword)
-	body.umami.postgresqlPassword = decrypt(body.umami.postgresqlPassword);
-
-if (body.umami?.hashSalt) body.umami.hashSalt = decrypt(body.umami.hashSalt);
+export const umami = [{
+	name: 'postgresqlUser',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+}]
 ```
 
-4. Add service deletion query to `removeService` function in [src/lib/database/services.ts](src/lib/database/services.ts)
+4. Add service deletion query to `removeService` function in [apps/api/src/lib/services/common.ts](apps/api/src/lib/services/common.ts)
 
-### Create API endpoints.
 
-You need to add a new folder under [src/routes/services/[id]](src/routes/services/[id]) with the low-capital name of the service. You need 3 default files in that folder.
+5. You need to add start process for the new service in [apps/api/src/routes/api/v1/services/handlers.ts](apps/api/src/routes/api/v1/services/handlers.ts)
 
-#### `index.json.ts`:
+> See startUmamiService() function as example.
 
-It has a POST endpoint that updates the service details in Coolify's database, such as name, url, other configurations, like passwords. It should look something like this:
 
-```js
-import { getUserDetails } from '$lib/common';
-import * as db from '$lib/database';
-import { ErrorHandler } from '$lib/database';
-import type { RequestHandler } from '@sveltejs/kit';
-
-export const post: RequestHandler = async (event) => {
-	const { status, body } = await getUserDetails(event);
-	if (status === 401) return { status, body };
-
-	const { id } = event.params;
-
-	let { name, fqdn } = await event.request.json();
-	if (fqdn) fqdn = fqdn.toLowerCase();
-
-	try {
-		await db.updateService({ id, fqdn, name });
-		return { status: 201 };
-	} catch (error) {
-		return ErrorHandler(error);
-	}
-};
-```
-
-If it's necessary, you can create your own database update function, specifically for the new service.
-
-#### `start.json.ts`
-
-It has a POST endpoint that sets all the required secrets, persistent volumes, `docker-compose.yaml` file and sends a request to the specified docker engine.
-
-You could also define an `HTTP` or `TCP` proxy for every other port that should be proxied to your server. (See `startHttpProxy` and `startTcpProxy` functions in [src/lib/haproxy/index.ts](src/lib/haproxy/index.ts))
-
-#### `stop.json.ts`
-
-It has a POST endpoint that stops the service and all dependent (TCP/HTTP proxies) containers. If publicPort is specified it also needs to cleanup it from the database.
-
-## Frontend
-
-1. You need to add a custom logo at [src/lib/components/svg/services/](src/lib/components/svg/services/) as a svelte component.
+6. You need to add a custom logo at [apps/ui/src/lib/components/svg/services](apps/ui/src/lib/components/svg/services) as a svelte component and export it in [apps/ui/src/lib/components/svg/services/index.ts](apps/ui/src/lib/components/svg/services/index.ts)
 
    SVG is recommended, but you can use PNG as well. It should have the `isAbsolute` variable with the suitable CSS classes, primarily for sizing and positioning.
 
-2. You need to include it the logo at
+7. You need to include it the logo at:
 
-- [src/routes/services/index.svelte](src/routes/services/index.svelte) with `isAbsolute` in two places,
-- [src/lib/components/ServiceLinks.svelte](src/lib/components/ServiceLinks.svelte) with `isAbsolute` and a link to the docs/main site of the service
-- [src/routes/services/[id]/configuration/type.svelte](src/routes/services/[id]/configuration/type.svelte) with `isAbsolute`.
+- [apps/ui/src/lib/components/svg/services/ServiceIcons.svelte](apps/ui/src/lib/components/svg/services/ServiceIcons.svelte) with `isAbsolute`.
+- [apps/ui/src/routes/services/[id]/_ServiceLinks.svelte](apps/ui/src/routes/services/[id]/_ServiceLinks.svelte) with the link to the docs/main site of the service
 
-3. By default the URL and the name frontend forms are included in [src/routes/services/[id]/\_Services/\_Services.svelte](src/routes/services/[id]/_Services/_Services.svelte).
+8. By default the URL and the name frontend forms are included in [apps/ui/src/routes/services/[id]/_Services/_Services.svelte](apps/ui/src/routes/services/[id]/_Services/_Services.svelte).
 
-   If you need to show more details on the frontend, such as users/passwords, you need to add Svelte component to [src/routes/services/[id]/\_Services](src/routes/services/[id]/_Services) with an underscore. For example, see other files in that folder.
+   If you need to show more details on the frontend, such as users/passwords, you need to add Svelte component to [apps/ui/src/routes/services/[id]/_Services](apps/ui/src/routes/services/[id]/_Services) with an underscore. 
+   
+   > For example, see other [here](apps/ui/src/routes/services/[id]/_Services/_Umami.svelte).
 
-   You also need to add the new inputs to the `index.json.ts` file of the specific service, like for MinIO here: [src/routes/services/[id]/minio/index.json.ts](src/routes/services/[id]/minio/index.json.ts)
 
-## 🌐 Translate the project
+Good job! 👏
+
+<!-- # 🌐 Translate the project
 
 The project use [sveltekit-i18n](https://github.com/sveltekit-i18n/lib) to translate the project.
 It follows the [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) to name languages.
@@ -278,4 +253,4 @@ If your language doesn't appear in the [locales folder list](src/lib/locales/),
 
 1.  In `src/lib/locales/`, Copy paste `en.json` and rename it with your language (eg: `cz.json`).
 2.  In the [lang.json](src/lib/lang.json) file, add a line after the first bracket (`{`) with `"ISO of your language": "Language",` (eg: `"cz": "Czech",`).
-3.  Have fun translating!
+3.  Have fun translating! -->

Dockerfile

@@ -21,7 +21,7 @@ ENV PRISMA_QUERY_ENGINE_BINARY=/app/prisma-engines/query-engine \
   PRISMA_CLI_QUERY_ENGINE_TYPE=binary \
   PRISMA_CLIENT_ENGINE_TYPE=binary
 
-COPY --from=coollabsio/prisma-engine:3.15 /prisma-engines/query-engine /prisma-engines/migration-engine /prisma-engines/introspection-engine /prisma-engines/prisma-fmt /app/prisma-engines/
+COPY --from=coollabsio/prisma-engine:4.2.0 /prisma-engines/query-engine /prisma-engines/migration-engine /prisma-engines/introspection-engine /prisma-engines/prisma-fmt /app/prisma-engines/
 
 RUN apk add --no-cache git git-lfs openssh-client curl jq cmake sqlite openssl psmisc
 RUN curl -sL https://unpkg.com/@pnpm/self-installer | node
@@ -45,4 +45,5 @@ COPY --from=build /app/docker-compose.yaml .
 RUN pnpm install -p
 
 EXPOSE 3000
+ENV CHECKPOINT_DISABLE=1
 CMD pnpm start

README.md

@@ -16,7 +16,7 @@ If you have a new service / build pack you would like to add, raise an idea [her
 
 ## How to install
 
-For more details goto the [docs](https://docs.coollabs.io/coolify/installation.html).
+For more details goto the [docs](https://docs.coollabs.io/coolify/installation).
 
 Installation is automated with the following command:
 
@@ -103,7 +103,7 @@ A fresh installation is necessary. v2 and v3 are not compatible with v1.
 - Twitter: [@andrasbacsai](https://twitter.com/andrasbacsai)
 - Telegram: [@andrasbacsai](https://t.me/andrasbacsai)
 - Email: [andras@coollabs.io](mailto:andras@coollabs.io)
-- Discord: [Invitation](https://discord.gg/6rDM4fkymF)
+- Discord: [Invitation](https://coollabs.io/discord)
 
 ## Financial Contributors
 

apps/api/.env.example

@@ -1,6 +1,7 @@
-COOLIFY_APP_ID=
-COOLIFY_SECRET_KEY="12341234123412341234123412341234 - 32 long"
-COOLIFY_DATABASE_URL=
+COOLIFY_APP_ID=local-dev
+# 32 bits long secret key
+COOLIFY_SECRET_KEY=12341234123412341234123412341234
+COOLIFY_DATABASE_URL=file:../db/dev.db
 COOLIFY_SENTRY_DSN=
 
 COOLIFY_IS_ON=docker

apps/api/package.json

@@ -16,25 +16,26 @@
   "dependencies": {
     "@breejs/ts-worker": "2.0.0",
     "@fastify/autoload": "5.2.0",
-    "@fastify/cookie": "8.0.0",
+    "@fastify/cookie": "8.1.0",
     "@fastify/cors": "8.1.0",
     "@fastify/env": "4.1.0",
     "@fastify/jwt": "6.3.2",
     "@fastify/static": "6.5.0",
     "@iarna/toml": "2.2.5",
-    "@prisma/client": "3.15.2",
+    "@ladjs/graceful": "3.0.2",
+    "@prisma/client": "4.2.1",
     "axios": "0.27.2",
     "bcryptjs": "2.4.3",
     "bree": "9.1.2",
     "cabin": "9.1.2",
-    "compare-versions": "4.1.3",
+    "compare-versions": "5.0.1",
     "cuid": "2.1.8",
     "dayjs": "1.11.5",
     "dockerode": "3.3.4",
     "dotenv-extended": "2.9.0",
     "execa": "6.1.0",
-    "fastify": "4.5.2",
-    "fastify-plugin": "4.2.0",
+    "fastify": "4.5.3",
+    "fastify-plugin": "4.2.1",
     "generate-password": "1.7.0",
     "got": "12.3.1",
     "is-ip": "5.0.0",
@@ -43,24 +44,25 @@
     "jsonwebtoken": "8.5.1",
     "node-forge": "1.3.1",
     "node-os-utils": "1.3.7",
-    "p-queue": "7.3.0",
+    "p-all": "4.0.0",
+    "p-throttle": "5.0.0",
     "public-ip": "6.0.1",
     "ssh-config": "4.1.6",
     "strip-ansi": "7.0.1",
     "unique-names-generator": "4.7.1"
   },
   "devDependencies": {
-    "@types/node": "18.7.11",
+    "@types/node": "18.7.13",
     "@types/node-os-utils": "1.3.0",
-    "@typescript-eslint/eslint-plugin": "5.34.0",
-    "@typescript-eslint/parser": "5.34.0",
+    "@typescript-eslint/eslint-plugin": "5.35.1",
+    "@typescript-eslint/parser": "5.35.1",
     "esbuild": "0.15.5",
-    "eslint": "8.22.0",
+    "eslint": "8.23.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.2.1",
     "nodemon": "2.0.19",
     "prettier": "2.7.1",
-    "prisma": "3.15.2",
+    "prisma": "4.2.1",
     "rimraf": "3.0.2",
     "tsconfig-paths": "4.1.0",
     "typescript": "4.7.4"

apps/api/prisma/migrations/20220825064811_concurrent_build_settings/migration.sql

@@ -0,0 +1,29 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Setting" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "fqdn" TEXT,
+    "isRegistrationEnabled" BOOLEAN NOT NULL DEFAULT false,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "minPort" INTEGER NOT NULL DEFAULT 9000,
+    "maxPort" INTEGER NOT NULL DEFAULT 9100,
+    "proxyPassword" TEXT NOT NULL,
+    "proxyUser" TEXT NOT NULL,
+    "proxyHash" TEXT,
+    "isAutoUpdateEnabled" BOOLEAN NOT NULL DEFAULT false,
+    "isDNSCheckEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "DNSServers" TEXT,
+    "isTraefikUsed" BOOLEAN NOT NULL DEFAULT true,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "ipv4" TEXT,
+    "ipv6" TEXT,
+    "arch" TEXT,
+    "concurrentBuilds" INTEGER NOT NULL DEFAULT 1
+);
+INSERT INTO "new_Setting" ("DNSServers", "arch", "createdAt", "dualCerts", "fqdn", "id", "ipv4", "ipv6", "isAutoUpdateEnabled", "isDNSCheckEnabled", "isRegistrationEnabled", "isTraefikUsed", "maxPort", "minPort", "proxyHash", "proxyPassword", "proxyUser", "updatedAt") SELECT "DNSServers", "arch", "createdAt", "dualCerts", "fqdn", "id", "ipv4", "ipv6", "isAutoUpdateEnabled", "isDNSCheckEnabled", "isRegistrationEnabled", "isTraefikUsed", "maxPort", "minPort", "proxyHash", "proxyPassword", "proxyUser", "updatedAt" FROM "Setting";
+DROP TABLE "Setting";
+ALTER TABLE "new_Setting" RENAME TO "Setting";
+CREATE UNIQUE INDEX "Setting_fqdn_key" ON "Setting"("fqdn");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/migrations/20220825072007_build_queue_improvements/migration.sql

@@ -0,0 +1,24 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Build" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "type" TEXT NOT NULL,
+    "applicationId" TEXT,
+    "destinationDockerId" TEXT,
+    "gitSourceId" TEXT,
+    "githubAppId" TEXT,
+    "gitlabAppId" TEXT,
+    "commit" TEXT,
+    "pullmergeRequestId" TEXT,
+    "forceRebuild" BOOLEAN NOT NULL DEFAULT false,
+    "sourceBranch" TEXT,
+    "branch" TEXT,
+    "status" TEXT DEFAULT 'queued',
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+INSERT INTO "new_Build" ("applicationId", "branch", "commit", "createdAt", "destinationDockerId", "gitSourceId", "githubAppId", "gitlabAppId", "id", "status", "type", "updatedAt") SELECT "applicationId", "branch", "commit", "createdAt", "destinationDockerId", "gitSourceId", "githubAppId", "gitlabAppId", "id", "status", "type", "updatedAt" FROM "Build";
+DROP TABLE "Build";
+ALTER TABLE "new_Build" RENAME TO "Build";
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/schema.prisma

@@ -27,6 +27,7 @@ model Setting {
   ipv4                  String?
   ipv6                  String?
   arch                  String?
+  concurrentBuilds      Int      @default(1)
 }
 
 model User {
@@ -197,6 +198,9 @@ model Build {
   githubAppId         String?
   gitlabAppId         String?
   commit              String?
+  pullmergeRequestId  String?
+  forceRebuild        Boolean  @default(false)
+  sourceBranch        String?  
   branch              String?
   status              String?  @default("queued")
   createdAt           DateTime @default(now())

apps/api/src/index.ts

@@ -7,9 +7,8 @@ import path, { join } from 'path';
 import autoLoad from '@fastify/autoload';
 import { asyncExecShell, isDev, listSettings, prisma, version } from './lib/common';
 import { scheduler } from './lib/scheduler';
-import axios from 'axios';
-import compareVersions from 'compare-versions';
-
+import { compareVersions } from 'compare-versions';
+import Graceful from '@ladjs/graceful'
 declare module 'fastify' {
 	interface FastifyInstance {
 		config: {
@@ -104,49 +103,39 @@ fastify.listen({ port, host }, async (err: any, address: any) => {
 	}
 	console.log(`Coolify's API is listening on ${host}:${port}`);
 	await initServer();
-	await scheduler.start('deployApplication');
-	await scheduler.start('cleanupStorage');
-	await scheduler.start('cleanupPrismaEngines');
-	await scheduler.start('checkProxies');
 
-	// Check if no build is running
+	const graceful = new Graceful({ brees: [scheduler] });
+	graceful.listen();
 
-	// Check for update
 	setInterval(async () => {
-		const { isAutoUpdateEnabled } = await prisma.setting.findFirst();
-		if (isAutoUpdateEnabled) {
-			const currentVersion = version;
-			const { data: versions } = await axios
-				.get(
-					`https://get.coollabs.io/versions.json`
-					, {
-						params: {
-							appId: process.env['COOLIFY_APP_ID'] || undefined,
-							version: currentVersion
-						}
-					})
-			const latestVersion = versions['coolify'].main.version;
-			const isUpdateAvailable = compareVersions(latestVersion, currentVersion);
-			if (isUpdateAvailable === 1) {
-				if (scheduler.workers.has('deployApplication')) {
-					scheduler.workers.get('deployApplication').postMessage("status:autoUpdater");
-				}
-			}
+		if (!scheduler.workers.has('deployApplication')) {
+			scheduler.run('deployApplication');
 		}
+		if (!scheduler.workers.has('infrastructure')) {
+			scheduler.run('infrastructure');
+		}
+	}, 2000)
+
+	// autoUpdater
+	setInterval(async () => {
+		scheduler.workers.has('infrastructure') && scheduler.workers.get('infrastructure').postMessage("action:autoUpdater")
 	}, isDev ? 5000 : 60000 * 15)
 
-	// Cleanup storage
+	// cleanupStorage
 	setInterval(async () => {
-		if (scheduler.workers.has('deployApplication')) {
-			scheduler.workers.get('deployApplication').postMessage("status:cleanupStorage");
-		}
-	}, isDev ? 5000 : 60000 * 10)
+		scheduler.workers.has('infrastructure') && scheduler.workers.get('infrastructure').postMessage("action:cleanupStorage")
+	}, isDev ? 6000 : 60000 * 10)
+
+	// checkProxies
+	setInterval(async () => {
+		scheduler.workers.has('infrastructure') && scheduler.workers.get('infrastructure').postMessage("action:checkProxies")
+	}, 10000)
+
+	// cleanupPrismaEngines
+	// setInterval(async () => {
+	// 	scheduler.workers.has('infrastructure') && scheduler.workers.get('infrastructure').postMessage("action:cleanupPrismaEngines")
+	// }, 60000)
 
-	scheduler.on('worker deleted', async (name) => {
-		if (name === 'autoUpdater' || name === 'cleanupStorage') {
-			if (!scheduler.workers.has('deployApplication')) await scheduler.start('deployApplication');
-		}
-	});
 	await getArch();
 	await getIPAddress();
 });
@@ -170,6 +159,12 @@ async function initServer() {
 	try {
 		await asyncExecShell(`docker network create --attachable coolify`);
 	} catch (error) { }
+	try {
+		const isOlder = compareVersions('3.8.1', version);
+		if (isOlder === 1) {
+			await prisma.build.updateMany({ where: { status: { in: ['running', 'queued'] } }, data: { status: 'failed' } });
+		}
+	} catch (error) { }
 }
 async function getArch() {
 	try {

apps/api/src/jobs/autoUpdater.ts

@@ -1,43 +0,0 @@
-import axios from 'axios';
-import compareVersions from 'compare-versions';
-import { parentPort } from 'node:worker_threads';
-import { asyncExecShell, asyncSleep, isDev, prisma, version } from '../lib/common';
-
-(async () => {
-    if (parentPort) {
-        try {
-            const currentVersion = version;
-            const { data: versions } = await axios
-                .get(
-                    `https://get.coollabs.io/versions.json`
-                    , {
-                        params: {
-                            appId: process.env['COOLIFY_APP_ID'] || undefined,
-                            version: currentVersion
-                        }
-                    })
-            const latestVersion = versions['coolify'].main.version;
-            const isUpdateAvailable = compareVersions(latestVersion, currentVersion);
-            if (isUpdateAvailable === 1) {
-                const activeCount = 0
-                if (activeCount === 0) {
-                    if (!isDev) {
-                        console.log(`Updating Coolify to ${latestVersion}.`);
-                        await asyncExecShell(`docker pull coollabsio/coolify:${latestVersion}`);
-                        await asyncExecShell(`env | grep COOLIFY > .env`);
-                        await asyncExecShell(
-                            `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify && docker rm coolify && docker compose up -d --force-recreate"`
-                        );
-                    } else {
-                        console.log('Updating (not really in dev mode).');
-                    }
-                }
-            }
-        } catch (error) {
-            console.log(error);
-        } finally {
-            await prisma.$disconnect();
-        }
-
-    } else process.exit(0);
-})();

apps/api/src/jobs/checkProxies.ts

@@ -1,96 +0,0 @@
-import { parentPort } from 'node:worker_threads';
-import { prisma, startTraefikTCPProxy, generateDatabaseConfiguration, startTraefikProxy, executeDockerCmd, listSettings } from '../lib/common';
-import { checkContainer } from '../lib/docker';
-
-(async () => {
-    if (parentPort) {
-        try {
-            const { arch } = await listSettings();
-            // Coolify Proxy local
-            const engine = '/var/run/docker.sock';
-            const localDocker = await prisma.destinationDocker.findFirst({
-                where: { engine, network: 'coolify' }
-            });
-            if (localDocker && localDocker.isCoolifyProxyUsed) {
-                // Remove HAProxy
-                const found = await checkContainer({ dockerId: localDocker.id, container: 'coolify-haproxy' });
-                if (found) {
-                    await executeDockerCmd({
-                        dockerId: localDocker.id,
-                        command: `docker stop -t 0 coolify-haproxy && docker rm coolify-haproxy`
-                    })
-                }
-                await startTraefikProxy(localDocker.id);
-            }
-
-            // TCP Proxies
-            const databasesWithPublicPort = await prisma.database.findMany({
-                where: { publicPort: { not: null } },
-                include: { settings: true, destinationDocker: true }
-            });
-            for (const database of databasesWithPublicPort) {
-                const { destinationDockerId, destinationDocker, publicPort, id } = database;
-                if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
-                    const { privatePort } = generateDatabaseConfiguration(database, arch);
-                    // Remove HAProxy
-                    const found = await checkContainer({
-                        dockerId: localDocker.id, container: `haproxy-for-${publicPort}`
-                    });
-                    if (found) {
-                        await executeDockerCmd({
-                            dockerId: localDocker.id,
-                            command: `docker stop -t 0 haproxy-for-${publicPort} && docker rm haproxy-for-${publicPort}`
-                        })
-                    }
-                    await startTraefikTCPProxy(destinationDocker, id, publicPort, privatePort);
-                }
-            }
-            const wordpressWithFtp = await prisma.wordpress.findMany({
-                where: { ftpPublicPort: { not: null } },
-                include: { service: { include: { destinationDocker: true } } }
-            });
-            for (const ftp of wordpressWithFtp) {
-                const { service, ftpPublicPort } = ftp;
-                const { destinationDockerId, destinationDocker, id } = service;
-                if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
-                    // Remove HAProxy
-                    const found = await checkContainer({ dockerId: localDocker.id, container: `haproxy-for-${ftpPublicPort}` });
-                    if (found) {
-                        await executeDockerCmd({
-                            dockerId: localDocker.id,
-                            command: `docker stop -t 0 haproxy -for-${ftpPublicPort} && docker rm haproxy-for-${ftpPublicPort}`
-                        })
-                    }
-                    await startTraefikTCPProxy(destinationDocker, id, ftpPublicPort, 22, 'wordpressftp');
-                }
-            }
-
-            // HTTP Proxies
-            const minioInstances = await prisma.minio.findMany({
-                where: { publicPort: { not: null } },
-                include: { service: { include: { destinationDocker: true } } }
-            });
-            for (const minio of minioInstances) {
-                const { service, publicPort } = minio;
-                const { destinationDockerId, destinationDocker, id } = service;
-                if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
-                    // Remove HAProxy
-                    const found = await checkContainer({ dockerId: localDocker.id, container: `${id}-${publicPort}` });
-                    if (found) {
-                        await executeDockerCmd({
-                            dockerId: localDocker.id,
-                            command: `docker stop -t 0 ${id}-${publicPort} && docker rm ${id}-${publicPort} `
-                        })
-                    }
-                    await startTraefikTCPProxy(destinationDocker, id, publicPort, 9000);
-                }
-            }
-
-        } catch (error) {
-
-        } finally {
-            await prisma.$disconnect();
-        }
-
-    } else process.exit(0);
-})();

apps/api/src/jobs/cleanupPrismaEngines.ts

@@ -1,19 +0,0 @@
-import { parentPort } from 'node:worker_threads';
-import { asyncExecShell, isDev, prisma } from '../lib/common';
-
-(async () => {
-    if (parentPort) {
-        if (!isDev) {
-            try {
-                const { stdout } = await asyncExecShell(`ps -ef | grep /app/prisma-engines/query-engine | grep -v grep | wc -l | xargs`)
-                if (stdout.trim() != null && stdout.trim() != '' && Number(stdout.trim()) > 1) {
-                    await asyncExecShell(`killall -q -e /app/prisma-engines/query-engine -o 10m`)
-                }
-            } catch (error) {
-                console.log(error);
-            } finally {
-                await prisma.$disconnect();
-            }
-        }
-    } else process.exit(0);
-})();

apps/api/src/jobs/cleanupStorage.ts

@@ -1,60 +0,0 @@
-import { parentPort } from 'node:worker_threads';
-import { asyncExecShell, cleanupDockerStorage, executeDockerCmd, isDev, prisma, version } from '../lib/common';
-
-(async () => {
-    if (parentPort) {
-        const destinationDockers = await prisma.destinationDocker.findMany();
-        let enginesDone = new Set()
-        for (const destination of destinationDockers) {
-            if (enginesDone.has(destination.engine) || enginesDone.has(destination.remoteIpAddress)) return
-            if (destination.engine) enginesDone.add(destination.engine)
-            if (destination.remoteIpAddress) enginesDone.add(destination.remoteIpAddress)
-            
-            let lowDiskSpace = false;
-            try {
-                let stdout = null
-                if (!isDev) {
-                    const output = await executeDockerCmd({ dockerId: destination.id, command: `CONTAINER=$(docker ps -lq | head -1) && docker exec $CONTAINER sh -c 'df -kPT /'` })
-                    stdout = output.stdout;
-                } else {
-                    const output = await asyncExecShell(
-                        `df -kPT /`
-                    );
-                    stdout = output.stdout;
-                }
-                let lines = stdout.trim().split('\n');
-                let header = lines[0];
-                let regex =
-                    /^Filesystem\s+|Type\s+|1024-blocks|\s+Used|\s+Available|\s+Capacity|\s+Mounted on\s*$/g;
-                const boundaries = [];
-                let match;
-
-                while ((match = regex.exec(header))) {
-                    boundaries.push(match[0].length);
-                }
-
-                boundaries[boundaries.length - 1] = -1;
-                const data = lines.slice(1).map((line) => {
-                    const cl = boundaries.map((boundary) => {
-                        const column = boundary > 0 ? line.slice(0, boundary) : line;
-                        line = line.slice(boundary);
-                        return column.trim();
-                    });
-                    return {
-                        capacity: Number.parseInt(cl[5], 10) / 100
-                    };
-                });
-                if (data.length > 0) {
-                    const { capacity } = data[0];
-                    if (capacity > 0.8) {
-                        lowDiskSpace = true;
-                    }
-                }
-            } catch (error) {
-                console.log(error);
-            }
-            await cleanupDockerStorage(destination.id, lowDiskSpace, false)
-        }
-        await prisma.$disconnect();
-    } else process.exit(0);
-})();

apps/api/src/jobs/deployApplication.ts

@@ -4,214 +4,279 @@ import fs from 'fs/promises';
 import yaml from 'js-yaml';
 
 import { copyBaseConfigurationFiles, makeLabelForStandaloneApplication, saveBuildLog, setDefaultConfiguration } from '../lib/buildPacks/common';
-import { createDirectories, decrypt, defaultComposeConfiguration, executeDockerCmd, getDomain, prisma } from '../lib/common';
+import { createDirectories, decrypt, defaultComposeConfiguration, executeDockerCmd, getDomain, prisma, decryptApplication } from '../lib/common';
 import * as importers from '../lib/importers';
 import * as buildpacks from '../lib/buildPacks';
 
 (async () => {
 	if (parentPort) {
-		const concurrency = 1
-		const PQueue = await import('p-queue');
-		const queue = new PQueue.default({ concurrency });
 		parentPort.on('message', async (message) => {
-			if (parentPort) {
-				if (message === 'error') throw new Error('oops');
-				if (message === 'cancel') {
-					parentPort.postMessage('cancelled');
-					return;
-				}
-				if (message === 'status:autoUpdater') {
-					parentPort.postMessage({ size: queue.size, pending: queue.pending, caller: 'autoUpdater' });
-					return;
-				}
-				if (message === 'status:cleanupStorage') {
-					parentPort.postMessage({ size: queue.size, pending: queue.pending, caller: 'cleanupStorage' });
-					return;
-				}
-				if (message === 'action:flushQueue') {
-					queue.clear()
-					return;
-				}
+			if (message === 'error') throw new Error('oops');
+			if (message === 'cancel') {
+				parentPort.postMessage('cancelled');
+				await prisma.$disconnect()
+				process.exit(0);
+			}
+		});
+		const pThrottle = await import('p-throttle')
+		const throttle = pThrottle.default({
+			limit: 1,
+			interval: 2000
+		});
 
-				await queue.add(async () => {
-					const {
-						id: applicationId,
-						repository,
-						name,
-						destinationDocker,
-						destinationDockerId,
-						gitSource,
-						build_id: buildId,
-						configHash,
-						fqdn,
-						projectId,
-						secrets,
-						phpModules,
-						type,
-						pullmergeRequestId = null,
-						sourceBranch = null,
-						settings,
-						persistentStorage,
-						pythonWSGI,
-						pythonModule,
-						pythonVariable,
-						denoOptions,
-						exposePort,
-						baseImage,
-						baseBuildImage,
-						deploymentType,
-						forceRebuild
-					} = message
-					let {
-						branch,
-						buildPack,
-						port,
-						installCommand,
-						buildCommand,
-						startCommand,
-						baseDirectory,
-						publishDirectory,
-						dockerFileLocation,
-						denoMainFile
-					} = message
-					const currentHash = crypto
-						.createHash('sha256')
-						.update(
-							JSON.stringify({
-								pythonWSGI,
-								pythonModule,
-								pythonVariable,
-								deploymentType,
-								denoOptions,
-								baseImage,
-								baseBuildImage,
-								buildPack,
-								port,
-								exposePort,
-								installCommand,
-								buildCommand,
-								startCommand,
-								secrets,
-								branch,
-								repository,
-								fqdn
-							})
-						)
-						.digest('hex');
-					try {
-						const { debug } = settings;
-						if (concurrency === 1) {
-							await prisma.build.updateMany({
-								where: {
-									status: { in: ['queued', 'running'] },
-									id: { not: buildId },
-									applicationId,
-									createdAt: { lt: new Date(new Date().getTime() - 10 * 1000) }
-								},
-								data: { status: 'failed' }
-							});
-						}
-						let imageId = applicationId;
-						let domain = getDomain(fqdn);
-						const volumes =
-							persistentStorage?.map((storage) => {
-								return `${applicationId}${storage.path.replace(/\//gi, '-')}:${buildPack !== 'docker' ? '/app' : ''
-									}${storage.path}`;
-							}) || [];
-						// Previews, we need to get the source branch and set subdomain
-						if (pullmergeRequestId) {
-							branch = sourceBranch;
-							domain = `${pullmergeRequestId}.${domain}`;
-							imageId = `${applicationId}-${pullmergeRequestId}`;
-						}
 
-						let deployNeeded = true;
-						let destinationType;
-
-						if (destinationDockerId) {
-							destinationType = 'docker';
-						}
-						if (destinationType === 'docker') {
-							await prisma.build.update({ where: { id: buildId }, data: { status: 'running' } });
-							const { workdir, repodir } = await createDirectories({ repository, buildId });
-							const configuration = await setDefaultConfiguration(message);
-
-							buildPack = configuration.buildPack;
-							port = configuration.port;
-							installCommand = configuration.installCommand;
-							startCommand = configuration.startCommand;
-							buildCommand = configuration.buildCommand;
-							publishDirectory = configuration.publishDirectory;
-							baseDirectory = configuration.baseDirectory;
-							dockerFileLocation = configuration.dockerFileLocation;
-							denoMainFile = configuration.denoMainFile;
-							const commit = await importers[gitSource.type]({
-								applicationId,
-								debug,
-								workdir,
-								repodir,
-								githubAppId: gitSource.githubApp?.id,
-								gitlabAppId: gitSource.gitlabApp?.id,
-								customPort: gitSource.customPort,
-								repository,
-								branch,
-								buildId,
-								apiUrl: gitSource.apiUrl,
-								htmlUrl: gitSource.htmlUrl,
-								projectId,
-								deployKeyId: gitSource.gitlabApp?.deployKeyId || null,
-								privateSshKey: decrypt(gitSource.gitlabApp?.privateSshKey) || null,
-								forPublic: gitSource.forPublic
-							});
-							if (!commit) {
-								throw new Error('No commit found?');
-							}
-							let tag = commit.slice(0, 7);
-							if (pullmergeRequestId) {
-								tag = `${commit.slice(0, 7)}-${pullmergeRequestId}`;
-							}
+		const th = throttle(async () => {
+			try {
+				const queuedBuilds = await prisma.build.findMany({ where: { status: { in: ['queued', 'running'] } }, orderBy: { createdAt: 'asc' } });
+				const { concurrentBuilds } = await prisma.setting.findFirst({})
+				if (queuedBuilds.length > 0) {
+					parentPort.postMessage({ deploying: true });
+					const concurrency = concurrentBuilds;
+					const pAll = await import('p-all');
+					const actions = []
 
+					for (const queueBuild of queuedBuilds) {
+						actions.push(async () => {
+							let application = await prisma.application.findUnique({ where: { id: queueBuild.applicationId }, include: { destinationDocker: true, gitSource: { include: { githubApp: true, gitlabApp: true } }, persistentStorage: true, secrets: true, settings: true, teams: true } })
+							let { id: buildId, type, sourceBranch = null, pullmergeRequestId = null, forceRebuild } = queueBuild
+							application = decryptApplication(application)
 							try {
-								await prisma.build.update({ where: { id: buildId }, data: { commit } });
-							} catch (err) {
-								console.log(err);
-							}
-
-							if (!pullmergeRequestId) {
-
-								if (configHash !== currentHash) {
-									deployNeeded = true;
-									if (configHash) {
-										await saveBuildLog({ line: 'Configuration changed.', buildId, applicationId });
-									}
-								} else {
-									deployNeeded = false;
+								if (queueBuild.status === 'running') {
+									await saveBuildLog({ line: 'Building halted, restarting...', buildId, applicationId: application.id });
+								}
+								const {
+									id: applicationId,
+									repository,
+									name,
+									destinationDocker,
+									destinationDockerId,
+									gitSource,
+									configHash,
+									fqdn,
+									projectId,
+									secrets,
+									phpModules,
+									settings,
+									persistentStorage,
+									pythonWSGI,
+									pythonModule,
+									pythonVariable,
+									denoOptions,
+									exposePort,
+									baseImage,
+									baseBuildImage,
+									deploymentType,
+								} = application
+								let {
+									branch,
+									buildPack,
+									port,
+									installCommand,
+									buildCommand,
+									startCommand,
+									baseDirectory,
+									publishDirectory,
+									dockerFileLocation,
+									denoMainFile
+								} = application
+								const currentHash = crypto
+									.createHash('sha256')
+									.update(
+										JSON.stringify({
+											pythonWSGI,
+											pythonModule,
+											pythonVariable,
+											deploymentType,
+											denoOptions,
+											baseImage,
+											baseBuildImage,
+											buildPack,
+											port,
+											exposePort,
+											installCommand,
+											buildCommand,
+											startCommand,
+											secrets,
+											branch,
+											repository,
+											fqdn
+										})
+									)
+									.digest('hex');
+								const { debug } = settings;
+								if (concurrency === 1) {
+									await prisma.build.updateMany({
+										where: {
+											status: { in: ['queued', 'running'] },
+											id: { not: buildId },
+											applicationId,
+											createdAt: { lt: new Date(new Date().getTime() - 10 * 1000) }
+										},
+										data: { status: 'failed' }
+									});
+								}
+								let imageId = applicationId;
+								let domain = getDomain(fqdn);
+								const volumes =
+									persistentStorage?.map((storage) => {
+										return `${applicationId}${storage.path.replace(/\//gi, '-')}:${buildPack !== 'docker' ? '/app' : ''
+											}${storage.path}`;
+									}) || [];
+								// Previews, we need to get the source branch and set subdomain
+								if (pullmergeRequestId) {
+									branch = sourceBranch;
+									domain = `${pullmergeRequestId}.${domain}`;
+									imageId = `${applicationId}-${pullmergeRequestId}`;
 								}
-							} else {
-								deployNeeded = true;
-							}
 
-							let imageFound = false;
-							try {
-								await executeDockerCmd({
-									dockerId: destinationDocker.id,
-									command: `docker image inspect ${applicationId}:${tag}`
-								})
-								imageFound = true;
-							} catch (error) {
-								//
-							}
-							await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
+								let deployNeeded = true;
+								let destinationType;
 
-							if (forceRebuild) deployNeeded = true
-							if (!imageFound || deployNeeded) {
-								// if (true) {
-								if (buildpacks[buildPack])
-									await buildpacks[buildPack]({
-										dockerId: destinationDocker.id,
-										buildId,
+								if (destinationDockerId) {
+									destinationType = 'docker';
+								}
+								if (destinationType === 'docker') {
+									await prisma.build.update({ where: { id: buildId }, data: { status: 'running' } });
+									const { workdir, repodir } = await createDirectories({ repository, buildId });
+									const configuration = await setDefaultConfiguration(application);
+
+									buildPack = configuration.buildPack;
+									port = configuration.port;
+									installCommand = configuration.installCommand;
+									startCommand = configuration.startCommand;
+									buildCommand = configuration.buildCommand;
+									publishDirectory = configuration.publishDirectory;
+									baseDirectory = configuration.baseDirectory;
+									dockerFileLocation = configuration.dockerFileLocation;
+									denoMainFile = configuration.denoMainFile;
+									const commit = await importers[gitSource.type]({
 										applicationId,
-										domain,
+										debug,
+										workdir,
+										repodir,
+										githubAppId: gitSource.githubApp?.id,
+										gitlabAppId: gitSource.gitlabApp?.id,
+										customPort: gitSource.customPort,
+										repository,
+										branch,
+										buildId,
+										apiUrl: gitSource.apiUrl,
+										htmlUrl: gitSource.htmlUrl,
+										projectId,
+										deployKeyId: gitSource.gitlabApp?.deployKeyId || null,
+										privateSshKey: decrypt(gitSource.gitlabApp?.privateSshKey) || null,
+										forPublic: gitSource.forPublic
+									});
+									if (!commit) {
+										throw new Error('No commit found?');
+									}
+									let tag = commit.slice(0, 7);
+									if (pullmergeRequestId) {
+										tag = `${commit.slice(0, 7)}-${pullmergeRequestId}`;
+									}
+
+									try {
+										await prisma.build.update({ where: { id: buildId }, data: { commit } });
+									} catch (err) {
+										console.log(err);
+									}
+
+									if (!pullmergeRequestId) {
+										if (configHash !== currentHash) {
+											deployNeeded = true;
+											if (configHash) {
+												await saveBuildLog({ line: 'Configuration changed.', buildId, applicationId });
+											}
+										} else {
+											deployNeeded = false;
+										}
+									} else {
+										deployNeeded = true;
+									}
+
+									let imageFound = false;
+									try {
+										await executeDockerCmd({
+											dockerId: destinationDocker.id,
+											command: `docker image inspect ${applicationId}:${tag}`
+										})
+										imageFound = true;
+									} catch (error) {
+										//
+									}
+									await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
+
+									if (forceRebuild) deployNeeded = true
+									if (!imageFound || deployNeeded) {
+										// if (true) {
+										if (buildpacks[buildPack])
+											await buildpacks[buildPack]({
+												dockerId: destinationDocker.id,
+												buildId,
+												applicationId,
+												domain,
+												name,
+												type,
+												pullmergeRequestId,
+												buildPack,
+												repository,
+												branch,
+												projectId,
+												publishDirectory,
+												debug,
+												commit,
+												tag,
+												workdir,
+												port: exposePort ? `${exposePort}:${port}` : port,
+												installCommand,
+												buildCommand,
+												startCommand,
+												baseDirectory,
+												secrets,
+												phpModules,
+												pythonWSGI,
+												pythonModule,
+												pythonVariable,
+												dockerFileLocation,
+												denoMainFile,
+												denoOptions,
+												baseImage,
+												baseBuildImage,
+												deploymentType
+											});
+										else {
+											await saveBuildLog({ line: `Build pack ${buildPack} not found`, buildId, applicationId });
+											throw new Error(`Build pack ${buildPack} not found.`);
+										}
+									} else {
+										await saveBuildLog({ line: 'Build image already available - no rebuild required.', buildId, applicationId });
+									}
+									try {
+										await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker stop -t 0 ${imageId}` })
+										await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker rm ${imageId}` })
+									} catch (error) {
+										//
+									}
+									const envs = [
+										`PORT=${port}`
+									];
+									if (secrets.length > 0) {
+										secrets.forEach((secret) => {
+											if (pullmergeRequestId) {
+												if (secret.isPRMRSecret) {
+													envs.push(`${secret.name}=${secret.value}`);
+												}
+											} else {
+												if (!secret.isPRMRSecret) {
+													envs.push(`${secret.name}=${secret.value}`);
+												}
+											}
+										});
+									}
+									await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
+									const labels = makeLabelForStandaloneApplication({
+										applicationId,
+										fqdn,
 										name,
 										type,
 										pullmergeRequestId,
@@ -219,148 +284,96 @@ import * as buildpacks from '../lib/buildPacks';
 										repository,
 										branch,
 										projectId,
-										publishDirectory,
-										debug,
-										commit,
-										tag,
-										workdir,
 										port: exposePort ? `${exposePort}:${port}` : port,
+										commit,
 										installCommand,
 										buildCommand,
 										startCommand,
 										baseDirectory,
-										secrets,
-										phpModules,
-										pythonWSGI,
-										pythonModule,
-										pythonVariable,
-										dockerFileLocation,
-										denoMainFile,
-										denoOptions,
-										baseImage,
-										baseBuildImage,
-										deploymentType
+										publishDirectory
 									});
-								else {
-									await saveBuildLog({ line: `Build pack ${buildPack} not found`, buildId, applicationId });
-									throw new Error(`Build pack ${buildPack} not found.`);
-								}
-							} else {
-								await saveBuildLog({ line: 'Build image already available - no rebuild required.', buildId, applicationId });
-							}
-							try {
-								await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker stop -t 0 ${imageId}` })
-								await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker rm ${imageId}` })
-							} catch (error) {
-								//
-							}
-							const envs = [
-								`PORT=${port}`
-							];
-							if (secrets.length > 0) {
-								secrets.forEach((secret) => {
-									if (pullmergeRequestId) {
-										if (secret.isPRMRSecret) {
-											envs.push(`${secret.name}=${secret.value}`);
-										}
-									} else {
-										if (!secret.isPRMRSecret) {
-											envs.push(`${secret.name}=${secret.value}`);
-										}
+									let envFound = false;
+									try {
+										envFound = !!(await fs.stat(`${workdir}/.env`));
+									} catch (error) {
+										//
 									}
-								});
+									try {
+										await saveBuildLog({ line: 'Deployment started.', buildId, applicationId });
+										const composeVolumes = volumes.map((volume) => {
+											return {
+												[`${volume.split(':')[0]}`]: {
+													name: volume.split(':')[0]
+												}
+											};
+										});
+										const composeFile = {
+											version: '3.8',
+											services: {
+												[imageId]: {
+													image: `${applicationId}:${tag}`,
+													container_name: imageId,
+													volumes,
+													env_file: envFound ? [`${workdir}/.env`] : [],
+													labels,
+													depends_on: [],
+													expose: [port],
+													...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
+													// logging: {
+													// 	driver: 'fluentd',
+													// },
+													...defaultComposeConfiguration(destinationDocker.network),
+												}
+											},
+											networks: {
+												[destinationDocker.network]: {
+													external: true
+												}
+											},
+											volumes: Object.assign({}, ...composeVolumes)
+										};
+										await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(composeFile));
+										await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose --project-directory ${workdir} up -d` })
+										await saveBuildLog({ line: 'Deployment successful!', buildId, applicationId });
+									} catch (error) {
+										await saveBuildLog({ line: error, buildId, applicationId });
+										await prisma.build.updateMany({
+											where: { id: buildId, status: { in: ['queued', 'running'] } },
+											data: { status: 'failed' }
+										});
+										throw new Error(error);
+									}
+									await saveBuildLog({ line: 'Proxy will be updated shortly.', buildId, applicationId });
+									await prisma.build.update({ where: { id: buildId }, data: { status: 'success' } });
+									if (!pullmergeRequestId) await prisma.application.update({
+										where: { id: applicationId },
+										data: { configHash: currentHash }
+									});
+								}
 							}
-							await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
-							const labels = makeLabelForStandaloneApplication({
-								applicationId,
-								fqdn,
-								name,
-								type,
-								pullmergeRequestId,
-								buildPack,
-								repository,
-								branch,
-								projectId,
-								port: exposePort ? `${exposePort}:${port}` : port,
-								commit,
-								installCommand,
-								buildCommand,
-								startCommand,
-								baseDirectory,
-								publishDirectory
-							});
-							let envFound = false;
-							try {
-								envFound = !!(await fs.stat(`${workdir}/.env`));
-							} catch (error) {
-								//
-							}
-							try {
-								await saveBuildLog({ line: 'Deployment started.', buildId, applicationId });
-								const composeVolumes = volumes.map((volume) => {
-									return {
-										[`${volume.split(':')[0]}`]: {
-											name: volume.split(':')[0]
-										}
-									};
-								});
-								const composeFile = {
-									version: '3.8',
-									services: {
-										[imageId]: {
-											image: `${applicationId}:${tag}`,
-											container_name: imageId,
-											volumes,
-											env_file: envFound ? [`${workdir}/.env`] : [],
-											labels,
-											depends_on: [],
-											expose: [port],
-											...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
-											// logging: {
-											// 	driver: 'fluentd',
-											// },
-											...defaultComposeConfiguration(destinationDocker.network),
-										}
-									},
-									networks: {
-										[destinationDocker.network]: {
-											external: true
-										}
-									},
-									volumes: Object.assign({}, ...composeVolumes)
-								};
-								await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(composeFile));
-								await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose --project-directory ${workdir} up -d` })
-								await saveBuildLog({ line: 'Deployment successful!', buildId, applicationId });
-							} catch (error) {
-								await saveBuildLog({ line: error, buildId, applicationId });
+							catch (error) {
 								await prisma.build.updateMany({
-									where: { id: message.build_id, status: { in: ['queued', 'running'] } },
+									where: { id: buildId, status: { in: ['queued', 'running'] } },
 									data: { status: 'failed' }
 								});
-								throw new Error(error);
+								await saveBuildLog({ line: error, buildId, applicationId: application.id });
 							}
-							await saveBuildLog({ line: 'Proxy will be updated shortly.', buildId, applicationId });
-							await prisma.build.update({ where: { id: message.build_id }, data: { status: 'success' } });
-							if (!pullmergeRequestId) await prisma.application.update({
-								where: { id: applicationId },
-								data: { configHash: currentHash }
-							});
-						}
+						});
 
 					}
-					catch (error) {
-						await prisma.build.updateMany({
-							where: { id: message.build_id, status: { in: ['queued', 'running'] } },
-							data: { status: 'failed' }
-						});
-						await saveBuildLog({ line: error, buildId, applicationId });
-					} finally {
-						await prisma.$disconnect();
-					}
-				});
-				await prisma.$disconnect();
+
+					await pAll.default(actions, { concurrency })
+				}
+			} catch (error) {
+				console.log(error)
+			} finally {
 			}
-		});
+		})
+
+		while (true) {
+			await th()
+		}
+
+
 	} else process.exit(0);
 })();

apps/api/src/jobs/infrastructure.ts

@@ -0,0 +1,216 @@
+import { parentPort } from 'node:worker_threads';
+import axios from 'axios';
+import { compareVersions } from 'compare-versions';
+import { asyncExecShell, cleanupDockerStorage, executeDockerCmd, isDev, prisma, startTraefikTCPProxy, generateDatabaseConfiguration, startTraefikProxy, listSettings, version } from '../lib/common';
+
+async function disconnect() {
+    await prisma.$disconnect();
+}
+async function autoUpdater() {
+    try {
+        const currentVersion = version;
+        const { data: versions } = await axios
+            .get(
+                `https://get.coollabs.io/versions.json`
+                , {
+                    params: {
+                        appId: process.env['COOLIFY_APP_ID'] || undefined,
+                        version: currentVersion
+                    }
+                })
+        const latestVersion = versions['coolify'].main.version;
+        const isUpdateAvailable = compareVersions(latestVersion, currentVersion);
+        if (isUpdateAvailable === 1) {
+            const activeCount = 0
+            if (activeCount === 0) {
+                if (!isDev) {
+                    console.log(`Updating Coolify to ${latestVersion}.`);
+                    await asyncExecShell(`docker pull coollabsio/coolify:${latestVersion}`);
+                    await asyncExecShell(`env | grep COOLIFY > .env`);
+                    await asyncExecShell(
+                        `docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify && docker rm coolify && docker compose up -d --force-recreate"`
+                    );
+                } else {
+                    console.log('Updating (not really in dev mode).');
+                }
+            }
+        }
+    } catch (error) {
+        console.log(error);
+    }
+}
+async function checkProxies() {
+    try {
+        const { default: isReachable } = await import('is-port-reachable');
+        let portReachable;
+
+        const { arch, ipv4, ipv6 } = await listSettings();
+        // Coolify Proxy local
+        const engine = '/var/run/docker.sock';
+        const localDocker = await prisma.destinationDocker.findFirst({
+            where: { engine, network: 'coolify' }
+        });
+        if (localDocker && localDocker.isCoolifyProxyUsed) {
+            portReachable = await isReachable(80, { host: ipv4 || ipv6 })
+            if (!portReachable) {
+                await startTraefikProxy(localDocker.id);
+            }
+        }
+
+        // TCP Proxies
+        const databasesWithPublicPort = await prisma.database.findMany({
+            where: { publicPort: { not: null } },
+            include: { settings: true, destinationDocker: true }
+        });
+        for (const database of databasesWithPublicPort) {
+            const { destinationDockerId, destinationDocker, publicPort, id } = database;
+            if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
+                const { privatePort } = generateDatabaseConfiguration(database, arch);
+                portReachable = await isReachable(publicPort, { host: destinationDocker.remoteIpAddress || ipv4 || ipv6 })
+                if (!portReachable) {
+                    await startTraefikTCPProxy(destinationDocker, id, publicPort, privatePort);
+                }
+            }
+        }
+        const wordpressWithFtp = await prisma.wordpress.findMany({
+            where: { ftpPublicPort: { not: null } },
+            include: { service: { include: { destinationDocker: true } } }
+        });
+        for (const ftp of wordpressWithFtp) {
+            const { service, ftpPublicPort } = ftp;
+            const { destinationDockerId, destinationDocker, id } = service;
+            if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
+                portReachable = await isReachable(ftpPublicPort, { host: destinationDocker.remoteIpAddress || ipv4 || ipv6 })
+                if (!portReachable) {
+                    await startTraefikTCPProxy(destinationDocker, id, ftpPublicPort, 22, 'wordpressftp');
+                }
+            }
+        }
+
+        // HTTP Proxies
+        const minioInstances = await prisma.minio.findMany({
+            where: { publicPort: { not: null } },
+            include: { service: { include: { destinationDocker: true } } }
+        });
+        for (const minio of minioInstances) {
+            const { service, publicPort } = minio;
+            const { destinationDockerId, destinationDocker, id } = service;
+            if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
+                portReachable = await isReachable(publicPort, { host: destinationDocker.remoteIpAddress || ipv4 || ipv6 })
+                if (!portReachable) {
+                    await startTraefikTCPProxy(destinationDocker, id, publicPort, 9000);
+                }
+            }
+        }
+    } catch (error) {
+
+    }
+}
+async function cleanupPrismaEngines() {
+    if (!isDev) {
+        try {
+            const { stdout } = await asyncExecShell(`ps -ef | grep /app/prisma-engines/query-engine | grep -v grep | wc -l | xargs`)
+            if (stdout.trim() != null && stdout.trim() != '' && Number(stdout.trim()) > 1) {
+                await asyncExecShell(`killall -q -e /app/prisma-engines/query-engine -o 1m`)
+            }
+        } catch (error) {
+            console.log(error);
+        }
+    }
+}
+async function cleanupStorage() {
+    const destinationDockers = await prisma.destinationDocker.findMany();
+    let enginesDone = new Set()
+    for (const destination of destinationDockers) {
+        if (enginesDone.has(destination.engine) || enginesDone.has(destination.remoteIpAddress)) return
+        if (destination.engine) enginesDone.add(destination.engine)
+        if (destination.remoteIpAddress) enginesDone.add(destination.remoteIpAddress)
+
+        let lowDiskSpace = false;
+        try {
+            let stdout = null
+            if (!isDev) {
+                const output = await executeDockerCmd({ dockerId: destination.id, command: `CONTAINER=$(docker ps -lq | head -1) && docker exec $CONTAINER sh -c 'df -kPT /'` })
+                stdout = output.stdout;
+            } else {
+                const output = await asyncExecShell(
+                    `df -kPT /`
+                );
+                stdout = output.stdout;
+            }
+            let lines = stdout.trim().split('\n');
+            let header = lines[0];
+            let regex =
+                /^Filesystem\s+|Type\s+|1024-blocks|\s+Used|\s+Available|\s+Capacity|\s+Mounted on\s*$/g;
+            const boundaries = [];
+            let match;
+
+            while ((match = regex.exec(header))) {
+                boundaries.push(match[0].length);
+            }
+
+            boundaries[boundaries.length - 1] = -1;
+            const data = lines.slice(1).map((line) => {
+                const cl = boundaries.map((boundary) => {
+                    const column = boundary > 0 ? line.slice(0, boundary) : line;
+                    line = line.slice(boundary);
+                    return column.trim();
+                });
+                return {
+                    capacity: Number.parseInt(cl[5], 10) / 100
+                };
+            });
+            if (data.length > 0) {
+                const { capacity } = data[0];
+                if (capacity > 0.8) {
+                    lowDiskSpace = true;
+                }
+            }
+        } catch (error) {
+            console.log(error);
+        }
+        await cleanupDockerStorage(destination.id, lowDiskSpace, false)
+    }
+}
+
+(async () => {
+    let status = {
+        cleanupStorage: false,
+        autoUpdater: false
+    }
+    if (parentPort) {
+        parentPort.on('message', async (message) => {
+            if (parentPort) {
+                if (message === 'error') throw new Error('oops');
+                if (message === 'cancel') {
+                    parentPort.postMessage('cancelled');
+                    process.exit(1);
+                }
+                if (message === 'action:cleanupStorage') {
+                    if (!status.autoUpdater) {
+                        status.cleanupStorage = true
+                        await cleanupStorage();
+                        status.cleanupStorage = false
+                    }
+                    return;
+                }
+                if (message === 'action:cleanupPrismaEngines') {
+                    await cleanupPrismaEngines();
+                    return;
+                }
+                if (message === 'action:checkProxies') {
+                    await checkProxies();
+                    return;
+                }
+                if (message === 'action:autoUpdater') {
+                    if (!status.cleanupStorage) {
+                        status.autoUpdater = true
+                        await autoUpdater();
+                        status.autoUpdater = false
+                    }
+                    return;
+                }
+            }
+        });
+    } else process.exit(0);
+})();

apps/api/src/lib/buildPacks/common.ts

@@ -553,7 +553,7 @@ export async function buildImage({
 	await executeDockerCmd({ debug, buildId, applicationId, dockerId, command: `docker build --progress plain -f ${workdir}/${dockerFile} -t ${cache} ${workdir}` })
 	const { status } = await prisma.build.findUnique({ where: { id: buildId } })
 	if (status === 'canceled') {
-		throw new Error('Build canceled.')
+		throw new Error('Deployment canceled.')
 	}
 	if (isCache) {
 		await saveBuildLog({ line: `Building cache image successful.`, buildId, applicationId });
@@ -671,11 +671,10 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 	if (isPnpm) {
 		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7');
 	}
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	if (installCommand) {
-		Dockerfile.push(`COPY .${baseDirectory || ''}/package.json ./`);
 		Dockerfile.push(`RUN ${installCommand}`);
 	}
-	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${buildCommand}`);
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
 	await buildImage({ ...data, isCache: true });

apps/api/src/lib/common.ts

@@ -15,11 +15,13 @@ import sshConfig from 'ssh-config'
 
 import { checkContainer, removeContainer } from './docker';
 import { day } from './dayjs';
-import * as serviceFields from './serviceFields'
+import * as serviceFields from './services/serviceFields'
 import { saveBuildLog } from './buildPacks/common';
 import { scheduler } from './scheduler';
+import { supportedServiceTypesAndVersions } from './services/supportedVersions';
+import { includeServices } from './services/common';
 
-export const version = '3.8.1';
+export const version = '3.8.6';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
@@ -67,25 +69,6 @@ const otherTraefikEndpoint = isDev
 	: 'http://coolify:3000/webhooks/traefik/other.json';
 
 
-export const include: any = {
-	destinationDocker: true,
-	persistentStorage: true,
-	serviceSecret: true,
-	minio: true,
-	plausibleAnalytics: true,
-	vscodeserver: true,
-	wordpress: true,
-	ghost: true,
-	meiliSearch: true,
-	umami: true,
-	hasura: true,
-	fider: true,
-	moodle: true,
-	appwrite: true,
-	glitchTip: true,
-	searxng: true
-};
-
 export const uniqueName = (): string => uniqueNamesGenerator(customConfig);
 export const asyncExecShell = util.promisify(exec);
 export const asyncExecShellStream = async ({ debug, buildId, applicationId, command, engine }: { debug: boolean, buildId: string, applicationId: string, command: string, engine: string }) => {
@@ -93,7 +76,6 @@ export const asyncExecShellStream = async ({ debug, buildId, applicationId, comm
 		const { execaCommand } = await import('execa')
 		const subprocess = execaCommand(command, { env: { DOCKER_BUILDKIT: "1", DOCKER_HOST: engine } })
 		if (debug) {
-			await saveBuildLog({ line: `=========================`, buildId, applicationId });
 			subprocess.stdout.on('data', async (data) => {
 				const stdout = data.toString();
 				const array = stdout.split('\n')
@@ -123,7 +105,6 @@ export const asyncExecShellStream = async ({ debug, buildId, applicationId, comm
 		}
 		subprocess.on('exit', async (code) => {
 			await asyncSleep(1000);
-			await saveBuildLog({ line: `=========================`, buildId, applicationId });
 			if (code === 0) {
 				resolve(code)
 			} else {
@@ -136,9 +117,33 @@ export const asyncExecShellStream = async ({ debug, buildId, applicationId, comm
 export const asyncSleep = (delay: number): Promise<unknown> =>
 	new Promise((resolve) => setTimeout(resolve, delay));
 export const prisma = new PrismaClient({
-	errorFormat: 'minimal'
+	errorFormat: 'minimal',
+	// log: [
+	// 	{
+	// 	  emit: 'event',
+	// 	  level: 'query',
+	// 	},
+	// 	{
+	// 	  emit: 'stdout',
+	// 	  level: 'error',
+	// 	},
+	// 	{
+	// 	  emit: 'stdout',
+	// 	  level: 'info',
+	// 	},
+	// 	{
+	// 	  emit: 'stdout',
+	// 	  level: 'warn',
+	// 	},
+	//   ],
 });
 
+// prisma.$on('query', (e) => {
+	// console.log({e})
+	// console.log('Query: ' + e.query)
+	// console.log('Params: ' + e.params)
+	// console.log('Duration: ' + e.duration + 'ms')
+//   })
 export const base64Encode = (text: string): string => {
 	return Buffer.from(text).toString('base64');
 };
@@ -178,199 +183,7 @@ export const encrypt = (text: string) => {
 	}
 };
 
-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
-		}
-	},
-	{
-		name: 'umami',
-		fancyName: 'Umami',
-		baseImage: 'ghcr.io/mikecao/umami',
-		images: ['postgres:12-alpine'],
-		versions: ['postgresql-latest'],
-		recommendedVersion: 'postgresql-latest',
-		ports: {
-			main: 3000
-		}
-	},
-	{
-		name: 'hasura',
-		fancyName: 'Hasura',
-		baseImage: 'hasura/graphql-engine',
-		images: ['postgres:12-alpine'],
-		versions: ['latest', 'v2.10.0', 'v2.5.1'],
-		recommendedVersion: 'v2.10.0',
-		ports: {
-			main: 8080
-		}
-	},
-	{
-		name: 'fider',
-		fancyName: 'Fider',
-		baseImage: 'getfider/fider',
-		images: ['postgres:12-alpine'],
-		versions: ['stable'],
-		recommendedVersion: 'stable',
-		ports: {
-			main: 3000
-		}
-	},
-	{
-		name: 'appwrite',
-		fancyName: 'Appwrite',
-		baseImage: 'appwrite/appwrite',
-		images: ['mariadb:10.7', 'redis:6.2-alpine', 'appwrite/telegraf:1.4.0'],
-		versions: ['latest', '0.15.3'],
-		recommendedVersion: '0.15.3',
-		ports: {
-			main: 80
-		}
-	},
-	// {
-	//     name: 'moodle',
-	//     fancyName: 'Moodle',
-	//     baseImage: 'bitnami/moodle',
-	//     images: [],
-	//     versions: ['latest', 'v4.0.2'],
-	//     recommendedVersion: 'latest',
-	//     ports: {
-	//         main: 8080
-	//     }
-	// }
-	{
-		name: 'glitchTip',
-		fancyName: 'GlitchTip',
-		baseImage: 'glitchtip/glitchtip',
-		images: ['postgres:14-alpine', 'redis:7-alpine'],
-		versions: ['latest'],
-		recommendedVersion: 'latest',
-		ports: {
-			main: 8000
-		}
-	},
-	{
-		name: 'searxng',
-		fancyName: 'SearXNG',
-		baseImage: 'searxng/searxng',
-		images: [],
-		versions: ['latest'],
-		recommendedVersion: 'latest',
-		ports: {
-			main: 8080
-		}
-	},
-];
+
 
 export async function checkDoubleBranch(branch: string, projectId: number): Promise<boolean> {
 	const applications = await prisma.application.findMany({ where: { branch, projectId } });
@@ -548,7 +361,7 @@ export function generateTimestamp(): string {
 
 export async function listServicesWithIncludes(): Promise<any> {
 	return await prisma.service.findMany({
-		include,
+		include: includeServices,
 		orderBy: { createdAt: 'desc' }
 	});
 }
@@ -1445,7 +1258,7 @@ export async function getServiceFromDB({ id, teamId }: { id: string; teamId: str
 	const settings = await prisma.setting.findFirst();
 	const body = await prisma.service.findFirst({
 		where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
-		include
+		include: includeServices
 	});
 	let { type } = body
 	type = fixType(type)
@@ -1477,311 +1290,6 @@ export function getServiceImages(type: string): string[] {
 	return [];
 }
 
-export async function configureServiceType({
-	id,
-	type
-}: {
-	id: string;
-	type: string;
-}): Promise<void> {
-	if (type === 'plausibleanalytics') {
-		const password = encrypt(generatePassword({}));
-		const postgresqlUser = cuid();
-		const postgresqlPassword = encrypt(generatePassword({}));
-		const postgresqlDatabase = 'plausibleanalytics';
-		const secretKeyBase = encrypt(generatePassword({ length: 64 }));
-
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				plausibleAnalytics: {
-					create: {
-						postgresqlDatabase,
-						postgresqlUser,
-						postgresqlPassword,
-						password,
-						secretKeyBase
-					}
-				}
-			}
-		});
-	} else if (type === 'nocodb') {
-		await prisma.service.update({
-			where: { id },
-			data: { type }
-		});
-	} else if (type === 'minio') {
-		const rootUser = cuid();
-		const rootUserPassword = encrypt(generatePassword({}));
-		await prisma.service.update({
-			where: { id },
-			data: { type, minio: { create: { rootUser, rootUserPassword } } }
-		});
-	} else if (type === 'vscodeserver') {
-		const password = encrypt(generatePassword({}));
-		await prisma.service.update({
-			where: { id },
-			data: { type, vscodeserver: { create: { password } } }
-		});
-	} else if (type === 'wordpress') {
-		const mysqlUser = cuid();
-		const mysqlPassword = encrypt(generatePassword({}));
-		const mysqlRootUser = cuid();
-		const mysqlRootUserPassword = encrypt(generatePassword({}));
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				wordpress: { create: { mysqlPassword, mysqlRootUserPassword, mysqlRootUser, mysqlUser } }
-			}
-		});
-	} else if (type === 'vaultwarden') {
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type
-			}
-		});
-	} else if (type === 'languagetool') {
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type
-			}
-		});
-	} else if (type === 'n8n') {
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type
-			}
-		});
-	} else if (type === 'uptimekuma') {
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type
-			}
-		});
-	} else if (type === 'ghost') {
-		const defaultEmail = `${cuid()}@example.com`;
-		const defaultPassword = encrypt(generatePassword({}));
-		const mariadbUser = cuid();
-		const mariadbPassword = encrypt(generatePassword({}));
-		const mariadbRootUser = cuid();
-		const mariadbRootUserPassword = encrypt(generatePassword({}));
-
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				ghost: {
-					create: {
-						defaultEmail,
-						defaultPassword,
-						mariadbUser,
-						mariadbPassword,
-						mariadbRootUser,
-						mariadbRootUserPassword
-					}
-				}
-			}
-		});
-	} else if (type === 'meilisearch') {
-		const masterKey = encrypt(generatePassword({ length: 32 }));
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				meiliSearch: { create: { masterKey } }
-			}
-		});
-	} else if (type === 'umami') {
-		const umamiAdminPassword = encrypt(generatePassword({}));
-		const postgresqlUser = cuid();
-		const postgresqlPassword = encrypt(generatePassword({}));
-		const postgresqlDatabase = 'umami';
-		const hashSalt = encrypt(generatePassword({ length: 64 }));
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				umami: {
-					create: {
-						umamiAdminPassword,
-						postgresqlDatabase,
-						postgresqlPassword,
-						postgresqlUser,
-						hashSalt
-					}
-				}
-			}
-		});
-	} else if (type === 'hasura') {
-		const postgresqlUser = cuid();
-		const postgresqlPassword = encrypt(generatePassword({}));
-		const postgresqlDatabase = 'hasura';
-		const graphQLAdminPassword = encrypt(generatePassword({}));
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				hasura: {
-					create: {
-						postgresqlDatabase,
-						postgresqlPassword,
-						postgresqlUser,
-						graphQLAdminPassword
-					}
-				}
-			}
-		});
-	} else if (type === 'fider') {
-		const postgresqlUser = cuid();
-		const postgresqlPassword = encrypt(generatePassword({}));
-		const postgresqlDatabase = 'fider';
-		const jwtSecret = encrypt(generatePassword({ length: 64, symbols: true }));
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				fider: {
-					create: {
-						postgresqlDatabase,
-						postgresqlPassword,
-						postgresqlUser,
-						jwtSecret
-					}
-				}
-			}
-		});
-	} else if (type === 'moodle') {
-		const defaultUsername = cuid();
-		const defaultPassword = encrypt(generatePassword({}));
-		const defaultEmail = `${cuid()} @example.com`;
-		const mariadbUser = cuid();
-		const mariadbPassword = encrypt(generatePassword({}));
-		const mariadbDatabase = 'moodle_db';
-		const mariadbRootUser = cuid();
-		const mariadbRootUserPassword = encrypt(generatePassword({}));
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				moodle: {
-					create: {
-						defaultUsername,
-						defaultPassword,
-						defaultEmail,
-						mariadbUser,
-						mariadbPassword,
-						mariadbDatabase,
-						mariadbRootUser,
-						mariadbRootUserPassword
-					}
-				}
-			}
-		});
-	} else if (type === 'appwrite') {
-		const opensslKeyV1 = encrypt(generatePassword({}));
-		const executorSecret = encrypt(generatePassword({}));
-		const redisPassword = encrypt(generatePassword({}));
-		const mariadbHost = `${id}-mariadb`
-		const mariadbUser = cuid();
-		const mariadbPassword = encrypt(generatePassword({}));
-		const mariadbDatabase = 'appwrite';
-		const mariadbRootUser = cuid();
-		const mariadbRootUserPassword = encrypt(generatePassword({}));
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				appwrite: {
-					create: {
-						opensslKeyV1,
-						executorSecret,
-						redisPassword,
-						mariadbHost,
-						mariadbUser,
-						mariadbPassword,
-						mariadbDatabase,
-						mariadbRootUser,
-						mariadbRootUserPassword
-					}
-				}
-			}
-		});
-	} else if (type === 'glitchTip') {
-		const defaultUsername = cuid();
-		const defaultEmail = `${defaultUsername}@example.com`;
-		const defaultPassword = encrypt(generatePassword({}));
-		const postgresqlUser = cuid();
-		const postgresqlPassword = encrypt(generatePassword({}));
-		const postgresqlDatabase = 'glitchTip';
-		const secretKeyBase = encrypt(generatePassword({ length: 64 }));
-
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				glitchTip: {
-					create: {
-						postgresqlDatabase,
-						postgresqlUser,
-						postgresqlPassword,
-						secretKeyBase,
-						defaultEmail,
-						defaultUsername,
-						defaultPassword,
-					}
-				}
-			}
-		});
-	} else if (type === 'searxng') {
-		const secretKey = encrypt(generatePassword({ length: 32, isHex: true }))
-		const redisPassword = encrypt(generatePassword({}));
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type,
-				searxng: {
-					create: {
-						secretKey,
-						redisPassword,
-					}
-				}
-			}
-		});
-	} else {
-		await prisma.service.update({
-			where: { id },
-			data: {
-				type
-			}
-		});
-	}
-}
-
-export async function removeService({ id }: { id: string }): Promise<void> {
-	await prisma.serviceSecret.deleteMany({ where: { serviceId: id } });
-	await prisma.servicePersistentStorage.deleteMany({ where: { serviceId: id } });
-	await prisma.meiliSearch.deleteMany({ where: { serviceId: id } });
-	await prisma.fider.deleteMany({ where: { serviceId: id } });
-	await prisma.ghost.deleteMany({ where: { serviceId: id } });
-	await prisma.umami.deleteMany({ where: { serviceId: id } });
-	await prisma.hasura.deleteMany({ where: { serviceId: id } });
-	await prisma.plausibleAnalytics.deleteMany({ where: { serviceId: id } });
-	await prisma.minio.deleteMany({ where: { serviceId: id } });
-	await prisma.vscodeserver.deleteMany({ where: { serviceId: id } });
-	await prisma.wordpress.deleteMany({ where: { serviceId: id } });
-	await prisma.glitchTip.deleteMany({ where: { serviceId: id } });
-	await prisma.moodle.deleteMany({ where: { serviceId: id } });
-	await prisma.appwrite.deleteMany({ where: { serviceId: id } });
-	await prisma.searxng.deleteMany({ where: { serviceId: id } });
-	await prisma.service.delete({ where: { id } });
-}
-
 export function saveUpdateableFields(type: string, data: any) {
 	const update = {};
 	if (type && serviceFields[type]) {
@@ -1871,7 +1379,7 @@ export async function stopBuild(buildId, applicationId) {
 	let count = 0;
 	await new Promise<void>(async (resolve, reject) => {
 		const { destinationDockerId, status } = await prisma.build.findFirst({ where: { id: buildId } });
-		const { engine, id: dockerId } = await prisma.destinationDocker.findFirst({ where: { id: destinationDockerId } });
+		const { id: dockerId } = await prisma.destinationDocker.findFirst({ where: { id: destinationDockerId } });
 		const interval = setInterval(async () => {
 			try {
 				if (status === 'failed' || status === 'canceled') {
@@ -1881,10 +1389,10 @@ export async function stopBuild(buildId, applicationId) {
 				if (count > 15) {
 					clearInterval(interval);
 					if (scheduler.workers.has('deployApplication')) {
-						scheduler.workers.get('deployApplication').postMessage("action:flushQueue")
+						scheduler.workers.get('deployApplication').postMessage('cancel')
 					}
-					await cleanupDB(buildId);
-					return reject(new Error('Build canceled'));
+					await cleanupDB(buildId, applicationId);
+					return reject(new Error('Deployment canceled.'));
 				}
 				const { stdout: buildContainers } = await executeDockerCmd({ dockerId, command: `docker container ls --filter "label=coolify.buildId=${buildId}" --format '{{json .}}'` })
 				if (buildContainers) {
@@ -1896,9 +1404,9 @@ export async function stopBuild(buildId, applicationId) {
 							await removeContainer({ id, dockerId });
 							clearInterval(interval);
 							if (scheduler.workers.has('deployApplication')) {
-								scheduler.workers.get('deployApplication').postMessage("action:flushQueue")
+								scheduler.workers.get('deployApplication').postMessage('cancel')
 							}
-							await cleanupDB(buildId);
+							await cleanupDB(buildId, applicationId);
 							return resolve();
 						}
 					}
@@ -1909,11 +1417,12 @@ export async function stopBuild(buildId, applicationId) {
 	});
 }
 
-async function cleanupDB(buildId: string) {
+async function cleanupDB(buildId: string, applicationId: string) {
 	const data = await prisma.build.findUnique({ where: { id: buildId } });
 	if (data?.status === 'queued' || data?.status === 'running') {
 		await prisma.build.update({ where: { id: buildId }, data: { status: 'canceled' } });
 	}
+	await saveBuildLog({ line: 'Deployment canceled.', buildId, applicationId });
 }
 
 export function convertTolOldVolumeNames(type) {
@@ -1954,6 +1463,12 @@ export async function cleanupDockerStorage(dockerId, lowDiskSpace, force) {
 		} catch (error) {
 			//console.log(error);
 		}
+		// Cleanup build caches
+		try {
+			await executeDockerCmd({ dockerId, command: `docker builder prune -a -f` })
+		} catch (error) {
+			//console.log(error);
+		}
 	}
 }
 
@@ -1999,3 +1514,27 @@ export function defaultComposeConfiguration(network: string): any {
 		}
 	}
 }
+export function decryptApplication(application: any) {
+    if (application) {
+        if (application?.gitSource?.githubApp?.clientSecret) {
+            application.gitSource.githubApp.clientSecret = decrypt(application.gitSource.githubApp.clientSecret) || null;
+        }
+        if (application?.gitSource?.githubApp?.webhookSecret) {
+            application.gitSource.githubApp.webhookSecret = decrypt(application.gitSource.githubApp.webhookSecret) || null;
+        }
+        if (application?.gitSource?.githubApp?.privateKey) {
+            application.gitSource.githubApp.privateKey = decrypt(application.gitSource.githubApp.privateKey) || null;
+        }
+        if (application?.gitSource?.gitlabApp?.appSecret) {
+            application.gitSource.gitlabApp.appSecret = decrypt(application.gitSource.gitlabApp.appSecret) || null;
+        }
+        if (application?.secrets.length > 0) {
+            application.secrets = application.secrets.map((s: any) => {
+                s.value = decrypt(s.value) || null
+                return s;
+            });
+        }
+
+        return application;
+    }
+}

apps/api/src/lib/scheduler.ts

@@ -9,48 +9,22 @@ Bree.extend(TSBree);
 
 const options: any = {
 	defaultExtension: 'js',
+	// logger: new Cabin(),
 	logger: false,
 	workerMessageHandler: async ({ name, message }) => {
-		if (name === 'deployApplication') {
-			if (message.pending === 0 && message.size === 0) {
-				if (message.caller === 'autoUpdater') {
-					if (!scheduler.workers.has('autoUpdater')) {
-						await scheduler.stop('deployApplication');
-						await scheduler.run('autoUpdater')
-					}
-				}
-				if (message.caller === 'cleanupStorage') {
-					if (!scheduler.workers.has('cleanupStorage')) {
-						await scheduler.run('cleanupStorage')
-					}
-				}
-
+		if (name === 'deployApplication' && message?.deploying) {
+			if (scheduler.workers.has('autoUpdater') || scheduler.workers.has('cleanupStorage')) {
+				scheduler.workers.get('deployApplication').postMessage('cancel')
 			}
 		}
 	},
 	jobs: [
-		{
-			name: 'deployApplication'
-		},
-		{
-			name: 'cleanupStorage',
-		},
-		{
-			name: 'cleanupPrismaEngines',
-			interval: '1m'
-		},
-		{
-			name: 'checkProxies',
-			interval: '10s'
-		},
-		{
-			name: 'autoUpdater',
-		}
+		{ name: 'infrastructure' },
+		{ name: 'deployApplication' },
 	],
 };
 if (isDev) options.root = path.join(__dirname, '../jobs');
 
-
 export const scheduler = new Bree(options);
 
 

apps/api/src/lib/services/common.ts

@@ -0,0 +1,344 @@
+import { exec } from 'node:child_process'
+import util from 'util';
+import fs from 'fs/promises';
+import yaml from 'js-yaml';
+import forge from 'node-forge';
+import { uniqueNamesGenerator, adjectives, colors, animals } from 'unique-names-generator';
+import type { Config } from 'unique-names-generator';
+import generator from 'generate-password';
+import crypto from 'crypto';
+import { promises as dns } from 'dns';
+import { PrismaClient } from '@prisma/client';
+import cuid from 'cuid';
+import os from 'os';
+import sshConfig from 'ssh-config'
+import { encrypt, generatePassword, prisma } from '../common';
+
+
+export const version = '3.8.2';
+export const isDev = process.env.NODE_ENV === 'development';
+
+export const includeServices: any = {
+	destinationDocker: true,
+	persistentStorage: true,
+	serviceSecret: true,
+	minio: true,
+	plausibleAnalytics: true,
+	vscodeserver: true,
+	wordpress: true,
+	ghost: true,
+	meiliSearch: true,
+	umami: true,
+	hasura: true,
+	fider: true,
+	moodle: true,
+	appwrite: true,
+	glitchTip: true,
+	searxng: true
+};
+export async function configureServiceType({
+	id,
+	type
+}: {
+	id: string;
+	type: string;
+}): Promise<void> {
+	if (type === 'plausibleanalytics') {
+		const password = encrypt(generatePassword({}));
+		const postgresqlUser = cuid();
+		const postgresqlPassword = encrypt(generatePassword({}));
+		const postgresqlDatabase = 'plausibleanalytics';
+		const secretKeyBase = encrypt(generatePassword({ length: 64 }));
+
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				plausibleAnalytics: {
+					create: {
+						postgresqlDatabase,
+						postgresqlUser,
+						postgresqlPassword,
+						password,
+						secretKeyBase
+					}
+				}
+			}
+		});
+	} else if (type === 'nocodb') {
+		await prisma.service.update({
+			where: { id },
+			data: { type }
+		});
+	} else if (type === 'minio') {
+		const rootUser = cuid();
+		const rootUserPassword = encrypt(generatePassword({}));
+		await prisma.service.update({
+			where: { id },
+			data: { type, minio: { create: { rootUser, rootUserPassword } } }
+		});
+	} else if (type === 'vscodeserver') {
+		const password = encrypt(generatePassword({}));
+		await prisma.service.update({
+			where: { id },
+			data: { type, vscodeserver: { create: { password } } }
+		});
+	} else if (type === 'wordpress') {
+		const mysqlUser = cuid();
+		const mysqlPassword = encrypt(generatePassword({}));
+		const mysqlRootUser = cuid();
+		const mysqlRootUserPassword = encrypt(generatePassword({}));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				wordpress: { create: { mysqlPassword, mysqlRootUserPassword, mysqlRootUser, mysqlUser } }
+			}
+		});
+	} else if (type === 'vaultwarden') {
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type
+			}
+		});
+	} else if (type === 'languagetool') {
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type
+			}
+		});
+	} else if (type === 'n8n') {
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type
+			}
+		});
+	} else if (type === 'uptimekuma') {
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type
+			}
+		});
+	} else if (type === 'ghost') {
+		const defaultEmail = `${cuid()}@example.com`;
+		const defaultPassword = encrypt(generatePassword({}));
+		const mariadbUser = cuid();
+		const mariadbPassword = encrypt(generatePassword({}));
+		const mariadbRootUser = cuid();
+		const mariadbRootUserPassword = encrypt(generatePassword({}));
+
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				ghost: {
+					create: {
+						defaultEmail,
+						defaultPassword,
+						mariadbUser,
+						mariadbPassword,
+						mariadbRootUser,
+						mariadbRootUserPassword
+					}
+				}
+			}
+		});
+	} else if (type === 'meilisearch') {
+		const masterKey = encrypt(generatePassword({ length: 32 }));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				meiliSearch: { create: { masterKey } }
+			}
+		});
+	} else if (type === 'umami') {
+		const umamiAdminPassword = encrypt(generatePassword({}));
+		const postgresqlUser = cuid();
+		const postgresqlPassword = encrypt(generatePassword({}));
+		const postgresqlDatabase = 'umami';
+		const hashSalt = encrypt(generatePassword({ length: 64 }));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				umami: {
+					create: {
+						umamiAdminPassword,
+						postgresqlDatabase,
+						postgresqlPassword,
+						postgresqlUser,
+						hashSalt
+					}
+				}
+			}
+		});
+	} else if (type === 'hasura') {
+		const postgresqlUser = cuid();
+		const postgresqlPassword = encrypt(generatePassword({}));
+		const postgresqlDatabase = 'hasura';
+		const graphQLAdminPassword = encrypt(generatePassword({}));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				hasura: {
+					create: {
+						postgresqlDatabase,
+						postgresqlPassword,
+						postgresqlUser,
+						graphQLAdminPassword
+					}
+				}
+			}
+		});
+	} else if (type === 'fider') {
+		const postgresqlUser = cuid();
+		const postgresqlPassword = encrypt(generatePassword({}));
+		const postgresqlDatabase = 'fider';
+		const jwtSecret = encrypt(generatePassword({ length: 64, symbols: true }));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				fider: {
+					create: {
+						postgresqlDatabase,
+						postgresqlPassword,
+						postgresqlUser,
+						jwtSecret
+					}
+				}
+			}
+		});
+	} else if (type === 'moodle') {
+		const defaultUsername = cuid();
+		const defaultPassword = encrypt(generatePassword({}));
+		const defaultEmail = `${cuid()} @example.com`;
+		const mariadbUser = cuid();
+		const mariadbPassword = encrypt(generatePassword({}));
+		const mariadbDatabase = 'moodle_db';
+		const mariadbRootUser = cuid();
+		const mariadbRootUserPassword = encrypt(generatePassword({}));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				moodle: {
+					create: {
+						defaultUsername,
+						defaultPassword,
+						defaultEmail,
+						mariadbUser,
+						mariadbPassword,
+						mariadbDatabase,
+						mariadbRootUser,
+						mariadbRootUserPassword
+					}
+				}
+			}
+		});
+	} else if (type === 'appwrite') {
+		const opensslKeyV1 = encrypt(generatePassword({}));
+		const executorSecret = encrypt(generatePassword({}));
+		const redisPassword = encrypt(generatePassword({}));
+		const mariadbHost = `${id}-mariadb`
+		const mariadbUser = cuid();
+		const mariadbPassword = encrypt(generatePassword({}));
+		const mariadbDatabase = 'appwrite';
+		const mariadbRootUser = cuid();
+		const mariadbRootUserPassword = encrypt(generatePassword({}));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				appwrite: {
+					create: {
+						opensslKeyV1,
+						executorSecret,
+						redisPassword,
+						mariadbHost,
+						mariadbUser,
+						mariadbPassword,
+						mariadbDatabase,
+						mariadbRootUser,
+						mariadbRootUserPassword
+					}
+				}
+			}
+		});
+	} else if (type === 'glitchTip') {
+		const defaultUsername = cuid();
+		const defaultEmail = `${defaultUsername}@example.com`;
+		const defaultPassword = encrypt(generatePassword({}));
+		const postgresqlUser = cuid();
+		const postgresqlPassword = encrypt(generatePassword({}));
+		const postgresqlDatabase = 'glitchTip';
+		const secretKeyBase = encrypt(generatePassword({ length: 64 }));
+
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				glitchTip: {
+					create: {
+						postgresqlDatabase,
+						postgresqlUser,
+						postgresqlPassword,
+						secretKeyBase,
+						defaultEmail,
+						defaultUsername,
+						defaultPassword,
+					}
+				}
+			}
+		});
+	} else if (type === 'searxng') {
+		const secretKey = encrypt(generatePassword({ length: 32, isHex: true }))
+		const redisPassword = encrypt(generatePassword({}));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				searxng: {
+					create: {
+						secretKey,
+						redisPassword,
+					}
+				}
+			}
+		});
+	} else {
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type
+			}
+		});
+	}
+}
+
+export async function removeService({ id }: { id: string }): Promise<void> {
+	await prisma.serviceSecret.deleteMany({ where: { serviceId: id } });
+	await prisma.servicePersistentStorage.deleteMany({ where: { serviceId: id } });
+	await prisma.meiliSearch.deleteMany({ where: { serviceId: id } });
+	await prisma.fider.deleteMany({ where: { serviceId: id } });
+	await prisma.ghost.deleteMany({ where: { serviceId: id } });
+	await prisma.umami.deleteMany({ where: { serviceId: id } });
+	await prisma.hasura.deleteMany({ where: { serviceId: id } });
+	await prisma.plausibleAnalytics.deleteMany({ where: { serviceId: id } });
+	await prisma.minio.deleteMany({ where: { serviceId: id } });
+	await prisma.vscodeserver.deleteMany({ where: { serviceId: id } });
+	await prisma.wordpress.deleteMany({ where: { serviceId: id } });
+	await prisma.glitchTip.deleteMany({ where: { serviceId: id } });
+	await prisma.moodle.deleteMany({ where: { serviceId: id } });
+	await prisma.appwrite.deleteMany({ where: { serviceId: id } });
+	await prisma.searxng.deleteMany({ where: { serviceId: id } });
+
+	
+	await prisma.service.delete({ where: { id } });
+}

apps/api/src/lib/services/supportedVersions.ts

@@ -0,0 +1,193 @@
+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
+		}
+	},
+	{
+		name: 'umami',
+		fancyName: 'Umami',
+		baseImage: 'ghcr.io/mikecao/umami',
+		images: ['postgres:12-alpine'],
+		versions: ['postgresql-latest'],
+		recommendedVersion: 'postgresql-latest',
+		ports: {
+			main: 3000
+		}
+	},
+	{
+		name: 'hasura',
+		fancyName: 'Hasura',
+		baseImage: 'hasura/graphql-engine',
+		images: ['postgres:12-alpine'],
+		versions: ['latest', 'v2.10.0', 'v2.5.1'],
+		recommendedVersion: 'v2.10.0',
+		ports: {
+			main: 8080
+		}
+	},
+	{
+		name: 'fider',
+		fancyName: 'Fider',
+		baseImage: 'getfider/fider',
+		images: ['postgres:12-alpine'],
+		versions: ['stable'],
+		recommendedVersion: 'stable',
+		ports: {
+			main: 3000
+		}
+	},
+	{
+		name: 'appwrite',
+		fancyName: 'Appwrite',
+		baseImage: 'appwrite/appwrite',
+		images: ['mariadb:10.7', 'redis:6.2-alpine', 'appwrite/telegraf:1.4.0'],
+		versions: ['latest', '0.15.3'],
+		recommendedVersion: '0.15.3',
+		ports: {
+			main: 80
+		}
+	},
+	// {
+	//     name: 'moodle',
+	//     fancyName: 'Moodle',
+	//     baseImage: 'bitnami/moodle',
+	//     images: [],
+	//     versions: ['latest', 'v4.0.2'],
+	//     recommendedVersion: 'latest',
+	//     ports: {
+	//         main: 8080
+	//     }
+	// }
+	{
+		name: 'glitchTip',
+		fancyName: 'GlitchTip',
+		baseImage: 'glitchtip/glitchtip',
+		images: ['postgres:14-alpine', 'redis:7-alpine'],
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 8000
+		}
+	},
+	{
+		name: 'searxng',
+		fancyName: 'SearXNG',
+		baseImage: 'searxng/searxng',
+		images: [],
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 8080
+		}
+	},
+];

apps/api/src/routes/api/v1/applications/handlers.ts

@@ -34,7 +34,7 @@ export async function getImages(request: FastifyRequest<GetImages>) {
         const { buildPack, deploymentType } = request.body
         let publishDirectory = undefined;
         let port = undefined
-        const { baseImage, baseBuildImage, baseBuildImages, baseImages, } = setDefaultBaseImage(
+        const { baseImage, baseBuildImage, baseBuildImages, baseImages } = setDefaultBaseImage(
             buildPack, deploymentType
         );
         if (buildPack === 'nextjs') {
@@ -56,8 +56,7 @@ export async function getImages(request: FastifyRequest<GetImages>) {
             }
         }
 
-
-        return { baseBuildImage, baseBuildImages, publishDirectory, port }
+        return { baseImage, baseImages, baseBuildImage, baseBuildImages, publishDirectory, port }
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
@@ -75,7 +74,6 @@ export async function getApplicationStatus(request: FastifyRequest<OnlyId>) {
             isExited = await isContainerExited(application.destinationDocker.id, id);
         }
         return {
-            isQueueActive: scheduler.workers.has('deployApplication'),
             isRunning,
             isExited,
         };
@@ -233,7 +231,6 @@ export async function saveApplication(request: FastifyRequest<SaveApplication>,
             baseBuildImage,
             deploymentType
         } = request.body
-
         if (port) port = Number(port);
         if (exposePort) {
             exposePort = Number(exposePort);
@@ -452,7 +449,10 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
                 data: {
                     id: buildId,
                     applicationId: id,
+                    sourceBranch: branch,
                     branch: application.branch,
+                    pullmergeRequestId: pullmergeRequestId.toString(),
+                    forceRebuild,
                     destinationDockerId: application.destinationDocker?.id,
                     gitSourceId: application.gitSource?.id,
                     githubAppId: application.gitSource?.githubApp?.id,
@@ -461,24 +461,6 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
                     type: 'manual'
                 }
             });
-            if (pullmergeRequestId) {
-                scheduler.workers.get('deployApplication').postMessage({
-                    build_id: buildId,
-                    type: 'manual',
-                    ...application,
-                    sourceBranch: branch,
-                    pullmergeRequestId,
-                    forceRebuild
-                });
-            } else {
-                scheduler.workers.get('deployApplication').postMessage({
-                    build_id: buildId,
-                    type: 'manual',
-                    ...application,
-                    forceRebuild
-                });
-
-            }
             return {
                 buildId
             };

apps/api/src/routes/api/v1/handlers.ts

@@ -1,11 +1,11 @@
 import os from 'node:os';
 import osu from 'node-os-utils';
 import axios from 'axios';
-import compare from 'compare-versions';
+import { compareVersions } from 'compare-versions';
 import cuid from 'cuid';
 import bcrypt from 'bcryptjs';
 import { asyncExecShell, asyncSleep, cleanupDockerStorage, errorHandler, isDev, listSettings, prisma, uniqueName, version } from '../../../lib/common';
-
+import { supportedServiceTypesAndVersions } from '../../../lib/services/supportedVersions';
 import type { FastifyReply, FastifyRequest } from 'fastify';
 import type { Login, Update } from '.';
 import type { GetCurrentUser } from './types';
@@ -32,7 +32,7 @@ export async function checkUpdate(request: FastifyRequest) {
 			`https://get.coollabs.io/versions.json?appId=${process.env['COOLIFY_APP_ID']}&version=${currentVersion}`
 		);
 		const latestVersion = versions['coolify'].main.version
-		const isUpdateAvailable = compare(latestVersion, currentVersion);
+		const isUpdateAvailable = compareVersions(latestVersion, currentVersion);
 		if (isStaging) {
 			return {
 				isUpdateAvailable: true,
@@ -73,6 +73,23 @@ export async function update(request: FastifyRequest<Update>) {
 		return errorHandler({ status, message })
 	}
 }
+export async function restartCoolify(request: FastifyRequest<any>) {
+	try {
+		const teamId = request.user.teamId;
+		if (teamId === '0') {
+			if (!isDev) {
+				await asyncExecShell(`docker restart coolify`);
+				return {};
+			} else {
+				console.log('Restarting Coolify')
+				return {};
+			}
+		}
+		throw { status: 500, message: 'You are not authorized to restart Coolify.' };
+	} catch ({ status, message }) {
+		return errorHandler({ status, message })
+	}
+}
 export async function showUsage() {
 	try {
 		return {
@@ -101,7 +118,8 @@ export async function showDashboard(request: FastifyRequest) {
 			include: { settings: true }
 		});
 		const databases = await prisma.database.findMany({
-			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } },
+			include: { settings: true }
 		});
 		const services = await prisma.service.findMany({
 			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
@@ -282,6 +300,7 @@ export async function getCurrentUser(request: FastifyRequest<GetCurrentUser>, fa
 	}
 	return {
 		settings: await prisma.setting.findFirst(),
+		supportedServiceTypesAndVersions,
 		token,
 		...request.user
 	}

apps/api/src/routes/api/v1/iam/handlers.ts

@@ -158,8 +158,11 @@ export async function getTeam(request: FastifyRequest<OnlyId>, reply: FastifyRep
         });
         const team = await prisma.team.findUnique({ where: { id }, include: { permissions: true } });
         const invitations = await prisma.teamInvitation.findMany({ where: { teamId: team.id } });
+        const { teams } = await prisma.user.findUnique({ where: { id: userId }, include: { teams: true } })
         return {
+            currentTeam: teamId,
             team,
+            teams,
             permissions,
             invitations
         };
@@ -275,10 +278,10 @@ export async function inviteToTeam(request: FastifyRequest<InviteToTeam>, reply:
         if (!userFound) {
             throw {
                 message: `No user found with '${email}' email address.`
-            };         
+            };
         }
         const uid = userFound.id;
-        if (uid === userId) {          
+        if (uid === userId) {
             throw {
                 message: `Invitation to yourself? Whaaaaat?`
             };

apps/api/src/routes/api/v1/index.ts

@@ -1,5 +1,5 @@
 import { FastifyPluginAsync } from 'fastify';
-import { checkUpdate, login, showDashboard, update, showUsage, getCurrentUser, cleanupManually } from './handlers';
+import { checkUpdate, login, showDashboard, update, showUsage, getCurrentUser, cleanupManually, restartCoolify } from './handlers';
 import { GetCurrentUser } from './types';
 
 export interface Update {
@@ -47,6 +47,10 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
 		onRequest: [fastify.authenticate]
 	}, async () => await showUsage());
 
+	fastify.post('/internal/restart', {
+		onRequest: [fastify.authenticate]
+	}, async (request) => await restartCoolify(request));
+
 	fastify.post('/internal/cleanup', {
 		onRequest: [fastify.authenticate]
 	}, async () => await cleanupManually());

apps/api/src/routes/api/v1/services/index.ts

@@ -26,12 +26,11 @@ import {
     saveServiceType,
     saveServiceVersion,
     setSettingsService,
-    startService,
-    stopService
 } from './handlers';
 
 import type { OnlyId } from '../../../../types';
 import type { ActivateWordpressFtp, CheckService, CheckServiceDomain, DeleteServiceSecret, DeleteServiceStorage, GetServiceLogs, SaveService, SaveServiceDestination, SaveServiceSecret, SaveServiceSettings, SaveServiceStorage, SaveServiceType, SaveServiceVersion, ServiceStartStop, SetWordpressSettings } from './types';
+import { startService, stopService } from '../../../../lib/services/handlers';
 
 const root: FastifyPluginAsync = async (fastify): Promise<void> => {
     fastify.addHook('onRequest', async (request) => {

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

@@ -142,17 +142,11 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
                         type: 'webhook_commit'
                     }
                 });
-                scheduler.workers.get('deployApplication').postMessage({
-                    build_id: buildId,
-                    type: 'webhook_commit',
-                    ...applicationFound
-                });
-
                 return {
                     message: 'Queued. Thank you!'
                 };
             } else if (githubEvent === 'pull_request') {
-                const pullmergeRequestId = body.number;
+                const pullmergeRequestId = body.number.toString();
                 const pullmergeRequestAction = body.action;
                 const sourceBranch = body.pull_request.head.ref.includes('/') ? body.pull_request.head.ref.split('/')[2] : body.pull_request.head.ref;
                 if (!allowedActions.includes(pullmergeRequestAction)) {
@@ -183,6 +177,8 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
                         await prisma.build.create({
                             data: {
                                 id: buildId,
+                                pullmergeRequestId,
+                                sourceBranch,
                                 applicationId: applicationFound.id,
                                 destinationDockerId: applicationFound.destinationDocker.id,
                                 gitSourceId: applicationFound.gitSource.id,
@@ -192,14 +188,7 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
                                 type: 'webhook_pr'
                             }
                         });
-                        scheduler.workers.get('deployApplication').postMessage({
-                            build_id: buildId,
-                            type: 'webhook_pr',
-                            ...applicationFound,
-                            sourceBranch,
-                            pullmergeRequestId
-                        });
-
+                    
                         return {
                             message: 'Queued. Thank you!'
                         };

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

@@ -89,12 +89,6 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
                     }
                 });
 
-                scheduler.workers.get('deployApplication').postMessage({
-                    build_id: buildId,
-                    type: 'webhook_commit',
-                    ...applicationFound
-                });
-
                 return {
                     message: 'Queued. Thank you!'
                 };
@@ -141,6 +135,8 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
                         await prisma.build.create({
                             data: {
                                 id: buildId,
+                                pullmergeRequestId,
+                                sourceBranch,
                                 applicationId: applicationFound.id,
                                 destinationDockerId: applicationFound.destinationDocker.id,
                                 gitSourceId: applicationFound.gitSource.id,
@@ -150,21 +146,12 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
                                 type: 'webhook_mr'
                             }
                         });
-                        scheduler.workers.get('deployApplication').postMessage({
-                            build_id: buildId,
-                            type: 'webhook_mr',
-                            ...applicationFound,
-                            sourceBranch,
-                            pullmergeRequestId
-                        });
-
                         return {
                             message: 'Queued. Thank you!'
                         };
                     } else if (action === 'close') {
                         if (applicationFound.destinationDockerId) {
                             const id = `${applicationFound.id}-${pullmergeRequestId}`;
-                            const engine = applicationFound.destinationDocker.engine;
                             await removeContainer({ id, dockerId: applicationFound.destinationDocker.id });
                         }
                         return {

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

@@ -1,5 +1,7 @@
 import { FastifyRequest } from "fastify";
-import { errorHandler, getDomain, isDev, prisma, supportedServiceTypesAndVersions, include, executeDockerCmd } from "../../../lib/common";
+import { errorHandler, getDomain, isDev, prisma, executeDockerCmd } from "../../../lib/common";
+import { supportedServiceTypesAndVersions } from "../../../lib/services/supportedVersions";
+import { includeServices } from "../../../lib/services/common";
 import { TraefikOtherConfiguration } from "./types";
 
 function configureMiddleware(
@@ -234,7 +236,7 @@ export async function traefikConfiguration(request, reply) {
 		}
 		const services: any = await prisma.service.findMany({
 			where: { destinationDocker: { remoteEngine: false } },
-			include,
+			include: includeServices,
 			orderBy: { createdAt: 'desc' },
 		});
 
@@ -590,7 +592,7 @@ export async function remoteTraefikConfiguration(request: FastifyRequest) {
 		}
 		const services: any = await prisma.service.findMany({
 			where: { destinationDocker: { id } },
-			include,
+			include: includeServices,
 			orderBy: { createdAt: 'desc' }
 		});
 

apps/ui/package.json

@@ -14,20 +14,20 @@
 		"format": "prettier --write --plugin-search-dir=. ."
 	},
 	"devDependencies": {
-		"@playwright/test": "1.24.2",
+		"@playwright/test": "1.25.1",
 		"@sveltejs/kit": "1.0.0-next.405",
 		"@types/js-cookie": "3.0.2",
-		"@typescript-eslint/eslint-plugin": "5.33.0",
-		"@typescript-eslint/parser": "5.33.0",
+		"@typescript-eslint/eslint-plugin": "5.35.1",
+		"@typescript-eslint/parser": "5.35.1",
 		"autoprefixer": "10.4.8",
-		"eslint": "8.21.0",
+		"eslint": "8.22.0",
 		"eslint-config-prettier": "8.5.0",
 		"eslint-plugin-svelte3": "4.0.0",
 		"postcss": "8.4.16",
 		"prettier": "2.7.1",
 		"prettier-plugin-svelte": "2.7.0",
 		"svelte": "3.49.0",
-		"svelte-check": "2.8.0",
+		"svelte-check": "2.8.1",
 		"svelte-preprocess": "4.10.7",
 		"tailwindcss": "3.1.8",
 		"tailwindcss-scrollbar": "0.1.0",
@@ -38,8 +38,9 @@
 	"type": "module",
 	"dependencies": {
 		"@sveltejs/adapter-static": "1.0.0-next.39",
+		"@tailwindcss/typography": "^0.5.4",
 		"cuid": "2.1.8",
-		"daisyui": "2.22.0",
+		"daisyui": "2.24.0",
 		"js-cookie": "3.0.1",
 		"p-limit": "4.0.0",
 		"svelte-select": "4.4.7",

apps/ui/src/lib/common.ts

@@ -1,199 +1,5 @@
 import { addToast } from '$lib/store';
 
-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
-		}
-	},
-	{
-		name: 'umami',
-		fancyName: 'Umami',
-		baseImage: 'ghcr.io/mikecao/umami',
-		images: ['postgres:12-alpine'],
-		versions: ['postgresql-latest'],
-		recommendedVersion: 'postgresql-latest',
-		ports: {
-			main: 3000
-		}
-	},
-	{
-		name: 'hasura',
-		fancyName: 'Hasura',
-		baseImage: 'hasura/graphql-engine',
-		images: ['postgres:12-alpine'],
-		versions: ['latest', 'v2.10.0', 'v2.5.1'],
-		recommendedVersion: 'v2.10.0',
-		ports: {
-			main: 8080
-		}
-	},
-	{
-		name: 'fider',
-		fancyName: 'Fider',
-		baseImage: 'getfider/fider',
-		images: ['postgres:12-alpine'],
-		versions: ['stable'],
-		recommendedVersion: 'stable',
-		ports: {
-			main: 3000
-		}
-	},
-	{
-		name: 'appwrite',
-		fancyName: 'Appwrite',
-		baseImage: 'appwrite/appwrite',
-		images: ['mariadb:10.7', 'redis:6.2-alpine', 'appwrite/telegraf:1.4.0'],
-		versions: ['latest', '0.15.3'],
-		recommendedVersion: '0.15.3',
-		ports: {
-			main: 80
-		}
-	},
-	// {
-	//     name: 'moodle',
-	//     fancyName: 'Moodle',
-	//     baseImage: 'bitnami/moodle',
-	//     images: [],
-	//     versions: ['latest', 'v4.0.2'],
-	//     recommendedVersion: 'latest',
-	//     ports: {
-	//         main: 8080
-	//     }
-	// }
-	{
-		name: 'glitchTip',
-		fancyName: 'GlitchTip',
-		baseImage: 'glitchtip/glitchtip',
-		images: ['postgres:14-alpine', 'redis:7-alpine'],
-		versions: ['latest'],
-		recommendedVersion: 'latest',
-		ports: {
-			main: 8000
-		}
-	},
-	{
-		name: 'searxng',
-		fancyName: 'SearXNG',
-		baseImage: 'searxng/searxng',
-		images: ['redis:6.2-alpine'],
-		versions: ['latest'],
-		recommendedVersion: 'latest',
-		ports: {
-			main: 8080
-		}
-	},
-];
-
 export const asyncSleep = (delay: number) =>
 	new Promise((resolve) => setTimeout(resolve, delay));
 
@@ -265,15 +71,6 @@ export function changeQueryParams(buildId: string) {
 	return history.pushState(null, null, '?' + queryParams.toString());
 }
 
-export const getServiceMainPort = (service: string) => {
-	const serviceType = supportedServiceTypesAndVersions.find((s) => s.name === service);
-	if (serviceType) {
-		return serviceType.ports.main;
-	}
-	return null;
-};
-
-
 
 export function handlerNotFoundLoad(error: any, url: URL) {
 	if (error?.status === 404) {

apps/ui/src/lib/components/Usage.svelte

@@ -20,11 +20,12 @@
 	let usageInterval: any;
 	let loading = {
 		usage: false,
-		cleanup: false
+		cleanup: false,
+		restart: false
 	};
-	import { appSession } from '$lib/store';
+	import { addToast, appSession } from '$lib/store';
 	import { onDestroy, onMount } from 'svelte';
-	import { get } from '$lib/api';
+	import { get, post } from '$lib/api';
 	import { errorNotification } from '$lib/common';
 	async function getStatus() {
 		if (loading.usage) return;
@@ -33,6 +34,25 @@
 		usage = data.usage;
 		loading.usage = false;
 	}
+	async function restartCoolify() {
+		const sure = confirm(
+			'Are you sure you would like to restart Coolify? Currently running deployments will be stopped and restarted.'
+		);
+		if (sure) {
+			loading.restart = true;
+			try {
+				await post(`/internal/restart`, {});
+				addToast({
+					type: 'success',
+					message: 'Coolify restarted successfully. It will take a moment.'
+				});
+			} catch (error) {
+				return errorNotification(error);
+			} finally {
+				loading.restart = false;
+			}
+		}
+	}
 	onDestroy(() => {
 		clearInterval(usageInterval);
 	});
@@ -48,65 +68,105 @@
 			return errorNotification(error);
 		}
 	});
+	async function manuallyCleanupStorage() {
+		try {
+			loading.cleanup = true;
+			await post('/internal/cleanup', {});
+			return addToast({
+				message: 'Cleanup done.',
+				type: 'success'
+			});
+		} catch (error) {
+			return errorNotification(error);
+		} finally {
+			loading.cleanup = false;
+		}
+	}
 </script>
 
-<div class="pb-4">
-	<div class="title">Hardware Details</div>
-	<div class="text-center p-8 ">
-		<div>
-			<div class="stat w-64">
+<div class="w-full">
+	<div class="flex lg:flex-row flex-col gap-4">
+		<h1 class="title lg:text-3xl">Hardware Details</h1>
+		<div class="flex lg:flex-row flex-col space-x-0 lg:space-x-2 space-y-2 lg:space-y-0">
+			{#if $appSession.teamId === '0'}
+				<button
+					on:click={manuallyCleanupStorage}
+					class:loading={loading.cleanup}
+					class="btn btn-sm">Cleanup Storage</button
+				>
+				<button
+					on:click={restartCoolify}
+					class:loading={loading.restart}
+					class="btn btn-sm bg-red-600 hover:bg-red-500">Restart Coolify</button
+				>
+			{/if}
+		</div>
+	</div>
+	<div class="divider" />
+	<div class="grid grid-flow-col gap-4 grid-rows-3 justify-start lg:justify-center lg:grid-rows-1">
+		<div class="stats stats-vertical min-w-[16rem] mb-5 rounded bg-transparent">
+			<div class="stat">
 				<div class="stat-title">Total Memory</div>
-				<div class="stat-value">
+				<div class="stat-value text-2xl">
 					{(usage?.memory.totalMemMb).toFixed(0)}<span class="text-sm">MB</span>
 				</div>
 			</div>
-			<div class="stat w-64">
+
+			<div class="stat">
 				<div class="stat-title">Used Memory</div>
-				<div class="stat-value">
+				<div class="stat-value text-2xl">
 					{(usage?.memory.usedMemMb).toFixed(0)}<span class="text-sm">MB</span>
 				</div>
 			</div>
-			<div class="stat w-64">
+
+			<div class="stat">
 				<div class="stat-title">Free Memory</div>
-				<div class="stat-value">
+				<div class="stat-value text-2xl">
 					{usage?.memory.freeMemPercentage}<span class="text-sm">%</span>
 				</div>
 			</div>
 		</div>
-		<div class="py-10">
-			<div class="stat w-64">
-				<div class="stat-title">Total CPUs</div>
-				<div class="stat-value">
+
+		<div class="stats stats-vertical min-w-[20rem] mb-5 bg-transparent rounded">
+			<div class="stat">
+				<div class="stat-title">Total CPU</div>
+				<div class="stat-value text-2xl">
 					{usage?.cpu.count}
 				</div>
 			</div>
-			<div class="stat w-64">
+
+			<div class="stat">
 				<div class="stat-title">CPU Usage</div>
-				<div class="stat-value">
+				<div class="stat-value text-2xl">
 					{usage?.cpu.usage}<span class="text-sm">%</span>
 				</div>
 			</div>
-			<div class="stat w-64">
+
+			<div class="stat">
 				<div class="stat-title">Load Average (5,10,30mins)</div>
-				<div class="stat-value">{usage?.cpu.load}</div>
+				<div class="stat-value text-2xl">{usage?.cpu.load}</div>
 			</div>
 		</div>
-		<div>
-			<div class="stat w-64">
+		<div class="stats stats-vertical min-w-[16rem] mb-5 bg-transparent rounded">
+			<div class="stat">
 				<div class="stat-title">Total Disk</div>
-				<div class="stat-value">
+				<div class="stat-value text-2xl">
 					{usage?.disk.totalGb}<span class="text-sm">GB</span>
 				</div>
 			</div>
-			<div class="stat w-64">
+
+			<div class="stat">
 				<div class="stat-title">Used Disk</div>
-				<div class="stat-value">
+				<div class="stat-value text-2xl">
 					{usage?.disk.usedGb}<span class="text-sm">GB</span>
 				</div>
 			</div>
-			<div class="stat w-64">
+
+			<div class="stat">
 				<div class="stat-title">Free Disk</div>
-				<div class="stat-value">{usage?.disk.freePercentage}<span class="text-sm">%</span></div>
+				<div class="stat-value text-2xl">
+					{usage?.disk.freePercentage}<span class="text-sm">%</span>
+				</div>
 			</div>
 		</div>
 	</div>

apps/ui/src/lib/components/svg/applications/Docker.svelte

@@ -2,79 +2,8 @@
 	export let isAbsolute = true;
 </script>
 
-<svg
-	viewBox="0 0 128 128"
-	class={isAbsolute ? 'absolute top-0 left-0 -m-8 h-16 w-16' : 'mx-auto w-8 h-8'}
->
-	<g
-		><path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			fill="#3A4D54"
-			d="M73.8 50.8h11.3v11.5h5.7c2.6 0 5.3-.5 7.8-1.3 1.2-.4 2.6-1 3.8-1.7-1.6-2.1-2.4-4.7-2.6-7.3-.3-3.5.4-8.1 2.8-10.8l1.2-1.4 1.4 1.1c3.6 2.9 6.5 6.8 7.1 11.4 4.3-1.3 9.3-1 13.1 1.2l1.5.9-.8 1.6c-3.2 6.2-9.9 8.2-16.4 7.8-9.8 24.3-31 35.8-56.8 35.8-13.3 0-25.5-5-32.5-16.8l-.1-.2-1-2.1c-2.4-5.2-3.1-10.9-2.6-16.6l.2-1.7h9.6v-11.4h11.3v-11.2h22.5v-11.3h13.5v22.5z"
-		/><path
-			fill="#00AADA"
-			d="M110.4 55.1c.8-5.9-3.6-10.5-6.4-12.7-3.1 3.6-3.6 13.2 1.3 17.2-2.8 2.4-8.5 4.7-14.5 4.7h-72.2c-.6 6.2.5 11.9 3 16.8l.8 1.5c.5.9 1.1 1.7 1.7 2.6 3 .2 5.7.3 8.2.2 4.9-.1 8.9-.7 12-1.7.5-.2.9.1 1.1.5.2.5-.1.9-.5 1.1-.4.1-.8.3-1.3.4-2.4.7-5 1.1-8.3 1.3h-.6000000000000001c-1.3.1-2.7.1-4.2.1-1.6 0-3.1 0-4.9-.1 6 6.8 15.4 10.8 27.2 10.8 25 0 46.2-11.1 55.5-35.9 6.7.7 13.1-1 16-6.7-4.5-2.7-10.5-1.8-13.9-.1z"
-		/><path
-			fill="#28B8EB"
-			d="M110.4 55.1c.8-5.9-3.6-10.5-6.4-12.7-3.1 3.6-3.6 13.2 1.3 17.2-2.8 2.4-8.5 4.7-14.5 4.7h-68c-.3 9.5 3.2 16.7 9.5 21 4.9-.1 8.9-.7 12-1.7.5-.2.9.1 1.1.5.2.5-.1.9-.5 1.1-.4.1-.8.3-1.3.4-2.4.7-5.2 1.2-8.5 1.4l-.1-.1c8.5 4.4 20.8 4.3 35-1.1 15.8-6.1 30.6-17.7 40.9-30.9-.2.1-.4.1-.5.2z"
-		/><path
-			fill="#028BB8"
-			d="M18.7 71.8c.4 3.3 1.4 6.4 2.9 9.3l.8 1.5c.5.9 1.1 1.7 1.7 2.6 3 .2 5.7.3 8.2.2 4.9-.1 8.9-.7 12-1.7.5-.2.9.1 1.1.5.2.5-.1.9-.5 1.1-.4.1-.8.3-1.3.4-2.4.7-5.2 1.2-8.5 1.4h-.4c-1.3.1-2.7.1-4.1.1-1.6 0-3.2 0-4.9-.1 6 6.8 15.5 10.8 27.3 10.8 21.4 0 40-8.1 50.8-26h-85.1v-.1z"
-		/><path
-			fill="#019BC6"
-			d="M23.5 71.8c1.3 5.8 4.3 10.4 8.8 13.5 4.9-.1 8.9-.7 12-1.7.5-.2.9.1 1.1.5.2.5-.1.9-.5 1.1-.4.1-.8.3-1.3.4-2.4.7-5.2 1.2-8.6 1.4 8.5 4.4 20.8 4.3 34.9-1.1 8.5-3.3 16.8-8.2 24.2-14.1h-70.6z"
-		/><path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			fill="#00ACD3"
-			d="M28.4 52.7h9.8v9.8h-9.8v-9.8zm.8.8h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zM39.6 41.5h9.8v9.8h-9.8v-9.8zm.9.8h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1z"
-		/><path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			fill="#23C2EE"
-			d="M39.6 52.7h9.8v9.8h-9.8v-9.8zm.9.8h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1z"
-		/><path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			fill="#00ACD3"
-			d="M50.9 52.7h9.8v9.8h-9.8v-9.8zm.8.8h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1z"
-		/><path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			fill="#23C2EE"
-			d="M50.9 41.5h9.8v9.8h-9.8v-9.8zm.8.8h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zM62.2 52.7h9.8v9.8h-9.8v-9.8zm.8.8h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1z"
-		/><path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			fill="#00ACD3"
-			d="M62.2 41.5h9.8v9.8h-9.8v-9.8zm.8.8h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1z"
-		/><path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			fill="#23C2EE"
-			d="M62.2 30.2h9.8v9.8h-9.8v-9.8zm.8.8h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1z"
-		/><path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			fill="#00ACD3"
-			d="M73.5 52.7h9.8v9.8h-9.8v-9.8zm.8.8h.8v8.1h-.8v-8.1zm1.4 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1zm1.5 0h.8v8.1h-.8v-8.1z"
-		/><path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			fill="#D4EEF1"
-			d="M48.8 78.3c1.5 0 2.7 1.2 2.7 2.7 0 1.5-1.2 2.7-2.7 2.7-1.5 0-2.7-1.2-2.7-2.7 0-1.5 1.2-2.7 2.7-2.7"
-		/><path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			fill="#3A4D54"
-			d="M48.8 79.1c.2 0 .5 0 .7.1-.2.1-.4.4-.4.7 0 .4.4.8.8.8.3 0 .6-.2.7-.4.1.2.1.5.1.7 0 1.1-.9 1.9-1.9 1.9-1.1 0-1.9-.9-1.9-1.9 0-1 .8-1.9 1.9-1.9M1.1 72.8h125.4c-2.7-.7-8.6-1.6-7.7-5.2-5 5.7-16.9 4-20 1.2-3.4 4.9-23 3-24.3-.8-4.2 5-17.3 5-21.5 0-1.4 3.8-21 5.7-24.3.8-3 2.8-15 4.5-20-1.2 1.1 3.5-4.9 4.5-7.6 5.2"
-		/><path
-			fill="#BFDBE0"
-			d="M56 97.8c-6.7-3.2-10.3-7.5-12.4-12.2-2.5.7-5.5 1.2-8.9 1.4-1.3.1-2.7.1-4.1.1-1.7 0-3.4 0-5.2-.1 6 6 13.6 10.7 27.5 10.8h3.1z"
-		/><path
-			fill="#D4EEF1"
-			d="M46.1 89.9c-.9-1.3-1.8-2.8-2.5-4.3-2.5.7-5.5 1.2-8.9 1.4 2.3 1.2 5.7 2.4 11.4 2.9z"
-		/></g
-	>
-</svg>
+
+<svg viewBox="0 0 128 128" class={isAbsolute ? 'absolute top-0 left-0 -m-5 h-12 w-12' : 'mx-auto w-10 h-10'}>
+	<path d="M124.8 52.1c-4.3-2.5-10-2.8-14.8-1.4-.6-5.2-4-9.7-8-12.9l-1.6-1.3-1.4 1.6c-2.7 3.1-3.5 8.3-3.1 12.3.3 2.9 1.2 5.9 3 8.3-1.4.8-2.9 1.9-4.3 2.4-2.8 1-5.9 2-8.9 2H79V49H66V24H51v12H26v13H13v14H1.8l-.2 1.5c-.5 6.4.3 12.6 3 18.5l1.1 2.2.1.2c7.9 13.4 21.7 19 36.8 19 29.2 0 53.3-13.1 64.3-40.6 7.4.4 15-1.8 18.6-8.9l.9-1.8-1.6-1zM28 39h10v11H28V39zm13.1 44.2c0 1.7-1.4 3.1-3.1 3.1-1.7 0-3.1-1.4-3.1-3.1 0-1.7 1.4-3.1 3.1-3.1 1.7.1 3.1 1.4 3.1 3.1zM28 52h10v11H28V52zm-13 0h11v11H15V52zm27.7 50.2c-15.8-.1-24.3-5.4-31.3-12.4 2.1.1 4.1.2 5.9.2 1.6 0 3.2 0 4.7-.1 3.9-.2 7.3-.7 10.1-1.5 2.3 5.3 6.5 10.2 14 13.8h-3.4zM51 63H40V52h11v11zm0-13H40V39h11v11zm13 13H53V52h11v11zm0-13H53V39h11v11zm0-13H53V26h11v11zm13 26H66V52h11v11zM38.8 81.2c-.2-.1-.5-.2-.8-.2-1.2 0-2.2 1-2.2 2.2 0 1.2 1 2.2 2.2 2.2s2.2-1 2.2-2.2c0-.3-.1-.6-.2-.8-.2.3-.4.5-.8.5-.5 0-.9-.4-.9-.9.1-.4.3-.7.5-.8z" fill="#019BC6"></path>
+	</svg>
+  

apps/ui/src/lib/components/svg/services/Appwrite.svelte

@@ -4,7 +4,7 @@
 
 <svg
 	xmlns="http://www.w3.org/2000/svg"
-	class={isAbsolute ? 'w-14 h-14 absolute top-0 left-0 -m-5' : 'w-9 mx-auto'}
+	class={isAbsolute ? 'w-14 h-14 absolute top-0 left-0 -m-5' : 'w-9 h-9 mx-auto'}
 	viewBox="0 0 384 384"
 	fill="none"
 >

apps/ui/src/lib/components/svg/services/Fider.svelte

@@ -5,7 +5,7 @@
 <svg
 	viewBox="0 0 700 240"
 	xmlns="http://www.w3.org/2000/svg"
-	class={isAbsolute ? 'w-36 absolute top-0 left-0 -m-3 -mt-5' : 'w-28 mx-auto'}
+	class={isAbsolute ? 'w-36 absolute top-0 left-0 -m-3 -mt-5' : 'w-28 h-28 mx-auto'}
 	><path fill="#FDBC3D" d="m90.694 107.498-.981.39-20.608 8.23 6.332 6.547z" /><path
 		fill="#8EC63F"
 		d="M61.139 77.914 46.632 93 56.9 103.547c8.649-7.169 17.832-10.502 18.653-10.789L61.139 77.914z"

apps/ui/src/lib/components/svg/services/Ghost.svelte

@@ -4,6 +4,6 @@
 
 <img
 	alt="ghost logo"
-	class={isAbsolute ? 'w-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 h-8 mx-auto'}
 	src="/ghost.png"
 />

apps/ui/src/lib/components/svg/services/GlitchTip.svelte

@@ -3,7 +3,7 @@
 </script>
 
 <svg
-  class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+  class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   style="isolation:isolate"

apps/ui/src/lib/components/svg/services/Hasura.svelte

@@ -3,7 +3,7 @@
 </script>
 
 <svg
-	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 	viewBox="0 0 81 84"
 	fill="none"
 	xmlns="http://www.w3.org/2000/svg"

apps/ui/src/lib/components/svg/services/LanguageTool.svelte

@@ -4,7 +4,7 @@
 
 <svg
 	xmlns="http://www.w3.org/2000/svg"
-	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 	fill="none"
 	viewBox="0 0 140 140"
 	data-lt-extension-installed="true"

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

@@ -4,7 +4,7 @@
 
 <svg
 	viewBox="0 0 127 74"
-	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-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"

apps/ui/src/lib/components/svg/services/MinIO.svelte

@@ -4,6 +4,6 @@
 
 <img
 	alt="minio logo"
-	class={isAbsolute ? 'w-7 absolute top-0 left-0 -m-3 -mt-5' : 'w-4  mx-auto'}
+	class={isAbsolute ? 'w-7 h-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-4 h-8 mx-auto'}
 	src="/minio.png"
 />

apps/ui/src/lib/components/svg/services/Moodle.svelte

@@ -3,6 +3,6 @@
 </script>
 <img
 	alt="moodle logo"
-	class={isAbsolute ? 'w-9 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-9 h-9 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 h-8 mx-auto'}
 	src="/moodle.png"
 />

apps/ui/src/lib/components/svg/services/N8n.svelte

@@ -3,7 +3,7 @@
 </script>
 
 <svg
-	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 	viewBox="0 0 220 105"
 >
 	<g>

apps/ui/src/lib/components/svg/services/NocoDB.svelte

@@ -4,6 +4,6 @@
 
 <img
 	alt="nocodb logo"
-	class={isAbsolute ? 'w-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 	src="/nocodb.png"
 />

apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte

@@ -4,6 +4,6 @@
 
 <img
 	alt="plausible logo"
-	class={isAbsolute ? 'w-9 absolute top-0 left-0 -m-4' : 'w-6 mx-auto'}
+	class={isAbsolute ? 'w-9 h-12 absolute top-0 left-0 -m-4' : 'w-6 h-8 mx-auto'}
 	src="/plausible.png"
 />

apps/ui/src/lib/components/svg/services/Searxng.svelte

@@ -3,7 +3,6 @@
 </script>
 
 <svg
-	xmlns:dc="http://purl.org/dc/elements/1.1/"
 	xmlns:cc="http://creativecommons.org/ns#"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns:svg="http://www.w3.org/2000/svg"
@@ -11,7 +10,7 @@
 	id="svg8"
 	version="1.1"
 	viewBox="0 0 92 92"
-	class={isAbsolute ? 'w-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 h-8 mx-auto'}
 >
 	<defs id="defs2" />
 	<metadata id="metadata5">

apps/ui/src/lib/components/svg/services/Umami.svelte

@@ -7,7 +7,7 @@
 	xmlns="http://www.w3.org/2000/svg"
 	viewBox="0 0 856.000000 856.000000"
 	preserveAspectRatio="xMidYMid meet"
-	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 >
 	<metadata> Created by potrace 1.11, written by Peter Selinger 2001-2013 </metadata>
 	<g

apps/ui/src/lib/components/svg/services/VSCodeServer.svelte

@@ -3,7 +3,7 @@
 </script>
 
 <svg
-	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'}
 	viewBox="0 0 128 128"
 >
 	<path

apps/ui/src/lib/components/svg/services/VaultWarden.svelte

@@ -3,7 +3,7 @@
 </script>
 
 <svg
-	class={isAbsolute ? 'w-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'}
 	xmlns="http://www.w3.org/2000/svg"
 	xmlns:xlink="http://www.w3.org/1999/xlink"
 	version="1.1"

apps/ui/src/lib/components/svg/services/Wordpress.svelte

@@ -2,7 +2,7 @@
 	export let isAbsolute = false;
 </script>
 
-<svg class={isAbsolute ? 'w-10  absolute top-0 left-0 -m-5' : 'w-8 mx-auto'} viewBox="0 0 128 128">
+<svg class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'} viewBox="0 0 128 128">
 	<path
 		fill-rule="evenodd"
 		clip-rule="evenodd"

apps/ui/src/lib/store.ts

@@ -17,7 +17,8 @@ interface AppSession {
     tokens: {
         github: string | null,
         gitlab: string | null,
-    }
+    },
+    supportedServiceTypesAndVersions: Array<any>
 }
 interface AddToast {
     type?: "info" | "success" | "error",
@@ -40,7 +41,8 @@ export const appSession: Writable<AppSession> = writable({
     tokens: {
         github: null,
         gitlab: null
-    }
+    },
+    supportedServiceTypesAndVersions: []
 });
 export const disabledButton: Writable<boolean> = writable(false);
 export const status: Writable<any> = writable({

apps/ui/src/routes/__layout.svelte

@@ -65,11 +65,13 @@
 
 <script lang="ts">
 	export let baseSettings: any;
+	export let supportedServiceTypesAndVersions: any;
 	$appSession.ipv4 = baseSettings.ipv4;
 	$appSession.ipv6 = baseSettings.ipv6;
 	$appSession.version = baseSettings.version;
 	$appSession.whiteLabeled = baseSettings.whiteLabeled;
 	$appSession.whiteLabeledDetails.icon = baseSettings.whiteLabeledIcon;
+	$appSession.supportedServiceTypesAndVersions = supportedServiceTypesAndVersions
 
 	export let userId: string;
 	export let teamId: string;
@@ -120,7 +122,13 @@
 	<nav class="nav-main">
 		<div class="flex h-screen w-full flex-col items-center transition-all duration-100">
 			{#if !$appSession.whiteLabeled}
-				<div class="my-4 h-10 w-10"><img src="/favicon.png" alt="coolLabs logo" /></div>
+				<div class="mb-2 mt-4 h-10 w-10">
+					<img src="/favicon.png" alt="coolLabs logo" />
+				</div>
+			{:else if $appSession.whiteLabeledDetails.icon}
+				<div class="mb-2 mt-4 h-10 w-10">
+					<img src={$appSession.whiteLabeledDetails.icon} alt="White labeled logo" />
+				</div>
 			{/if}
 			<div class="flex flex-col space-y-2 py-2" class:mt-2={$appSession.whiteLabeled}>
 				<a
@@ -388,5 +396,7 @@
 	{/if}
 {/if}
 <main>
-	<slot />
+	<div class="px-20">
+		<slot />
+	</div>
 </main>

apps/ui/src/routes/applications/[id]/_Secret.svelte

@@ -57,11 +57,12 @@
 					message: 'Secret added.',
 					type: 'success'
 				});
-			}
-			addToast({
+			} else {
+				addToast({
 				message: 'Secret updated.',
 				type: 'success'
 			});
+			}
 			dispatch('refresh');
 		} catch (error) {
 			console.log(error);

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

@@ -66,7 +66,6 @@
 
 	let loading = false;
 	let statusInterval: any;
-	let isQueueActive = false;
 	$disabledButton =
 		!$appSession.isAdmin ||
 		(!application.fqdn && !application.settings.isBot) ||
@@ -121,7 +120,6 @@
 		if ($status.application.loading) return;
 		$status.application.loading = true;
 		const data = await get(`/applications/${id}/status`);
-		isQueueActive = data.isQueueActive;
 		$status.application.isRunning = data.isRunning;
 		$status.application.isExited = data.isExited;
 		$status.application.loading = false;
@@ -259,13 +257,10 @@
 			<form on:submit|preventDefault={() => handleDeploySubmit(true)}>
 				<button
 					type="submit"
-					disabled={$disabledButton || !isQueueActive}
-					class:hover:text-green-500={isQueueActive}
+					disabled={$disabledButton}
 					class="icons bg-transparent tooltip tooltip-primary tooltip-bottom text-sm flex items-center space-x-2"
 					data-tip={$appSession.isAdmin
-						? isQueueActive
-							? 'Force Rebuild Application'
-							: 'Autoupdate inprogress. Cannot rebuild application.'
+						? 'Force Rebuild Application'
 						: 'You do not have permission to rebuild application.'}
 				>
 					<svg
@@ -287,7 +282,7 @@
 				</button>
 			</form>
 		{:else}
-			<form on:submit|preventDefault={handleDeploySubmit}>
+			<form on:submit|preventDefault={() => handleDeploySubmit(false)}>
 				<button
 					type="submit"
 					disabled={$disabledButton}
@@ -359,7 +354,7 @@
 			<button
 				disabled={$disabledButton}
 				class="icons bg-transparent tooltip tooltip-primary tooltip-bottom text-sm"
-				data-tip="Secret"
+				data-tip="Secrets"
 			>
 				<svg
 					xmlns="http://www.w3.org/2000/svg"

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

@@ -114,10 +114,33 @@
 			buildPack: application.buildPack,
 			deploymentType: application.deploymentType
 		});
-		application = {
-			...application,
-			...data
-		};
+		const baseImageCorrect = data.baseImages.filter(
+			(image: any) => image.value === application.baseImage
+		);
+		if (baseImageCorrect.length === 0) {
+			application.baseImage = data.baseImage;
+		}
+		application.baseImages = data.baseImages;
+
+		const baseBuildImageCorrect = data.baseBuildImages.filter(
+			(image: any) => image.value === application.baseBuildImage
+		);
+		if (baseBuildImageCorrect.length === 0) {
+			application.baseBuildImage = data.baseBuildImage;
+		}
+		application.baseBuildImages = data.baseBuildImages;
+		if (application.deploymentType === 'static' && application.port !== '80') {
+			application.port = data.port;
+		}
+		if (application.deploymentType === 'node' && application.port === '80') {
+			application.port = data.port;
+		}
+		if (application.deploymentType === 'static' && !application.publishDirectory) {
+			application.publishDirectory = data.publishDirectory;
+		}
+		if (application.deploymentType === 'node' && application.publishDirectory === 'out') {
+			application.publishDirectory = data.publishDirectory;
+		}
 	}
 	async function changeSettings(name: any) {
 		if (name === 'debug') {
@@ -631,9 +654,7 @@
 						bind:value={application.port}
 						placeholder="{$t('forms.default')}: 'python' ? '8000' : '3000'"
 					/>
-					<Explainer
-					text={'The port your application listens on.'}
-				/>
+					<Explainer text={'The port your application listens on.'} />
 				</div>
 			{/if}
 			<div class="grid grid-cols-2 items-center">

apps/ui/src/routes/applications/[id]/logs/build.svelte

@@ -158,7 +158,6 @@
 							{build.type}
 						</div>
 					</div>
-					<div class="flex-1" />
 
 					<div class="w-48 text-center text-xs">
 						{#if build.status === 'running'}
@@ -178,7 +177,7 @@
 		{#if !noMoreBuilds}
 			{#if buildCount > 5}
 				<div class="flex space-x-2">
-					<button disabled={noMoreBuilds} class="w-full" on:click={loadMoreBuilds}
+					<button disabled={noMoreBuilds} class=" btn btn-sm w-full" on:click={loadMoreBuilds}
 						>{$t('application.build.load_more')}</button
 					>
 				</div>

apps/ui/src/routes/databases/[id]/configuration/destination.svelte

@@ -65,7 +65,7 @@
 				{$t('application.configuration.no_configurable_destination')}
 			</div>
 			<div class="flex justify-center">
-				<a href="/new/destination" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
+				<a href="/destinations/new" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
 					<svg
 						class="w-6"
 						xmlns="http://www.w3.org/2000/svg"

apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte

@@ -33,7 +33,7 @@
 		customClass="max-w-[32rem]"
 		text="Remote Docker Engines are using <span class='text-white font-bold'>SSH</span> to communicate with the remote docker engine. 
         You need to setup an <span class='text-white font-bold'>SSH key</span> in advance on the server and install Docker. 
-        <br>See <a class='text-white' href='https://docs.coollabs.io/coolify/destinations/remote.html'>docs</a> for more details."
+        <br>See <a class='text-white' href='https://docs.coollabs.io/coolify/destinations#remote-docker-engine'>docs</a> for more details."
 	/>
 </div>
 <div class="flex justify-center px-6 pb-8">

apps/ui/src/routes/iam/team/[id]/__layout.svelte

@@ -25,18 +25,38 @@
 </script>
 
 <script lang="ts">
+	export let team: any;
+	export let currentTeam: string;
+	export let teams: any;
 	import { page } from '$app/stores';
 	import { errorNotification, handlerNotFoundLoad } from '$lib/common';
 	import { appSession } from '$lib/store';
 	import { t } from '$lib/translations';
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import { goto } from '$app/navigation';
+	import Cookies from 'js-cookie';
 	const { id } = $page.params;
+
 	async function deleteTeam() {
 		const sure = confirm('Are you sure you want to delete this team?');
 		if (sure) {
 			try {
 				await del(`/iam/team/${id}`, { id });
+				if (currentTeam === id) {
+					const switchTeam = teams.find((team: any) => team.id !== id);
+					const payload = await get(`/user?teamId=${switchTeam.id}`);
+					if (payload.token) {
+						Cookies.set('token', payload.token, {
+							path: '/'
+						});
+						$appSession.teamId = payload.teamId;
+						$appSession.userId = payload.userId;
+						$appSession.permission = payload.permission;
+						$appSession.isAdmin = payload.isAdmin;
+						return window.location.assign('/iam');
+					}
+				}
+
 				return await goto('/iam', { replaceState: true });
 			} catch (error) {
 				return errorNotification(error);
@@ -47,16 +67,18 @@
 
 {#if id !== 'new'}
 	<nav class="nav-side">
-		<button
-			on:click={deleteTeam}
-			type="submit"
-			disabled={!$appSession.isAdmin}
-			class:hover:text-red-500={$appSession.isAdmin}
-			class="icons tooltip tooltip-primary tooltip-left bg-transparent text-sm"
-			data-tip={$appSession.isAdmin
-				? 'Delete'
-				: $t('destination.permission_denied_delete_destination')}><DeleteIcon /></button
-		>
+		{#if team.id !== '0'}
+			<button
+				on:click={deleteTeam}
+				type="submit"
+				disabled={!$appSession.isAdmin}
+				class:hover:text-red-500={$appSession.isAdmin}
+				class="icons tooltip tooltip-primary tooltip-left bg-transparent text-sm"
+				data-tip={$appSession.isAdmin
+					? 'Delete'
+					: $t('destination.permission_denied_delete_destination')}><DeleteIcon /></button
+			>
+		{/if}
 	</nav>
 {/if}
 <slot />

apps/ui/src/routes/index.svelte

@@ -36,10 +36,6 @@
 	import ServiceIcons from '$lib/components/svg/services/ServiceIcons.svelte';
 	import { dev } from '$app/env';
 
-	let loading = {
-		cleanup: false
-	};
-
 	let numberOfGetStatus = 0;
 
 	function getRndInteger(min: number, max: number) {
@@ -75,280 +71,217 @@
 			numberOfGetStatus--;
 		}
 	}
-	async function manuallyCleanupStorage() {
-		try {
-			loading.cleanup = true;
-			await post('/internal/cleanup', {});
-			return addToast({
-				message: 'Cleanup done.',
-				type: 'success'
-			});
-		} catch (error) {
-			return errorNotification(error);
-		} finally {
-			loading.cleanup = false;
-		}
-	}
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">{$t('index.dashboard')}</div>
-	{#if $appSession.teamId === '0'}
-		<button on:click={manuallyCleanupStorage} class:loading={loading.cleanup} class="btn btn-sm"
-			>Cleanup Storage</button
-		>
-	{/if}
 </div>
-<div class="mt-10 pb-12 sm:pb-16">
-	<div class="mx-auto px-10">
-		<div class="flex flex-col justify-center xl:flex-row">
-			{#if applications.length > 0}
-				<div>
-					<div class="title">Resources</div>
-					<div class="flex items-start justify-center p-8">
-						<table class="rounded-none text-base">
-							<tbody>
-								{#each applications as application}
-									<tr>
-										<td class="space-x-2 items-center tracking-tight font-bold">
-											{#await getStatus(application)}
-												<div class="inline-flex w-2 h-2 bg-yellow-500 rounded-full" />
-											{:then status}
-												{#if status === 'Running'}
-													<div class="inline-flex w-2 h-2 bg-success rounded-full" />
-												{:else}
-													<div class="inline-flex w-2 h-2 bg-error rounded-full" />
-												{/if}
-											{/await}
-											<div class="inline-flex">{application.name}</div>
-										</td>
-										<td class="px-10 inline-flex">
-											<ApplicationsIcons {application} isAbsolute={false} />
-										</td>
-										<td class="px-10">
-											<div
-												class="badge badge-outline text-xs border-applications rounded text-white"
+<div class="container lg:mx-auto lg:p-0 px-8 p-5">
+	{#if $appSession.teamId === '0'}
+		<Usage />
+	{/if}
+	<h1 class="title lg:text-3xl mt-10">Applications</h1>
+	<div class="divider" />
+	<div class="grid grid-col gap-8 auto-cols-max grid-cols-1 lg:grid-cols-3 p-4">
+		{#if applications.length > 0}
+			{#each applications as application}
+				<a class="no-underline mb-5" href={`/applications/${application.id}`}>
+					<div class="w-full rounded p-5 bg-coolgray-200 hover:bg-green-600 indicator">
+						{#await getStatus(application)}
+							<span class="indicator-item badge bg-yellow-500 badge-xs" />
+						{:then status}
+							{#if status === 'Running'}
+								<span class="indicator-item badge bg-success badge-xs" />
+							{:else}
+								<span class="indicator-item badge bg-error badge-xs" />
+							{/if}
+						{/await}
+						<div class="w-full flex flex-row">
+							<ApplicationsIcons {application} isAbsolute={true} />
+							<div class="w-full flex flex-col">
+								<h1 class="font-bold text-lg lg:text-sm truncate">
+									{application.name}
+									{#if application.settings.isBot}
+										<span class="text-xs">BOT</span>
+									{/if}
+								</h1>
+								<div class="h-10">
+									{#if application?.fqdn}
+										<h2>{application?.fqdn.replace('https://', '').replace('http://', '')}</h2>
+									{:else if !application.settings.isBot && !application?.fqdn}
+										<h2 class="text-red-500">Not configured</h2>
+									{/if}
+								</div>
+								<div class="flex justify-end items-end space-x-2 h-10">
+									{#if application.fqdn}
+										<a href={application.fqdn} target="_blank" class="icons hover:bg-green-500">
+											<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"
 											>
-												Application
-												{#if application.settings.isBot}
-													| BOT
-												{/if}
-											</div></td
+												<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}
+									{#if application.settings.isBot && application.exposePort}
+										<a
+											href={`http://${dev ? 'localhost' : settings.ipv4}:${application.exposePort}`}
+											target="_blank"
+											class="icons hover:bg-green-500"
 										>
-										<td class="flex justify-end">
-											{#if application.fqdn}
-												<a
-													href={application.fqdn}
-													target="_blank"
-													class="icons bg-transparent text-sm inline-flex"
-													><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}
-											{#if application.settings.isBot && application.exposePort}
-												<a
-													href={`http://${dev ? 'localhost' : settings.ipv4}:${
-														application.exposePort
-													}`}
-													target="_blank"
-													class="icons bg-transparent text-sm inline-flex"
-													><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={`/applications/${application.id}`}
-												class="icons bg-transparent text-sm inline-flex"
+											<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"
 											>
-												<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" />
-													<rect x="4" y="8" width="4" height="4" />
-													<line x1="6" y1="4" x2="6" y2="8" />
-													<line x1="6" y1="12" x2="6" y2="20" />
-													<rect x="10" y="14" width="4" height="4" />
-													<line x1="12" y1="4" x2="12" y2="14" />
-													<line x1="12" y1="18" x2="12" y2="20" />
-													<rect x="16" y="5" width="4" height="4" />
-													<line x1="18" y1="4" x2="18" y2="5" />
-													<line x1="18" y1="9" x2="18" y2="20" />
-												</svg>
-											</a>
-										</td>
-									</tr>
-								{/each}
-
-								{#each services as service}
-									<tr>
-										<td class="space-x-2 items-center tracking-tight font-bold">
-											{#await getStatus(service)}
-												<div class="inline-flex w-2 h-2 bg-yellow-500 rounded-full" />
-											{:then status}
-												{#if status === 'Running'}
-													<div class="inline-flex w-2 h-2 bg-success rounded-full" />
-												{:else}
-													<div class="inline-flex w-2 h-2 bg-error rounded-full" />
-												{/if}
-											{/await}
-											<div class="inline-flex">{service.name}</div>
-										</td>
-										<td class="px-10 inline-flex">
-											<ServiceIcons type={service.type} isAbsolute={false} />
-										</td>
-										<td class="px-10"
-											><div class="badge badge-outline text-xs border-services rounded text-white">
-												Service
-											</div>
-										</td>
-
-										<td class="flex justify-end">
-											{#if service.fqdn}
-												<a
-													href={service.fqdn}
-													target="_blank"
-													class="icons bg-transparent text-sm inline-flex"
-													><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={`/services/${service.id}`}
-												class="icons bg-transparent text-sm inline-flex"
-											>
-												<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" />
-													<rect x="4" y="8" width="4" height="4" />
-													<line x1="6" y1="4" x2="6" y2="8" />
-													<line x1="6" y1="12" x2="6" y2="20" />
-													<rect x="10" y="14" width="4" height="4" />
-													<line x1="12" y1="4" x2="12" y2="14" />
-													<line x1="12" y1="18" x2="12" y2="20" />
-													<rect x="16" y="5" width="4" height="4" />
-													<line x1="18" y1="4" x2="18" y2="5" />
-													<line x1="18" y1="9" x2="18" y2="20" />
-												</svg>
-											</a>
-										</td>
-									</tr>
-								{/each}
-								{#each databases as database}
-									<tr>
-										<td class="space-x-2 items-center tracking-tight font-bold">
-											{#await getStatus(database)}
-												<div class="inline-flex w-2 h-2 bg-yellow-500 rounded-full" />
-											{:then status}
-												{#if status === 'Running'}
-													<div class="inline-flex w-2 h-2 bg-success rounded-full" />
-												{:else}
-													<div class="inline-flex w-2 h-2 bg-error rounded-full" />
-												{/if}
-											{/await}
-											<div class="inline-flex">{database.name}</div>
-										</td>
-										<td class="px-10 inline-flex">
-											<DatabaseIcons type={database.type} />
-										</td>
-										<td class="px-10">
-											<div class="badge badge-outline text-xs border-databases rounded text-white">
-												Database
-											</div>
-										</td>
-										<td class="flex justify-end">
-											<a
-												href={`/databases/${database.id}`}
-												class="icons bg-transparent text-sm inline-flex ml-11"
-											>
-												<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" />
-													<rect x="4" y="8" width="4" height="4" />
-													<line x1="6" y1="4" x2="6" y2="8" />
-													<line x1="6" y1="12" x2="6" y2="20" />
-													<rect x="10" y="14" width="4" height="4" />
-													<line x1="12" y1="4" x2="12" y2="14" />
-													<line x1="12" y1="18" x2="12" y2="20" />
-													<rect x="16" y="5" width="4" height="4" />
-													<line x1="18" y1="4" x2="18" y2="5" />
-													<line x1="18" y1="9" x2="18" y2="20" />
-												</svg>
-											</a>
-										</td>
-									</tr>
-								{/each}
-							</tbody>
-						</table>
+												<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}
+								</div>
+							</div>
+						</div>
 					</div>
-				</div>
-			{:else if $appSession.teamId !== '0'}
-				<div class="text-center text-xl font-bold">Nothing is configured yet.</div>
-			{/if}
-			{#if $appSession.teamId === '0'}
-				<Usage />
-			{/if}
-		</div>
+				</a>
+			{/each}
+		{:else}
+			<h1 class="">Nothing is configured yet.</h1>
+		{/if}
+	</div>
+	<h1 class="title lg:text-3xl mt-10">Services</h1>
+	<div class="divider" />
+	<div class="grid grid-col gap-8 auto-cols-max grid-cols-1 lg:grid-cols-3 p-4">
+		{#if services.length > 0}
+			{#each services as service}
+				<a class="no-underline mb-5" href={`/services/${service.id}`}>
+					<div class="w-full rounded p-5 bg-coolgray-200 hover:bg-pink-600 indicator">
+						{#await getStatus(service)}
+							<span class="indicator-item badge bg-yellow-500 badge-xs" />
+						{:then status}
+							{#if status === 'Running'}
+								<span class="indicator-item badge bg-success badge-xs" />
+							{:else}
+								<span class="indicator-item badge bg-error badge-xs" />
+							{/if}
+						{/await}
+						<div class="w-full flex flex-row">
+							<ServiceIcons type={service.type} isAbsolute={true} />
+							<div class="w-full flex flex-col">
+								<h1 class="font-bold text-lg lg:text-sm truncate">{service.name}</h1>
+								<div class="h-10">
+									{#if service?.fqdn}
+										<h2>{service?.fqdn.replace('https://', '').replace('http://', '')}</h2>
+									{:else}
+										<h2 class="text-red-500">Not configured</h2>
+									{/if}
+								</div>
+								<div class="flex justify-end items-end space-x-2 h-10">
+									{#if service.fqdn}
+										<a href={service.fqdn} target="_blank" class="icons hover:bg-pink-500">
+											<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}
+								</div>
+							</div>
+						</div>
+					</div>
+				</a>
+			{/each}
+		{:else}
+			<h1 class="">Nothing is configured yet.</h1>
+		{/if}
+	</div>
+
+	<h1 class="title lg:text-3xl mt-10">Databases</h1>
+	<div class="divider" />
+	<div class="grid grid-col gap-8 auto-cols-max grid-cols-1 lg:grid-cols-3 p-4 mb-32">
+		{#if databases.length > 0}
+			{#each databases as database}
+				<a class="no-underline mb-5" href={`/databases/${database.id}`}>
+					<div class="w-full rounded p-5 bg-coolgray-200 hover:bg-purple-500 indicator">
+						{#await getStatus(database)}
+							<span class="indicator-item badge bg-yellow-500 badge-xs" />
+						{:then status}
+							{#if status === 'Running'}
+								<span class="indicator-item badge bg-success badge-xs" />
+							{:else}
+								<span class="indicator-item badge bg-error badge-xs" />
+							{/if}
+						{/await}
+						<div class="w-full flex flex-row">
+							<DatabaseIcons type={database.type} isAbsolute={true} />
+							<div class="w-full flex flex-col">
+								<div class="h-10">
+									<h1 class="font-bold text-lg lg:text-sm truncate">{database.name}</h1>
+									<div class="h-10">
+										{#if database?.version}
+											<h2 class="text-xs">{database?.version}</h2>
+										{:else}
+											<h2 class="text-red-500">Not configured</h2>
+										{/if}
+									</div>
+								</div>
+								<div class="flex justify-end items-end space-x-2 h-10">
+									{#if database.settings.isPublic}
+										<div title="Public">
+											<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" />
+												<circle cx="12" cy="12" r="9" />
+												<line x1="3.6" y1="9" x2="20.4" y2="9" />
+												<line x1="3.6" y1="15" x2="20.4" y2="15" />
+												<path d="M11.5 3a17 17 0 0 0 0 18" />
+												<path d="M12.5 3a17 17 0 0 1 0 18" />
+											</svg>
+										</div>
+									{/if}
+								</div>
+							</div>
+						</div>
+					</div>
+				</a>
+			{/each}
+		{:else}
+			<h1 class="">Nothing is configured yet.</h1>
+		{/if}
 	</div>
 </div>

apps/ui/src/routes/login.svelte

@@ -69,6 +69,7 @@
 				required
 				bind:this={emailEl}
 				bind:value={email}
+				class="w-56 md:w-96"
 			/>
 			<input
 				type="password"
@@ -76,6 +77,7 @@
 				placeholder={$t('forms.password')}
 				bind:value={password}
 				required
+				class="w-56 md:w-96"
 			/>
 
 			<div class="flex space-x-2 h-8 items-center justify-center pt-8">
@@ -83,14 +85,13 @@
 					type="submit"
 					disabled={loading}
 					class="btn btn-sm"
-					class:loading={loading}
+					class:loading
 					class:bg-coollabs={!loading}
 					>{loading ? $t('login.authenticating') : $t('login.login')}</button
 				>
 
-				<button
-					on:click|preventDefault={gotoRegister}
-					class="btn btn-sm">{$t('register.register')}</button
+				<button on:click|preventDefault={gotoRegister} class="btn btn-sm"
+					>{$t('register.register')}</button
 				>
 			</div>
 		</form>

apps/ui/src/routes/register.svelte

@@ -101,6 +101,7 @@
 					required
 					bind:this={emailEl}
 					bind:value={email}
+					class="w-56 md:w-96"
 				/>
 				<input
 					type="password"
@@ -109,6 +110,7 @@
 					bind:this={passwordEl}
 					bind:value={password}
 					required
+					class="w-56 md:w-96"
 				/>
 				<input
 					type="password"
@@ -116,6 +118,7 @@
 					placeholder={$t('forms.password_again')}
 					bind:value={passwordCheck}
 					required
+					class="w-56 md:w-96"
 				/>
 
 				<div class="flex space-x-2 h-8 items-center justify-center pt-8">
@@ -125,8 +128,7 @@
 						disabled={loading}
 						class:bg-transparent={loading}
 						class:bg-coollabs={!loading}
-						class:loading={loading}
-						>{loading ? $t('register.registering') : $t('register.register')}</button
+						class:loading>{loading ? $t('register.registering') : $t('register.register')}</button
 					>
 				</div>
 			</form>

apps/ui/src/routes/services/[id]/configuration/version.svelte

@@ -31,12 +31,13 @@
 	import { goto } from '$app/navigation';
 	import { get, post } from '$lib/api';
 	import { t } from '$lib/translations';
-	import { errorNotification, supportedServiceTypesAndVersions } from '$lib/common';
+	import { errorNotification } from '$lib/common';
 	import { onMount } from 'svelte';
+	import { appSession } from '$lib/store';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
-	let recommendedVersion = supportedServiceTypesAndVersions.find(
+	let recommendedVersion = $appSession.supportedServiceTypesAndVersions.find(
 		({ name }) => name === type
 	)?.recommendedVersion;
 

apps/ui/src/tailwind.css

@@ -24,12 +24,6 @@ body {
 	@apply min-h-screen overflow-x-hidden bg-coolblack text-sm text-white scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200;
 }
 
-main,
-.main {
-	width: calc(100% - 4rem);
-	margin-left: 4rem;
-}
-
 input {
 	@apply h-12 w-96 rounded border border-transparent bg-transparent bg-coolgray-200 p-2 text-xs tracking-tight text-white placeholder-stone-600 outline-none transition duration-150 hover:bg-coolgray-500 focus:bg-coolgray-500 disabled:border disabled:border-dashed disabled:border-coolgray-300 disabled:bg-transparent md:text-sm;
 }
@@ -106,7 +100,7 @@ a {
 	@apply mr-4 text-base tracking-tight md:text-2xl font-bold;
 }
 .nav-main {
-	@apply fixed top-0 left-0 min-h-screen w-16 min-w-[4rem] overflow-auto border-r border-stone-800 bg-coolgray-200 scrollbar-w-1  scrollbar-thumb-coollabs scrollbar-track-coolgray-200 xl:overflow-visible;
+	@apply fixed top-0 left-0 min-h-screen w-16 min-w-[4rem] overflow-hidden border-r border-stone-800 bg-coolgray-200 scrollbar-w-1  scrollbar-thumb-coollabs scrollbar-track-coolgray-200 xl:overflow-visible;
 }
 
 .nav-side {

apps/ui/tailwind.config.cjs

@@ -62,5 +62,5 @@ module.exports = {
 		scrollbar: ['dark'],
 		extend: {}
 	},
-	plugins: [require('tailwindcss-scrollbar'), require('daisyui')]
+	plugins: [require('tailwindcss-scrollbar'), require('daisyui'), require("@tailwindcss/typography")]
 };

package.json

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