Merge branch 'next' into edge-db

.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.
@@ -19,12 +19,14 @@
 		"dbaeumer.vscode-eslint",
 		"svelte.svelte-vscode",
 		"ardenivanov.svelte-intellisense",
-		"Prisma.prisma"
+		"Prisma.prisma",
+		"bradlc.vscode-tailwindcss",
+		"waderyan.gitblame"
 	],
 	// 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/FUNDING.yml

@@ -1 +1,2 @@
 open_collective: coollabsio
+github: coollabsio

.github/ISSUE_TEMPLATE/config.yml

@@ -5,4 +5,4 @@ contact_links:
     about: Reach out to us on discord or our github discussions page.
   - name: 🙋‍♂️ Service request
     url: https://feedback.coolify.io/
-    about: want to request a new service? for e.g wordpress, hasura, appwrite etc...
+    about: Want to request a new service or build pack? For example Wordpress, Hasura, Appwrite, Angular etc...

.github/workflows/production-release.yml

@@ -2,14 +2,14 @@ name: production-release
 
 on:
   release:
-    types: [published]
+    types: [released]
 
 jobs:
-  making-something-cool:
+  arm64-build:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, arm64]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -26,12 +26,60 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/arm64
           push: true
-          tags: coollabsio/coolify:latest,coollabsio/coolify:${{steps.package-version.outputs.current-version}}
+          tags: coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache
+          cache-from: type=registry,ref=coollabsio/coolify:buildcache-arm64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache,mode=max
+          cache-to: type=registry,ref=coollabsio/coolify:buildcache-arm64,mode=max
+  amd64-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Get current package version
+        uses: martinbeentjes/npm-get-version-action@v1.2.3
+        id: package-version
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: coollabsio/coolify:${{steps.package-version.outputs.current-version}}-amd64
+          cache-from: type=registry,ref=coollabsio/coolify:buildcache-amd64
+          cache-to: type=registry,ref=coollabsio/coolify:buildcache-amd64,mode=max
+  merge-manifest:
+    runs-on: ubuntu-latest
+    needs: [amd64-build, arm64-build]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Get current package version
+        uses: martinbeentjes/npm-get-version-action@v1.2.3
+        id: package-version
+      - name: Create & publish manifest
+        run: |
+          docker manifest create coollabsio/coolify:${{steps.package-version.outputs.current-version}} --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-amd64 --amend coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64
+          docker manifest push coollabsio/coolify:${{steps.package-version.outputs.current-version}}
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_CHANNEL }}
+          webhook: ${{ secrets.DISCORD_WEBHOOK_PROD_RELEASE_CHANNEL }}

.github/workflows/release-candidate.yml

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

.github/workflows/staging-release.yml

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

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+.pnpm-store
 build
 .svelte-kit
 package
@@ -11,3 +12,4 @@ client
 apps/api/db/*.db
 local-serve
 apps/api/db/migration.db-journal
+apps/api/core*

.gitpod.Dockerfile

@@ -0,0 +1,2 @@
+FROM gitpod/workspace-full:2022-08-17-18-37-55
+RUN brew install buildpacks/tap/pack

.gitpod.yml

@@ -1,10 +1,11 @@
 # This configuration file was automatically generated by Gitpod.
 # Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
 # and commit this file to your remote git repository to share the goodness with others.
-image: gitpod/workspace-node:2022-06-20-19-54-55
+#image:
-tasks:
+#  file: .gitpod.Dockerfile
-  - init: pnpm install && pnpm db:push && pnpm db:seed
+#tasks:
-    command: pnpm dev
+#  - init: pnpm install && pnpm db:push && pnpm db:seed
+#    command: pnpm dev
 
 ports:
   - port: 3001

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
+## Database migrations
-
-- **Languages**: Node.js / Javascript / Typescript
-- **Framework JS/TS**: Svelte / SvelteKit
-- **Database ORM**: Prisma.io
-- **Docker Engine**
-
-### 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 [apps/api/src/lib/services/supportedVersions.ts](apps/api/src/lib/services/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)
+export const umami = [{
-	body.umami.postgresqlPassword = decrypt(body.umami.postgresqlPassword);
+	name: 'postgresqlUser',
-
+	isEditable: false,
-if (body.umami?.hashSalt) body.umami.hashSalt = decrypt(body.umami.hashSalt);
+	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.
+5. Add start process for the new service in [apps/api/src/lib/services/handlers.ts](apps/api/src/lib/services/handlers.ts)
 
-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.
+> See startUmamiService() function as example.
 
-#### `index.json.ts`:
+6. Add the newly added start process to `startService` in [apps/api/src/routes/api/v1/services/handlers.ts](apps/api/src/routes/api/v1/services/handlers.ts)
 
-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:
+7. 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)
-
-```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.
 
    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
+8. You need to include it the logo at:
 
-- [src/routes/services/index.svelte](src/routes/services/index.svelte) with `isAbsolute` in two places,
+- [apps/ui/src/lib/components/svg/services/ServiceIcons.svelte](apps/ui/src/lib/components/svg/services/ServiceIcons.svelte) with `isAbsolute`.
-- [src/lib/components/ServiceLinks.svelte](src/lib/components/ServiceLinks.svelte) with `isAbsolute` and a link to the docs/main site of the service
+- [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
-- [src/routes/services/[id]/configuration/type.svelte](src/routes/services/[id]/configuration/type.svelte) with `isAbsolute`.
 
-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).
+9. 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. 
    
-   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)
+   > For example, see other [here](apps/ui/src/routes/services/[id]/_Services/_Umami.svelte).
 
-## 🌐 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! -->

CONTRIBUTION_NEW.md

@@ -0,0 +1,108 @@
+---
+head:
+  - - meta
+    - name: description
+      content: Coolify - Databases
+  - - meta
+    - name: keywords
+      content: databases coollabs coolify 
+  - - meta
+    - name: twitter:card
+      content: summary_large_image
+  - - meta
+    - name: twitter:site
+      content: '@andrasbacsai'
+  - - meta
+    - name: twitter:title
+      content: Coolify
+  - - meta
+    - name: twitter:description
+      content: An open-source & self-hostable Heroku / Netlify alternative.
+  - - meta
+    - name: twitter:image
+      content: https://cdn.coollabs.io/assets/coollabs/og-image-databases.png
+  - - meta
+    - property: og:type
+      content: website
+  - - meta
+    - property: og:url
+      content: https://coolify.io
+  - - meta
+    - property: og:title
+      content: Coolify
+  - - meta
+    - property: og:description
+      content: An open-source & self-hostable Heroku / Netlify alternative.
+  - - meta
+    - property: og:site_name
+      content: Coolify
+  - - meta
+    - property: og:image
+      content: https://cdn.coollabs.io/assets/coollabs/og-image-databases.png
+---
+# Contribution
+
+First, thanks for considering to contribute to my project. It really means a lot! :)
+
+You can ask for guidance anytime on our Discord server in the #contribution channel.
+
+## Setup your development environment
+### 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.
+
+### 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.
+
+### Local Machine
+> At the moment, Coolify `doesn't support Windows`. You must use `Linux` or `MacOS` or consider using Gitpod or Github Codespaces.
+
+- 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!
+
+- You need to have [Docker Engine](https://docs.docker.com/engine/install/) installed locally.
+- You need to have [Docker Compose Plugin](https://docs.docker.com/compose/install/compose-plugin/) installed locally.
+- You need to have [GIT LFS Support](https://git-lfs.github.com/) installed locally.
+
+Optional:
+- To test Heroku buildpacks, you need [pack](https://github.com/buildpacks/pack) binary installed locally.
+
+### Inside a Docker container
+`WIP`
+
+## Setup Coolify
+- Copy `apps/api/.env.template` to `apps/api/.env.template` and set the `COOLIFY_APP_ID` environment variable to something cool.
+- `pnpm install` to install dependencies.
+- `pnpm db:push` to o create a local SQlite database.
+
+   This will apply all migrations at `db/dev.db`.
+
+- `pnpm db:seed` seed the database.
+- `pnpm dev` start coding.
+
+## Technical skills required
+
+- **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**
+
+## Add a new service
+### Which service is eligable to add to Coolify?
+The following statements needs to be true:
+
+- Self-hostable
+- Open-source
+- Maintained (I do not want to add software full of bugs)
+
+### Create Prisma / Database schema for the new service.
+All data that needs to be persist for a service should be saved to the database in `cleartext` or `encrypted`.
+
+very password/api key/passphrase needs to be encrypted. If you are not sure, whether it should be encrypted or not, just encrypt it.
+
+Update Prisma schema in [src/api/prisma/schema.prisma](https://github.com/coollabsio/coolify/blob/main/apps/api/prisma/schema.prisma).
+
+- Add new model with the new service name.
+- 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.

Dockerfile

@@ -1,38 +1,37 @@
-FROM node:18-alpine3.16 as build
+ARG PNPM_VERSION=7.11.0
+ARG NPM_VERSION=8.19.1
+
+FROM node:18-slim as build
 WORKDIR /app
 
-RUN apk add --no-cache curl
+RUN apt update && apt -y install curl
-RUN curl -sL https://unpkg.com/@pnpm/self-installer | node
+RUN npm --no-update-notifier --no-fund --global install pnpm@${PNPM_VERSION}
 
 COPY . .
 RUN pnpm install
 RUN pnpm build
 
 # Production build
-FROM node:18-alpine3.16
+FROM node:18-slim
 WORKDIR /app
 ENV NODE_ENV production
 ARG TARGETPLATFORM
 
-ENV PRISMA_QUERY_ENGINE_BINARY=/app/prisma-engines/query-engine \
+RUN apt update && apt -y install --no-install-recommends ca-certificates git git-lfs openssh-client curl jq cmake sqlite3 openssl psmisc python3
-  PRISMA_MIGRATION_ENGINE_BINARY=/app/prisma-engines/migration-engine \
+RUN apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/{apt,dpkg,cache,log}/
-  PRISMA_INTROSPECTION_ENGINE_BINARY=/app/prisma-engines/introspection-engine \
+RUN npm --no-update-notifier --no-fund --global install pnpm@${PNPM_VERSION}
-  PRISMA_FMT_BINARY=/app/prisma-engines/prisma-fmt \
+RUN npm install -g npm@${PNPM_VERSION}
-  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/
-
-RUN apk add --no-cache git git-lfs openssh-client curl jq cmake sqlite openssl
-RUN curl -sL https://unpkg.com/@pnpm/self-installer | node
 
 RUN mkdir -p ~/.docker/cli-plugins/
 # https://download.docker.com/linux/static/stable/
 RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-20.10.9 -o /usr/bin/docker
 # https://github.com/docker/compose/releases
-RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.7.0 -o ~/.docker/cli-plugins/docker-compose
+# Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
+RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.6.1 -o ~/.docker/cli-plugins/docker-compose
 RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker
 
+RUN (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack)
+
 COPY --from=build /app/apps/api/build/ .
 COPY --from=build /app/apps/ui/build/ ./public
 COPY --from=build /app/apps/api/prisma/ ./prisma
@@ -42,4 +41,5 @@ COPY --from=build /app/docker-compose.yaml .
 RUN pnpm install -p
 
 EXPOSE 3000
+ENV CHECKPOINT_DISABLE=1
 CMD pnpm start

LICENSE

@@ -1,661 +1,201 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
+                                Apache License
-                       Version 3, 19 November 2007
+                           Version 2.0, January 2004
-
+                        http://www.apache.org/licenses/
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+
- Everyone is permitted to copy and distribute verbatim copies
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- of this license document, but changing it is not allowed.
+
-
+   1. Definitions.
-                            Preamble
+
-
+      "License" shall mean the terms and conditions for use, reproduction,
-  The GNU Affero General Public License is a free, copyleft license for
+      and distribution as defined by Sections 1 through 9 of this document.
-software and other kinds of works, specifically designed to ensure
+
-cooperation with the community in the case of network server software.
+      "Licensor" shall mean the copyright owner or entity authorized by
-
+      the copyright owner that is granting the License.
-  The licenses for most software and other practical works are designed
+
-to take away your freedom to share and change the works.  By contrast,
+      "Legal Entity" shall mean the union of the acting entity and all
-our General Public Licenses are intended to guarantee your freedom to
+      other entities that control, are controlled by, or are under common
-share and change all versions of a program--to make sure it remains free
+      control with that entity. For the purposes of this definition,
-software for all its users.
+      "control" means (i) the power, direct or indirect, to cause the
-
+      direction or management of such entity, whether by contract or
-  When we speak of free software, we are referring to freedom, not
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-price.  Our General Public Licenses are designed to make sure that you
+      outstanding shares, or (iii) beneficial ownership of such entity.
-have the freedom to distribute copies of free software (and charge for
+
-them if you wish), that you receive source code or can get it if you
+      "You" (or "Your") shall mean an individual or Legal Entity
-want it, that you can change the software or use pieces of it in new
+      exercising permissions granted by this License.
-free programs, and that you know you can do these things.
+
-
+      "Source" form shall mean the preferred form for making modifications,
-  Developers that use our General Public Licenses protect your rights
+      including but not limited to software source code, documentation
-with two steps: (1) assert copyright on the software, and (2) offer
+      source, and configuration files.
-you this License which gives you legal permission to copy, distribute
+
-and/or modify the software.
+      "Object" form shall mean any form resulting from mechanical
-
+      transformation or translation of a Source form, including but
-  A secondary benefit of defending all users' freedom is that
+      not limited to compiled object code, generated documentation,
-improvements made in alternate versions of the program, if they
+      and conversions to other media types.
-receive widespread use, become available for other developers to
+
-incorporate.  Many developers of free software are heartened and
+      "Work" shall mean the work of authorship, whether in Source or
-encouraged by the resulting cooperation.  However, in the case of
+      Object form, made available under the License, as indicated by a
-software used on network servers, this result may fail to come about.
+      copyright notice that is included in or attached to the work
-The GNU General Public License permits making a modified version and
+      (an example is provided in the Appendix below).
-letting the public access it on a server without ever releasing its
+
-source code to the public.
+      "Derivative Works" shall mean any work, whether in Source or Object
-
+      form, that is based on (or derived from) the Work and for which the
-  The GNU Affero General Public License is designed specifically to
+      editorial revisions, annotations, elaborations, or other modifications
-ensure that, in such cases, the modified source code becomes available
+      represent, as a whole, an original work of authorship. For the purposes
-to the community.  It requires the operator of a network server to
+      of this License, Derivative Works shall not include works that remain
-provide the source code of the modified version running there to the
+      separable from, or merely link (or bind by name) to the interfaces of,
-users of that server.  Therefore, public use of a modified version, on
+      the Work and Derivative Works thereof.
-a publicly accessible server, gives the public access to the source
+
-code of the modified version.
+      "Contribution" shall mean any work of authorship, including
-
+      the original version of the Work and any modifications or additions
-  An older license, called the Affero General Public License and
+      to that Work or Derivative Works thereof, that is intentionally
-published by Affero, was designed to accomplish similar goals.  This is
+      submitted to Licensor for inclusion in the Work by the copyright owner
-a different license, not a version of the Affero GPL, but Affero has
+      or by an individual or Legal Entity authorized to submit on behalf of
-released a new version of the Affero GPL which permits relicensing under
+      the copyright owner. For the purposes of this definition, "submitted"
-this license.
+      means any form of electronic, verbal, or written communication sent
-
+      to the Licensor or its representatives, including but not limited to
-  The precise terms and conditions for copying, distribution and
+      communication on electronic mailing lists, source code control systems,
-modification follow.
+      and issue tracking systems that are managed by, or on behalf of, the
-
+      Licensor for the purpose of discussing and improving the Work, but
-                       TERMS AND CONDITIONS
+      excluding communication that is conspicuously marked or otherwise
-
+      designated in writing by the copyright owner as "Not a Contribution."
-  0. Definitions.
+
-
+      "Contributor" shall mean Licensor and any individual or Legal Entity
-  "This License" refers to version 3 of the GNU Affero General Public License.
+      on behalf of whom a Contribution has been received by Licensor and
-
+      subsequently incorporated within the Work.
-  "Copyright" also means copyright-like laws that apply to other kinds of
+
-works, such as semiconductor masks.
+   2. Grant of Copyright License. Subject to the terms and conditions of
-
+      this License, each Contributor hereby grants to You a perpetual,
-  "The Program" refers to any copyrightable work licensed under this
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-License.  Each licensee is addressed as "you".  "Licensees" and
+      copyright license to reproduce, prepare Derivative Works of,
-"recipients" may be individuals or organizations.
+      publicly display, publicly perform, sublicense, and distribute the
-
+      Work and such Derivative Works in Source or Object form.
-  To "modify" a work means to copy from or adapt all or part of the work
+
-in a fashion requiring copyright permission, other than the making of an
+   3. Grant of Patent License. Subject to the terms and conditions of
-exact copy.  The resulting work is called a "modified version" of the
+      this License, each Contributor hereby grants to You a perpetual,
-earlier work or a work "based on" the earlier work.
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-
+      (except as stated in this section) patent license to make, have made,
-  A "covered work" means either the unmodified Program or a work based
+      use, offer to sell, sell, import, and otherwise transfer the Work,
-on the Program.
+      where such license applies only to those patent claims licensable
-
+      by such Contributor that are necessarily infringed by their
-  To "propagate" a work means to do anything with it that, without
+      Contribution(s) alone or by combination of their Contribution(s)
-permission, would make you directly or secondarily liable for
+      with the Work to which such Contribution(s) was submitted. If You
-infringement under applicable copyright law, except executing it on a
+      institute patent litigation against any entity (including a
-computer or modifying a private copy.  Propagation includes copying,
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
-distribution (with or without modification), making available to the
+      or a Contribution incorporated within the Work constitutes direct
-public, and in some countries other activities as well.
+      or contributory patent infringement, then any patent licenses
-
+      granted to You under this License for that Work shall terminate
-  To "convey" a work means any kind of propagation that enables other
+      as of the date such litigation is filed.
-parties to make or receive copies.  Mere interaction with a user through
+
-a computer network, with no transfer of a copy, is not conveying.
+   4. Redistribution. You may reproduce and distribute copies of the
-
+      Work or Derivative Works thereof in any medium, with or without
-  An interactive user interface displays "Appropriate Legal Notices"
+      modifications, and in Source or Object form, provided that You
-to the extent that it includes a convenient and prominently visible
+      meet the following conditions:
-feature that (1) displays an appropriate copyright notice, and (2)
+
-tells the user that there is no warranty for the work (except to the
+      (a) You must give any other recipients of the Work or
-extent that warranties are provided), that licensees may convey the
+          Derivative Works a copy of this License; and
-work under this License, and how to view a copy of this License.  If
+
-the interface presents a list of user commands or options, such as a
+      (b) You must cause any modified files to carry prominent notices
-menu, a prominent item in the list meets this criterion.
+          stating that You changed the files; and
-
+
-  1. Source Code.
+      (c) You must retain, in the Source form of any Derivative Works
-
+          that You distribute, all copyright, patent, trademark, and
-  The "source code" for a work means the preferred form of the work
+          attribution notices from the Source form of the Work,
-for making modifications to it.  "Object code" means any non-source
+          excluding those notices that do not pertain to any part of
-form of a work.
+          the Derivative Works; and
-
+
-  A "Standard Interface" means an interface that either is an official
+      (d) If the Work includes a "NOTICE" text file as part of its
-standard defined by a recognized standards body, or, in the case of
+          distribution, then any Derivative Works that You distribute must
-interfaces specified for a particular programming language, one that
+          include a readable copy of the attribution notices contained
-is widely used among developers working in that language.
+          within such NOTICE file, excluding those notices that do not
-
+          pertain to any part of the Derivative Works, in at least one
-  The "System Libraries" of an executable work include anything, other
+          of the following places: within a NOTICE text file distributed
-than the work as a whole, that (a) is included in the normal form of
+          as part of the Derivative Works; within the Source form or
-packaging a Major Component, but which is not part of that Major
+          documentation, if provided along with the Derivative Works; or,
-Component, and (b) serves only to enable use of the work with that
+          within a display generated by the Derivative Works, if and
-Major Component, or to implement a Standard Interface for which an
+          wherever such third-party notices normally appear. The contents
-implementation is available to the public in source code form.  A
+          of the NOTICE file are for informational purposes only and
-"Major Component", in this context, means a major essential component
+          do not modify the License. You may add Your own attribution
-(kernel, window system, and so on) of the specific operating system
+          notices within Derivative Works that You distribute, alongside
-(if any) on which the executable work runs, or a compiler used to
+          or as an addendum to the NOTICE text from the Work, provided
-produce the work, or an object code interpreter used to run it.
+          that such additional attribution notices cannot be construed
-
+          as modifying the License.
-  The "Corresponding Source" for a work in object code form means all
+
-the source code needed to generate, install, and (for an executable
+      You may add Your own copyright statement to Your modifications and
-work) run the object code and to modify the work, including scripts to
+      may provide additional or different license terms and conditions
-control those activities.  However, it does not include the work's
+      for use, reproduction, or distribution of Your modifications, or
-System Libraries, or general-purpose tools or generally available free
+      for any such Derivative Works as a whole, provided Your use,
-programs which are used unmodified in performing those activities but
+      reproduction, and distribution of the Work otherwise complies with
-which are not part of the work.  For example, Corresponding Source
+      the conditions stated in this License.
-includes interface definition files associated with source files for
+
-the work, and the source code for shared libraries and dynamically
+   5. Submission of Contributions. Unless You explicitly state otherwise,
-linked subprograms that the work is specifically designed to require,
+      any Contribution intentionally submitted for inclusion in the Work
-such as by intimate data communication or control flow between those
+      by You to the Licensor shall be under the terms and conditions of
-subprograms and other parts of the work.
+      this License, without any additional terms or conditions.
-
+      Notwithstanding the above, nothing herein shall supersede or modify
-  The Corresponding Source need not include anything that users
+      the terms of any separate license agreement you may have executed
-can regenerate automatically from other parts of the Corresponding
+      with Licensor regarding such Contributions.
-Source.
+
-
+   6. Trademarks. This License does not grant permission to use the trade
-  The Corresponding Source for a work in source code form is that
+      names, trademarks, service marks, or product names of the Licensor,
-same work.
+      except as required for reasonable and customary use in describing the
-
+      origin of the Work and reproducing the content of the NOTICE file.
-  2. Basic Permissions.
+
-
+   7. Disclaimer of Warranty. Unless required by applicable law or
-  All rights granted under this License are granted for the term of
+      agreed to in writing, Licensor provides the Work (and each
-copyright on the Program, and are irrevocable provided the stated
+      Contributor provides its Contributions) on an "AS IS" BASIS,
-conditions are met.  This License explicitly affirms your unlimited
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-permission to run the unmodified Program.  The output from running a
+      implied, including, without limitation, any warranties or conditions
-covered work is covered by this License only if the output, given its
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-content, constitutes a covered work.  This License acknowledges your
+      PARTICULAR PURPOSE. You are solely responsible for determining the
-rights of fair use or other equivalent, as provided by copyright law.
+      appropriateness of using or redistributing the Work and assume any
-
+      risks associated with Your exercise of permissions under this License.
-  You may make, run and propagate covered works that you do not
+
-convey, without conditions so long as your license otherwise remains
+   8. Limitation of Liability. In no event and under no legal theory,
-in force.  You may convey covered works to others for the sole purpose
+      whether in tort (including negligence), contract, or otherwise,
-of having them make modifications exclusively for you, or provide you
+      unless required by applicable law (such as deliberate and grossly
-with facilities for running those works, provided that you comply with
+      negligent acts) or agreed to in writing, shall any Contributor be
-the terms of this License in conveying all material for which you do
+      liable to You for damages, including any direct, indirect, special,
-not control copyright.  Those thus making or running the covered works
+      incidental, or consequential damages of any character arising as a
-for you must do so exclusively on your behalf, under your direction
+      result of this License or out of the use or inability to use the
-and control, on terms that prohibit them from making any copies of
+      Work (including but not limited to damages for loss of goodwill,
-your copyrighted material outside their relationship with you.
+      work stoppage, computer failure or malfunction, or any and all
-
+      other commercial damages or losses), even if such Contributor
-  Conveying under any other circumstances is permitted solely under
+      has been advised of the possibility of such damages.
-the conditions stated below.  Sublicensing is not allowed; section 10
+
-makes it unnecessary.
+   9. Accepting Warranty or Additional Liability. While redistributing
-
+      the Work or Derivative Works thereof, You may choose to offer,
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+      and charge a fee for, acceptance of support, warranty, indemnity,
-
+      or other liability obligations and/or rights consistent with this
-  No covered work shall be deemed part of an effective technological
+      License. However, in accepting such obligations, You may act only
-measure under any applicable law fulfilling obligations under article
+      on Your own behalf and on Your sole responsibility, not on behalf
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
+      of any other Contributor, and only if You agree to indemnify,
-similar laws prohibiting or restricting circumvention of such
+      defend, and hold each Contributor harmless for any liability
-measures.
+      incurred by, or claims asserted against, such Contributor by reason
-
+      of your accepting any such warranty or additional liability.
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
 
    END OF TERMS AND CONDITIONS
 
-            How to Apply These Terms to Your New Programs
+   APPENDIX: How to apply the Apache License to your work.
 
-  If you develop a new program, and you want it to be of the greatest
+      To apply the Apache License to your work, attach the following
-possible use to the public, the best way to achieve this is to make it
+      boilerplate notice, with the fields enclosed by brackets "[]"
-free software which everyone can redistribute and change under these terms.
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
 
-  To do so, attach the following notices to the program.  It is safest
+   Copyright [2022] [Andras Bacsai]
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
+   Licensed under the Apache License, Version 2.0 (the "License");
-    Copyright (C) <year>  <name of author>
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-    This program is free software: you can redistribute it and/or modify
+       http://www.apache.org/licenses/LICENSE-2.0
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+   Unless required by applicable law or agreed to in writing, software
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+   distributed under the License is distributed on an "AS IS" BASIS,
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    GNU Affero General Public License for more details.
+   See the License for the specific language governing permissions and
-
+   limitations under the License.
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.

README.md

@@ -1,7 +1,109 @@
 # Coolify
 
-An open-source & self-hostable Heroku / Netlify alternative
+An open-source & self-hostable Heroku / Netlify alternative.
-(ARM support is in beta).
+
+## Live Demo
+
+https://demo.coolify.io/
+
+(If it is unresponsive, that means someone overloaded the server. 😄)
+
+## Feedback
+
+If you have a new service / build pack you would like to add, raise an idea [here](https://feedback.coolify.io/) to get feedback from the community!
+
+--- 
+
+## How to install
+
+For more details goto the [docs](https://docs.coollabs.io/coolify/installation).
+
+Installation is automated with the following command:
+
+```bash
+wget -q https://get.coollabs.io/coolify/install.sh -O install.sh; sudo bash ./install.sh
+```
+
+If you would like no questions during installation:
+
+```bash
+wget -q https://get.coollabs.io/coolify/install.sh -O install.sh; sudo bash ./install.sh -f
+```
+
+--- 
+
+## Features
+
+### Git Sources
+
+Self-hosted versions also!
+
+<a href="https://github.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/github.com"></a>
+<a href="https://gitlab.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/gitlab.com"></a>
+
+### Destinations
+
+Deploy your resource to:
+
+- Local Docker Engine
+- Remote Docker Engine
+
+### Applications
+
+<a href="https://heroku.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/heroku.com"></a>
+<a href="https://html5.org/">
+<svg style="width:40px;height:40px" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" ><g clip-path="url(#HTML5_Clip0_4)" ><path d="M30.216 0L27.6454 28.7967L16.0907 32L4.56783 28.8012L2 0H30.216Z" fill="#E44D26" /><path d="M16.108 29.5515L25.4447 26.963L27.6415 2.35497H16.108V29.5515Z" fill="#F16529" /><path d="M11.1109 9.4197H16.108V5.88731H7.25053L7.33509 6.83499L8.20327 16.5692H16.108V13.0369H11.4338L11.1109 9.4197Z" fill="#EBEBEB" /><path d="M11.907 18.3354H8.36111L8.856 23.8818L16.0917 25.8904L16.108 25.8859V22.2108L16.0925 22.2149L12.1585 21.1527L11.907 18.3354Z" fill="#EBEBEB" /><path d="M16.0958 16.5692H20.4455L20.0354 21.1504L16.0958 22.2138V25.8887L23.3373 23.8817L23.3904 23.285L24.2205 13.9855L24.3067 13.0369H16.0958V16.5692Z" fill="white" /><path d="M16.0958 9.41105V9.41969H24.6281L24.6989 8.62572L24.8599 6.83499L24.9444 5.88731H16.0958V9.41105Z" fill="white" /></g><defs><clipPath id="HTML5_Clip0_4"><rect width="32" height="32" fill="white" /></clipPath></defs></svg></a>
+<a href="https://nodejs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/nodejs.org"></a>
+<a href="https://vuejs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/vuejs.org"></a>
+<a href="https://nuxtjs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/nuxtjs.org"></a>
+<a href="https://nextjs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/nextjs.org"></a>
+<a href="https://reactjs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/reactjs.org"></a>
+<a href="https://preactjs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/preactjs.org"></a>
+<a href="https://gatsbyjs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/gatsbyjs.org"></a>
+<a href="https://svelte.dev"><img style="width:40px;height:40px" src="https://icon.horse/icon/svelte.dev"></a>
+<a href="https://php.net"><img style="width:40px;height:40px" src="https://icon.horse/icon/php.net"></a>
+<a href="https://laravel.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/laravel.com"></a>
+<a href="https://python.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/python.org"></a>
+<a href="https://deno.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/deno.com"></a>
+<a href="https://docker.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/docker.com"></a>
+
+### Databases
+
+<a href="https://mongodb.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/mongodb.org"></a>
+<a href="https://mariadb.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/mariadb.org"></a>
+<a href="https://mysql.com"><svg style="width:40px;height:40px" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 25.6 25.6" ><path d="M179.076 94.886c-3.568-.1-6.336.268-8.656 1.25-.668.27-1.74.27-1.828 1.116.357.355.4.936.713 1.428.535.893 1.473 2.096 2.32 2.72l2.855 2.053c1.74 1.07 3.703 1.695 5.398 2.766.982.625 1.963 1.428 2.945 2.098.5.357.803.938 1.428 1.16v-.135c-.312-.4-.402-.98-.713-1.428l-1.34-1.293c-1.293-1.74-2.9-3.258-4.64-4.506-1.428-.982-4.55-2.32-5.13-3.97l-.088-.1c.98-.1 2.14-.447 3.078-.715 1.518-.4 2.9-.312 4.46-.713l2.143-.625v-.4c-.803-.803-1.383-1.874-2.23-2.632-2.275-1.963-4.775-3.882-7.363-5.488-1.383-.892-3.168-1.473-4.64-2.23-.537-.268-1.428-.402-1.74-.848-.805-.98-1.25-2.275-1.83-3.436l-3.658-7.763c-.803-1.74-1.295-3.48-2.275-5.086-4.596-7.585-9.594-12.18-17.268-16.687-1.65-.937-3.613-1.34-5.7-1.83l-3.346-.18c-.715-.312-1.428-1.16-2.053-1.562-2.543-1.606-9.102-5.086-10.977-.5-1.205 2.9 1.785 5.755 2.8 7.228.76 1.026 1.74 2.186 2.277 3.346.3.758.4 1.562.713 2.365.713 1.963 1.383 4.15 2.32 5.98.5.937 1.025 1.92 1.65 2.767.357.5.982.714 1.115 1.517-.625.893-.668 2.23-1.025 3.347-1.607 5.042-.982 11.288 1.293 15 .715 1.115 2.4 3.57 4.686 2.632 2.008-.803 1.56-3.346 2.14-5.577.135-.535.045-.892.312-1.25v.1l1.83 3.703c1.383 2.186 3.793 4.462 5.8 5.98 1.07.803 1.918 2.187 3.256 2.677v-.135h-.088c-.268-.4-.67-.58-1.027-.892-.803-.803-1.695-1.785-2.32-2.677-1.873-2.498-3.523-5.265-4.996-8.12-.715-1.383-1.34-2.9-1.918-4.283-.27-.536-.27-1.34-.715-1.606-.67.98-1.65 1.83-2.143 3.034-.848 1.918-.936 4.283-1.248 6.737-.18.045-.1 0-.18.1-1.426-.356-1.918-1.83-2.453-3.078-1.338-3.168-1.562-8.254-.402-11.913.312-.937 1.652-3.882 1.117-4.774-.27-.848-1.16-1.338-1.652-2.008-.58-.848-1.203-1.918-1.605-2.855-1.07-2.5-1.605-5.265-2.766-7.764-.537-1.16-1.473-2.365-2.232-3.435-.848-1.205-1.783-2.053-2.453-3.48-.223-.5-.535-1.294-.178-1.83.088-.357.268-.5.623-.58.58-.5 2.232.134 2.812.4 1.65.67 3.033 1.294 4.416 2.23.625.446 1.295 1.294 2.098 1.518h.938c1.428.312 3.033.1 4.37.5 2.365.76 4.506 1.874 6.426 3.08 5.844 3.703 10.664 8.968 13.92 15.26.535 1.026.758 1.963 1.25 3.034.938 2.187 2.098 4.417 3.033 6.56.938 2.097 1.83 4.24 3.168 5.98.67.937 3.346 1.427 4.55 1.918.893.4 2.275.76 3.08 1.25 1.516.937 3.033 2.008 4.46 3.034.713.534 2.945 1.65 3.078 2.54zm-45.5-38.772a7.09 7.09 0 0 0-1.828.223v.1h.088c.357.714.982 1.205 1.428 1.83l1.027 2.142.088-.1c.625-.446.938-1.16.938-2.23-.268-.312-.312-.625-.535-.937-.268-.446-.848-.67-1.206-1.026z" transform="matrix(.390229 0 0 .38781 -46.300037 -16.856717)" fill-rule="evenodd" fill="#00678c" /></svg></a>
+<a href="https://postgresql.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/postgresql.org"></a>
+<a href="https://couchdb.apache.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/couchdb.apache.org"></a>
+<a href="https://redis.io"><svg style="width:40px;height:40px" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ><defs ><path id="a" d="m45.536 38.764c-2.013 1.05-12.44 5.337-14.66 6.494s-3.453 1.146-5.207.308-12.85-5.32-14.85-6.276c-1-.478-1.524-.88-1.524-1.26v-3.813s14.447-3.145 16.78-3.982 3.14-.867 5.126-.14 13.853 2.868 15.814 3.587v3.76c0 .377-.452.8-1.477 1.324z" /><path id="b" d="m45.536 28.733c-2.013 1.05-12.44 5.337-14.66 6.494s-3.453 1.146-5.207.308-12.85-5.32-14.85-6.276-2.04-1.613-.077-2.382l15.332-5.935c2.332-.837 3.14-.867 5.126-.14s12.35 4.853 14.312 5.57 2.037 1.31.024 2.36z" /></defs ><g transform="matrix(.848327 0 0 .848327 -7.883573 -9.449691)" ><use fill="#a41e11" xlink:href="#a" /><path d="m45.536 34.95c-2.013 1.05-12.44 5.337-14.66 6.494s-3.453 1.146-5.207.308-12.85-5.32-14.85-6.276-2.04-1.613-.077-2.382l15.332-5.936c2.332-.836 3.14-.867 5.126-.14s12.35 4.852 14.31 5.582 2.037 1.31.024 2.36z" fill="#d82c20" /><use fill="#a41e11" xlink:href="#a" y="-6.218" /><use fill="#d82c20" xlink:href="#b" /><path d="m45.536 26.098c-2.013 1.05-12.44 5.337-14.66 6.495s-3.453 1.146-5.207.308-12.85-5.32-14.85-6.276c-1-.478-1.524-.88-1.524-1.26v-3.815s14.447-3.145 16.78-3.982 3.14-.867 5.126-.14 13.853 2.868 15.814 3.587v3.76c0 .377-.452.8-1.477 1.324z" fill="#a41e11" /><use fill="#d82c20" xlink:href="#b" y="-6.449" /><g fill="#fff" ><path d="m29.096 20.712-1.182-1.965-3.774-.34 2.816-1.016-.845-1.56 2.636 1.03 2.486-.814-.672 1.612 2.534.95-3.268.34zm-6.296 3.912 8.74-1.342-2.64 3.872z" /><ellipse cx="20.444" cy="21.402" rx="4.672" ry="1.811" /></g ><path d="m42.132 21.138-5.17 2.042-.004-4.087z" fill="#7a0c00" /><path d="m36.963 23.18-.56.22-5.166-2.042 5.723-2.264z" fill="#ad2115" /></g ></svg ></a>
+
+### Services
+- [Appwrite](https://appwrite.io)
+- [WordPress](https://docs.coollabs.io/coolify/services/wordpress)
+- [Ghost](https://ghost.org)
+- [Plausible Analytics](https://docs.coollabs.io/coolify/services/plausible-analytics)
+- [NocoDB](https://nocodb.com)
+- [VSCode Server](https://github.com/cdr/code-server)
+- [MinIO](https://min.io)
+- [VaultWarden](https://github.com/dani-garcia/vaultwarden)
+- [LanguageTool](https://languagetool.org)
+- [n8n](https://n8n.io)
+- [Uptime Kuma](https://github.com/louislam/uptime-kuma)
+- [MeiliSearch](https://github.com/meilisearch/meilisearch)
+- [Umami](https://github.com/mikecao/umami)
+- [Fider](https://fider.io)
+- [Hasura](https://hasura.io)
+- [GlitchTip](https://glitchtip.com)
+
+## Migration from v1
+
+A fresh installation is necessary. v2 and v3 are not compatible with v1.
+
+## Support
+
+- Twitter: [@andrasbacsai](https://twitter.com/andrasbacsai)
+- Telegram: [@andrasbacsai](https://t.me/andrasbacsai)
+- Email: [andras@coollabs.io](mailto:andras@coollabs.io)
+- Discord: [Invitation](https://coollabs.io/discord)
 
 ## Financial Contributors
 
@@ -25,126 +127,3 @@ Support this project with your organization. Your logo will show up here with a
 <a href="https://opencollective.com/coollabsio/organization/7/website"><img src="https://opencollective.com/coollabsio/organization/7/avatar.svg"></a>
 <a href="https://opencollective.com/coollabsio/organization/8/website"><img src="https://opencollective.com/coollabsio/organization/8/avatar.svg"></a>
 <a href="https://opencollective.com/coollabsio/organization/9/website"><img src="https://opencollective.com/coollabsio/organization/9/avatar.svg"></a> 
-
---- 
-
-## Live Demo
-
-https://demo.coolify.io/
-
-(If it is unresponsive, that means someone overloaded the server. 😄)
-
-## Feedback
-
-If you have a new service / build pack you would like to add, raise an idea [here](https://feedback.coolify.io/) to get feedback from the community!
-
---- 
-
-## How to install
-
-Installation is automated with the following command:
-
-```bash
-wget -q https://get.coollabs.io/coolify/install.sh -O install.sh; sudo bash ./install.sh
-```
-
-If you would like no questions during installation:
-
-```bash
-wget -q https://get.coollabs.io/coolify/install.sh -O install.sh; sudo bash ./install.sh -f
-```
-
-For more details goto the [docs](https://docs.coollabs.io/coolify/installation).
-
---- 
-
-## Features
-
-### Git Sources
-
-You can use the following Git Sources to be auto-deployed to your Coolify instance! (Self-hosted versions are also supported.)
-
-<a href="https://github.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/github.com"></a>
-<a href="https://gitlab.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/gitlab.com"></a>
-
-### Destinations
-
-You can deploy your applications to the following destinations:
-
-- Local Docker Engine
-- Remote Docker Engine
-
-### Applications
-
-Predefined build packs to cover the basic needs to deploy applications.
-
-If you have an advanced use case, you can use the Docker build pack that allows you to deploy your application based on your custom Dockerfile.
-
-<a href="https://html5.org/">
-<svg style="width:40px;height:40px" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" ><g clip-path="url(#HTML5_Clip0_4)" ><path d="M30.216 0L27.6454 28.7967L16.0907 32L4.56783 28.8012L2 0H30.216Z" fill="#E44D26" /><path d="M16.108 29.5515L25.4447 26.963L27.6415 2.35497H16.108V29.5515Z" fill="#F16529" /><path d="M11.1109 9.4197H16.108V5.88731H7.25053L7.33509 6.83499L8.20327 16.5692H16.108V13.0369H11.4338L11.1109 9.4197Z" fill="#EBEBEB" /><path d="M11.907 18.3354H8.36111L8.856 23.8818L16.0917 25.8904L16.108 25.8859V22.2108L16.0925 22.2149L12.1585 21.1527L11.907 18.3354Z" fill="#EBEBEB" /><path d="M16.0958 16.5692H20.4455L20.0354 21.1504L16.0958 22.2138V25.8887L23.3373 23.8817L23.3904 23.285L24.2205 13.9855L24.3067 13.0369H16.0958V16.5692Z" fill="white" /><path d="M16.0958 9.41105V9.41969H24.6281L24.6989 8.62572L24.8599 6.83499L24.9444 5.88731H16.0958V9.41105Z" fill="white" /></g><defs><clipPath id="HTML5_Clip0_4"><rect width="32" height="32" fill="white" /></clipPath></defs></svg></a>
-<a href="https://nodejs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/nodejs.org"></a>
-<a href="https://vuejs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/vuejs.org"></a>
-<a href="https://nuxtjs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/nuxtjs.org"></a>
-<a href="https://nextjs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/nextjs.org"></a>
-<a href="https://reactjs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/reactjs.org"></a>
-<a href="https://preactjs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/preactjs.org"></a>
-<a href="https://gatsbyjs.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/gatsbyjs.org"></a>
-<a href="https://svelte.dev"><img style="width:40px;height:40px" src="https://icon.horse/icon/svelte.dev"></a>
-<a href="https://php.net"><img style="width:40px;height:40px" src="https://icon.horse/icon/php.net"></a>
-<a href="https://laravel.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/laravel.com"></a>
-<a href="https://python.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/python.org"></a>
-<a href="https://deno.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/deno.com"></a>
-<a href="https://docker.com"><img style="width:40px;height:40px" src="https://icon.horse/icon/docker.com"></a>
-
-If you have a new build pack you would like to add, raise an idea [here](https://feedback.coolify.io/) to get feedback from the community!
-
-### Databases
-
-One-click database is ready to be used internally or shared over the internet:
-
-<a href="https://mongodb.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/mongodb.org"></a>
-<a href="https://mariadb.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/mariadb.org"></a>
-<a href="https://mysql.com"><svg style="width:40px;height:40px" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 25.6 25.6" ><path d="M179.076 94.886c-3.568-.1-6.336.268-8.656 1.25-.668.27-1.74.27-1.828 1.116.357.355.4.936.713 1.428.535.893 1.473 2.096 2.32 2.72l2.855 2.053c1.74 1.07 3.703 1.695 5.398 2.766.982.625 1.963 1.428 2.945 2.098.5.357.803.938 1.428 1.16v-.135c-.312-.4-.402-.98-.713-1.428l-1.34-1.293c-1.293-1.74-2.9-3.258-4.64-4.506-1.428-.982-4.55-2.32-5.13-3.97l-.088-.1c.98-.1 2.14-.447 3.078-.715 1.518-.4 2.9-.312 4.46-.713l2.143-.625v-.4c-.803-.803-1.383-1.874-2.23-2.632-2.275-1.963-4.775-3.882-7.363-5.488-1.383-.892-3.168-1.473-4.64-2.23-.537-.268-1.428-.402-1.74-.848-.805-.98-1.25-2.275-1.83-3.436l-3.658-7.763c-.803-1.74-1.295-3.48-2.275-5.086-4.596-7.585-9.594-12.18-17.268-16.687-1.65-.937-3.613-1.34-5.7-1.83l-3.346-.18c-.715-.312-1.428-1.16-2.053-1.562-2.543-1.606-9.102-5.086-10.977-.5-1.205 2.9 1.785 5.755 2.8 7.228.76 1.026 1.74 2.186 2.277 3.346.3.758.4 1.562.713 2.365.713 1.963 1.383 4.15 2.32 5.98.5.937 1.025 1.92 1.65 2.767.357.5.982.714 1.115 1.517-.625.893-.668 2.23-1.025 3.347-1.607 5.042-.982 11.288 1.293 15 .715 1.115 2.4 3.57 4.686 2.632 2.008-.803 1.56-3.346 2.14-5.577.135-.535.045-.892.312-1.25v.1l1.83 3.703c1.383 2.186 3.793 4.462 5.8 5.98 1.07.803 1.918 2.187 3.256 2.677v-.135h-.088c-.268-.4-.67-.58-1.027-.892-.803-.803-1.695-1.785-2.32-2.677-1.873-2.498-3.523-5.265-4.996-8.12-.715-1.383-1.34-2.9-1.918-4.283-.27-.536-.27-1.34-.715-1.606-.67.98-1.65 1.83-2.143 3.034-.848 1.918-.936 4.283-1.248 6.737-.18.045-.1 0-.18.1-1.426-.356-1.918-1.83-2.453-3.078-1.338-3.168-1.562-8.254-.402-11.913.312-.937 1.652-3.882 1.117-4.774-.27-.848-1.16-1.338-1.652-2.008-.58-.848-1.203-1.918-1.605-2.855-1.07-2.5-1.605-5.265-2.766-7.764-.537-1.16-1.473-2.365-2.232-3.435-.848-1.205-1.783-2.053-2.453-3.48-.223-.5-.535-1.294-.178-1.83.088-.357.268-.5.623-.58.58-.5 2.232.134 2.812.4 1.65.67 3.033 1.294 4.416 2.23.625.446 1.295 1.294 2.098 1.518h.938c1.428.312 3.033.1 4.37.5 2.365.76 4.506 1.874 6.426 3.08 5.844 3.703 10.664 8.968 13.92 15.26.535 1.026.758 1.963 1.25 3.034.938 2.187 2.098 4.417 3.033 6.56.938 2.097 1.83 4.24 3.168 5.98.67.937 3.346 1.427 4.55 1.918.893.4 2.275.76 3.08 1.25 1.516.937 3.033 2.008 4.46 3.034.713.534 2.945 1.65 3.078 2.54zm-45.5-38.772a7.09 7.09 0 0 0-1.828.223v.1h.088c.357.714.982 1.205 1.428 1.83l1.027 2.142.088-.1c.625-.446.938-1.16.938-2.23-.268-.312-.312-.625-.535-.937-.268-.446-.848-.67-1.206-1.026z" transform="matrix(.390229 0 0 .38781 -46.300037 -16.856717)" fill-rule="evenodd" fill="#00678c" /></svg></a>
-<a href="https://postgresql.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/postgresql.org"></a>
-<a href="https://couchdb.apache.org"><img style="width:40px;height:40px" src="https://icon.horse/icon/couchdb.apache.org"></a>
-<a href="https://redis.io"><svg style="width:40px;height:40px" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ><defs ><path id="a" d="m45.536 38.764c-2.013 1.05-12.44 5.337-14.66 6.494s-3.453 1.146-5.207.308-12.85-5.32-14.85-6.276c-1-.478-1.524-.88-1.524-1.26v-3.813s14.447-3.145 16.78-3.982 3.14-.867 5.126-.14 13.853 2.868 15.814 3.587v3.76c0 .377-.452.8-1.477 1.324z" /><path id="b" d="m45.536 28.733c-2.013 1.05-12.44 5.337-14.66 6.494s-3.453 1.146-5.207.308-12.85-5.32-14.85-6.276-2.04-1.613-.077-2.382l15.332-5.935c2.332-.837 3.14-.867 5.126-.14s12.35 4.853 14.312 5.57 2.037 1.31.024 2.36z" /></defs ><g transform="matrix(.848327 0 0 .848327 -7.883573 -9.449691)" ><use fill="#a41e11" xlink:href="#a" /><path d="m45.536 34.95c-2.013 1.05-12.44 5.337-14.66 6.494s-3.453 1.146-5.207.308-12.85-5.32-14.85-6.276-2.04-1.613-.077-2.382l15.332-5.936c2.332-.836 3.14-.867 5.126-.14s12.35 4.852 14.31 5.582 2.037 1.31.024 2.36z" fill="#d82c20" /><use fill="#a41e11" xlink:href="#a" y="-6.218" /><use fill="#d82c20" xlink:href="#b" /><path d="m45.536 26.098c-2.013 1.05-12.44 5.337-14.66 6.495s-3.453 1.146-5.207.308-12.85-5.32-14.85-6.276c-1-.478-1.524-.88-1.524-1.26v-3.815s14.447-3.145 16.78-3.982 3.14-.867 5.126-.14 13.853 2.868 15.814 3.587v3.76c0 .377-.452.8-1.477 1.324z" fill="#a41e11" /><use fill="#d82c20" xlink:href="#b" y="-6.449" /><g fill="#fff" ><path d="m29.096 20.712-1.182-1.965-3.774-.34 2.816-1.016-.845-1.56 2.636 1.03 2.486-.814-.672 1.612 2.534.95-3.268.34zm-6.296 3.912 8.74-1.342-2.64 3.872z" /><ellipse cx="20.444" cy="21.402" rx="4.672" ry="1.811" /></g ><path d="m42.132 21.138-5.17 2.042-.004-4.087z" fill="#7a0c00" /><path d="m36.963 23.18-.56.22-5.166-2.042 5.723-2.264z" fill="#ad2115" /></g ></svg ></a>
-
-If you have a new database you would like to add, raise an idea [here](https://feedback.coolify.io/) to get feedback from the community!
-
-
-### Services
-
-You quickly need to host a self-hostable, open-source service? You can do it with a few clicks!
-- [WordPress](https://docs.coollabs.io/coolify/services/wordpress)
-- [Ghost](https://ghost.org)
-- [Plausible Analytics](https://docs.coollabs.io/coolify/services/plausible-analytics)
-- [NocoDB](https://nocodb.com)
-- [VSCode Server](https://github.com/cdr/code-server)
-- [MinIO](https://min.io)
-- [VaultWarden](https://github.com/dani-garcia/vaultwarden)
-- [LanguageTool](https://languagetool.org)
-- [n8n](https://n8n.io)
-- [Uptime Kuma](https://github.com/louislam/uptime-kuma)
-- [MeiliSearch](https://github.com/meilisearch/meilisearch)
-- [Umami](https://github.com/mikecao/umami)
-- [Fider](https://fider.io)
-- [Hasura](https://hasura.io)
-
-
-If you have a new service you would like to add, raise an idea [here](https://feedback.coolify.io/) to get feedback from the community!
-
-## Migration from v1
-
-A fresh installation is necessary. v2 and v3 are not compatible with v1.
-
-## Support
-
-- 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/xhBCC7eGKw)
-
-
-## License
-
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Please see the [LICENSE](/LICENSE) file in our repository for the full text.

TODO.md

@@ -1,6 +0,0 @@
-- RDE Application DNS check not working 
-- Check DNS configurations for app/service/coolify with RDE and local engines
-
-
-# Low
-- Create previews model in Coolify DB

apps/api/.env.example

@@ -0,0 +1,10 @@
+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
+COOLIFY_WHITE_LABELED=false
+COOLIFY_WHITE_LABELED_ICON=
+COOLIFY_AUTO_UPDATE=

apps/api/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "coolify-api",
+  "name": "api",
   "description": "Coolify's Fastify API",
-  "license": "AGPL-3.0",
+  "license": "Apache-2.0",
   "scripts": {
     "db:push": "prisma db push && prisma generate",
     "db:seed": "prisma db seed",
@@ -15,55 +15,57 @@
   },
   "dependencies": {
     "@breejs/ts-worker": "2.0.0",
-    "@fastify/autoload": "5.1.0",
+    "@fastify/autoload": "5.3.1",
-    "@fastify/cookie": "7.3.1",
+    "@fastify/cookie": "8.1.0",
-    "@fastify/cors": "8.0.0",
+    "@fastify/cors": "8.1.0",
-    "@fastify/env": "4.0.0",
+    "@fastify/env": "4.1.0",
-    "@fastify/jwt": "6.3.1",
+    "@fastify/jwt": "6.3.2",
-    "@fastify/static": "6.4.1",
+    "@fastify/static": "6.5.0",
     "@iarna/toml": "2.2.5",
-    "@prisma/client": "3.15.2",
+    "@ladjs/graceful": "3.0.2",
+    "@prisma/client": "4.3.1",
     "axios": "0.27.2",
     "bcryptjs": "2.4.3",
-    "bree": "9.1.1",
+    "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.4",
+    "dayjs": "1.11.5",
-    "dockerode": "3.3.2",
+    "dockerode": "3.3.4",
     "dotenv-extended": "2.9.0",
-    "fastify": "4.3.0",
+    "execa": "6.1.0",
-    "fastify-plugin": "4.0.0",
+    "fastify": "4.5.3",
+    "fastify-plugin": "4.2.1",
     "generate-password": "1.7.0",
-    "get-port": "6.1.2",
+    "got": "12.4.1",
-    "got": "12.2.0",
     "is-ip": "5.0.0",
     "is-port-reachable": "4.0.0",
     "js-yaml": "4.1.0",
     "jsonwebtoken": "8.5.1",
     "node-forge": "1.3.1",
     "node-os-utils": "1.3.7",
-    "p-queue": "7.2.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.6.1",
+    "@types/node": "18.7.15",
     "@types/node-os-utils": "1.3.0",
-    "@typescript-eslint/eslint-plugin": "5.31.0",
+    "@typescript-eslint/eslint-plugin": "5.36.2",
-    "@typescript-eslint/parser": "5.31.0",
+    "@typescript-eslint/parser": "5.36.2",
-    "esbuild": "0.14.50",
+    "esbuild": "0.15.7",
-    "eslint": "8.20.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.3.1",
     "rimraf": "3.0.2",
-    "tsconfig-paths": "4.0.0",
+    "tsconfig-paths": "4.1.0",
-    "typescript": "4.7.4"
+    "typescript": "4.8.2"
   },
   "prisma": {
     "seed": "node prisma/seed.js"

apps/api/prisma/migrations/20220806090621_fqdn_not_unique_anymore/migration.sql

@@ -0,0 +1,2 @@
+-- DropIndex
+DROP INDEX "Application_fqdn_key";

apps/api/prisma/migrations/20220806102340_rde_ssh_local_port/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "DestinationDocker" ADD COLUMN "sshLocalPort" INTEGER;

apps/api/prisma/migrations/20220815092230_glitchtip/migration.sql

@@ -0,0 +1,30 @@
+-- CreateTable
+CREATE TABLE "GlitchTip" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "postgresqlUser" TEXT NOT NULL,
+    "postgresqlPassword" TEXT NOT NULL,
+    "postgresqlDatabase" TEXT NOT NULL,
+    "postgresqlPublicPort" INTEGER,
+    "secretKeyBase" TEXT,
+    "defaultEmail" TEXT NOT NULL,
+    "defaultUsername" TEXT NOT NULL,
+    "defaultPassword" TEXT NOT NULL,
+    "defaultEmailFrom" TEXT NOT NULL DEFAULT 'glitchtip@domain.tdl',
+    "emailSmtpHost" TEXT DEFAULT 'domain.tdl',
+    "emailSmtpPort" INTEGER DEFAULT 25,
+    "emailSmtpUser" TEXT,
+    "emailSmtpPassword" TEXT,
+    "emailSmtpUseTls" BOOLEAN DEFAULT false,
+    "emailSmtpUseSsl" BOOLEAN DEFAULT false,
+    "emailBackend" TEXT,
+    "mailgunApiKey" TEXT,
+    "sendgridApiKey" TEXT,
+    "enableOpenUserRegistration" BOOLEAN NOT NULL DEFAULT true,
+    "serviceId" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "GlitchTip_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "GlitchTip_serviceId_key" ON "GlitchTip"("serviceId");

apps/api/prisma/migrations/20220815133844_appwrite/migration.sql

@@ -0,0 +1,22 @@
+-- CreateTable
+CREATE TABLE "Appwrite" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "serviceId" TEXT NOT NULL,
+    "opensslKeyV1" TEXT NOT NULL,
+    "executorSecret" TEXT NOT NULL,
+    "redisPassword" TEXT NOT NULL,
+    "mariadbHost" TEXT,
+    "mariadbPort" INTEGER NOT NULL DEFAULT 3306,
+    "mariadbUser" TEXT NOT NULL,
+    "mariadbPassword" TEXT NOT NULL,
+    "mariadbRootUser" TEXT NOT NULL,
+    "mariadbRootUserPassword" TEXT NOT NULL,
+    "mariadbDatabase" TEXT NOT NULL,
+    "mariadbPublicPort" INTEGER,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Appwrite_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Appwrite_serviceId_key" ON "Appwrite"("serviceId");

apps/api/prisma/migrations/20220816133447_bot_deployments/migration.sql

@@ -0,0 +1,20 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_ApplicationSettings" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT NOT NULL,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "debug" BOOLEAN NOT NULL DEFAULT false,
+    "previews" BOOLEAN NOT NULL DEFAULT false,
+    "autodeploy" BOOLEAN NOT NULL DEFAULT true,
+    "isBot" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ApplicationSettings_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_ApplicationSettings" ("applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "previews", "updatedAt") SELECT "applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "previews", "updatedAt" FROM "ApplicationSettings";
+DROP TABLE "ApplicationSettings";
+ALTER TABLE "new_ApplicationSettings" RENAME TO "ApplicationSettings";
+CREATE UNIQUE INDEX "ApplicationSettings_applicationId_key" ON "ApplicationSettings"("applicationId");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/migrations/20220817082342_custom_dns_servers/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Setting" ADD COLUMN "DNSServers" TEXT;

apps/api/prisma/migrations/20220818093615_public_repositories/migration.sql

@@ -0,0 +1,42 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_GitSource" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "forPublic" BOOLEAN NOT NULL DEFAULT false,
+    "type" TEXT,
+    "apiUrl" TEXT,
+    "htmlUrl" TEXT,
+    "customPort" INTEGER NOT NULL DEFAULT 22,
+    "organization" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "githubAppId" TEXT,
+    "gitlabAppId" TEXT,
+    CONSTRAINT "GitSource_githubAppId_fkey" FOREIGN KEY ("githubAppId") REFERENCES "GithubApp" ("id") ON DELETE SET NULL ON UPDATE CASCADE,
+    CONSTRAINT "GitSource_gitlabAppId_fkey" FOREIGN KEY ("gitlabAppId") REFERENCES "GitlabApp" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+INSERT INTO "new_GitSource" ("apiUrl", "createdAt", "customPort", "githubAppId", "gitlabAppId", "htmlUrl", "id", "name", "organization", "type", "updatedAt") SELECT "apiUrl", "createdAt", "customPort", "githubAppId", "gitlabAppId", "htmlUrl", "id", "name", "organization", "type", "updatedAt" FROM "GitSource";
+DROP TABLE "GitSource";
+ALTER TABLE "new_GitSource" RENAME TO "GitSource";
+CREATE UNIQUE INDEX "GitSource_githubAppId_key" ON "GitSource"("githubAppId");
+CREATE UNIQUE INDEX "GitSource_gitlabAppId_key" ON "GitSource"("gitlabAppId");
+CREATE TABLE "new_ApplicationSettings" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT NOT NULL,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "debug" BOOLEAN NOT NULL DEFAULT false,
+    "previews" BOOLEAN NOT NULL DEFAULT false,
+    "autodeploy" BOOLEAN NOT NULL DEFAULT true,
+    "isBot" BOOLEAN NOT NULL DEFAULT false,
+    "isPublicRepository" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ApplicationSettings_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_ApplicationSettings" ("applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "isBot", "previews", "updatedAt") SELECT "applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "isBot", "previews", "updatedAt" FROM "ApplicationSettings";
+DROP TABLE "ApplicationSettings";
+ALTER TABLE "new_ApplicationSettings" RENAME TO "ApplicationSettings";
+CREATE UNIQUE INDEX "ApplicationSettings_applicationId_key" ON "ApplicationSettings"("applicationId");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/migrations/20220823070532_service_searxng/migration.sql

@@ -0,0 +1,13 @@
+-- CreateTable
+CREATE TABLE "Searxng" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "secretKey" TEXT NOT NULL,
+    "redisPassword" TEXT NOT NULL,
+    "serviceId" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Searxng_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Searxng_serviceId_key" ON "Searxng"("serviceId");

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/migrations/20220831095714_service_weblate/migration.sql

@@ -0,0 +1,18 @@
+-- CreateTable
+CREATE TABLE "Weblate" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "adminPassword" TEXT NOT NULL,
+    "postgresqlHost" TEXT NOT NULL,
+    "postgresqlPort" INTEGER NOT NULL,
+    "postgresqlUser" TEXT NOT NULL,
+    "postgresqlPassword" TEXT NOT NULL,
+    "postgresqlDatabase" TEXT NOT NULL,
+    "postgresqlPublicPort" INTEGER,
+    "serviceId" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Weblate_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Weblate_serviceId_key" ON "Weblate"("serviceId");

apps/api/prisma/migrations/20220902115640_service_taiga/migration.sql

@@ -0,0 +1,23 @@
+-- CreateTable
+CREATE TABLE "Taiga" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "secretKey" TEXT NOT NULL,
+    "erlangSecret" TEXT NOT NULL,
+    "djangoAdminPassword" TEXT NOT NULL,
+    "djangoAdminUser" TEXT NOT NULL,
+    "rabbitMQUser" TEXT NOT NULL,
+    "rabbitMQPassword" TEXT NOT NULL,
+    "postgresqlHost" TEXT NOT NULL,
+    "postgresqlPort" INTEGER NOT NULL,
+    "postgresqlUser" TEXT NOT NULL,
+    "postgresqlPassword" TEXT NOT NULL,
+    "postgresqlDatabase" TEXT NOT NULL,
+    "postgresqlPublicPort" INTEGER,
+    "serviceId" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Taiga_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Taiga_serviceId_key" ON "Taiga"("serviceId");

apps/api/prisma/migrations/20220905062318_database_branching/migration.sql

@@ -0,0 +1,22 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_ApplicationSettings" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT NOT NULL,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "debug" BOOLEAN NOT NULL DEFAULT false,
+    "previews" BOOLEAN NOT NULL DEFAULT false,
+    "autodeploy" BOOLEAN NOT NULL DEFAULT true,
+    "isBot" BOOLEAN NOT NULL DEFAULT false,
+    "isPublicRepository" BOOLEAN NOT NULL DEFAULT false,
+    "isDBBranching" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ApplicationSettings_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_ApplicationSettings" ("applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "isBot", "isPublicRepository", "previews", "updatedAt") SELECT "applicationId", "autodeploy", "createdAt", "debug", "dualCerts", "id", "isBot", "isPublicRepository", "previews", "updatedAt" FROM "ApplicationSettings";
+DROP TABLE "ApplicationSettings";
+ALTER TABLE "new_ApplicationSettings" RENAME TO "ApplicationSettings";
+CREATE UNIQUE INDEX "ApplicationSettings_applicationId_key" ON "ApplicationSettings"("applicationId");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/migrations/20220905113241_prisma_migration/migration.sql

@@ -0,0 +1,20 @@
+/*
+  Warnings:
+
+  - You are about to alter the column `time` on the `BuildLog` table. The data in that column could be lost. The data in that column will be cast from `Int` to `BigInt`.
+
+*/
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_BuildLog" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT,
+    "buildId" TEXT NOT NULL,
+    "line" TEXT NOT NULL,
+    "time" BIGINT NOT NULL
+);
+INSERT INTO "new_BuildLog" ("applicationId", "buildId", "id", "line", "time") SELECT "applicationId", "buildId", "id", "line", "time" FROM "BuildLog";
+DROP TABLE "BuildLog";
+ALTER TABLE "new_BuildLog" RENAME TO "BuildLog";
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/migrations/20220905115321_application_connected_database/migration.sql

@@ -0,0 +1,20 @@
+-- CreateTable
+CREATE TABLE "ApplicationConnectedDatabase" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT NOT NULL,
+    "databaseId" TEXT,
+    "hostedDatabaseType" TEXT,
+    "hostedDatabaseHost" TEXT,
+    "hostedDatabasePort" INTEGER,
+    "hostedDatabaseName" TEXT,
+    "hostedDatabaseUser" TEXT,
+    "hostedDatabasePassword" TEXT,
+    "hostedDatabaseDBName" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ApplicationConnectedDatabase_databaseId_fkey" FOREIGN KEY ("databaseId") REFERENCES "Database" ("id") ON DELETE SET NULL ON UPDATE CASCADE,
+    CONSTRAINT "ApplicationConnectedDatabase_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ApplicationConnectedDatabase_applicationId_key" ON "ApplicationConnectedDatabase"("applicationId");

apps/api/prisma/migrations/20220906120112_enable_api_debug_logging/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Setting" ADD COLUMN "isAPIDebuggingEnabled" BOOLEAN DEFAULT false;

apps/api/prisma/schema.prisma

@@ -1,6 +1,6 @@
 generator client {
   provider      = "prisma-client-js"
-  binaryTargets = ["native", "linux-musl"]
+  binaryTargets = ["native"]
 }
 
 datasource db {
@@ -11,6 +11,7 @@ datasource db {
 model Setting {
   id                    String   @id @default(cuid())
   fqdn                  String?  @unique
+  isAPIDebuggingEnabled Boolean? @default(false)
   isRegistrationEnabled Boolean  @default(false)
   dualCerts             Boolean  @default(false)
   minPort               Int      @default(9000)
@@ -20,12 +21,14 @@ model Setting {
   proxyHash             String?
   isAutoUpdateEnabled   Boolean  @default(false)
   isDNSCheckEnabled     Boolean  @default(true)
+  DNSServers            String?
   isTraefikUsed         Boolean  @default(true)
   createdAt             DateTime @default(now())
   updatedAt             DateTime @updatedAt
   ipv4                  String?
   ipv6                  String?
   arch                  String?
+  concurrentBuilds      Int      @default(1)
 }
 
 model User {
@@ -82,7 +85,7 @@ model TeamInvitation {
 model Application {
   id                  String                         @id @default(cuid())
   name                String
-  fqdn                String?                        @unique
+  fqdn                String?
   repository          String?
   configHash          String?
   branch              String?
@@ -115,6 +118,24 @@ model Application {
   settings            ApplicationSettings?
   secrets             Secret[]
   teams               Team[]
+  connectedDatabase   ApplicationConnectedDatabase?
+}
+
+model ApplicationConnectedDatabase {
+  id                     String      @id @default(cuid())
+  applicationId          String      @unique
+  databaseId             String?
+  hostedDatabaseType     String?
+  hostedDatabaseHost     String?
+  hostedDatabasePort     Int?
+  hostedDatabaseName     String?
+  hostedDatabaseUser     String?
+  hostedDatabasePassword String?
+  hostedDatabaseDBName   String?
+  createdAt              DateTime    @default(now())
+  updatedAt              DateTime    @updatedAt
+  database               Database?   @relation(fields: [databaseId], references: [id])
+  application            Application @relation(fields: [applicationId], references: [id])
 }
 
 model ApplicationSettings {
@@ -124,6 +145,9 @@ model ApplicationSettings {
   debug              Boolean     @default(false)
   previews           Boolean     @default(false)
   autodeploy         Boolean     @default(true)
+  isBot              Boolean     @default(false)
+  isPublicRepository Boolean     @default(false)
+  isDBBranching      Boolean     @default(false)
   createdAt          DateTime    @default(now())
   updatedAt          DateTime    @updatedAt
   application        Application @relation(fields: [applicationId], references: [id])
@@ -182,7 +206,7 @@ model BuildLog {
   applicationId String?
   buildId       String
   line          String
-  time          Int
+  time          BigInt
 }
 
 model Build {
@@ -194,6 +218,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())
@@ -215,6 +242,7 @@ model DestinationDocker {
   updatedAt          DateTime      @updatedAt
   sshKeyId           String?
   sshKey             SshKey?       @relation(fields: [sshKeyId], references: [id])
+  sshLocalPort       Int?
   application        Application[]
   database           Database[]
   service            Service[]
@@ -235,6 +263,7 @@ model SshKey {
 model GitSource {
   id           String        @id @default(cuid())
   name         String
+  forPublic    Boolean       @default(false)
   type         String?
   apiUrl       String?
   htmlUrl      String?
@@ -298,6 +327,7 @@ model Database {
   destinationDocker            DestinationDocker?             @relation(fields: [destinationDockerId], references: [id])
   settings                     DatabaseSettings?
   teams                        Team[]
+  applicationConnectedDatabase ApplicationConnectedDatabase[]
 }
 
 model DatabaseSettings {
@@ -322,19 +352,25 @@ model Service {
   createdAt           DateTime                   @default(now())
   updatedAt           DateTime                   @updatedAt
   destinationDocker   DestinationDocker?         @relation(fields: [destinationDockerId], references: [id])
+  persistentStorage   ServicePersistentStorage[]
+  serviceSecret       ServiceSecret[]
+  teams               Team[]
+
   fider              Fider?
   ghost              Ghost?
+  glitchTip          GlitchTip?
   hasura             Hasura?
   meiliSearch        MeiliSearch?
   minio              Minio?
   moodle             Moodle?
   plausibleAnalytics PlausibleAnalytics?
-  persistentStorage   ServicePersistentStorage[]
-  serviceSecret       ServiceSecret[]
   umami              Umami?
   vscodeserver       Vscodeserver?
   wordpress          Wordpress?
-  teams               Team[]
+  appwrite           Appwrite?
+  searxng            Searxng?
+  weblate            Weblate?
+  taiga              Taiga?
 }
 
 model PlausibleAnalytics {
@@ -490,3 +526,94 @@ model Moodle {
   updatedAt               DateTime @updatedAt
   service                 Service  @relation(fields: [serviceId], references: [id])
 }
+
+model Appwrite {
+  id                      String   @id @default(cuid())
+  serviceId               String   @unique
+  opensslKeyV1            String
+  executorSecret          String
+  redisPassword           String
+  mariadbHost             String?
+  mariadbPort             Int      @default(3306)
+  mariadbUser             String
+  mariadbPassword         String
+  mariadbRootUser         String
+  mariadbRootUserPassword String
+  mariadbDatabase         String
+  mariadbPublicPort       Int?
+  createdAt               DateTime @default(now())
+  updatedAt               DateTime @updatedAt
+  service                 Service  @relation(fields: [serviceId], references: [id])
+}
+
+model GlitchTip {
+  id                         String   @id @default(cuid())
+  postgresqlUser             String
+  postgresqlPassword         String
+  postgresqlDatabase         String
+  postgresqlPublicPort       Int?
+  secretKeyBase              String?
+  defaultEmail               String
+  defaultUsername            String
+  defaultPassword            String
+  defaultEmailFrom           String   @default("glitchtip@domain.tdl")
+  emailSmtpHost              String?  @default("domain.tdl")
+  emailSmtpPort              Int?     @default(25)
+  emailSmtpUser              String?
+  emailSmtpPassword          String?
+  emailSmtpUseTls            Boolean? @default(false)
+  emailSmtpUseSsl            Boolean? @default(false)
+  emailBackend               String?
+  mailgunApiKey              String?
+  sendgridApiKey             String?
+  enableOpenUserRegistration Boolean  @default(true)
+  serviceId                  String   @unique
+  createdAt                  DateTime @default(now())
+  updatedAt                  DateTime @updatedAt
+  service                    Service  @relation(fields: [serviceId], references: [id])
+}
+
+model Searxng {
+  id            String   @id @default(cuid())
+  secretKey     String
+  redisPassword String
+  serviceId     String   @unique
+  createdAt     DateTime @default(now())
+  updatedAt     DateTime @updatedAt
+  service       Service  @relation(fields: [serviceId], references: [id])
+}
+
+model Weblate {
+  id                   String   @id @default(cuid())
+  adminPassword        String
+  postgresqlHost       String
+  postgresqlPort       Int
+  postgresqlUser       String
+  postgresqlPassword   String
+  postgresqlDatabase   String
+  postgresqlPublicPort Int?
+  serviceId            String   @unique
+  createdAt            DateTime @default(now())
+  updatedAt            DateTime @updatedAt
+  service              Service  @relation(fields: [serviceId], references: [id])
+}
+
+model Taiga {
+  id                   String   @id @default(cuid())
+  secretKey            String
+  erlangSecret         String
+  djangoAdminPassword  String
+  djangoAdminUser      String
+  rabbitMQUser         String
+  rabbitMQPassword     String
+  postgresqlHost       String
+  postgresqlPort       Int
+  postgresqlUser       String
+  postgresqlPassword   String
+  postgresqlDatabase   String
+  postgresqlPublicPort Int?
+  serviceId            String   @unique
+  createdAt            DateTime @default(now())
+  updatedAt            DateTime @updatedAt
+  service              Service  @relation(fields: [serviceId], references: [id])
+}

apps/api/prisma/seed.js

@@ -17,7 +17,6 @@ const algorithm = 'aes-256-ctr';
 
 async function main() {
 	// Enable registration for the first user
-	// Set initial HAProxy password
 	const settingsFound = await prisma.setting.findFirst({});
 	if (!settingsFound) {
 		await prisma.setting.create({
@@ -25,7 +24,8 @@ async function main() {
 				isRegistrationEnabled: true,
 				proxyPassword: encrypt(generatePassword()),
 				proxyUser: cuid(),
-				arch: process.arch
+				arch: process.arch,
+				DNSServers: '1.1.1.1,8.8.8.8'
 			}
 		});
 	} else {
@@ -66,6 +66,34 @@ async function main() {
 			}
 		});
 	}
+	const github = await prisma.gitSource.findFirst({
+		where: { htmlUrl: 'https://github.com', forPublic: true }
+	});
+	const gitlab = await prisma.gitSource.findFirst({
+		where: { htmlUrl: 'https://gitlab.com', forPublic: true }
+	});
+	if (!github) {
+		await prisma.gitSource.create({
+			data: {
+				apiUrl: 'https://api.github.com',
+				htmlUrl: 'https://github.com',
+				forPublic: true,
+				name: 'Github Public',
+				type: 'github'
+			}
+		});
+	}
+	if (!gitlab) {
+		await prisma.gitSource.create({
+			data: {
+				apiUrl: 'https://gitlab.com/api/v4',
+				htmlUrl: 'https://gitlab.com',
+				forPublic: true,
+				name: 'Gitlab Public',
+				type: 'gitlab'
+			}
+		});
+	}
 }
 main()
 	.catch((e) => {

apps/api/src/index.ts

@@ -5,9 +5,10 @@ import env from '@fastify/env';
 import cookie from '@fastify/cookie';
 import path, { join } from 'path';
 import autoLoad from '@fastify/autoload';
-import { asyncExecShell, isDev, listSettings, prisma } from './lib/common';
+import { asyncExecShell, createRemoteEngineConfiguration, getDomain, isDev, listSettings, prisma, version } from './lib/common';
 import { scheduler } from './lib/scheduler';
-
+import { compareVersions } from 'compare-versions';
+import Graceful from '@ladjs/graceful'
 declare module 'fastify' {
 	interface FastifyInstance {
 		config: {
@@ -16,20 +17,21 @@ declare module 'fastify' {
 			COOLIFY_DATABASE_URL: string,
 			COOLIFY_SENTRY_DSN: string,
 			COOLIFY_IS_ON: string,
-			COOLIFY_WHITE_LABELED: boolean,
+			COOLIFY_WHITE_LABELED: string,
 			COOLIFY_WHITE_LABELED_ICON: string | null,
-			COOLIFY_AUTO_UPDATE: boolean,
+			COOLIFY_AUTO_UPDATE: string,
 		};
 	}
 }
 
 const port = isDev ? 3001 : 3000;
 const host = '0.0.0.0';
-const fastify = Fastify({
+prisma.setting.findFirst().then(async (settings) => {
-	logger: false,
+	const fastify = Fastify({
+		logger: settings?.isAPIDebuggingEnabled || false,
 		trustProxy: true
-});
+	});
-const schema = {
+	const schema = {
 		type: 'object',
 		required: ['COOLIFY_SECRET_KEY', 'COOLIFY_DATABASE_URL', 'COOLIFY_IS_ON'],
 		properties: {
@@ -52,27 +54,27 @@ const schema = {
 				default: 'docker'
 			},
 			COOLIFY_WHITE_LABELED: {
-			type: 'boolean',
+				type: 'string',
-			default: false
+				default: 'false'
 			},
 			COOLIFY_WHITE_LABELED_ICON: {
 				type: 'string',
 				default: null
 			},
 			COOLIFY_AUTO_UPDATE: {
-			type: 'boolean',
+				type: 'string',
-			default: false
+				default: 'false'
 			},
 
 		}
-};
+	};
 
-const options = {
+	const options = {
 		schema,
 		dotenv: true
-};
+	};
-fastify.register(env, options);
+	fastify.register(env, options);
-if (!isDev) {
+	if (!isDev) {
 		fastify.register(serve, {
 			root: path.join(__dirname, './public'),
 			preCompressed: true
@@ -85,54 +87,82 @@ if (!isDev) {
 			}
 			return reply.status(200).sendFile('index.html');
 		});
-}
+	}
-fastify.register(autoLoad, {
+	fastify.register(autoLoad, {
 		dir: join(__dirname, 'plugins')
-});
+	});
-fastify.register(autoLoad, {
+	fastify.register(autoLoad, {
 		dir: join(__dirname, 'routes')
-});
+	});
 
-fastify.register(cookie)
+	fastify.register(cookie)
-fastify.register(cors);
+	fastify.register(cors);
-fastify.listen({ port, host }, async (err: any, address: any) => {
+	fastify.addHook('onRequest', async (request, reply) => {
+		let allowedList = ['coolify:3000'];
+		const { ipv4, ipv6, fqdn } = await prisma.setting.findFirst({})
+
+		ipv4 && allowedList.push(`${ipv4}:3000`);
+		ipv6 && allowedList.push(ipv6);
+		fqdn && allowedList.push(getDomain(fqdn));
+		isDev && allowedList.push('localhost:3000') && allowedList.push('localhost:3001') && allowedList.push('host.docker.internal:3001');
+		const remotes = await prisma.destinationDocker.findMany({ where: { remoteEngine: true, remoteVerified: true } })
+		if (remotes.length > 0) {
+			remotes.forEach(remote => {
+				allowedList.push(`${remote.remoteIpAddress}:3000`);
+			})
+		}
+		if (!allowedList.includes(request.headers.host)) {
+			// console.log('not allowed', request.headers.host)
+		}
+	})
+	fastify.listen({ port, host }, async (err: any, address: any) => {
 		if (err) {
 			console.error(err);
 			process.exit(1);
 		}
 		console.log(`Coolify's API is listening on ${host}:${port}`);
 		await initServer();
-	await scheduler.start('deployApplication');
-	await scheduler.start('cleanupStorage');
-	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 (!scheduler.workers.has('deployApplication')) {
-		if (isAutoUpdateEnabled) {
+				scheduler.run('deployApplication');
-			if (scheduler.workers.has('deployApplication')) {
-				scheduler.workers.get('deployApplication').postMessage("status:autoUpdater");
 			}
+			if (!scheduler.workers.has('infrastructure')) {
+				scheduler.run('infrastructure');
 			}
-	}, 60000 * 15)
+		}, 2000)
 
-	// Cleanup storage
+		// autoUpdater
 		setInterval(async () => {
-		if (scheduler.workers.has('deployApplication')) {
+			scheduler.workers.has('infrastructure') && scheduler.workers.get('infrastructure').postMessage("action:autoUpdater")
-			scheduler.workers.get('deployApplication').postMessage("status:cleanupStorage");
+		}, isDev ? 5000 : 60000 * 15)
-		}
-	}, 60000 * 10)
 
-	scheduler.on('worker deleted', async (name) => {
+		// cleanupStorage
-		if (name === 'autoUpdater' || name === 'cleanupStorage') {
+		setInterval(async () => {
-			if (!scheduler.workers.has('deployApplication')) await scheduler.start('deployApplication');
+			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)
+
+		await Promise.all([
+			getArch(),
+			getIPAddress(),
+			configureRemoteDockers(),
+		])
 	});
-	await getArch();
+})
-	await getIPAddress();
+
-});
 async function getIPAddress() {
 	const { publicIpv4, publicIpv6 } = await import('public-ip')
 	try {
@@ -153,6 +183,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 {
@@ -163,4 +199,15 @@ async function getArch() {
 	} catch (error) { }
 }
 
-
+async function configureRemoteDockers() {
+	try {
+		const remoteDocker = await prisma.destinationDocker.findMany({
+			where: { remoteVerified: true, remoteEngine: true }
+		});
+		if (remoteDocker.length > 0) {
+			for (const docker of remoteDocker) {
+				await createRemoteEngineConfiguration(docker.id)
+			}
+		}
+	} catch (error) { }
+}

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,90 +0,0 @@
-import { parentPort } from 'node:worker_threads';
-import { prisma, startTraefikTCPProxy, generateDatabaseConfiguration, startTraefikProxy, executeDockerCmd } from '../lib/common';
-import { checkContainer } from '../lib/docker';
-
-(async () => {
-    if (parentPort) {
-        // 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);
-                // 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);
-            }
-        }
-        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,32 +4,46 @@ import fs from 'fs/promises';
 import yaml from 'js-yaml';
 
 import { copyBaseConfigurationFiles, makeLabelForStandaloneApplication, saveBuildLog, setDefaultConfiguration } from '../lib/buildPacks/common';
-import { createDirectories, decrypt, 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;
+				await prisma.$disconnect()
-				}
+				process.exit(0);
-				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;
 			}
+		});
+		const pThrottle = await import('p-throttle')
+		const throttle = pThrottle.default({
+			limit: 1,
+			interval: 2000
+		});
 
-				await queue.add(async () => {
+
+		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 {
+								if (queueBuild.status === 'running') {
+									await saveBuildLog({ line: 'Building halted, restarting...', buildId, applicationId: application.id });
+								}
 								const {
 									id: applicationId,
 									repository,
@@ -37,15 +51,11 @@ import * as buildpacks from '../lib/buildPacks';
 									destinationDocker,
 									destinationDockerId,
 									gitSource,
-						build_id: buildId,
 									configHash,
 									fqdn,
 									projectId,
 									secrets,
 									phpModules,
-						type,
-						pullmergeRequestId = null,
-						sourceBranch = null,
 									settings,
 									persistentStorage,
 									pythonWSGI,
@@ -56,7 +66,7 @@ import * as buildpacks from '../lib/buildPacks';
 									baseImage,
 									baseBuildImage,
 									deploymentType,
-					} = message
+								} = application
 								let {
 									branch,
 									buildPack,
@@ -68,8 +78,31 @@ import * as buildpacks from '../lib/buildPacks';
 									publishDirectory,
 									dockerFileLocation,
 									denoMainFile
-					} = message
+								} = application
-					try {
+								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({
@@ -105,7 +138,7 @@ import * as buildpacks from '../lib/buildPacks';
 								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);
+									const configuration = await setDefaultConfiguration(application);
 
 									buildPack = configuration.buildPack;
 									port = configuration.port;
@@ -131,7 +164,8 @@ import * as buildpacks from '../lib/buildPacks';
 										htmlUrl: gitSource.htmlUrl,
 										projectId,
 										deployKeyId: gitSource.gitlabApp?.deployKeyId || null,
-								privateSshKey: decrypt(gitSource.gitlabApp?.privateSshKey) || null
+										privateSshKey: decrypt(gitSource.gitlabApp?.privateSshKey) || null,
+										forPublic: gitSource.forPublic
 									});
 									if (!commit) {
 										throw new Error('No commit found?');
@@ -143,34 +177,10 @@ import * as buildpacks from '../lib/buildPacks';
 
 									try {
 										await prisma.build.update({ where: { id: buildId }, data: { commit } });
-							} catch (err) {
+									} catch (err) { }
-								console.log(err);
-							}
-							if (!pullmergeRequestId) {
-								const currentHash = crypto
-									//@ts-ignore
-									.createHash('sha256')
-									.update(
-										JSON.stringify({
-											buildPack,
-											port,
-											exposePort,
-											installCommand,
-											buildCommand,
-											startCommand,
-											secrets,
-											branch,
-											repository,
-											fqdn
-										})
-									)
-									.digest('hex');
 
+									if (!pullmergeRequestId) {
 										if (configHash !== currentHash) {
-									await prisma.application.update({
-										where: { id: applicationId },
-										data: { configHash: currentHash }
-									});
 											deployNeeded = true;
 											if (configHash) {
 												await saveBuildLog({ line: 'Configuration changed.', buildId, applicationId });
@@ -192,9 +202,11 @@ import * as buildpacks from '../lib/buildPacks';
 									} catch (error) {
 										//
 									}
-							// if (!imageFound || deployNeeded) {
-							if (true) {
 									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,
@@ -243,7 +255,9 @@ import * as buildpacks from '../lib/buildPacks';
 									} catch (error) {
 										//
 									}
-							const envs = [];
+									const envs = [
+										`PORT=${port}`
+									];
 									if (secrets.length > 0) {
 										secrets.forEach((secret) => {
 											if (pullmergeRequestId) {
@@ -299,22 +313,14 @@ import * as buildpacks from '../lib/buildPacks';
 													container_name: imageId,
 													volumes,
 													env_file: envFound ? [`${workdir}/.env`] : [],
-											networks: [destinationDocker.network],
 													labels,
 													depends_on: [],
-											restart: 'always',
+													expose: [port],
 													...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
 													// logging: {
 													// 	driver: 'fluentd',
 													// },
-											deploy: {
+													...defaultComposeConfiguration(destinationDocker.network),
-												restart_policy: {
-													condition: 'on-failure',
-													delay: '5s',
-													max_attempts: 3,
-													window: '120s'
-												}
-											}
 												}
 											},
 											networks: {
@@ -329,29 +335,37 @@ import * as buildpacks from '../lib/buildPacks';
 										await saveBuildLog({ line: 'Deployment successful!', buildId, applicationId });
 									} catch (error) {
 										await saveBuildLog({ line: error, buildId, applicationId });
-								await prisma.build.update({
+										await prisma.build.updateMany({
-									where: { id: message.build_id },
+											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: message.build_id }, data: { status: 'success' } });
+									await prisma.build.update({ where: { id: buildId }, data: { status: 'success' } });
+									if (!pullmergeRequestId) await prisma.application.update({
+										where: { id: applicationId },
+										data: { configHash: currentHash }
+									});
 								}
-
 							}
 							catch (error) {
-						await prisma.build.update({
+								await prisma.build.updateMany({
-							where: { id: message.build_id },
+									where: { id: buildId, status: { in: ['queued', 'running'] } },
 									data: { status: 'failed' }
 								});
-						await saveBuildLog({ line: error, buildId, applicationId });
+								await saveBuildLog({ line: error, buildId, applicationId: application.id });
-					} finally {
-						await prisma.$disconnect();
 							}
 						});
-				await prisma.$disconnect();
 					}
-		});
+					await pAll.default(actions, { concurrency })
+				}
+			} catch (error) {
+				console.log(error)
+			}
+		})
+		while (true) {
+			await th()
+		}
 	} else process.exit(0);
 })();

apps/api/src/jobs/infrastructure.ts

@@ -0,0 +1,226 @@
+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, createRemoteEngineConfiguration } from '../lib/common';
+
+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) {
+                    await asyncExecShell(`docker pull coollabsio/coolify:${latestVersion}`);
+                    await asyncExecShell(`env | grep COOLIFY > .env`);
+                    await asyncExecShell(
+                        `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=true' .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) { }
+}
+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', isCoolifyProxyUsed: true }
+        });
+        if (localDocker) {
+            portReachable = await isReachable(80, { host: ipv4 || ipv6 })
+            if (!portReachable) {
+                await startTraefikProxy(localDocker.id);
+            }
+        }
+        // Coolify Proxy remote
+        const remoteDocker = await prisma.destinationDocker.findMany({
+            where: { remoteEngine: true, remoteVerified: true }
+        });
+        if (remoteDocker.length > 0) {
+            for (const docker of remoteDocker) {
+                if (docker.isCoolifyProxyUsed) {
+                    portReachable = await isReachable(80, { host: docker.remoteIpAddress })
+                    if (!portReachable) {
+                        await startTraefikProxy(docker.id);
+                    }
+                }
+                try {
+                    await createRemoteEngineConfiguration(docker.id)
+                } catch (error) { }
+            }
+        }
+        // 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) { }
+    }
+}
+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) { }
+        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

@@ -89,6 +89,22 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 		}
 	];
 	const phpVersions = [
+		{
+			value: 'webdevops/php-apache:8.2',
+			label: 'webdevops/php-apache:8.2'
+		},
+		{
+			value: 'webdevops/php-nginx:8.2',
+			label: 'webdevops/php-nginx:8.2'
+		},
+		{
+			value: 'webdevops/php-apache:8.1',
+			label: 'webdevops/php-apache:8.1'
+		},
+		{
+			value: 'webdevops/php-nginx:8.1',
+			label: 'webdevops/php-nginx:8.1'
+		},
 		{
 			value: 'webdevops/php-apache:8.0',
 			label: 'webdevops/php-apache:8.0'
@@ -145,6 +161,22 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 			value: 'webdevops/php-nginx:5.6',
 			label: 'webdevops/php-nginx:5.6'
 		},
+		{
+			value: 'webdevops/php-apache:8.2-alpine',
+			label: 'webdevops/php-apache:8.2-alpine'
+		},
+		{
+			value: 'webdevops/php-nginx:8.2-alpine',
+			label: 'webdevops/php-nginx:8.2-alpine'
+		},
+		{
+			value: 'webdevops/php-apache:8.1-alpine',
+			label: 'webdevops/php-apache:8.1-alpine'
+		},
+		{
+			value: 'webdevops/php-nginx:8.1-alpine',
+			label: 'webdevops/php-nginx:8.1-alpine'
+		},
 		{
 			value: 'webdevops/php-apache:8.0-alpine',
 			label: 'webdevops/php-apache:8.0-alpine'
@@ -252,6 +284,20 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 			label: 'python:3.7-slim-bullseye'
 		}
 	];
+	const herokuVersions = [
+		{
+			value: 'heroku/builder:22',
+			label: 'heroku/builder:22'
+		},
+		{
+			value: 'heroku/buildpacks:20',
+			label: 'heroku/buildpacks:20'
+		},
+		{
+			value: 'heroku/builder-classic:22',
+			label: 'heroku/builder-classic:22'
+		},
+	]
 	let payload: any = {
 		baseImage: null,
 		baseBuildImage: null,
@@ -291,14 +337,19 @@ export function setDefaultBaseImage(buildPack: string | null, deploymentType: st
 		payload.baseImage = 'denoland/deno:latest';
 	}
 	if (buildPack === 'php') {
-		payload.baseImage = 'webdevops/php-apache:8.0-alpine';
+		payload.baseImage = 'webdevops/php-apache:8.2-alpine';
 		payload.baseImages = phpVersions;
 	}
 	if (buildPack === 'laravel') {
-		payload.baseImage = 'webdevops/php-apache:8.0-alpine';
+		payload.baseImage = 'webdevops/php-apache:8.2-alpine';
 		payload.baseBuildImage = 'node:18';
 		payload.baseBuildImages = nodeVersions;
 	}
+	if (buildPack === 'heroku') {
+		payload.baseImage = 'heroku/buildpacks:20';
+		payload.baseImages = herokuVersions;
+
+	}
 	return payload;
 }
 
@@ -493,7 +544,6 @@ export async function copyBaseConfigurationFiles(
 			);
 		}
 	} catch (error) {
-		console.log(error);
 		throw new Error(error);
 	}
 }
@@ -522,9 +572,6 @@ export async function buildImage({
 	} else {
 		await saveBuildLog({ line: `Building image started.`, buildId, applicationId });
 	}
-	if (debug) {
-		await saveBuildLog({ line: `\n###############\nIMPORTANT: Due to some issues during implementing Remote Docker Engine, the builds logs are not streamed at the moment. You will see the full build log when the build is finished!\n###############`, buildId, applicationId });
-	}
 	if (!debug && isCache) {
 		await saveBuildLog({
 			line: `Debug turned off. To see more details, allow it in the configuration.`,
@@ -534,54 +581,11 @@ export async function buildImage({
 	}
 	const dockerFile = isCache ? `${dockerFileLocation}-cache` : `${dockerFileLocation}`
 	const cache = `${applicationId}:${tag}${isCache ? '-cache' : ''}`
-	const { stderr } = await executeDockerCmd({ dockerId, command: `docker build --progress plain -f ${workdir}/${dockerFile} -t ${cache} ${workdir}` })
+	await executeDockerCmd({ debug, buildId, applicationId, dockerId, command: `docker build --progress plain -f ${workdir}/${dockerFile} -t ${cache} ${workdir}` })
-	if (debug) {
+	const { status } = await prisma.build.findUnique({ where: { id: buildId } })
-		const array = stderr.split('\n')
+	if (status === 'canceled') {
-		for (const line of array) {
+		throw new Error('Deployment canceled.')
-			if (line !== '\n') {
-				await saveBuildLog({
-					line: `${line.replace('\n', '')}`,
-					buildId,
-					applicationId
-				});
 	}
-		}
-	}
-
-
-	// await new Promise((resolve, reject) => {
-	// 	const command = spawn(`docker`, ['build', '-f', `${workdir}${dockerFile}`, '-t', `${cache}`,`${workdir}`], {
-	// 		env: {
-	// 			DOCKER_HOST: 'ssh://root@95.217.178.202',
-	// 			DOCKER_BUILDKIT: '1'
-	// 		}
-	// 	});
-	// 	command.stdout.on('data', function (data) {
-	// 		console.log('stdout: ' + data);
-	// 	});
-	// 	command.stderr.on('data', function (data) {
-	// 		console.log('stderr: ' + data);
-	// 	});
-	// 	command.on('error', function (error) {
-	// 		console.log(error)
-	// 		reject(error)
-	// 	})
-	// 	command.on('exit', function (code) {
-	// 		console.log('exit code: ' + code);
-	// 		resolve(code)
-	// 	});
-	// })
-
-
-	// console.log({ stdout, stderr })
-	// const stream = await docker.engine.buildImage(
-	// 	{ src: ['.'], context: workdir },
-	// 	{
-	// 		dockerfile: isCache ? `${dockerFileLocation}-cache` : dockerFileLocation,
-	// 		t: `${applicationId}:${tag}${isCache ? '-cache' : ''}`
-	// 	}
-	// );
-	// await streamEvents({ stream, docker, buildId, applicationId, debug });
 	if (isCache) {
 		await saveBuildLog({ line: `Building cache image successful.`, buildId, applicationId });
 	} else {
@@ -698,11 +702,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/buildPacks/heroku.ts

@@ -0,0 +1,39 @@
+import { executeDockerCmd, prisma } from "../common"
+import { saveBuildLog } from "./common";
+
+export default async function (data: any): Promise<void> {
+    const { buildId, applicationId, tag, dockerId, debug, workdir } = data
+    try {
+
+        await saveBuildLog({ line: `Building image started.`, buildId, applicationId });
+        const { stdout } = await executeDockerCmd({
+            dockerId,
+            command: `pack build -p ${workdir} ${applicationId}:${tag} --builder heroku/buildpacks:20`
+        })
+        if (debug) {
+            const array = stdout.split('\n')
+            for (const line of array) {
+                if (line !== '\n') {
+                    await saveBuildLog({
+                        line: `${line.replace('\n', '')}`,
+                        buildId,
+                        applicationId
+                    });
+                }
+            }
+        }
+        await saveBuildLog({ line: `Building image successful.`, buildId, applicationId });
+    } catch (error) {
+        const array = error.stdout.split('\n')
+        for (const line of array) {
+            if (line !== '\n') {
+                await saveBuildLog({
+                    line: `${line.replace('\n', '')}`,
+                    buildId,
+                    applicationId
+                });
+            }
+        }
+        throw error;
+    }
+}

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

@@ -15,6 +15,7 @@ import eleventy from './static';
 import python from './python';
 import deno from './deno';
 import laravel from './laravel';
+import heroku from './heroku';
 
 export {
 	node,
@@ -33,5 +34,6 @@ export {
 	eleventy,
 	python,
 	deno,
-	laravel
+	laravel,
+    heroku
 };

apps/api/src/lib/docker.ts

@@ -71,13 +71,11 @@ export async function removeContainer({
 }): Promise<void> {
 	try {
 		const { stdout } = await executeDockerCmd({ dockerId, command: `docker inspect --format '{{json .State}}' ${id}` })
-
 		if (JSON.parse(stdout).Running) {
 			await executeDockerCmd({ dockerId, command: `docker stop -t 0 ${id}` })
 			await executeDockerCmd({ dockerId, command: `docker rm ${id}` })
 		}
 	} catch (error) {
-		console.log(error);
 		throw error;
 	}
 }

apps/api/src/lib/importers/github.ts

@@ -12,7 +12,8 @@ export default async function ({
 	htmlUrl,
 	branch,
 	buildId,
-	customPort
+	customPort,
+	forPublic
 }: {
 	applicationId: string;
 	workdir: string;
@@ -23,15 +24,25 @@ export default async function ({
 	branch: string;
 	buildId: string;
 	customPort: number;
+	forPublic?: boolean;
 }): Promise<string> {
 	const { default: got } = await import('got')
 	const url = htmlUrl.replace('https://', '').replace('http://', '');
 	await saveBuildLog({ line: 'GitHub importer started.', buildId, applicationId });
+	if (forPublic) {
+		await saveBuildLog({
+			line: `Cloning ${repository}:${branch} branch.`,
+			buildId,
+			applicationId
+		});
+		await asyncExecShell(
+			`git clone -q -b ${branch} https://${url}/${repository}.git ${workdir}/ && cd ${workdir} && git submodule update --init --recursive && git lfs pull && cd .. `
+		);
 
+	} else {
 		const body = await prisma.githubApp.findUnique({ where: { id: githubAppId } });
 		if (body.privateKey) body.privateKey = decrypt(body.privateKey);
 		const { privateKey, appId, installationId } = body
-
 		const githubPrivateKey = privateKey.replace(/\\n/g, '\n').replace(/"/g, '');
 
 		const payload = {
@@ -58,6 +69,10 @@ export default async function ({
 		await asyncExecShell(
 			`git clone -q -b ${branch} https://x-access-token:${token}@${url}/${repository}.git --config core.sshCommand="ssh -p ${customPort}" ${workdir}/ && cd ${workdir} && git submodule update --init --recursive && git lfs pull && cd .. `
 		);
+	}
 	const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
+
 	return commit.replace('\n', '');
+
+
 }

apps/api/src/lib/scheduler.ts

@@ -2,51 +2,29 @@ import Bree from 'bree';
 import path from 'path';
 import Cabin from 'cabin';
 import TSBree from '@breejs/ts-worker';
-import { isDev } from './common';
+
+export const isDev = process.env.NODE_ENV === 'development';
 
 Bree.extend(TSBree);
 
 const options: any = {
 	defaultExtension: 'js',
+	// logger: new Cabin(),
 	logger: false,
 	workerMessageHandler: async ({ name, message }) => {
-		if (name === 'deployApplication') {
+		if (name === 'deployApplication' && message?.deploying) {
-			if (message.pending === 0 && message.size === 0) {
+			if (scheduler.workers.has('autoUpdater') || scheduler.workers.has('cleanupStorage')) {
-				if (message.caller === 'autoUpdater') {
+				scheduler.workers.get('deployApplication').postMessage('cancel')
-					if (!scheduler.workers.has('autoUpdater')) {
-						await scheduler.stop('deployApplication');
-						await scheduler.run('autoUpdater')
-					}
-				}
-				if (message.caller === 'cleanupStorage') {
-					if (!scheduler.workers.has('cleanupStorage')) {
-						await scheduler.stop('deployApplication');
-						await scheduler.run('cleanupStorage')
-					}
-				}
-
 			}
 		}
 	},
 	jobs: [
-		{
+		{ name: 'infrastructure' },
-			name: 'deployApplication'
+		{ name: 'deployApplication' },
-		},
-		{
-			name: 'cleanupStorage',
-		},
-		{
-			name: 'checkProxies',
-			interval: '10s'
-		},
-		{
-			name: 'autoUpdater',
-		}
 	],
 };
 if (isDev) options.root = path.join(__dirname, '../jobs');
 
-
 export const scheduler = new Bree(options);
 
 

apps/api/src/lib/services.ts

@@ -0,0 +1,20 @@
+import { createDirectories, getServiceFromDB, getServiceImage, getServiceMainPort, makeLabelForServices } from "./common";
+
+export async function defaultServiceConfigurations({ id, teamId }) {
+    const service = await getServiceFromDB({ id, teamId });
+    const { destinationDockerId, destinationDocker, type, serviceSecret } = service;
+
+    const network = destinationDockerId && destinationDocker.network;
+    const port = getServiceMainPort(type);
+
+    const { workdir } = await createDirectories({ repository: type, buildId: id });
+
+    const image = getServiceImage(type);
+    let secrets = [];
+    if (serviceSecret.length > 0) {
+        serviceSecret.forEach((secret) => {
+            secrets.push(`${secret.name}=${secret.value}`);
+        });
+    }
+    return { ...service, network, port, workdir, image, secrets }
+}

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

@@ -0,0 +1,383 @@
+
+import cuid from 'cuid';
+import { encrypt, generatePassword, prisma } from '../common';
+
+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,
+	weblate: true,
+	taiga: 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 if (type === 'weblate') {
+		const adminPassword = encrypt(generatePassword({}))
+		const postgresqlUser = cuid();
+		const postgresqlPassword = encrypt(generatePassword({}));
+		const postgresqlDatabase = 'weblate';
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				weblate: {
+					create: {
+						adminPassword,
+						postgresqlHost: `${id}-postgresql`,
+						postgresqlPort: 5432,
+						postgresqlUser,
+						postgresqlPassword,
+						postgresqlDatabase,
+					}
+				}
+			}
+		});
+	} else if (type === 'taiga') {
+		const secretKey = encrypt(generatePassword({}))
+		const erlangSecret = encrypt(generatePassword({}))
+		const rabbitMQUser = cuid();
+		const djangoAdminUser = cuid();
+		const djangoAdminPassword = encrypt(generatePassword({}))
+		const rabbitMQPassword = encrypt(generatePassword({}))
+		const postgresqlUser = cuid();
+		const postgresqlPassword = encrypt(generatePassword({}));
+		const postgresqlDatabase = 'taiga';
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				taiga: {
+					create: {
+						secretKey,
+						erlangSecret,
+						djangoAdminUser,
+						djangoAdminPassword,
+						rabbitMQUser,
+						rabbitMQPassword,
+						postgresqlHost: `${id}-postgresql`,
+						postgresqlPort: 5432,
+						postgresqlUser,
+						postgresqlPassword,
+						postgresqlDatabase,
+					}
+				}
+			}
+		});
+	} 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.weblate.deleteMany({ where: { serviceId: id } });
+	await prisma.taiga.deleteMany({ where: { serviceId: id } });
+	
+	await prisma.service.delete({ where: { id } });
+}

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

@@ -326,7 +326,7 @@ export const fider = [{
 	isBoolean: false,
 	isEncrypted: true
 }, {
-	name: 'postgreslUser',
+	name: 'postgresqlUser',
 	isEditable: false,
 	isLowerCase: false,
 	isNumber: false,
@@ -344,7 +344,7 @@ export const fider = [{
 {
 	name: 'emailNoreply',
 	isEditable: true,
-	isLowerCase: true,
+	isLowerCase: false,
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
@@ -352,7 +352,7 @@ export const fider = [{
 {
 	name: 'emailSmtpHost',
 	isEditable: true,
-	isLowerCase: true,
+	isLowerCase: false,
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
@@ -376,7 +376,7 @@ export const fider = [{
 {
 	name: 'emailSmtpUser',
 	isEditable: true,
-	isLowerCase: true,
+	isLowerCase: false,
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
@@ -477,3 +477,391 @@ export const moodle = [{
 	isBoolean: false,
 	isEncrypted: false
 }]
+
+export const appwrite = [{
+	name: 'opensslKeyV1',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'executorSecret',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'redisPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'mariadbHost',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'mariadbPort',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'mariadbUser',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'mariadbPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'mariadbRootUser',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'mariadbRootUserPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'mariadbDatabase',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+}]
+
+export const glitchTip = [{
+	name: 'postgresqlUser',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'postgresqlPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'postgresqlDatabase',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'postgresqlPublicPort',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: true,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'secretKeyBase',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'emailSmtpHost',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'emailSmtpPassword',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'emailSmtpUseSsl',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: true,
+	isEncrypted: false
+},
+{
+	name: 'emailSmtpUseSsl',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: true,
+	isEncrypted: false
+},
+{
+	name: 'emailSmtpPort',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: true,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'emailSmtpUser',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'defaultEmail',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'defaultUsername',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'defaultPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'defaultEmailFrom',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'emailUrl',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'emailBackend',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'mailgunApiKey',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'sendgridApiKey',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'enableOpenUserRegistration',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: true,
+	isEncrypted: false
+}]
+
+export const searxng = [{
+	name: 'secretKey',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'redisPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+}]
+
+export const weblate = [{
+	name: 'adminPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'postgresqlHost',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'postgresqlPort',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'postgresqlUser',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'postgresqlPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'postgresqlDatabase',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+}]
+export const taiga = [{
+	name: 'secretKey',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'djangoAdminUser',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'djangoAdminPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'rabbitMQUser',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'rabbitMQPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'postgresqlHost',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'postgresqlPort',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'postgresqlUser',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'postgresqlPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	name: 'postgresqlDatabase',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+}]

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

@@ -0,0 +1,215 @@
+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
+		}
+	},
+	{
+		name: 'weblate',
+		fancyName: 'Weblate',
+		baseImage: 'weblate/weblate',
+		images: ['postgres:14-alpine', 'redis:6-alpine'],
+		versions: ['latest'],
+		recommendedVersion: 'latest',
+		ports: {
+			main: 8080
+		}
+	},
+	// {
+	// 	name: 'taiga',
+	// 	fancyName: 'Taiga',
+	// 	baseImage: 'taigaio/taiga-front',
+	// 	images: ['postgres:12.3', 'rabbitmq:3.8-management-alpine', 'taigaio/taiga-back', 'taigaio/taiga-events', 'taigaio/taiga-protected'],
+	// 	versions: ['latest'],
+	// 	recommendedVersion: 'latest',
+	// 	ports: {
+	// 		main: 80
+	// 	}
+	// },
+];

apps/api/src/plugins/jwt.ts

@@ -21,7 +21,6 @@ export default fp<FastifyJWTOptions>(async (fastify, opts) => {
         try {
             await request.jwtVerify()
         } catch (err) {
-            console.log(err)
             reply.send(err)
         }
     })

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

@@ -3,22 +3,29 @@ import crypto from 'node:crypto'
 import jsonwebtoken from 'jsonwebtoken';
 import axios from 'axios';
 import { FastifyReply } from 'fastify';
+import fs from 'fs/promises';
+import yaml from 'js-yaml';
+
 import { day } from '../../../../lib/dayjs';
-import { setDefaultBaseImage, setDefaultConfiguration } from '../../../../lib/buildPacks/common';
+import { makeLabelForStandaloneApplication, setDefaultBaseImage, setDefaultConfiguration } from '../../../../lib/buildPacks/common';
-import { checkDomainsIsValidInDNS, checkDoubleBranch, decrypt, encrypt, errorHandler, executeDockerCmd, generateSshKeyPair, getContainerUsage, getDomain, getFreeExposedPort, isDev, isDomainConfigured, prisma, stopBuild, uniqueName } from '../../../../lib/common';
+import { checkDomainsIsValidInDNS, checkDoubleBranch, checkExposedPort, createDirectories, decrypt, defaultComposeConfiguration, encrypt, errorHandler, executeDockerCmd, generateSshKeyPair, getContainerUsage, getDomain, isDev, isDomainConfigured, listSettings, prisma, stopBuild, uniqueName } from '../../../../lib/common';
 import { checkContainer, formatLabelsOnDocker, isContainerExited, removeContainer } from '../../../../lib/docker';
-import { scheduler } from '../../../../lib/scheduler';
 
 import type { FastifyRequest } from 'fastify';
 import type { GetImages, CancelDeployment, CheckDNS, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, GetApplicationLogs, GetBuildIdLogs, GetBuildLogs, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage, DeployApplication, CheckDomain, StopPreviewApplication } from './types';
 import { OnlyId } from '../../../../types';
 
+function filterObject(obj, callback) {
+    return Object.fromEntries(Object.entries(obj).
+        filter(([key, val]) => callback(val, key)));
+}
+
 export async function listApplications(request: FastifyRequest) {
     try {
         const { teamId } = request.user
         const applications = await prisma.application.findMany({
             where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } },
-            include: { teams: true, destinationDocker: true }
+            include: { teams: true, destinationDocker: true, settings: true }
         });
         const settings = await prisma.setting.findFirst()
         return {
@@ -34,7 +41,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 +63,7 @@ export async function getImages(request: FastifyRequest<GetImages>) {
             }
         }
 
-
+        return { baseImage, baseImages, baseBuildImage, baseBuildImages, publishDirectory, port }
-        return { baseBuildImage, baseBuildImages, publishDirectory, port }
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
@@ -75,7 +81,6 @@ export async function getApplicationStatus(request: FastifyRequest<OnlyId>) {
             isExited = await isContainerExited(application.destinationDocker.id, id);
         }
         return {
-            isQueueActive: scheduler.workers.has('deployApplication'),
             isRunning,
             isExited,
         };
@@ -90,10 +95,11 @@ export async function getApplication(request: FastifyRequest<OnlyId>) {
         const { teamId } = request.user
         const appId = process.env['COOLIFY_APP_ID'];
         const application: any = await getApplicationFromDB(id, teamId);
-
+        const settings = await listSettings();
         return {
             application,
-            appId
+            appId,
+            settings
         };
 
     } catch ({ status, message }) {
@@ -150,7 +156,8 @@ export async function getApplicationFromDB(id: string, teamId: string) {
                 settings: true,
                 gitSource: { include: { githubApp: true, gitlabApp: true } },
                 secrets: true,
-                persistentStorage: true
+                persistentStorage: true,
+                connectedDatabase: true
             }
         });
         if (!application) {
@@ -177,19 +184,21 @@ export async function getApplicationFromDB(id: string, teamId: string) {
 }
 export async function getApplicationFromDBWebhook(projectId: number, branch: string) {
     try {
-        let application = await prisma.application.findFirst({
+        let applications = await prisma.application.findMany({
             where: { projectId, branch, settings: { autodeploy: true } },
             include: {
                 destinationDocker: true,
                 settings: true,
                 gitSource: { include: { githubApp: true, gitlabApp: true } },
                 secrets: true,
-                persistentStorage: true
+                persistentStorage: true,
+                connectedDatabase: true
             }
         });
-        if (!application) {
+        if (applications.length === 0) {
             throw { status: 500, message: 'Application not configured.' }
         }
+        applications = applications.map((application: any) => {
             application = decryptApplication(application);
             const { baseImage, baseBuildImage, baseBuildImages, baseImages } = setDefaultBaseImage(
                 application.buildPack
@@ -202,7 +211,12 @@ export async function getApplicationFromDBWebhook(projectId: number, branch: str
             if (!application.baseBuildImage) {
                 application.baseBuildImage = baseBuildImage;
             }
-        return { ...application, baseBuildImages, baseImages };
+            application.baseBuildImages = baseBuildImages;
+            application.baseImages = baseImages;
+            return application
+        })
+
+        return applications;
 
     } catch ({ status, message }) {
         return errorHandler({ status, message })
@@ -230,13 +244,16 @@ export async function saveApplication(request: FastifyRequest<SaveApplication>,
             denoOptions,
             baseImage,
             baseBuildImage,
-            deploymentType
+            deploymentType,
+            baseDatabaseBranch
         } = request.body
-
         if (port) port = Number(port);
         if (exposePort) {
             exposePort = Number(exposePort);
         }
+
+        const { destinationDocker: { id: dockerId, remoteIpAddress }, exposePort: configuredPort } = await prisma.application.findUnique({ where: { id }, include: { destinationDocker: true } })
+        if (exposePort) await checkExposedPort({ id, configuredPort, exposePort, dockerId, remoteIpAddress })
         if (denoOptions) denoOptions = denoOptions.trim();
         const defaultConfiguration = await setDefaultConfiguration({
             buildPack,
@@ -249,6 +266,25 @@ export async function saveApplication(request: FastifyRequest<SaveApplication>,
             dockerFileLocation,
             denoMainFile
         });
+        if (baseDatabaseBranch) {
+            await prisma.application.update({
+                where: { id },
+                data: {
+                    name,
+                    fqdn,
+                    exposePort,
+                    pythonWSGI,
+                    pythonModule,
+                    pythonVariable,
+                    denoOptions,
+                    baseImage,
+                    baseBuildImage,
+                    deploymentType,
+                    ...defaultConfiguration,
+                    connectedDatabase: { update: { hostedDatabaseDBName: baseDatabaseBranch } }
+                }
+            });
+        } else {
             await prisma.application.update({
                 where: { id },
                 data: {
@@ -265,6 +301,8 @@ export async function saveApplication(request: FastifyRequest<SaveApplication>,
                     ...defaultConfiguration
                 }
             });
+        }
+
         return reply.code(201).send();
     } catch ({ status, message }) {
         return errorHandler({ status, message })
@@ -275,15 +313,15 @@ export async function saveApplication(request: FastifyRequest<SaveApplication>,
 export async function saveApplicationSettings(request: FastifyRequest<SaveApplicationSettings>, reply: FastifyReply) {
     try {
         const { id } = request.params
-        const { debug, previews, dualCerts, autodeploy, branch, projectId } = request.body
+        const { debug, previews, dualCerts, autodeploy, branch, projectId, isBot, isDBBranching } = request.body
-        const isDouble = await checkDoubleBranch(branch, projectId);
+        // const isDouble = await checkDoubleBranch(branch, projectId);
-        if (isDouble && autodeploy) {
+        // if (isDouble && autodeploy) {
-            await prisma.applicationSettings.updateMany({ where: { application: { branch, projectId } }, data: { autodeploy: false } })
+        //     await prisma.applicationSettings.updateMany({ where: { application: { branch, projectId } }, data: { autodeploy: false } })
-            throw { status: 500, message: 'Cannot activate automatic deployments until only one application is defined for this repository / branch.' }
+        //     throw { status: 500, message: 'Cannot activate automatic deployments until only one application is defined for this repository / branch.' }
-        }
+        // }
         await prisma.application.update({
             where: { id },
-            data: { settings: { update: { debug, previews, dualCerts, autodeploy } } },
+            data: { fqdn: isBot ? null : undefined, settings: { update: { debug, previews, dualCerts, autodeploy, isBot, isDBBranching } } },
             include: { destinationDocker: true }
         });
         return reply.code(201).send();
@@ -311,6 +349,113 @@ export async function stopPreviewApplication(request: FastifyRequest<StopPreview
         return errorHandler({ status, message })
     }
 }
+
+export async function restartApplication(request: FastifyRequest<OnlyId>, reply: FastifyReply) {
+    try {
+        const { id } = request.params
+        const { teamId } = request.user
+        let application: any = await getApplicationFromDB(id, teamId);
+        if (application?.destinationDockerId) {
+            const buildId = cuid();
+            const { id: dockerId, network } = application.destinationDocker;
+            const { secrets, pullmergeRequestId, port, repository, persistentStorage, id: applicationId, buildPack, exposePort } = application;
+
+            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}`);
+                        }
+                    }
+                });
+            }
+            const { workdir } = await createDirectories({ repository, buildId });
+            const labels = []
+            let image = null
+            const { stdout: container } = await executeDockerCmd({ dockerId, command: `docker container ls --filter 'label=com.docker.compose.service=${id}' --format '{{json .}}'` })
+            const containersArray = container.trim().split('\n');
+            for (const container of containersArray) {
+                const containerObj = formatLabelsOnDocker(container);
+                image = containerObj[0].Image
+                Object.keys(containerObj[0].Labels).forEach(function (key) {
+                    if (key.startsWith('coolify')) {
+                        labels.push(`${key}=${containerObj[0].Labels[key]}`)
+                    }
+                })
+            }
+            let imageFound = false;
+            try {
+                await executeDockerCmd({
+                    dockerId,
+                    command: `docker image inspect ${image}`
+                })
+                imageFound = true;
+            } catch (error) {
+                //
+            }
+            if (!imageFound) {
+                throw { status: 500, message: 'Image not found, cannot restart application.' }
+            }
+            await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
+
+            let envFound = false;
+            try {
+                envFound = !!(await fs.stat(`${workdir}/.env`));
+            } catch (error) {
+                //
+            }
+            const volumes =
+                persistentStorage?.map((storage) => {
+                    return `${applicationId}${storage.path.replace(/\//gi, '-')}:${buildPack !== 'docker' ? '/app' : ''
+                        }${storage.path}`;
+                }) || [];
+            const composeVolumes = volumes.map((volume) => {
+                return {
+                    [`${volume.split(':')[0]}`]: {
+                        name: volume.split(':')[0]
+                    }
+                };
+            });
+            const composeFile = {
+                version: '3.8',
+                services: {
+                    [applicationId]: {
+                        image,
+                        container_name: applicationId,
+                        volumes,
+                        env_file: envFound ? [`${workdir}/.env`] : [],
+                        labels,
+                        depends_on: [],
+                        expose: [port],
+                        ...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
+                        ...defaultComposeConfiguration(network),
+                    }
+                },
+                networks: {
+                    [network]: {
+                        external: true
+                    }
+                },
+                volumes: Object.assign({}, ...composeVolumes)
+            };
+            await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(composeFile));
+            await executeDockerCmd({ dockerId, command: `docker stop -t 0 ${id}` })
+            await executeDockerCmd({ dockerId, command: `docker rm ${id}` })
+            await executeDockerCmd({ dockerId, command: `docker compose --project-directory ${workdir} up -d` })
+            return reply.code(201).send();
+        }
+        throw { status: 500, message: 'Application cannot be restarted.' }
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
 export async function stopApplication(request: FastifyRequest<OnlyId>, reply: FastifyReply) {
     try {
         const { id } = request.params
@@ -331,12 +476,14 @@ export async function stopApplication(request: FastifyRequest<OnlyId>, reply: Fa
 export async function deleteApplication(request: FastifyRequest<DeleteApplication>, reply: FastifyReply) {
     try {
         const { id } = request.params
+        const { force } = request.body
+
         const { teamId } = request.user
         const application = await prisma.application.findUnique({
             where: { id },
             include: { destinationDocker: true }
         });
-        if (application?.destinationDockerId && application.destinationDocker?.network) {
+        if (!force && application?.destinationDockerId && application.destinationDocker?.network) {
             const { stdout: containers } = await executeDockerCmd({
                 dockerId: application.destinationDocker.id,
                 command: `docker ps -a --filter network=${application.destinationDocker.network} --filter name=${id} --format '{{json .}}'`
@@ -355,6 +502,7 @@ export async function deleteApplication(request: FastifyRequest<DeleteApplicatio
         await prisma.build.deleteMany({ where: { applicationId: id } });
         await prisma.secret.deleteMany({ where: { applicationId: id } });
         await prisma.applicationPersistentStorage.deleteMany({ where: { applicationId: id } });
+        await prisma.applicationConnectedDatabase.deleteMany({ where: { applicationId: id } });
         if (teamId === '0') {
             await prisma.application.deleteMany({ where: { id } });
         } else {
@@ -378,31 +526,22 @@ export async function checkDomain(request: FastifyRequest<CheckDomain>) {
 export async function checkDNS(request: FastifyRequest<CheckDNS>) {
     try {
         const { id } = request.params
-
         let { exposePort, fqdn, forceSave, dualCerts } = request.body
-
+        if (!fqdn) {
-        if (fqdn) fqdn = fqdn.toLowerCase();
+            return {}
+        } else {
+            fqdn = fqdn.toLowerCase();
+        }
         if (exposePort) exposePort = Number(exposePort);
 
         const { destinationDocker: { id: dockerId, remoteIpAddress, remoteEngine }, exposePort: configuredPort } = await prisma.application.findUnique({ where: { id }, include: { destinationDocker: true } })
         const { isDNSCheckEnabled } = await prisma.setting.findFirst({});
 
-        const found = await isDomainConfigured({ id, fqdn, dockerId });
+        const found = await isDomainConfigured({ id, fqdn, remoteIpAddress });
         if (found) {
             throw { status: 500, message: `Domain ${getDomain(fqdn).replace('www.', '')} is already in use!` }
         }
-        if (exposePort) {
+        if (exposePort) await checkExposedPort({ id, configuredPort, exposePort, dockerId, remoteIpAddress })
-            if (exposePort < 1024 || exposePort > 65535) {
-                throw { status: 500, message: `Exposed Port needs to be between 1024 and 65535.` }
-            }
-
-            if (configuredPort !== exposePort) {
-                const availablePort = await getFreeExposedPort(id, exposePort, dockerId, remoteIpAddress);
-                if (availablePort.toString() !== exposePort.toString()) {
-                    throw { status: 500, message: `Port ${exposePort} is already in use.` }
-                }
-            }
-        }
         if (isDNSCheckEnabled && !isDev && !forceSave) {
             let hostname = request.hostname.split(':')[0];
             if (remoteEngine) hostname = remoteIpAddress;
@@ -435,7 +574,7 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
     try {
         const { id } = request.params
         const teamId = request.user?.teamId;
-        const { pullmergeRequestId = null, branch } = request.body
+        const { pullmergeRequestId = null, branch, forceRebuild } = request.body
         const buildId = cuid();
         const application = await getApplicationFromDB(id, teamId);
         if (application) {
@@ -459,7 +598,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,
@@ -468,22 +610,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
-                });
-            } else {
-                scheduler.workers.get('deployApplication').postMessage({
-                    build_id: buildId,
-                    type: 'manual',
-                    ...application
-                });
-
-            }
             return {
                 buildId
             };
@@ -498,11 +624,20 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
 export async function saveApplicationSource(request: FastifyRequest<SaveApplicationSource>, reply: FastifyReply) {
     try {
         const { id } = request.params
-        const { gitSourceId } = request.body
+        const { gitSourceId, forPublic, type } = request.body
+        if (forPublic) {
+            const publicGit = await prisma.gitSource.findFirst({ where: { type, forPublic } });
+            await prisma.application.update({
+                where: { id },
+                data: { gitSource: { connect: { id: publicGit.id } } }
+            });
+        } else {
             await prisma.application.update({
                 where: { id },
                 data: { gitSource: { connect: { id: gitSourceId } } }
             });
+        }
+
         return reply.code(201).send()
     } catch ({ status, message }) {
         return errorHandler({ status, message })
@@ -556,7 +691,7 @@ export async function checkRepository(request: FastifyRequest<CheckRepository>)
 export async function saveRepository(request, reply) {
     try {
         const { id } = request.params
-        let { repository, branch, projectId, autodeploy, webhookToken } = request.body
+        let { repository, branch, projectId, autodeploy, webhookToken, isPublicRepository = false } = request.body
 
         repository = repository.toLowerCase();
         branch = branch.toLowerCase();
@@ -564,18 +699,20 @@ export async function saveRepository(request, reply) {
         if (webhookToken) {
             await prisma.application.update({
                 where: { id },
-                data: { repository, branch, projectId, gitSource: { update: { gitlabApp: { update: { webhookToken: webhookToken ? webhookToken : undefined } } } }, settings: { update: { autodeploy } } }
+                data: { repository, branch, projectId, gitSource: { update: { gitlabApp: { update: { webhookToken: webhookToken ? webhookToken : undefined } } } }, settings: { update: { autodeploy, isPublicRepository } } }
             });
         } else {
             await prisma.application.update({
                 where: { id },
-                data: { repository, branch, projectId, settings: { update: { autodeploy } } }
+                data: { repository, branch, projectId, settings: { update: { autodeploy, isPublicRepository } } }
             });
         }
-        const isDouble = await checkDoubleBranch(branch, projectId);
+        // if (!isPublicRepository) {
-        if (isDouble) {
+        //     const isDouble = await checkDoubleBranch(branch, projectId);
-            await prisma.applicationSettings.updateMany({ where: { application: { branch, projectId } }, data: { autodeploy: false } })
+        //     if (isDouble) {
-        }
+        //         await prisma.applicationSettings.updateMany({ where: { application: { branch, projectId } }, data: { autodeploy: false, isPublicRepository } })
+        //     }
+        // }
         return reply.code(201).send()
     } catch ({ status, message }) {
         return errorHandler({ status, message })
@@ -606,7 +743,8 @@ export async function getBuildPack(request) {
             projectId: application.projectId,
             repository: application.repository,
             branch: application.branch,
-            apiUrl: application.gitSource.apiUrl
+            apiUrl: application.gitSource.apiUrl,
+            isPublicRepository: application.settings.isPublicRepository
         }
     } catch ({ status, message }) {
         return errorHandler({ status, message })
@@ -623,6 +761,16 @@ export async function saveBuildPack(request, reply) {
         return errorHandler({ status, message })
     }
 }
+export async function saveConnectedDatabase(request, reply) {
+    try {
+        const { id } = request.params
+        const { databaseId, type } = request.body
+        await prisma.application.update({ where: { id }, data: { connectedDatabase: { upsert: { create: { database: { connect: { id: databaseId } }, hostedDatabaseType: type }, update: { database: { connect: { id: databaseId } }, hostedDatabaseType: type } } } } })
+        return reply.code(201).send()
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
 
 export async function getSecrets(request: FastifyRequest<OnlyId>) {
     try {
@@ -656,13 +804,13 @@ export async function saveSecret(request: FastifyRequest<SaveSecret>, reply: Fas
             if (found) {
                 throw { status: 500, message: `Secret ${name} already exists.` }
             } else {
-                value = encrypt(value);
+                value = encrypt(value.trim());
                 await prisma.secret.create({
                     data: { name, value, isBuildSecret, isPRMRSecret, application: { connect: { id } } }
                 });
             }
         } else {
-            value = encrypt(value);
+            value = encrypt(value.trim());
             const found = await prisma.secret.findFirst({ where: { applicationId: id, name, isPRMRSecret } });
 
             if (found) {
@@ -779,7 +927,6 @@ export async function getPreviews(request: FastifyRequest<OnlyId>) {
             })
         }
     } catch ({ status, message }) {
-        console.log({ status, message })
         return errorHandler({ status, message })
     }
 }
@@ -872,8 +1019,13 @@ export async function getBuildIdLogs(request: FastifyRequest<GetBuildIdLogs>) {
             orderBy: { time: 'asc' }
         });
         const data = await prisma.build.findFirst({ where: { id: buildId } });
+        const createdAt = day(data.createdAt).utc();
         return {
-            logs,
+            logs: logs.map(log => {
+                log.time = Number(log.time)
+                return log
+            }),
+            took: day().diff(createdAt) / 1000,
             status: data?.status || 'queued'
         }
     } catch ({ status, message }) {
@@ -949,3 +1101,58 @@ export async function cancelDeployment(request: FastifyRequest<CancelDeployment>
         return errorHandler({ status, message })
     }
 }
+
+
+export async function createdBranchDatabase(database: any, baseDatabaseBranch: string, pullmergeRequestId: string) {
+    try {
+        if (!baseDatabaseBranch) return
+        const { id, type, destinationDockerId, rootUser, rootUserPassword, dbUser } = database;
+        if (destinationDockerId) {
+            if (type === 'postgresql') {
+                const decryptedRootUserPassword = decrypt(rootUserPassword);
+                await executeDockerCmd({
+                    dockerId: destinationDockerId,
+                    command: `docker exec ${id} pg_dump -d "postgresql://postgres:${decryptedRootUserPassword}@${id}:5432/${baseDatabaseBranch}" --encoding=UTF8 --schema-only -f /tmp/${baseDatabaseBranch}.dump`
+                })
+                await executeDockerCmd({
+                    dockerId: destinationDockerId,
+                    command: `docker exec ${id} psql postgresql://postgres:${decryptedRootUserPassword}@${id}:5432 -c "CREATE DATABASE branch_${pullmergeRequestId}"`
+                })
+                await executeDockerCmd({
+                    dockerId: destinationDockerId,
+                    command: `docker exec ${id} psql -d "postgresql://postgres:${decryptedRootUserPassword}@${id}:5432/branch_${pullmergeRequestId}" -f /tmp/${baseDatabaseBranch}.dump`
+                })
+                await executeDockerCmd({
+                    dockerId: destinationDockerId,
+                    command: `docker exec ${id} psql postgresql://postgres:${decryptedRootUserPassword}@${id}:5432 -c "ALTER DATABASE branch_${pullmergeRequestId} OWNER TO ${dbUser}"`
+                })
+            }
+        }
+
+
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
+export async function removeBranchDatabase(database: any, pullmergeRequestId: string) {
+    try {
+        const { id, type, destinationDockerId, rootUser, rootUserPassword } = database;
+        if (destinationDockerId) {
+            if (type === 'postgresql') {
+                const decryptedRootUserPassword = decrypt(rootUserPassword);
+                // Terminate all connections to the database
+                await executeDockerCmd({
+                    dockerId: destinationDockerId,
+                    command: `docker exec ${id} psql postgresql://postgres:${decryptedRootUserPassword}@${id}:5432 -c "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = 'branch_${pullmergeRequestId}' AND pid <> pg_backend_pid();"`
+                })
+
+                await executeDockerCmd({
+                    dockerId: destinationDockerId,
+                    command: `docker exec ${id} psql postgresql://postgres:${decryptedRootUserPassword}@${id}:5432 -c "DROP DATABASE branch_${pullmergeRequestId}"`
+                })
+            }
+        }
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}

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

@@ -1,6 +1,6 @@
 import { FastifyPluginAsync } from 'fastify';
 import { OnlyId } from '../../../../types';
-import { cancelDeployment, checkDNS, checkDomain, checkRepository, deleteApplication, deleteSecret, deleteStorage, deployApplication, getApplication, getApplicationLogs, getApplicationStatus, getBuildIdLogs, getBuildLogs, getBuildPack, getGitHubToken, getGitLabSSHKey, getImages, getPreviews, getSecrets, getStorages, getUsage, listApplications, newApplication, saveApplication, saveApplicationSettings, saveApplicationSource, saveBuildPack, saveDeployKey, saveDestination, saveGitLabSSHKey, saveRepository, saveSecret, saveStorage, stopApplication, stopPreviewApplication } from './handlers';
+import { cancelDeployment, checkDNS, checkDomain, checkRepository, deleteApplication, deleteSecret, deleteStorage, deployApplication, getApplication, getApplicationLogs, getApplicationStatus, getBuildIdLogs, getBuildLogs, getBuildPack, getGitHubToken, getGitLabSSHKey, getImages, getPreviews, getSecrets, getStorages, getUsage, listApplications, newApplication, restartApplication, saveApplication, saveApplicationSettings, saveApplicationSource, saveBuildPack, saveConnectedDatabase, saveDeployKey, saveDestination, saveGitLabSSHKey, saveRepository, saveSecret, saveStorage, stopApplication, stopPreviewApplication } from './handlers';
 
 import type { CancelDeployment, CheckDNS, CheckDomain, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, DeployApplication, GetApplicationLogs, GetBuildIdLogs, GetBuildLogs, GetImages, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage, StopPreviewApplication } from './types';
 
@@ -19,6 +19,7 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
 
     fastify.get<OnlyId>('/:id/status', async (request) => await getApplicationStatus(request));
 
+    fastify.post<OnlyId>('/:id/restart', async (request, reply) => await restartApplication(request, reply));
     fastify.post<OnlyId>('/:id/stop', async (request, reply) => await stopApplication(request, reply));
     fastify.post<StopPreviewApplication>('/:id/stop/preview', async (request, reply) => await stopPreviewApplication(request, reply));
 
@@ -54,6 +55,8 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
     fastify.get('/:id/configuration/buildpack', async (request) => await getBuildPack(request));
     fastify.post('/:id/configuration/buildpack', async (request, reply) => await saveBuildPack(request, reply));
 
+    fastify.post('/:id/configuration/database', async (request, reply) => await saveConnectedDatabase(request, reply));
+
     fastify.get<OnlyId>('/:id/configuration/sshkey', async (request) => await getGitLabSSHKey(request));
     fastify.post<OnlyId>('/:id/configuration/sshkey', async (request, reply) => await saveGitLabSSHKey(request, reply));
 

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

@@ -20,15 +20,17 @@ export interface SaveApplication extends OnlyId {
         denoOptions: string,
         baseImage: string,
         baseBuildImage: string,
-        deploymentType: string
+        deploymentType: string,
+        baseDatabaseBranch: string
     }
 }
 export interface SaveApplicationSettings extends OnlyId {
     Querystring: { domain: string; };
-    Body: { debug: boolean; previews: boolean; dualCerts: boolean; autodeploy: boolean; branch: string; projectId: number; };
+    Body: { debug: boolean; previews: boolean; dualCerts: boolean; autodeploy: boolean; branch: string; projectId: number; isBot: boolean; isDBBranching: boolean };
 }
 export interface DeleteApplication extends OnlyId {
     Querystring: { domain: string; };
+    Body: { force: boolean }
 }
 export interface CheckDomain extends OnlyId {
     Querystring: { domain: string; };
@@ -44,13 +46,13 @@ export interface CheckDNS extends OnlyId {
 }
 export interface DeployApplication {
     Querystring: { domain: string }
-    Body: { pullmergeRequestId: string | null, branch: string }
+    Body: { pullmergeRequestId: string | null, branch: string, forceRebuild?: boolean }
 }
 export interface GetImages {
     Body: { buildPack: string, deploymentType: string }
 }
 export interface SaveApplicationSource extends OnlyId {
-    Body: { gitSourceId: string }
+    Body: { gitSourceId?: string | null, forPublic?: boolean, type?: string }
 }
 export interface CheckRepository extends OnlyId {
     Querystring: { repository: string, branch: string }
@@ -115,7 +117,8 @@ export interface CancelDeployment {
 export interface DeployApplication extends OnlyId {
     Body: {
         pullmergeRequestId: string | null,
-        branch: string
+        branch: string,
+        forceRebuild?: boolean
     }
 }
 

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

@@ -4,11 +4,10 @@ import { FastifyReply } from 'fastify';
 import yaml from 'js-yaml';
 import fs from 'fs/promises';
 import { ComposeFile, createDirectories, decrypt, encrypt, errorHandler, executeDockerCmd, generateDatabaseConfiguration, generatePassword, getContainerUsage, getDatabaseImage, getDatabaseVersions, getFreePublicPort, listSettings, makeLabelForStandaloneDatabase, prisma, startTraefikTCPProxy, stopDatabaseContainer, stopTcpHttpProxy, supportedDatabaseTypesAndVersions, uniqueName, updatePasswordInDb } from '../../../../lib/common';
-import { checkContainer } from '../../../../lib/docker';
 import { day } from '../../../../lib/dayjs';
 
 import { GetDatabaseLogs, OnlyId, SaveDatabase, SaveDatabaseDestination, SaveDatabaseSettings, SaveVersion } from '../../../../types';
-import { SaveDatabaseType } from './types';
+import { DeleteDatabase, SaveDatabaseType } from './types';
 
 export async function listDatabases(request: FastifyRequest) {
     try {
@@ -30,9 +29,9 @@ export async function newDatabase(request: FastifyRequest, reply: FastifyReply)
 
         const name = uniqueName();
         const dbUser = cuid();
-        const dbUserPassword = encrypt(generatePassword());
+        const dbUserPassword = encrypt(generatePassword({}));
         const rootUser = cuid();
-        const rootUserPassword = encrypt(generatePassword());
+        const rootUserPassword = encrypt(generatePassword({}));
         const defaultDatabase = cuid();
 
         const { id } = await prisma.database.create({
@@ -93,14 +92,15 @@ export async function getDatabase(request: FastifyRequest<OnlyId>) {
         if (!database) {
             throw { status: 404, message: 'Database not found.' }
         }
+        const { arch } = await listSettings();
         if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword);
         if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword);
-        const configuration = generateDatabaseConfiguration(database);
+        const configuration = generateDatabaseConfiguration(database, arch);
         const settings = await listSettings();
         return {
             privatePort: configuration?.privatePort,
             database,
-            versions: await getDatabaseVersions(database.type),
+            versions: await getDatabaseVersions(database.type, arch),
             settings
         };
     } catch ({ status, message }) {
@@ -137,8 +137,10 @@ export async function getVersions(request: FastifyRequest<OnlyId>) {
             where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
             include: { destinationDocker: true, settings: true }
         });
+        const { arch } = await listSettings();
+        const versions = getDatabaseVersions(type, arch);
         return {
-            versions: supportedDatabaseTypesAndVersions.find((name) => name.name === type).versions
+            versions
         }
     } catch ({ status, message }) {
         return errorHandler({ status, message })
@@ -165,6 +167,7 @@ export async function saveDatabaseDestination(request: FastifyRequest<SaveDataba
         const { id } = request.params;
         const { destinationId } = request.body;
 
+        const { arch } = await listSettings();
         await prisma.database.update({
             where: { id },
             data: { destinationDocker: { connect: { id: destinationId } } }
@@ -179,7 +182,7 @@ export async function saveDatabaseDestination(request: FastifyRequest<SaveDataba
 
         if (destinationDockerId) {
             if (type && version) {
-                const baseImage = getDatabaseImage(type);
+                const baseImage = getDatabaseImage(type, arch);
                 executeDockerCmd({ dockerId, command: `docker pull ${baseImage}:${version}` })
             }
         }
@@ -219,6 +222,7 @@ export async function startDatabase(request: FastifyRequest<OnlyId>) {
             where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
             include: { destinationDocker: true, settings: true }
         });
+        const { arch } = await listSettings();
         if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword);
         if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword);
         const {
@@ -228,8 +232,8 @@ export async function startDatabase(request: FastifyRequest<OnlyId>) {
             publicPort,
             settings: { isPublic }
         } = database;
-        const { privatePort, environmentVariables, image, volume, ulimits } =
+        const { privatePort, command, environmentVariables, image, volume, ulimits } =
-            generateDatabaseConfiguration(database);
+            generateDatabaseConfiguration(database, arch);
 
         const network = destinationDockerId && destinationDocker.network;
         const volumeName = volume.split(':')[0];
@@ -243,6 +247,7 @@ export async function startDatabase(request: FastifyRequest<OnlyId>) {
                 [id]: {
                     container_name: id,
                     image,
+                    command,
                     networks: [network],
                     environment: environmentVariables,
                     volumes: [volume],
@@ -270,13 +275,12 @@ export async function startDatabase(request: FastifyRequest<OnlyId>) {
                 }
             }
         };
+
         const composeFileDestination = `${workdir}/docker-compose.yaml`;
         await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
         try {
             await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker volume create ${volumeName}` })
-        } catch (error) {
+        } catch (error) { }
-            console.log(error);
-        }
         try {
             await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up -d` })
             if (isPublic) await startTraefikTCPProxy(destinationDocker, id, publicPort, privatePort);
@@ -354,20 +358,23 @@ export async function getDatabaseLogs(request: FastifyRequest<GetDatabaseLogs>)
         return errorHandler({ status, message })
     }
 }
-export async function deleteDatabase(request: FastifyRequest<OnlyId>) {
+export async function deleteDatabase(request: FastifyRequest<DeleteDatabase>) {
     try {
         const teamId = request.user.teamId;
         const { id } = request.params;
+        const { force } = request.body;
         const database = await prisma.database.findFirst({
             where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
             include: { destinationDocker: true, settings: true }
         });
+        if (!force) {
             if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword);
             if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword);
             if (database.destinationDockerId) {
                 const everStarted = await stopDatabaseContainer(database);
                 if (everStarted) await stopTcpHttpProxy(id, database.destinationDocker, database.publicPort);
             }
+        }
         await prisma.databaseSettings.deleteMany({ where: { databaseId: id } });
         await prisma.database.delete({ where: { id } });
         return {}
@@ -427,9 +434,13 @@ export async function saveDatabaseSettings(request: FastifyRequest<SaveDatabaseS
         const { id } = request.params;
         const { isPublic, appendOnly = true } = request.body;
 
-        const { destinationDocker: { id: dockerId } } = await prisma.database.findUnique({ where: { id }, include: { destinationDocker: true } })
+        let publicPort = null
-        const publicPort = await getFreePublicPort(id, dockerId);
 
+        const { destinationDocker: { id: dockerId } } = await prisma.database.findUnique({ where: { id }, include: { destinationDocker: true } })
+
+        if (isPublic) {
+            publicPort = await getFreePublicPort(id, dockerId);
+        }
         await prisma.database.update({
             where: { id },
             data: {
@@ -440,11 +451,12 @@ export async function saveDatabaseSettings(request: FastifyRequest<SaveDatabaseS
             where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
             include: { destinationDocker: true, settings: true }
         });
+        const { arch } = await listSettings();
         if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword);
         if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword);
 
         const { destinationDockerId, destinationDocker, publicPort: oldPublicPort } = database;
-        const { privatePort } = generateDatabaseConfiguration(database);
+        const { privatePort } = generateDatabaseConfiguration(database, arch);
 
         if (destinationDockerId) {
             if (isPublic) {

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

@@ -1,7 +1,7 @@
 import { FastifyPluginAsync } from 'fastify';
 import { deleteDatabase, getDatabase, getDatabaseLogs, getDatabaseStatus, getDatabaseTypes, getDatabaseUsage, getVersions, listDatabases, newDatabase, saveDatabase, saveDatabaseDestination, saveDatabaseSettings, saveDatabaseType, saveVersion, startDatabase, stopDatabase } from './handlers';
 
-import type { GetDatabaseLogs, OnlyId, SaveDatabase, SaveDatabaseDestination, SaveDatabaseSettings, SaveVersion } from '../../../../types';
+import type { DeleteDatabase, GetDatabaseLogs, OnlyId, SaveDatabase, SaveDatabaseDestination, SaveDatabaseSettings, SaveVersion } from '../../../../types';
 import type { SaveDatabaseType } from './types';
 
 const root: FastifyPluginAsync = async (fastify): Promise<void> => {
@@ -13,7 +13,7 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
 
     fastify.get<OnlyId>('/:id', async (request) => await getDatabase(request));
     fastify.post<SaveDatabase>('/:id', async (request, reply) => await saveDatabase(request, reply));
-    fastify.delete<OnlyId>('/:id', async (request) => await deleteDatabase(request));
+    fastify.delete<DeleteDatabase>('/:id', async (request) => await deleteDatabase(request));
 
     fastify.get<OnlyId>('/:id/status', async (request) => await getDatabaseStatus(request));
 

apps/api/src/routes/api/v1/databases/types.ts

@@ -3,3 +3,6 @@ import type { OnlyId } from "../../../../types";
 export interface SaveDatabaseType extends OnlyId {
     Body: { type: string }
 }
+export interface DeleteDatabase extends OnlyId {
+    Body: { force: string }
+}

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

@@ -4,7 +4,7 @@ import sshConfig from 'ssh-config'
 import fs from 'fs/promises'
 import os from 'os';
 
-import { asyncExecShell, decrypt, errorHandler, executeDockerCmd, listSettings, prisma, startTraefikProxy, stopTraefikProxy } from '../../../../lib/common';
+import { asyncExecShell, createRemoteEngineConfiguration, decrypt, errorHandler, executeDockerCmd, listSettings, prisma, startTraefikProxy, stopTraefikProxy } from '../../../../lib/common';
 import { checkContainer } from '../../../../lib/docker';
 
 import type { OnlyId } from '../../../../types';
@@ -53,13 +53,13 @@ export async function getDestination(request: FastifyRequest<OnlyId>) {
         const teamId = request.user?.teamId;
         const destination = await prisma.destinationDocker.findFirst({
             where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
-            include: { sshKey: true }
+            include: { sshKey: true, application: true, service: true, database: true }
         });
         if (!destination && id !== 'new') {
             throw { status: 404, message: `Destination not found.` };
         }
         const settings = await listSettings();
-        let payload = {
+        const payload = {
             destination,
             settings
         };
@@ -78,7 +78,6 @@ export async function newDestination(request: FastifyRequest<NewDestination>, re
 
         let { name, network, engine, isCoolifyProxyUsed, remoteIpAddress, remoteUser, remotePort } = request.body
         if (id === 'new') {
-            console.log(engine)
             if (engine) {
                 const { stdout } = await asyncExecShell(`DOCKER_HOST=unix:///var/run/docker.sock docker network ls --filter 'name=^${network}$' --format '{{json .}}'`);
                 if (stdout === '') {
@@ -114,7 +113,6 @@ export async function newDestination(request: FastifyRequest<NewDestination>, re
         }
 
     } catch ({ status, message }) {
-        console.log({ status, message })
         return errorHandler({ status, message })
     }
 }
@@ -162,7 +160,6 @@ export async function startProxy(request: FastifyRequest<Proxy>) {
         await startTraefikProxy(id);
         return {}
     } catch ({ status, message }) {
-        console.log({ status, message })
         await stopTraefikProxy(id);
         return errorHandler({ status, message })
     }
@@ -205,41 +202,21 @@ export async function assignSSHKey(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function verifyRemoteDockerEngine(request: FastifyRequest, reply: FastifyReply) {
+export async function verifyRemoteDockerEngine(request: FastifyRequest<OnlyId>, reply: FastifyReply) {
     try {
         const { id } = request.params;
-        const homedir = os.homedir();
+        await createRemoteEngineConfiguration(id);
-
+        const { remoteIpAddress, remoteUser, network, isCoolifyProxyUsed } = await prisma.destinationDocker.findFirst({ where: { id } })
-        const { sshKey: { privateKey }, remoteIpAddress, remotePort, remoteUser, network } = await prisma.destinationDocker.findFirst({ where: { id }, include: { sshKey: true } })
-
-        await fs.writeFile(`/tmp/id_rsa_verification_${id}`, decrypt(privateKey) + '\n', { encoding: 'utf8', mode: 400 })
-
         const host = `ssh://${remoteUser}@${remoteIpAddress}`
-
-        const config = sshConfig.parse('')
-        const found = config.find({ Host: remoteIpAddress })
-        if (!found) {
-            config.append({
-                Host: remoteIpAddress,
-                Port: remotePort.toString(),
-                User: remoteUser,
-                IdentityFile: `/tmp/id_rsa_verification_${id}`,
-                StrictHostKeyChecking: 'no'
-            })
-        }
-        try {
-            await fs.stat(`${homedir}/.ssh/`)
-        } catch (error) {
-            await fs.mkdir(`${homedir}/.ssh/`)
-        }
-        await fs.writeFile(`${homedir}/.ssh/config`, sshConfig.stringify(config))
-
         const { stdout } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=${network}' --no-trunc --format "{{json .}}"`);
-
         if (!stdout) {
             await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable ${network}`);
         }
-
+        const { stdout: coolifyNetwork } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=coolify-infra' --no-trunc --format "{{json .}}"`);
+        if (!coolifyNetwork) {
+            await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable coolify-infra`);
+        }
+        if (isCoolifyProxyUsed) await startTraefikProxy(id);
         await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } })
         return reply.code(201).send()
 
@@ -252,7 +229,7 @@ export async function getDestinationStatus(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params
         const destination = await prisma.destinationDocker.findUnique({ where: { id } })
-        const isRunning = await checkContainer({ dockerId: destination.id, container: 'coolify-proxy' })
+        const isRunning = await checkContainer({ dockerId: destination.id, container: 'coolify-proxy', remove: true })
         return {
             isRunning
         }

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

@@ -23,7 +23,7 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
 
     fastify.post('/:id/configuration/sshKey', async (request) => await assignSSHKey(request));
 
-    fastify.post('/:id/verify', async (request, reply) => await verifyRemoteDockerEngine(request, reply));
+    fastify.post<OnlyId>('/:id/verify', async (request, reply) => await verifyRemoteDockerEngine(request, reply));
 };
 
 export default root;

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, prisma, uniqueName, version } from '../../../lib/common';
+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';
@@ -31,11 +31,14 @@ export async function checkUpdate(request: FastifyRequest) {
 		const { data: versions } = await axios.get(
 			`https://get.coollabs.io/versions.json?appId=${process.env['COOLIFY_APP_ID']}&version=${currentVersion}`
 		);
-		const latestVersion =
+		const latestVersion = versions['coolify'].main.version
-			isStaging
+		const isUpdateAvailable = compareVersions(latestVersion, currentVersion);
-				? versions['coolify'].next.version
+		if (isStaging) {
-				: versions['coolify'].main.version;
+			return {
-		const isUpdateAvailable = compare(latestVersion, currentVersion);
+				isUpdateAvailable: true,
+				latestVersion: 'next'
+			}
+		}
 		return {
 			isUpdateAvailable: isStaging ? true : isUpdateAvailable === 1,
 			latestVersion
@@ -62,7 +65,6 @@ export async function update(request: FastifyRequest<Update>) {
 			);
 			return {};
 		} else {
-			console.log(latestVersion);
 			await asyncSleep(2000);
 			return {};
 		}
@@ -70,6 +72,22 @@ 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) {
+				asyncExecShell(`docker restart coolify`);
+				return {};
+			} else {
+				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 {
@@ -93,34 +111,23 @@ export async function showDashboard(request: FastifyRequest) {
 	try {
 		const userId = request.user.userId;
 		const teamId = request.user.teamId;
-		const applicationsCount = await prisma.application.count({
+		const applications = await prisma.application.findMany({
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } },
+			include: { settings: true }
+		});
+		const databases = await prisma.database.findMany({
+			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 } } }
 		});
-		const sourcesCount = await prisma.gitSource.count({
+		const settings = await listSettings();
-			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
-		});
-		const destinationsCount = await prisma.destinationDocker.count({
-			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
-		});
-		const teamsCount = await prisma.permission.count({ where: { userId } });
-		const databasesCount = await prisma.database.count({
-			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
-		});
-		const servicesCount = await prisma.service.count({
-			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
-		});
-		const teams = await prisma.permission.findMany({
-			where: { userId },
-			include: { team: { include: { _count: { select: { users: true } } } } }
-		});
 		return {
-			teams,
+			applications,
-			applicationsCount,
+			databases,
-			sourcesCount,
+			services,
-			destinationsCount,
+			settings,
-			teamsCount,
-			databasesCount,
-			servicesCount,
 		};
 	} catch ({ status, message }) {
 		return errorHandler({ status, message })
@@ -291,6 +298,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
         };

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

@@ -4,6 +4,7 @@ import {
     activateWordpressFtp,
     checkService,
     checkServiceDomain,
+    cleanupPlausibleLogs,
     deleteService,
     deleteServiceSecret,
     deleteServiceStorage,
@@ -25,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 type { ActivateWordpressFtp, CheckService, CheckServiceDomain, DeleteServiceSecret, DeleteServiceStorage, GetServiceLogs, SaveService, SaveServiceDestination, SaveServiceSecret, SaveServiceSettings, SaveServiceStorage, SaveServiceType, SaveServiceVersion, ServiceStartStop, SetGlitchTipSettings, SetWordpressSettings } from './types';
+import { startService, stopService } from '../../../../lib/services/handlers';
 
 const root: FastifyPluginAsync = async (fastify): Promise<void> => {
     fastify.addHook('onRequest', async (request) => {
@@ -71,9 +71,10 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
 
     fastify.post<ServiceStartStop>('/:id/:type/start', async (request) => await startService(request));
     fastify.post<ServiceStartStop>('/:id/:type/stop', async (request) => await stopService(request));
-    fastify.post<ServiceStartStop & SetWordpressSettings>('/:id/:type/settings', async (request, reply) => await setSettingsService(request, reply));
+    fastify.post<ServiceStartStop & SetWordpressSettings & SetGlitchTipSettings>('/:id/:type/settings', async (request, reply) => await setSettingsService(request, reply));
 
     fastify.post<OnlyId>('/:id/plausibleanalytics/activate', async (request, reply) => await activatePlausibleUsers(request, reply));
+    fastify.post<OnlyId>('/:id/plausibleanalytics/cleanup', async (request, reply) => await cleanupPlausibleLogs(request, reply));
     fastify.post<ActivateWordpressFtp>('/:id/wordpress/ftp', async (request, reply) => await activateWordpressFtp(request, reply));
 };
 

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

@@ -89,6 +89,10 @@ export interface ActivateWordpressFtp extends OnlyId {
     }
 }
 
-
+export interface SetGlitchTipSettings extends OnlyId {
-
+    Body: {
-
+        enableOpenUserRegistration: boolean,
+        emailSmtpUseSsl: boolean,
+        emailSmtpUseTls: boolean
+    }
+}

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

@@ -28,17 +28,19 @@ export async function saveSettings(request: FastifyRequest<SaveSettings>, reply:
     try {
         const {
             fqdn,
+            isAPIDebuggingEnabled,
             isRegistrationEnabled,
             dualCerts,
             minPort,
             maxPort,
             isAutoUpdateEnabled,
-            isDNSCheckEnabled
+            isDNSCheckEnabled,
+            DNSServers
         } = request.body
         const { id } = await listSettings();
         await prisma.setting.update({
             where: { id },
-            data: { isRegistrationEnabled, dualCerts, isAutoUpdateEnabled, isDNSCheckEnabled }
+            data: { isRegistrationEnabled, dualCerts, isAutoUpdateEnabled, isDNSCheckEnabled, DNSServers, isAPIDebuggingEnabled }
         });
         if (fqdn) {
             await prisma.setting.update({ where: { id }, data: { fqdn } });
@@ -54,6 +56,10 @@ export async function saveSettings(request: FastifyRequest<SaveSettings>, reply:
 export async function deleteDomain(request: FastifyRequest<DeleteDomain>, reply: FastifyReply) {
     try {
         const { fqdn } = request.body
+        const { DNSServers } = await listSettings();
+        if (DNSServers) {
+            dns.setServers([DNSServers]);
+        }
         let ip;
         try {
             ip = await dns.resolve(fqdn);

apps/api/src/routes/api/v1/settings/types.ts

@@ -3,12 +3,14 @@ import { OnlyId } from "../../../../types"
 export interface SaveSettings {
     Body: {
         fqdn: string,
+        isAPIDebuggingEnabled: boolean,
         isRegistrationEnabled: boolean,
         dualCerts: boolean,
         minPort: number,
         maxPort: number,
         isAutoUpdateEnabled: boolean,
-        isDNSCheckEnabled: boolean
+        isDNSCheckEnabled: boolean,
+        DNSServers: string
     }
 }
 export interface DeleteDomain {

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

@@ -3,8 +3,7 @@ import cuid from "cuid";
 import crypto from "crypto";
 import { encrypt, errorHandler, getUIUrl, isDev, prisma } from "../../../lib/common";
 import { checkContainer, removeContainer } from "../../../lib/docker";
-import { scheduler } from "../../../lib/scheduler";
+import { createdBranchDatabase, getApplicationFromDBWebhook, removeBranchDatabase } from "../../api/v1/applications/handlers";
-import { getApplicationFromDBWebhook } from "../../api/v1/applications/handlers";
 
 import type { FastifyReply, FastifyRequest } from "fastify";
 import type { GitHubEvents, InstallGithub } from "./types";
@@ -67,7 +66,6 @@ export async function configureGitHubApp(request, reply) {
 }
 export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promise<any> {
     try {
-        const buildId = cuid();
         const allowedGithubEvents = ['push', 'pull_request'];
         const allowedActions = ['opened', 'reopened', 'synchronize', 'closed'];
         const githubEvent = request.headers['x-github-event']?.toString().toLowerCase();
@@ -87,9 +85,11 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
         if (!projectId || !branch) {
             throw { status: 500, message: 'Cannot parse projectId or branch from the webhook?!' }
         }
-        const applicationFound = await getApplicationFromDBWebhook(projectId, branch);
+        const applicationsFound = await getApplicationFromDBWebhook(projectId, branch);
-        if (applicationFound) {
+        if (applicationsFound && applicationsFound.length > 0) {
-            const webhookSecret = applicationFound.gitSource.githubApp.webhookSecret || null;
+            for (const application of applicationsFound) {
+                const buildId = cuid();
+                const webhookSecret = application.gitSource.githubApp.webhookSecret || null;
                 //@ts-ignore
                 const hmac = crypto.createHmac('sha256', webhookSecret);
                 const digest = Buffer.from(
@@ -104,67 +104,60 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
                     };
                 }
 
-
                 if (githubEvent === 'push') {
-                if (!applicationFound.configHash) {
+                    if (!application.configHash) {
                         const configHash = crypto
                             //@ts-ignore
                             .createHash('sha256')
                             .update(
                                 JSON.stringify({
-                                buildPack: applicationFound.buildPack,
+                                    buildPack: application.buildPack,
-                                port: applicationFound.port,
+                                    port: application.port,
-                                exposePort: applicationFound.exposePort,
+                                    exposePort: application.exposePort,
-                                installCommand: applicationFound.installCommand,
+                                    installCommand: application.installCommand,
-                                buildCommand: applicationFound.buildCommand,
+                                    buildCommand: application.buildCommand,
-                                startCommand: applicationFound.startCommand
+                                    startCommand: application.startCommand
                                 })
                             )
                             .digest('hex');
-                    await prisma.application.updateMany({
+                        await prisma.application.update({
-                        where: { branch, projectId },
+                            where: { id: application.id },
                             data: { configHash }
                         });
                     }
+
                     await prisma.application.update({
-                    where: { id: applicationFound.id },
+                        where: { id: application.id },
                         data: { updatedAt: new Date() }
                     });
                     await prisma.build.create({
                         data: {
                             id: buildId,
-                        applicationId: applicationFound.id,
+                            applicationId: application.id,
-                        destinationDockerId: applicationFound.destinationDocker.id,
+                            destinationDockerId: application.destinationDocker.id,
-                        gitSourceId: applicationFound.gitSource.id,
+                            gitSourceId: application.gitSource.id,
-                        githubAppId: applicationFound.gitSource.githubApp?.id,
+                            githubAppId: application.gitSource.githubApp?.id,
-                        gitlabAppId: applicationFound.gitSource.gitlabApp?.id,
+                            gitlabAppId: application.gitSource.gitlabApp?.id,
                             status: 'queued',
                             type: 'webhook_commit'
                         }
                     });
-                scheduler.workers.get('deployApplication').postMessage({
+                    console.log(`Webhook for ${application.name} queued.`)
-                    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)) {
                         throw { status: 500, message: 'Action not allowed.' }
                     }
 
-                if (applicationFound.settings.previews) {
+                    if (application.settings.previews) {
-                    if (applicationFound.destinationDockerId) {
+                        if (application.destinationDockerId) {
                             const isRunning = await checkContainer(
                                 {
-                                dockerId: applicationFound.destinationDocker.id,
+                                    dockerId: application.destinationDocker.id,
-                                container: applicationFound.id
+                                    container: application.id
                                 }
                             );
                             if (!isRunning) {
@@ -177,47 +170,54 @@ export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promi
                             pullmergeRequestAction === 'synchronize'
                         ) {
                             await prisma.application.update({
-                            where: { id: applicationFound.id },
+                                where: { id: application.id },
                                 data: { updatedAt: new Date() }
                             });
+                            if (application.connectedDatabase && pullmergeRequestAction === 'opened' || pullmergeRequestAction === 'reopened') {
+                                // Coolify hosted database
+                                if (application.connectedDatabase.databaseId) {
+                                    const databaseId = application.connectedDatabase.databaseId;
+                                    const database = await prisma.database.findUnique({ where: { id: databaseId } });
+                                    if (database) {
+                                        await createdBranchDatabase(database, application.connectedDatabase.hostedDatabaseDBName, pullmergeRequestId);
+                                    }
+                                }
+                            }
                             await prisma.build.create({
                                 data: {
                                     id: buildId,
-                                applicationId: applicationFound.id,
+                                    pullmergeRequestId,
-                                destinationDockerId: applicationFound.destinationDocker.id,
+                                    sourceBranch,
-                                gitSourceId: applicationFound.gitSource.id,
+                                    applicationId: application.id,
-                                githubAppId: applicationFound.gitSource.githubApp?.id,
+                                    destinationDockerId: application.destinationDocker.id,
-                                gitlabAppId: applicationFound.gitSource.gitlabApp?.id,
+                                    gitSourceId: application.gitSource.id,
+                                    githubAppId: application.gitSource.githubApp?.id,
+                                    gitlabAppId: application.gitSource.gitlabApp?.id,
                                     status: 'queued',
                                     type: 'webhook_pr'
                                 }
                             });
-                        scheduler.workers.get('deployApplication').postMessage({
-                            build_id: buildId,
-                            type: 'webhook_pr',
-                            ...applicationFound,
-                            sourceBranch,
-                            pullmergeRequestId
-                        });
 
-                        return {
+
-                            message: 'Queued. Thank you!'
-                        };
                         } else if (pullmergeRequestAction === 'closed') {
-                        if (applicationFound.destinationDockerId) {
+                            if (application.destinationDockerId) {
-                            const id = `${applicationFound.id}-${pullmergeRequestId}`;
+                                const id = `${application.id}-${pullmergeRequestId}`;
-                            await removeContainer({ id, dockerId: applicationFound.destinationDocker.id });
+                                try {
+                                    await removeContainer({ id, dockerId: application.destinationDocker.id });
+                                } catch (error) { }
+                            }
+                            if (application.connectedDatabase.databaseId) {
+                                const databaseId = application.connectedDatabase.databaseId;
+                                const database = await prisma.database.findUnique({ where: { id: databaseId } });
+                                if (database) {
+                                    await removeBranchDatabase(database, pullmergeRequestId);
+                                }
+                            }
+                        }
                     }
-                        return {
-                            message: 'Removed preview. Thank you!'
-                        };
-                    }
-                } else {
-                    throw { status: 500, message: 'Pull request previews are not enabled.' }
                 }
             }
         }
-        throw { status: 500, message: 'Not handled event.' }
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }

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

@@ -2,9 +2,8 @@ import axios from "axios";
 import cuid from "cuid";
 import crypto from "crypto";
 import type { FastifyReply, FastifyRequest } from "fastify";
-import { errorHandler, getAPIUrl, isDev, listSettings, prisma } from "../../../lib/common";
+import { errorHandler, getAPIUrl, getUIUrl, isDev, listSettings, prisma } from "../../../lib/common";
 import { checkContainer, removeContainer } from "../../../lib/docker";
-import { scheduler } from "../../../lib/scheduler";
 import { getApplicationFromDB, getApplicationFromDBWebhook } from "../../api/v1/applications/handlers";
 
 import type { ConfigureGitLabApp, GitLabEvents } from "./types";
@@ -30,7 +29,7 @@ export async function configureGitLabApp(request: FastifyRequest<ConfigureGitLab
         });
         const { data } = await axios.post(`${htmlUrl}/oauth/token`, params)
         if (isDev) {
-            return reply.redirect(`${getAPIUrl()}/webhooks/success?token=${data.access_token}`)
+            return reply.redirect(`${getUIUrl()}/webhooks/success?token=${data.access_token}`)
         }
         return reply.redirect(`/webhooks/success?token=${data.access_token}`)
     } catch ({ status, message, ...other }) {
@@ -40,65 +39,56 @@ export async function configureGitLabApp(request: FastifyRequest<ConfigureGitLab
 export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
     const { object_kind: objectKind, ref, project_id } = request.body
     try {
-        const buildId = cuid();
 
         const allowedActions = ['opened', 'reopen', 'close', 'open', 'update'];
 
         const webhookToken = request.headers['x-gitlab-token'];
-        if (!webhookToken) {
+        if (!webhookToken && !isDev) {
             throw { status: 500, message: 'Invalid webhookToken.' }
         }
         if (objectKind === 'push') {
             const projectId = Number(project_id);
             const branch = ref.split('/')[2];
-            const applicationFound = await getApplicationFromDBWebhook(projectId, branch);
+            const applicationsFound = await getApplicationFromDBWebhook(projectId, branch);
-            if (applicationFound) {
+            if (applicationsFound && applicationsFound.length > 0) {
-                if (!applicationFound.configHash) {
+                for (const application of applicationsFound) {
+                    const buildId = cuid();
+                    if (!application.configHash) {
                         const configHash = crypto
                             .createHash('sha256')
                             .update(
                                 JSON.stringify({
-                                buildPack: applicationFound.buildPack,
+                                    buildPack: application.buildPack,
-                                port: applicationFound.port,
+                                    port: application.port,
-                                exposePort: applicationFound.exposePort,
+                                    exposePort: application.exposePort,
-                                installCommand: applicationFound.installCommand,
+                                    installCommand: application.installCommand,
-                                buildCommand: applicationFound.buildCommand,
+                                    buildCommand: application.buildCommand,
-                                startCommand: applicationFound.startCommand
+                                    startCommand: application.startCommand
                                 })
                             )
                             .digest('hex');
-                    await prisma.application.updateMany({
+                        await prisma.application.update({
-                        where: { branch, projectId },
+                            where: { id: application.id },
                             data: { configHash }
                         });
                     }
                     await prisma.application.update({
-                    where: { id: applicationFound.id },
+                        where: { id: application.id },
                         data: { updatedAt: new Date() }
                     });
                     await prisma.build.create({
                         data: {
                             id: buildId,
-                        applicationId: applicationFound.id,
+                            applicationId: application.id,
-                        destinationDockerId: applicationFound.destinationDocker.id,
+                            destinationDockerId: application.destinationDocker.id,
-                        gitSourceId: applicationFound.gitSource.id,
+                            gitSourceId: application.gitSource.id,
-                        githubAppId: applicationFound.gitSource.githubApp?.id,
+                            githubAppId: application.gitSource.githubApp?.id,
-                        gitlabAppId: applicationFound.gitSource.gitlabApp?.id,
+                            gitlabAppId: application.gitSource.gitlabApp?.id,
                             status: 'queued',
                             type: 'webhook_commit'
                         }
                     });
-
+                }
-                scheduler.workers.get('deployApplication').postMessage({
-                    build_id: buildId,
-                    type: 'webhook_commit',
-                    ...applicationFound
-                });
-
-                return {
-                    message: 'Queued. Thank you!'
-                };
-
             }
         } else if (objectKind === 'merge_request') {
             const { object_attributes: { work_in_progress: isDraft, action, source_branch: sourceBranch, target_branch: targetBranch, iid: pullmergeRequestId }, project: { id } } = request.body
@@ -111,21 +101,23 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
                 throw { status: 500, message: 'Draft MR, do nothing.' }
             }
 
-            const applicationFound = await getApplicationFromDBWebhook(projectId, targetBranch);
+            const applicationsFound = await getApplicationFromDBWebhook(projectId, targetBranch);
-            if (applicationFound) {
+            if (applicationsFound && applicationsFound.length > 0) {
-                if (applicationFound.settings.previews) {
+                for (const application of applicationsFound) {
-                    if (applicationFound.destinationDockerId) {
+                    const buildId = cuid();
+                    if (application.settings.previews) {
+                        if (application.destinationDockerId) {
                             const isRunning = await checkContainer(
                                 {
-                                dockerId: applicationFound.destinationDocker.id,
+                                    dockerId: application.destinationDocker.id,
-                                container: applicationFound.id
+                                    container: application.id
                                 }
                             );
                             if (!isRunning) {
                                 throw { status: 500, message: 'Application not running.' }
                             }
                         }
-                    if (!isDev && applicationFound.gitSource.gitlabApp.webhookToken !== webhookToken) {
+                        if (!isDev && application.gitSource.gitlabApp.webhookToken !== webhookToken) {
                             throw { status: 500, message: 'Invalid webhookToken. Are you doing something nasty?!' }
                         }
                         if (
@@ -135,47 +127,37 @@ export async function gitLabEvents(request: FastifyRequest<GitLabEvents>) {
                             action === 'update'
                         ) {
                             await prisma.application.update({
-                            where: { id: applicationFound.id },
+                                where: { id: application.id },
                                 data: { updatedAt: new Date() }
                             });
                             await prisma.build.create({
                                 data: {
                                     id: buildId,
-                                applicationId: applicationFound.id,
+                                    pullmergeRequestId: pullmergeRequestId.toString(),
-                                destinationDockerId: applicationFound.destinationDocker.id,
+                                    sourceBranch,
-                                gitSourceId: applicationFound.gitSource.id,
+                                    applicationId: application.id,
-                                githubAppId: applicationFound.gitSource.githubApp?.id,
+                                    destinationDockerId: application.destinationDocker.id,
-                                gitlabAppId: applicationFound.gitSource.gitlabApp?.id,
+                                    gitSourceId: application.gitSource.id,
+                                    githubAppId: application.gitSource.githubApp?.id,
+                                    gitlabAppId: application.gitSource.gitlabApp?.id,
                                     status: 'queued',
                                     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) {
+                            if (application.destinationDockerId) {
-                            const id = `${applicationFound.id}-${pullmergeRequestId}`;
+                                const id = `${application.id}-${pullmergeRequestId}`;
-                            const engine = applicationFound.destinationDocker.engine;
+                                await removeContainer({ id, dockerId: application.destinationDocker.id });
-                            await removeContainer({ id, dockerId: applicationFound.destinationDocker.id });
+                            }
+
                         }
-                        return {
-                            message: 'Removed preview. Thank you!'
-                        };
                     }
                 }
-                throw { status: 500, message: 'Merge request previews are not enabled.' }
             }
         }
-        throw { status: 500, message: 'Not handled event.' }
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }

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

@@ -1,6 +1,9 @@
 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";
+import { OnlyId } from "../../../types";
 
 function configureMiddleware(
 	{ id, container, port, domain, nakedDomain, isHttps, isWWW, isDualCerts, scriptName, type },
@@ -23,7 +26,30 @@ function configureMiddleware(
 				]
 			}
 		};
+		if (type === 'appwrite') {
+			traefik.http.routers[`${id}-realtime`] = {
+				entrypoints: ['websecure'],
+				rule: `(Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`)) && PathPrefix(\`/v1/realtime\`)`,
+				service: `${`${id}-realtime`}`,
+				tls: {
+					domains: {
+						main: `${domain}`
+					}
+				},
+				middlewares: []
+			};
 
+
+			traefik.http.services[`${id}-realtime`] = {
+				loadbalancer: {
+					servers: [
+						{
+							url: `http://${container}-realtime:${port}`
+						}
+					]
+				}
+			};
+		}
 		if (isDualCerts) {
 			traefik.http.routers[`${id}-secure`] = {
 				entrypoints: ['websecure'],
@@ -110,6 +136,23 @@ function configureMiddleware(
 				]
 			}
 		};
+		if (type === 'appwrite') {
+			traefik.http.routers[`${id}-realtime`] = {
+				entrypoints: ['web'],
+				rule: `(Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`)) && PathPrefix(\`/v1/realtime\`)`,
+				service: `${id}-realtime`,
+				middlewares: []
+			};
+			traefik.http.services[`${id}-realtime`] = {
+				loadbalancer: {
+					servers: [
+						{
+							url: `http://${container}-realtime:${port}`
+						}
+					]
+				}
+			};
+		}
 
 		if (!isDualCerts) {
 			if (isWWW) {
@@ -234,7 +277,7 @@ export async function traefikConfiguration(request, reply) {
 		}
 		const services: any = await prisma.service.findMany({
 			where: { destinationDocker: { remoteEngine: false } },
-			include,
+			include: includeServices,
 			orderBy: { createdAt: 'desc' },
 		});
 
@@ -484,12 +527,11 @@ export async function traefikOtherConfiguration(request: FastifyRequest<TraefikO
 		}
 		throw { status: 500 }
 	} catch ({ status, message }) {
-		console.log(status, message);
 		return errorHandler({ status, message })
 	}
 }
 
-export async function remoteTraefikConfiguration(request: FastifyRequest) {
+export async function remoteTraefikConfiguration(request: FastifyRequest<OnlyId>) {
 	const { id } = request.params
 	try {
 		const traefik = {
@@ -591,7 +633,7 @@ export async function remoteTraefikConfiguration(request: FastifyRequest) {
 		}
 		const services: any = await prisma.service.findMany({
 			where: { destinationDocker: { id } },
-			include,
+			include: includeServices,
 			orderBy: { createdAt: 'desc' }
 		});
 

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

@@ -1,4 +1,5 @@
 import { FastifyPluginAsync } from 'fastify';
+import { OnlyId } from '../../../types';
 import { remoteTraefikConfiguration, traefikConfiguration, traefikOtherConfiguration } from './handlers';
 import { TraefikOtherConfiguration } from './types';
 
@@ -6,7 +7,7 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
     fastify.get('/main.json', async (request, reply) => traefikConfiguration(request, reply));
     fastify.get<TraefikOtherConfiguration>('/other.json', async (request, reply) => traefikOtherConfiguration(request));
 
-    fastify.get('/remote/:id', async (request) => remoteTraefikConfiguration(request));
+    fastify.get<OnlyId>('/remote/:id', async (request) => remoteTraefikConfiguration(request));
 };
 
 export default root;

apps/api/src/types.ts

@@ -36,4 +36,3 @@ export interface SaveDatabaseSettings extends OnlyId {
 }
 
 
-

apps/i18n/.env.example

@@ -0,0 +1,4 @@
+WEBLATE_INSTANCE_URL=http://localhost
+WEBLATE_COMPONENT_NAME=coolify
+WEBLATE_TOKEN=
+TRANSLATION_DIR=

apps/i18n/.gitignore

@@ -0,0 +1 @@
+locales/*

apps/i18n/index.mjs

@@ -0,0 +1,63 @@
+import dotenv from 'dotenv';
+dotenv.config()
+import fs from 'fs'
+import path from 'path'
+import { fileURLToPath } from 'url';
+import Gettext from 'node-gettext'
+import { po } from 'gettext-parser'
+import got from 'got';
+const __filename = fileURLToPath(import.meta.url);
+
+const __dirname = path.dirname(__filename);
+
+const weblateInstanceURL = process.env.WEBLATE_INSTANCE_URL;
+const weblateComponentName = process.env.WEBLATE_COMPONENT_NAME
+const token = process.env.WEBLATE_TOKEN;
+
+const translationsDir = process.env.TRANSLATION_DIR;
+const translationsPODir = './locales';
+const locales = []
+const domain = 'locale'
+
+const translations = await got(`${weblateInstanceURL}/api/components/${weblateComponentName}/glossary/translations/?format=json`, {
+    headers: {
+        "Authorization": `Token ${token}`
+    }
+}).json()
+for (const translation of translations.results) {
+    const code = translation.language_code
+    locales.push(code)
+
+    const fileUrl = translation.file_url.replace('=json', '=po')
+    const file = await got(fileUrl, {
+        headers: {
+            "Authorization": `Token ${token}`
+        }
+    }).text()
+    fs.writeFileSync(path.join(__dirname, translationsPODir, domain + '-' + code + '.po'), file)
+}
+
+
+const gt = new Gettext()
+
+locales.forEach((locale) => {
+    let json = {}
+    const fileName = `${domain}-${locale}.po`
+    const translationsFilePath = path.join(translationsPODir, fileName)
+    const translationsContent = fs.readFileSync(translationsFilePath)
+
+    const parsedTranslations = po.parse(translationsContent)
+    const a = gt.gettext(parsedTranslations)
+    for (const [key, value] of Object.entries(a)) {
+        if (key === 'translations') {
+            for (const [key1, value1] of Object.entries(value)) {
+                if (key1 !== '') {
+                    for (const [key2, value2] of Object.entries(value1)) {
+                        json[value2.msgctxt] = value2.msgstr[0]
+                    }
+                }
+            }
+        }
+    }
+    fs.writeFileSync(`${translationsDir}/${locale}.json`, JSON.stringify(json))
+})

apps/i18n/package.json

@@ -0,0 +1,15 @@
+{
+	"name": "i18n-converter",
+	"description": "Convert Weblate translations to sveltekit-i18n",
+	"license": "Apache-2.0",
+	"scripts": {
+		"translate": "node index.mjs"
+	},
+	"type": "module",
+	"dependencies": {
+		"node-gettext": "3.0.0",
+		"gettext-parser": "6.0.0",
+		"got": "12.3.1",
+		"dotenv": "16.0.2"
+	}
+}

apps/ui/README.md

@@ -1,38 +0,0 @@
-# create-svelte
-
-Everything you need to build a Svelte project, powered by [`create-svelte`](https://github.com/sveltejs/kit/tree/master/packages/create-svelte).
-
-## Creating a project
-
-If you're seeing this, you've probably already done this step. Congrats!
-
-```bash
-# create a new project in the current directory
-npm init svelte
-
-# create a new project in my-app
-npm init svelte my-app
-```
-
-## Developing
-
-Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
-
-```bash
-npm run dev
-
-# or start the server and open the app in a new browser tab
-npm run dev -- --open
-```
-
-## Building
-
-To create a production version of your app:
-
-```bash
-npm run build
-```
-
-You can preview the production build with `npm run preview`.
-
-> To deploy your app, you may need to install an [adapter](https://kit.svelte.dev/docs/adapters) for your target environment.

apps/ui/package.json

@@ -1,13 +1,12 @@
 {
-	"name": "coolify-ui",
+	"name": "ui",
 	"description": "Coolify's SvelteKit UI",
-	"license": "AGPL-3.0",
+	"license": "Apache-2.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
 		"package": "svelte-kit package",
 		"preview": "svelte-kit preview",
-		"prepare": "svelte-kit sync",
 		"test": "playwright test",
 		"check": "svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
@@ -15,32 +14,38 @@
 		"format": "prettier --write --plugin-search-dir=. ."
 	},
 	"devDependencies": {
-		"@playwright/test": "1.23.4",
+		"@floating-ui/dom": "1.0.1",
-		"@sveltejs/kit": "1.0.0-next.377",
+		"@playwright/test": "1.25.1",
+		"@popperjs/core": "2.11.6",
+		"@sveltejs/kit": "1.0.0-next.405",
 		"@types/js-cookie": "3.0.2",
-		"@typescript-eslint/eslint-plugin": "5.30.6",
+		"@typescript-eslint/eslint-plugin": "5.36.1",
-		"@typescript-eslint/parser": "5.30.6",
+		"@typescript-eslint/parser": "5.36.1",
-		"autoprefixer": "10.4.7",
+		"autoprefixer": "10.4.8",
-		"eslint": "8.20.0",
+		"classnames": "2.3.1",
+		"eslint": "8.23.0",
 		"eslint-config-prettier": "8.5.0",
 		"eslint-plugin-svelte3": "4.0.0",
-		"postcss": "8.4.14",
+		"flowbite": "1.5.2",
+		"flowbite-svelte": "0.26.2",
+		"postcss": "8.4.16",
 		"prettier": "2.7.1",
 		"prettier-plugin-svelte": "2.7.0",
-		"svelte": "3.49.0",
+		"svelte": "3.50.0",
-		"svelte-check": "2.8.0",
+		"svelte-check": "2.9.0",
 		"svelte-preprocess": "4.10.7",
-		"tailwindcss": "3.1.6",
+		"tailwindcss": "3.1.8",
 		"tailwindcss-scrollbar": "0.1.0",
 		"tslib": "2.4.0",
-		"typescript": "4.7.4",
+		"typescript": "4.8.2",
-		"vite": "3.0.1"
+		"vite": "3.1.0"
 	},
 	"type": "module",
 	"dependencies": {
-		"@sveltejs/adapter-static": "1.0.0-next.37",
+		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@zerodevx/svelte-toast": "0.7.2",
+		"@tailwindcss/typography": "^0.5.7",
 		"cuid": "2.1.8",
+		"daisyui": "2.24.2",
 		"js-cookie": "3.0.1",
 		"p-limit": "4.0.0",
 		"svelte-select": "4.4.7",

apps/ui/src/app.d.ts

@@ -22,3 +22,4 @@ declare namespace App {
 
 declare const GITPOD_WORKSPACE_URL: string
 
+  

apps/ui/src/app.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html data-theme="coollabs" lang="en">
 	<head>
 		<meta charset="utf-8" />
 		<link rel="icon" href="%sveltekit.assets%/favicon.png" />

apps/ui/src/lib/api.ts

@@ -7,10 +7,12 @@ export function getAPIUrl() {
 		const newURL = href.replace('https://', 'https://3001-').replace(/\/$/, '')
 		return newURL
 	}
+	if (CODESANDBOX_HOST) {
+		     return `https://${CODESANDBOX_HOST.replace(/\$PORT/,'3001')}`
+	}
 	return dev ? 'http://localhost:3001' : 'http://localhost:3000';
 }
 export function getWebhookUrl(type: string) {
-	console.log(GITPOD_WORKSPACE_URL)
 	if (GITPOD_WORKSPACE_URL) {
 		const { href } = new URL(GITPOD_WORKSPACE_URL)
 		const newURL = href.replace('https://', 'https://3001-').replace(/\/$/, '')
@@ -21,6 +23,15 @@ export function getWebhookUrl(type: string) {
 			return `${newURL}/webhooks/gitlab/events`
 		}
 	}
+	if (CODESANDBOX_HOST) {
+		const newURL = `https://${CODESANDBOX_HOST.replace(/\$PORT/,'3001')}`
+		if (type === 'github') {
+			return `${newURL}/webhooks/github/events`
+		}
+		if (type === 'gitlab') {
+			return `${newURL}/webhooks/gitlab/events`
+		}
+	}
 	return `https://webhook.site/0e5beb2c-4e9b-40e2-a89e-32295e570c21/events`;
 }
 async function send({

apps/ui/src/lib/common.ts

@@ -1,165 +1,4 @@
-import { toast } from '@zerodevx/svelte-toast';
+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.5.1'],
-		recommendedVersion: 'v2.5.1',
-		ports: {
-			main: 8080
-		}
-	},
-	{
-		name: 'fider',
-		fancyName: 'Fider',
-		baseImage: 'getfider/fider',
-		images: ['postgres:12-alpine'],
-		versions: ['stable'],
-		recommendedVersion: 'stable',
-		ports: {
-			main: 3000
-		}
-	},
-	// {
-	//     name: 'moodle',
-	//     fancyName: 'Moodle',
-	//     baseImage: 'bitnami/moodle',
-	//     images: [],
-	//     versions: ['latest', 'v4.0.2'],
-	//     recommendedVersion: 'latest',
-	//     ports: {
-	//         main: 8080
-	//     }
-	// }
-];
 
 export const asyncSleep = (delay: number) =>
 	new Promise((resolve) => setTimeout(resolve, delay));
@@ -167,12 +6,20 @@ export const asyncSleep = (delay: number) =>
 export function errorNotification(error: any): void {
 	if (error.message) {
 		if (error.message === 'Cannot read properties of undefined (reading \'postMessage\')') {
-			toast.push('Currently there is background process in progress. Please try again later.');
+			return addToast({
-			return;
+				message: 'Currently there is background process in progress. Please try again later.',
+				type: 'error',
+			});
 		}
-		toast.push(error.message);
+		addToast({
+			message: error.message,
+			type: 'error',
+		});
 	} else {
-		toast.push('Ooops, something is not okay, are you okay?');
+		addToast({
+			message: 'Ooops, something is not okay, are you okay?',
+			type: 'error',
+		});
 	}
 	console.error(JSON.stringify(error));
 }
@@ -210,7 +57,7 @@ export const staticDeployments = [
 	'astro',
 	'eleventy'
 ];
-export const notNodeDeployments = ['php', 'docker', 'rust', 'python', 'deno', 'laravel'];
+export const notNodeDeployments = ['php', 'docker', 'rust', 'python', 'deno', 'laravel', 'heroku'];
 
 
 export function generateRemoteEngine(destination: any) {
@@ -224,44 +71,6 @@ export function changeQueryParams(buildId: string) {
 	return history.pushState(null, null, '?' + queryParams.toString());
 }
 
-export const supportedDatabaseTypesAndVersions = [
-	{
-		name: 'mongodb',
-		fancyName: 'MongoDB',
-		baseImage: 'bitnami/mongodb',
-		versions: ['5.0', '4.4', '4.2']
-	},
-	{ name: 'mysql', fancyName: 'MySQL', baseImage: 'bitnami/mysql', versions: ['8.0', '5.7'] },
-	{
-		name: 'mariadb',
-		fancyName: 'MariaDB',
-		baseImage: 'bitnami/mariadb',
-		versions: ['10.7', '10.6', '10.5', '10.4', '10.3', '10.2']
-	},
-	{
-		name: 'postgresql',
-		fancyName: 'PostgreSQL',
-		baseImage: 'bitnami/postgresql',
-		versions: ['14.2.0', '13.6.0', '12.10.0	', '11.15.0', '10.20.0']
-	},
-	{
-		name: 'redis',
-		fancyName: 'Redis',
-		baseImage: 'bitnami/redis',
-		versions: ['6.2', '6.0', '5.0']
-	},
-	{ name: 'couchdb', fancyName: 'CouchDB', baseImage: 'bitnami/couchdb', versions: ['3.2.1'] }
-];
-
-export const 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/CopyPasswordField.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { browser } from '$app/env';
-	import { toast } from '@zerodevx/svelte-toast';
+	import { addToast } from '$lib/store';
 	let showPassword = false;
 
 	export let value: string;
@@ -9,7 +9,7 @@
 	export let readonly = false;
 	export let textarea = false;
 	export let required = false;
-	export let pattern: string|null|undefined = null;
+	export let pattern: string | null | undefined = null;
 	export let id: string;
 	export let name: string;
 	export let placeholder = '';
@@ -20,7 +20,10 @@
 	function copyToClipboard() {
 		if (isHttps && navigator.clipboard) {
 			navigator.clipboard.writeText(value);
-			toast.push('Copied to clipboard.');
+			addToast({
+				message: 'Copied to clipboard.',
+				type: 'success'
+			});
 		}
 	}
 </script>

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

@@ -0,0 +1,32 @@
+<script lang="ts">
+	import Tooltip from './Tooltip.svelte';
+	export let url = 'https://docs.coollabs.io';
+	let id =
+		'cool-' +
+		url
+			.split('')
+			.map((c) => c.charCodeAt(0).toString(16).padStart(2, '0'))
+			.join('')
+			.slice(-16);
+</script>
+
+<a {id} href={url} target="_blank" class="icons inline-block text-pink-500 cursor-pointer text-xs">
+	<svg
+		xmlns="http://www.w3.org/2000/svg"
+		class="w-6 h-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="M6 4h11a2 2 0 0 1 2 2v12a2 2 0 0 1 -2 2h-11a1 1 0 0 1 -1 -1v-14a1 1 0 0 1 1 -1m3 0v18"
+		/>
+		<line x1="13" y1="8" x2="15" y2="8" />
+		<line x1="13" y1="12" x2="15" y2="12" />
+	</svg>
+</a>
+<Tooltip triggeredBy={`#${id}`}>See details in the documentation</Tooltip>

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

@@ -1,6 +1,31 @@
 <script lang="ts">
-	export let text: string;
+	import { onMount } from 'svelte';
-	export let customClass = 'max-w-[24rem]';
+
+	import Tooltip from './Tooltip.svelte';
+	export let explanation = '';
+	let id: any;
+	let self: any;
+	onMount(() => {
+		id = `info-${self.offsetLeft}-${self.offsetTop}`;
+	});
 </script>
 
-<div class="p-2 text-xs text-stone-400 {customClass}">{@html text}</div>
+<div {id} class="inline-block mx-2 text-pink-500 cursor-pointer" bind:this={self}>
+	<svg
+		fill="none"
+		height="18"
+		shape-rendering="geometricPrecision"
+		stroke="currentColor"
+		stroke-linecap="round"
+		stroke-linejoin="round"
+		stroke-width="1.5"
+		viewBox="0 0 24 24"
+		width="18"
+		><path d="M12 22c5.523 0 10-4.477 10-10S17.523 2 12 2 2 6.477 2 12s4.477 10 10 10z" /><path
+			d="M9.09 9a3 3 0 015.83 1c0 2-3 3-3 3"
+		/><circle cx="12" cy="17" r=".5" />
+	</svg>
+</div>
+{#if id}
+	<Tooltip triggeredBy={`#${id}`}>{@html explanation}</Tooltip>
+{/if}

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

@@ -1,6 +1,8 @@
 <script lang="ts">
-	import Explainer from '$lib/components/Explainer.svelte';
+	import Explaner from './Explainer.svelte';
+	import Tooltip from './Tooltip.svelte';
 
+	export let id: any;
 	export let setting: any;
 	export let title: any;
 	export let description: any;
@@ -8,22 +10,18 @@
 	export let disabled = false;
 	export let dataTooltip: any = null;
 	export let loading = false;
+	let triggeredBy = `#${id}`;
 </script>
 
 <div class="flex items-center py-4 pr-8">
 	<div class="flex w-96 flex-col">
-		<div class="text-xs font-bold text-stone-100 md:text-base">{title}</div>
+		<div class="text-xs font-bold text-stone-100 md:text-base">
-		<Explainer text={description} />
+			{title}<Explaner explanation={description} />
+		</div>
 	</div>
 </div>
-<div
+<div class:text-center={isCenter} class="flex justify-center">
-	class:tooltip={dataTooltip}
-	class:text-center={isCenter}
-	data-tooltip={dataTooltip}
-	class="flex justify-center"
->
 	<div
-		type="button"
 		on:click
 		aria-pressed="false"
 		class="relative mx-20 inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out"
@@ -31,6 +29,7 @@
 		class:bg-green-600={!loading && setting}
 		class:bg-stone-700={!loading && !setting}
 		class:bg-yellow-500={loading}
+		{id}
 	>
 		<span class="sr-only">Use setting</span>
 		<span
@@ -71,3 +70,7 @@
 		</span>
 	</div>
 </div>
+
+{#if dataTooltip}
+	<Tooltip {triggeredBy} placement="top">{dataTooltip}</Tooltip>
+{/if}

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

@@ -0,0 +1,6 @@
+<script lang="ts">
+	export let text: string;
+	export let customClass = 'max-w-[24rem]';
+</script>
+
+<div class="p-2 text-xs text-stone-400 {customClass}">{@html text}</div>

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

@@ -0,0 +1,59 @@
+<script>
+	import { createEventDispatcher } from 'svelte';
+	const dispatch = createEventDispatcher();
+	export let type = 'info';
+</script>
+
+<div
+	on:click={() => dispatch('click')}
+	on:mouseover={() => dispatch('pause')}
+	on:focus={() => dispatch('pause')}
+	on:mouseout={() => dispatch('resume')}
+	on:blur={() => dispatch('resume')}
+	class="alert shadow-lg text-white rounded hover:scale-105 transition-all duration-100 cursor-pointer"
+	class:bg-coollabs={type === 'success'}
+	class:alert-error={type === 'error'}
+	class:alert-info={type === 'info'}
+>
+	{#if type === 'success'}
+		<svg
+			xmlns="http://www.w3.org/2000/svg"
+			class="stroke-current flex-shrink-0 h-6 w-6"
+			fill="none"
+			viewBox="0 0 24 24"
+			><path
+				stroke-linecap="round"
+				stroke-linejoin="round"
+				stroke-width="2"
+				d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
+			/></svg
+		>
+	{:else if type === 'error'}
+		<svg
+			xmlns="http://www.w3.org/2000/svg"
+			class="stroke-current flex-shrink-0 h-6 w-6"
+			fill="none"
+			viewBox="0 0 24 24"
+			><path
+				stroke-linecap="round"
+				stroke-linejoin="round"
+				stroke-width="2"
+				d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"
+			/></svg
+		>
+	{:else if type === 'info'}
+		<svg
+			xmlns="http://www.w3.org/2000/svg"
+			fill="none"
+			viewBox="0 0 24 24"
+			class="stroke-current flex-shrink-0 w-6 h-6"
+			><path
+				stroke-linecap="round"
+				stroke-linejoin="round"
+				stroke-width="2"
+				d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+			/></svg
+		>
+	{/if}
+	<slot />
+</div>

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

@@ -0,0 +1,27 @@
+<script lang="ts">
+	import { fade } from 'svelte/transition';
+	import Toast from './Toast.svelte';
+
+	import { dismissToast, pauseToast, resumeToast, toasts } from '$lib/store';
+</script>
+
+{#if $toasts}
+	<section>
+		<article class="toast toast-top toast-end rounded-none" role="alert" transition:fade>
+			{#each $toasts as toast (toast.id)}
+				<Toast
+					type={toast.type}
+					on:resume={() => resumeToast(toast.id)}
+					on:pause={() => pauseToast(toast.id)}
+					on:click={() => dismissToast(toast.id)}>{@html toast.message}</Toast
+				>
+			{/each}
+		</article>
+	</section>
+{/if}
+
+<style lang="postcss">
+	section {
+		@apply fixed top-0 left-0 right-0 w-full flex flex-col mt-4 justify-center z-[1000];
+	}
+</style>

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

@@ -0,0 +1,8 @@
+<script lang="ts">
+	import { Tooltip } from 'flowbite-svelte';
+	export let placement = 'bottom';
+	export let color = 'bg-coollabs text-left';
+	export let triggeredBy = '#tooltip-default';
+</script>
+
+<Tooltip {triggeredBy} {placement} arrow={false} {color} style="custom"><slot /></Tooltip>

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

@@ -1,8 +1,7 @@
 <script lang="ts">
 	import { dev } from '$app/env';
 	import { get, post } from '$lib/api';
-	import { appSession, features } from '$lib/store';
+	import { addToast, appSession, features } from '$lib/store';
-	import { toast } from '@zerodevx/svelte-toast';
 	import { asyncSleep, errorNotification } from '$lib/common';
 	import { onMount } from 'svelte';
 
@@ -17,12 +16,15 @@
 		updateStatus.loading = true;
 		try {
 			if (dev) {
-				console.log(`updating to ${latestVersion}`);
 				await asyncSleep(4000);
 				return window.location.reload();
 			} else {
 				await post(`/update`, { type: 'update', latestVersion });
-				toast.push('Update completed.<br><br>Waiting for the new version to start...');
+				addToast({
+					message: 'Update completed.<br><br>Waiting for the new version to start...',
+					type: 'success'
+				});
+
 				let reachable = false;
 				let tries = 0;
 				do {
@@ -36,7 +38,10 @@
 					if (reachable) break;
 					tries++;
 				} while (!reachable || tries < 120);
-				toast.push('New version reachable. Reloading...');
+				addToast({
+					message: 'New version reachable. Reloading...',
+					type: 'success'
+				});
 				updateStatus.loading = false;
 				updateStatus.success = true;
 				await asyncSleep(3000);
@@ -75,9 +80,9 @@
 		{#if isUpdateAvailable}
 			<button
 				disabled={updateStatus.success === false}
-				title="Update available"
 				on:click={update}
-				class="icons tooltip-right bg-gradient-to-r from-purple-500 via-pink-500 to-red-500 text-white duration-75 hover:scale-105"
+				class="icons tooltip tooltip-right tooltip-primary bg-gradient-to-r from-purple-500 via-pink-500 to-red-500 text-white duration-75 hover:scale-105"
+				data-tip="Update Available!"
 			>
 				{#if updateStatus.loading}
 					<svg

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

@@ -19,13 +19,13 @@
 	};
 	let usageInterval: any;
 	let loading = {
-		usage: false
+		usage: false,
+		cleanup: false
 	};
-	import { appSession } from '$lib/store';
+	import { addToast, appSession } from '$lib/store';
 	import { onDestroy, onMount } from 'svelte';
 	import { get, post } from '$lib/api';
 	import { errorNotification } from '$lib/common';
-	import Trend from './Trend.svelte';
 	async function getStatus() {
 		if (loading.usage) return;
 		loading.usage = true;
@@ -33,6 +33,7 @@
 		usage = data.usage;
 		loading.usage = false;
 	}
+
 	onDestroy(() => {
 		clearInterval(usageInterval);
 	});
@@ -48,107 +49,99 @@
 			return errorNotification(error);
 		}
 	});
-
-	let warning = {
-		memory: false,
-		cpu: false,
-		disk: false
-	};
-	let trends = {
-		memory: 'stable',
-		cpu: 'stable',
-		disk: 'stable'
-	};
 	async function manuallyCleanupStorage() {
-		return await post('/internal/cleanup', {});
+		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>
 
-{#if $appSession.teamId === '0'}
+<div class="w-full">
-	<div class="px-6 text-2xl font-bold">Server Usage</div>
+	<div class="flex lg:flex-row flex-col gap-4">
-	<dl class="relative mt-5 grid grid-cols-1 gap-5 sm:grid-cols-3">
+		<h1 class="title lg:text-3xl">Hardware Details</h1>
-		<div class="overflow-hidden rounded px-4 py-5 text-center sm:p-6 sm:text-left">
+		<div class="flex lg:flex-row flex-col space-x-0 lg:space-x-2 space-y-2 lg:space-y-0">
-			<dt class="truncate text-sm font-medium text-white">Total Memory</dt>
+			{#if $appSession.teamId === '0'}
-			<dd class="mt-1 text-3xl font-semibold text-white">
+				<button on:click={manuallyCleanupStorage} class:loading={loading.cleanup} class="btn btn-sm"
-				{(usage?.memory.totalMemMb).toFixed(0)}<span class="text-sm">MB</span>
-			</dd>
-		</div>
-
-		<div class="overflow-hidden rounded px-4 py-5 text-center sm:p-6 sm:text-left">
-			<dt class="truncate text-sm font-medium text-white">Used Memory</dt>
-			<dd class="mt-1 text-3xl font-semibold text-white ">
-				{(usage?.memory.usedMemMb).toFixed(0)}<span class="text-sm">MB</span>
-			</dd>
-		</div>
-
-		<div
-			class="overflow-hidden rounded px-4 py-5 text-center sm:p-6 sm:text-left"
-			class:bg-red-500={warning.memory}
-		>
-			<dt class="truncate text-sm font-medium text-white">Free Memory</dt>
-			<dd class="mt-1 text-3xl font-semibold text-white">
-				{usage?.memory.freeMemPercentage}<span class="text-sm">%</span>
-				{#if !warning.memory}
-					<Trend trend={trends.memory} />
-				{/if}
-			</dd>
-		</div>
-	</dl>
-	<dl class="relative mt-5 grid grid-cols-1 gap-5 sm:grid-cols-3">
-		<div class="overflow-hidden rounded px-4 py-5 text-center sm:p-6 sm:text-left">
-			<dt class="truncate text-sm font-medium text-white">Total CPUs</dt>
-			<dd class="mt-1 text-3xl font-semibold text-white">
-				{usage?.cpu.count}
-			</dd>
-		</div>
-		<div
-			class="overflow-hidden rounded px-4 py-5 text-center sm:p-6 sm:text-left"
-			class:bg-red-500={warning.cpu}
-		>
-			<dt class="truncate text-sm font-medium text-white">CPU Usage</dt>
-			<dd class="mt-1 text-3xl font-semibold text-white">
-				{usage?.cpu.usage}<span class="text-sm">%</span>
-				{#if !warning.cpu}
-					<Trend trend={trends.cpu} />
-				{/if}
-			</dd>
-		</div>
-		<div class="overflow-hidden rounded px-4 py-5 text-center sm:p-6 sm:text-left">
-			<dt class="truncate text-sm font-medium text-white">Load Average (5/10/30mins)</dt>
-			<dd class="mt-1 text-3xl font-semibold text-white">
-				{usage?.cpu.load.join('/')}
-			</dd>
-		</div>
-	</dl>
-	<dl class="relative mt-5 grid grid-cols-1 gap-5 sm:grid-cols-3">
-		<div class="overflow-hidden rounded px-4 py-5 text-center sm:p-6 sm:text-left">
-			<dt class="truncate text-sm font-medium text-white">Total Disk</dt>
-			<dd class="mt-1 text-3xl font-semibold text-white">
-				{usage?.disk.totalGb}<span class="text-sm">GB</span>
-			</dd>
-		</div>
-		<div class="overflow-hidden rounded px-4 py-5 text-center sm:p-6 sm:text-left">
-			<dt class="truncate text-sm font-medium text-white">Used Disk</dt>
-			<dd class="mt-1 text-3xl font-semibold text-white">
-				{usage?.disk.usedGb}<span class="text-sm">GB</span>
-			</dd>
-			<button on:click={manuallyCleanupStorage} class="bg-coollabs hover:bg-coollabs-100"
 					>Cleanup Storage</button
 				>
-		</div>
-		<div
-			class="overflow-hidden rounded px-4 py-5 text-center sm:p-6 sm:text-left"
-			class:bg-red-500={warning.disk}
-		>
-			<dt class="truncate text-sm font-medium text-white">Free Disk</dt>
-			<dd class="mt-1 text-3xl font-semibold text-white">
-				{usage?.disk.freePercentage}<span class="text-sm">%</span>
-				{#if !warning.disk}
-					<Trend trend={trends.disk} />
 			{/if}
-			</dd>
 		</div>
-	</dl>
+	</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 text-2xl">
+					{(usage?.memory.totalMemMb).toFixed(0)}<span class="text-sm">MB</span>
+				</div>
+			</div>
 
-	<div class="px-6 pt-20 text-2xl font-bold">Resources</div>
+			<div class="stat">
-{/if}
+				<div class="stat-title">Used Memory</div>
+				<div class="stat-value text-2xl">
+					{(usage?.memory.usedMemMb).toFixed(0)}<span class="text-sm">MB</span>
+				</div>
+			</div>
+
+			<div class="stat">
+				<div class="stat-title">Free Memory</div>
+				<div class="stat-value text-2xl">
+					{usage?.memory.freeMemPercentage}<span class="text-sm">%</span>
+				</div>
+			</div>
+		</div>
+
+		<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">
+				<div class="stat-title">CPU Usage</div>
+				<div class="stat-value text-2xl">
+					{usage?.cpu.usage}<span class="text-sm">%</span>
+				</div>
+			</div>
+
+			<div class="stat">
+				<div class="stat-title">Load Average (5,10,30mins)</div>
+				<div class="stat-value text-2xl">{usage?.cpu.load}</div>
+			</div>
+		</div>
+		<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 text-2xl">
+					{usage?.disk.totalGb}<span class="text-sm">GB</span>
+				</div>
+			</div>
+
+			<div class="stat">
+				<div class="stat-title">Used Disk</div>
+				<div class="stat-value text-2xl">
+					{usage?.disk.usedGb}<span class="text-sm">GB</span>
+				</div>
+			</div>
+
+			<div class="stat">
+				<div class="stat-title">Free Disk</div>
+				<div class="stat-value text-2xl">
+					{usage?.disk.freePercentage}<span class="text-sm">%</span>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>

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

@@ -0,0 +1,43 @@
+<script lang="ts">
+	import * as Icons from '$lib/components/svg/applications';
+	export let application: any;
+	export let isAbsolute = true;
+</script>
+
+{#if application.buildPack?.toLowerCase() === 'rust'}
+	<Icons.Rust {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'node'}
+	<Icons.Nodejs {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'react'}
+	<Icons.React {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'svelte'}
+	<Icons.Svelte {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'vuejs'}
+	<Icons.Vuejs {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'php'}
+	<Icons.Php {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'python'}
+	<Icons.Python {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'static'}
+	<Icons.Static {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'nestjs'}
+	<Icons.Nestjs {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'nuxtjs'}
+	<Icons.Nuxtjs {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'nextjs'}
+	<Icons.Nextjs {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'gatsby'}
+	<Icons.Gatsby {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'docker'}
+	<Icons.Docker {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'astro'}
+	<Icons.Astro {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'eleventy'}
+	<Icons.Eleventy {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'deno'}
+	<Icons.Deno {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'laravel'}
+	<Icons.Laravel {isAbsolute} />
+{:else if application.buildPack?.toLowerCase() === 'heroku'}
+	<Icons.Heroku {isAbsolute} />
+{/if}

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

@@ -1,5 +1,9 @@
+<script lang="ts">
+	export let isAbsolute = true;
+</script>
+
 <svg
-	class="absolute top-0 left-0 -m-6 h-14 w-14"
+	class={isAbsolute ? 'absolute top-0 left-0 -m-6 h-14 w-14' : 'mx-auto w-8 h-8'}
 	viewBox="0 0 256 256"
 	fill="none"
 	xmlns="http://www.w3.org/2000/svg"

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

@@ -1,5 +1,11 @@
+<script lang="ts">
+	export let isAbsolute = true;
+</script>
+
 <svg
-	class="text-white-500 absolute top-0 left-0 -m-4 h-10 w-10"
+	class={isAbsolute
+		? 'absolute top-0 left-0 -m-4 h-10 w-10 text-white-500'
+		: 'mx-auto w-8 h-8 text-white-500'}
 	xmlns="http://www.w3.org/2000/svg"
 	aria-hidden="true"
 	focusable="false"

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

@@ -1,73 +1,9 @@
-<svg viewBox="0 0 128 128" class="absolute top-0 left-0 -m-8 h-16 w-16">
+<script lang="ts">
-	<g
+	export let isAbsolute = true;
-		><path
+</script>
-			fill-rule="evenodd"
+
-			clip-rule="evenodd"
+
-			fill="#3A4D54"
+<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'}>
-			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 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>
-		/><path
+	</svg>
-			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>