Merge pull request #529 from coollabsio/next

v3.2.2

.devcontainer/devcontainer.json

@@ -14,7 +14,14 @@
 	// Set *default* container specific settings.json values on container create.
 	"settings": {},
 	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": ["dbaeumer.vscode-eslint", "svelte.svelte-vscode"],
+	"extensions": [
+		"ms-azuretools.vscode-docker",
+		"dbaeumer.vscode-eslint",
+		"svelte.svelte-vscode",
+		"ardenivanov.svelte-intellisense",
+		"Prisma.prisma",
+		"bradlc.vscode-tailwindcss"
+	],
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [3000],
 	// Use 'postCreateCommand' to run commands after the container is created.

.dockerignore

@@ -8,4 +8,5 @@ package
 !.env.example
 dist
 client
-apps/api/db/*.db
+apps/api/db/*.db
+local-serve

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/config.yml

@@ -3,6 +3,6 @@ contact_links:
   - name: 🤔 Questions and Help
     url: https://discord.com/invite/6rDM4fkymF
     about: Reach out to us on discord or our github discussions page.
-  - name: 🙋‍♂️ service request
+  - 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

@@ -1,34 +1,28 @@
-name: release-coolify
+name: production-release
 
 on:
   release:
-    types: published
+    types: [published]
 
 jobs:
-  make-it-coolifyed:
+  making-something-cool:
     runs-on: ubuntu-latest
     steps:
-       -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v2
-       - 
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-       -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-       -
-        name: Login to DockerHub
-        uses: docker/login-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
+      - 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: .
@@ -37,3 +31,7 @@ jobs:
           tags: coollabsio/coolify:latest,coollabsio/coolify:${{steps.package-version.outputs.current-version}}
           cache-from: type=registry,ref=coollabsio/coolify:buildcache
           cache-to: type=registry,ref=coollabsio/coolify:buildcache,mode=max
+      - uses: sarisia/actions-status-discord@v1
+        if: always()
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_CHANNEL }}

.github/workflows/staging-release.yml

@@ -0,0 +1,35 @@
+name: staging-release
+
+on:
+  push:
+    branches:
+      - next
+
+jobs:
+  staging-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - 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: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: coollabsio/coolify:next
+          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next
+          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next,mode=max
+      - uses: sarisia/actions-status-discord@v1
+        if: always()
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_CHANNEL }}

.gitignore

@@ -8,4 +8,6 @@ package
 !.env.example
 dist
 client
-apps/api/db/*.db
+apps/api/db/*.db
+local-serve
+apps/api/db/migration.db-journal

.gitpod.yml

@@ -1,9 +1,13 @@
 # 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
 tasks:
-  - init: npm install && npm run build
-    command: npm run start
-
+  - init: pnpm install && pnpm db:push && pnpm db:seed
+    command: pnpm dev
 
+ports:
+  - port: 3001
+    visibility: public
+  - port: 3000
+    visibility: public

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine as build
+FROM node:18-alpine3.16 as build
 WORKDIR /app
 
 RUN apk add --no-cache curl
@@ -9,7 +9,7 @@ RUN pnpm install
 RUN pnpm build
 
 # Production build
-FROM node:18-alpine
+FROM node:18-alpine3.16
 WORKDIR /app
 ENV NODE_ENV production
 ARG TARGETPLATFORM
@@ -27,10 +27,14 @@ 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
-RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.3.4 -o ~/.docker/cli-plugins/docker-compose
+# 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
 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

LICENSE

@@ -1,661 +1,201 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-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
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  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
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-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
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  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
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-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.>
-    Copyright (C) <year>  <name of author>
-
-    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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    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/>.
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "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
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      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.
+
+   Copyright [2022] [Andras Bacsai]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,6 +1,32 @@
 # Coolify
 
-An open-source & self-hostable Heroku / Netlify alternative.
+An open-source & self-hostable Heroku / Netlify alternative
+(ARM support is in beta).
+
+## Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/coollabsio/contribute)]
+
+### Individuals
+
+<a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>
+
+### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. 
+
+<a href="https://opencollective.com/coollabsio/organization/0/website"><img src="https://opencollective.com/coollabsio/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/1/website"><img src="https://opencollective.com/coollabsio/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/2/website"><img src="https://opencollective.com/coollabsio/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/3/website"><img src="https://opencollective.com/coollabsio/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/4/website"><img src="https://opencollective.com/coollabsio/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/5/website"><img src="https://opencollective.com/coollabsio/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/coollabsio/organization/6/website"><img src="https://opencollective.com/coollabsio/organization/6/avatar.svg"></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
 
@@ -12,6 +38,8 @@ https://demo.coolify.io/
 
 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:
@@ -28,60 +56,65 @@ wget -q https://get.coollabs.io/coolify/install.sh -O install.sh; sudo bash ./in
 
 For more details goto the [docs](https://docs.coollabs.io/coolify/installation).
 
-## Features
+--- 
 
-ARM support is in beta!
+## Features
 
 ### Git Sources
 
-You can use the following Git Sources to be auto-deployed to your Coolifyt instance! (Self-hosted versions are also supported.)
+You can use the following Git Sources to be auto-deployed to your Coolify instance! (Self-hosted versions are also supported.)
 
-- Github
-- GitLab
-- Bitbucket (WIP)
+<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 (WIP)
-- Kubernetes (WIP)
+- Remote Docker Engine
 
 ### Applications
 
-These are the predefined build packs, but with the Docker build pack, you can host anything that is hostable with a single Dockerfile.
+Predefined build packs to cover the basic needs to deploy applications.
 
-- Static sites
-- NodeJS
-- VueJS
-- NuxtJS
-- NextJS
-- React/Preact
-- Gatsby
-- Svelte
-- PHP
-- Laravel
-- Rust
-- Docker
-- Python
-- Deno
+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:
 
-- MongoDB
-- MariaDB
-- MySQL
-- PostgreSQL
-- CouchDB
-- Redis
+<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>
 
-### One-click services
+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!
 
-You can host cool open-source services as well:
 
+### 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)
@@ -97,6 +130,9 @@ You can host cool open-source services as well:
 - [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.
@@ -108,9 +144,6 @@ A fresh installation is necessary. v2 and v3 are not compatible with v1.
 - Email: [andras@coollabs.io](mailto:andras@coollabs.io)
 - Discord: [Invitation](https://discord.gg/xhBCC7eGKw)
 
-## Contribute
-
-See [our contribution guide](./CONTRIBUTING.md).
 
 ## License
 

apps/api/.env.example

@@ -0,0 +1,9 @@
+COOLIFY_APP_ID=
+COOLIFY_SECRET_KEY="12341234123412341234123412341234 - 32 long"
+COOLIFY_DATABASE_URL=
+COOLIFY_SENTRY_DSN=
+
+COOLIFY_IS_ON=docker
+COOLIFY_WHITE_LABELED=false
+COOLIFY_WHITE_LABELED_ICON=
+COOLIFY_AUTO_UPDATE=

apps/api/nodemon.json

@@ -2,6 +2,6 @@
     "watch": ["src"],
     "ignore": ["src/**/*.test.ts"],
     "ext": "ts,mjs,json,graphql",
-    "exec": "rimraf build && esbuild `find src \\( -name '*.ts' \\) | grep -v client/` --platform=node --outdir=build --format=cjs && node build",
+    "exec": "rimraf build && esbuild `find src \\( -name '*.ts' \\)` --minify=true --platform=node --outdir=build --format=cjs  && node build",
     "legacyWatch": true
   }

apps/api/package.json

@@ -1,11 +1,12 @@
 {
-  "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",
     "db:studio": "prisma studio",
+    "db:migrate": "COOLIFY_DATABASE_URL=file:../db/migration.db prisma migrate dev --skip-seed --name",
     "dev": "nodemon",
     "build": "rimraf build && esbuild `find src \\( -name '*.ts' \\)| grep -v client/` --platform=node --outdir=build --format=cjs",
     "format": "prettier --write 'src/**/*.{js,ts,json,md}'",
@@ -14,51 +15,54 @@
   },
   "dependencies": {
     "@breejs/ts-worker": "2.0.0",
-    "@fastify/autoload": "5.0.0",
-    "@fastify/cookie": "7.0.0",
-    "@fastify/cors": "8.0.0",
-    "@fastify/env": "4.0.0",
-    "@fastify/jwt": "6.2.0",
-    "@fastify/static": "6.4.0",
+    "@fastify/autoload": "5.2.0",
+    "@fastify/cookie": "7.3.1",
+    "@fastify/cors": "8.1.0",
+    "@fastify/env": "4.1.0",
+    "@fastify/jwt": "6.3.2",
+    "@fastify/static": "6.5.0",
     "@iarna/toml": "2.2.5",
     "@prisma/client": "3.15.2",
     "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",
     "cuid": "2.1.8",
-    "dayjs": "1.11.3",
-    "dockerode": "3.3.2",
+    "dayjs": "1.11.4",
+    "dockerode": "3.3.3",
     "dotenv-extended": "2.9.0",
-    "fastify": "4.2.0",
-    "fastify-plugin": "3.0.1",
+    "fastify": "4.4.0",
+    "fastify-plugin": "4.1.0",
     "generate-password": "1.7.0",
     "get-port": "6.1.2",
-    "got": "12.1.0",
-    "is-ip": "4.0.0",
+    "got": "12.3.1",
+    "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-queue": "7.3.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.0.3",
+    "@types/node": "18.6.5",
     "@types/node-os-utils": "1.3.0",
-    "@typescript-eslint/eslint-plugin": "5.30.5",
-    "@typescript-eslint/parser": "5.30.5",
-    "esbuild": "0.14.48",
-    "eslint": "8.19.0",
+    "@typescript-eslint/eslint-plugin": "5.33.0",
+    "@typescript-eslint/parser": "5.33.0",
+    "esbuild": "0.15.0",
+    "eslint": "8.21.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",
     "rimraf": "3.0.2",
-    "tsconfig-paths": "4.0.0",
+    "tsconfig-paths": "4.1.0",
     "typescript": "4.7.4"
   },
   "prisma": {

apps/api/prisma/migrations/20220708132655_deployment_type_for_applications/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Application" ADD COLUMN "deploymentType" TEXT;

apps/api/prisma/migrations/20220712083523_custom_port_git_sources/migration.sql

@@ -0,0 +1,24 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_GitSource" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "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", "githubAppId", "gitlabAppId", "htmlUrl", "id", "name", "organization", "type", "updatedAt") SELECT "apiUrl", "createdAt", "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");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/migrations/20220718083646_moodle/migration.sql

@@ -0,0 +1,20 @@
+-- CreateTable
+CREATE TABLE "Moodle" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "serviceId" TEXT NOT NULL,
+    "defaultUsername" TEXT NOT NULL,
+    "defaultPassword" TEXT NOT NULL,
+    "defaultEmail" TEXT NOT NULL,
+    "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 "Moodle_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Moodle_serviceId_key" ON "Moodle"("serviceId");

apps/api/prisma/migrations/20220718114551_remote_docker_engine/migration.sql

@@ -0,0 +1,21 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_DestinationDocker" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "network" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "engine" TEXT,
+    "remoteEngine" BOOLEAN NOT NULL DEFAULT false,
+    "remoteIpAddress" TEXT,
+    "remoteUser" TEXT,
+    "remotePort" INTEGER,
+    "isCoolifyProxyUsed" BOOLEAN DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+INSERT INTO "new_DestinationDocker" ("createdAt", "engine", "id", "isCoolifyProxyUsed", "name", "network", "remoteEngine", "updatedAt") SELECT "createdAt", "engine", "id", "isCoolifyProxyUsed", "name", "network", "remoteEngine", "updatedAt" FROM "DestinationDocker";
+DROP TABLE "DestinationDocker";
+ALTER TABLE "new_DestinationDocker" RENAME TO "DestinationDocker";
+CREATE UNIQUE INDEX "DestinationDocker_network_key" ON "DestinationDocker"("network");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/migrations/20220721084020_ssh_key/migration.sql

@@ -0,0 +1,33 @@
+-- CreateTable
+CREATE TABLE "SshKey" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "privateKey" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_DestinationDocker" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "network" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "engine" TEXT,
+    "remoteEngine" BOOLEAN NOT NULL DEFAULT false,
+    "remoteIpAddress" TEXT,
+    "remoteUser" TEXT,
+    "remotePort" INTEGER,
+    "remoteVerified" BOOLEAN NOT NULL DEFAULT false,
+    "isCoolifyProxyUsed" BOOLEAN DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "sshKeyId" TEXT,
+    CONSTRAINT "DestinationDocker_sshKeyId_fkey" FOREIGN KEY ("sshKeyId") REFERENCES "SshKey" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+INSERT INTO "new_DestinationDocker" ("createdAt", "engine", "id", "isCoolifyProxyUsed", "name", "network", "remoteEngine", "remoteIpAddress", "remotePort", "remoteUser", "updatedAt") SELECT "createdAt", "engine", "id", "isCoolifyProxyUsed", "name", "network", "remoteEngine", "remoteIpAddress", "remotePort", "remoteUser", "updatedAt" FROM "DestinationDocker";
+DROP TABLE "DestinationDocker";
+ALTER TABLE "new_DestinationDocker" RENAME TO "DestinationDocker";
+CREATE UNIQUE INDEX "DestinationDocker_network_key" ON "DestinationDocker"("network");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

apps/api/prisma/migrations/20220722203927_ipaddress/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "Setting" ADD COLUMN "ipv4" TEXT;
+ALTER TABLE "Setting" ADD COLUMN "ipv6" TEXT;

apps/api/prisma/migrations/20220725191205_architecture/migration.sql

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

apps/api/prisma/migrations/20220726121333_fix_ssh_key/migration.sql

@@ -0,0 +1,16 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_SshKey" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "privateKey" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "teamId" TEXT,
+    CONSTRAINT "SshKey_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+INSERT INTO "new_SshKey" ("createdAt", "id", "name", "privateKey", "updatedAt") SELECT "createdAt", "id", "name", "privateKey", "updatedAt" FROM "SshKey";
+DROP TABLE "SshKey";
+ALTER TABLE "new_SshKey" RENAME TO "SshKey";
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

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/schema.prisma

@@ -23,6 +23,9 @@ model Setting {
   isTraefikUsed         Boolean  @default(true)
   createdAt             DateTime @default(now())
   updatedAt             DateTime @updatedAt
+  ipv4                  String?
+  ipv6                  String?
+  arch                  String?
 }
 
 model User {
@@ -30,39 +33,40 @@ model User {
   email      String       @unique
   type       String
   password   String?
-  teams      Team[]
-  permission Permission[]
   createdAt  DateTime     @default(now())
   updatedAt  DateTime     @updatedAt
+  permission Permission[]
+  teams      Team[]
 }
 
 model Permission {
   id         String   @id @default(cuid())
-  user       User     @relation(fields: [userId], references: [id])
   userId     String
-  team       Team     @relation(fields: [teamId], references: [id])
   teamId     String
   permission String
   createdAt  DateTime @default(now())
   updatedAt  DateTime @updatedAt
+  team       Team     @relation(fields: [teamId], references: [id])
+  user       User     @relation(fields: [userId], references: [id])
 }
 
 model Team {
   id                String              @id @default(cuid())
-  users             User[]
   name              String?
+  createdAt         DateTime            @default(now())
+  updatedAt         DateTime            @updatedAt
+  databaseId        String?
+  serviceId         String?
+  permissions       Permission[]
+  sshKey            SshKey[]
   applications      Application[]
+  database          Database[]
+  destinationDocker DestinationDocker[]
   gitSources        GitSource[]
   gitHubApps        GithubApp[]
   gitLabApps        GitlabApp[]
-  destinationDocker DestinationDocker[]
-  permissions       Permission[]
-  createdAt         DateTime            @default(now())
-  updatedAt         DateTime            @updatedAt
-  database          Database[]          @relation(references: [id])
-  databaseId        String?
-  service           Service[]           @relation(references: [id])
-  serviceId         String?
+  service           Service[]
+  users             User[]
 }
 
 model TeamInvitation {
@@ -78,7 +82,7 @@ model TeamInvitation {
 model Application {
   id                  String                         @id @default(cuid())
   name                String
-  fqdn                String?                        @unique
+  fqdn                String?
   repository          String?
   configHash          String?
   branch              String?
@@ -91,6 +95,7 @@ model Application {
   startCommand        String?
   baseDirectory       String?
   publishDirectory    String?
+  deploymentType      String?
   phpModules          String?
   pythonWSGI          String?
   pythonModule        String?
@@ -100,21 +105,20 @@ model Application {
   denoOptions         String?
   createdAt           DateTime                       @default(now())
   updatedAt           DateTime                       @updatedAt
-  settings            ApplicationSettings?
-  teams               Team[]
   destinationDockerId String?
-  destinationDocker   DestinationDocker?             @relation(fields: [destinationDockerId], references: [id])
   gitSourceId         String?
-  gitSource           GitSource?                     @relation(fields: [gitSourceId], references: [id])
-  secrets             Secret[]
-  persistentStorage   ApplicationPersistentStorage[]
   baseImage           String?
   baseBuildImage      String?
+  gitSource           GitSource?                     @relation(fields: [gitSourceId], references: [id])
+  destinationDocker   DestinationDocker?             @relation(fields: [destinationDockerId], references: [id])
+  persistentStorage   ApplicationPersistentStorage[]
+  settings            ApplicationSettings?
+  secrets             Secret[]
+  teams               Team[]
 }
 
 model ApplicationSettings {
   id            String      @id @default(cuid())
-  application   Application @relation(fields: [applicationId], references: [id])
   applicationId String      @unique
   dualCerts     Boolean     @default(false)
   debug         Boolean     @default(false)
@@ -122,26 +126,27 @@ model ApplicationSettings {
   autodeploy    Boolean     @default(true)
   createdAt     DateTime    @default(now())
   updatedAt     DateTime    @updatedAt
+  application   Application @relation(fields: [applicationId], references: [id])
 }
 
 model ApplicationPersistentStorage {
   id            String      @id @default(cuid())
-  application   Application @relation(fields: [applicationId], references: [id])
   applicationId String
   path          String
   createdAt     DateTime    @default(now())
   updatedAt     DateTime    @updatedAt
+  application   Application @relation(fields: [applicationId], references: [id])
 
   @@unique([applicationId, path])
 }
 
 model ServicePersistentStorage {
   id        String   @id @default(cuid())
-  service   Service  @relation(fields: [serviceId], references: [id])
   serviceId String
   path      String
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
+  service   Service  @relation(fields: [serviceId], references: [id])
 
   @@unique([serviceId, path])
 }
@@ -154,8 +159,8 @@ model Secret {
   isBuildSecret Boolean     @default(false)
   createdAt     DateTime    @default(now())
   updatedAt     DateTime    @updatedAt
-  application   Application @relation(fields: [applicationId], references: [id])
   applicationId String
+  application   Application @relation(fields: [applicationId], references: [id])
 
   @@unique([name, applicationId, isPRMRSecret])
 }
@@ -166,8 +171,8 @@ model ServiceSecret {
   value     String
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
-  service   Service  @relation(fields: [serviceId], references: [id])
   serviceId String
+  service   Service  @relation(fields: [serviceId], references: [id])
 
   @@unique([name, serviceId])
 }
@@ -199,38 +204,56 @@ model DestinationDocker {
   id                 String        @id @default(cuid())
   network            String        @unique
   name               String
-  engine             String
+  engine             String?
   remoteEngine       Boolean       @default(false)
+  remoteIpAddress    String?
+  remoteUser         String?
+  remotePort         Int?
+  remoteVerified     Boolean       @default(false)
   isCoolifyProxyUsed Boolean?      @default(false)
-  teams              Team[]
-  application        Application[]
   createdAt          DateTime      @default(now())
   updatedAt          DateTime      @updatedAt
+  sshKeyId           String?
+  sshKey             SshKey?       @relation(fields: [sshKeyId], references: [id])
+  sshLocalPort       Int?
+  application        Application[]
   database           Database[]
   service            Service[]
+  teams              Team[]
+}
+
+model SshKey {
+  id                String              @id @default(cuid())
+  name              String
+  privateKey        String
+  createdAt         DateTime            @default(now())
+  updatedAt         DateTime            @updatedAt
+  teamId            String?
+  team              Team?               @relation(fields: [teamId], references: [id])
+  destinationDocker DestinationDocker[]
 }
 
 model GitSource {
   id           String        @id @default(cuid())
   name         String
-  teams        Team[]
   type         String?
   apiUrl       String?
   htmlUrl      String?
+  customPort   Int           @default(22)
   organization String?
   createdAt    DateTime      @default(now())
   updatedAt    DateTime      @updatedAt
   githubAppId  String?       @unique
-  githubApp    GithubApp?    @relation(fields: [githubAppId], references: [id])
-  application  Application[]
   gitlabAppId  String?       @unique
   gitlabApp    GitlabApp?    @relation(fields: [gitlabAppId], references: [id])
+  githubApp    GithubApp?    @relation(fields: [githubAppId], references: [id])
+  application  Application[]
+  teams        Team[]
 }
 
 model GithubApp {
   id             String     @id @default(cuid())
   name           String?    @unique
-  teams          Team[]
   appId          Int?
   installationId Int?
   clientId       String?
@@ -240,13 +263,13 @@ model GithubApp {
   createdAt      DateTime   @default(now())
   updatedAt      DateTime   @updatedAt
   gitSource      GitSource?
+  teams          Team[]
 }
 
 model GitlabApp {
   id            String     @id @default(cuid())
   oauthId       Int        @unique
   groupName     String?    @unique
-  teams         Team[]
   deployKeyId   Int?
   privateSshKey String?
   publicSshKey  String?
@@ -256,6 +279,7 @@ model GitlabApp {
   createdAt     DateTime   @default(now())
   updatedAt     DateTime   @updatedAt
   gitSource     GitSource?
+  teams         Team[]
 }
 
 model Database {
@@ -269,22 +293,22 @@ model Database {
   dbUserPassword      String?
   rootUser            String?
   rootUserPassword    String?
-  settings            DatabaseSettings?
-  destinationDocker   DestinationDocker? @relation(fields: [destinationDockerId], references: [id])
   destinationDockerId String?
-  teams               Team[]
   createdAt           DateTime           @default(now())
   updatedAt           DateTime           @updatedAt
+  destinationDocker   DestinationDocker? @relation(fields: [destinationDockerId], references: [id])
+  settings            DatabaseSettings?
+  teams               Team[]
 }
 
 model DatabaseSettings {
   id         String   @id @default(cuid())
-  database   Database @relation(fields: [databaseId], references: [id])
   databaseId String   @unique
   isPublic   Boolean  @default(false)
   appendOnly Boolean  @default(true)
   createdAt  DateTime @default(now())
   updatedAt  DateTime @updatedAt
+  database   Database @relation(fields: [databaseId], references: [id])
 }
 
 model Service {
@@ -295,22 +319,23 @@ model Service {
   dualCerts           Boolean                    @default(false)
   type                String?
   version             String?
-  teams               Team[]
   destinationDockerId String?
-  destinationDocker   DestinationDocker?         @relation(fields: [destinationDockerId], references: [id])
   createdAt           DateTime                   @default(now())
   updatedAt           DateTime                   @updatedAt
-  plausibleAnalytics  PlausibleAnalytics?
+  destinationDocker   DestinationDocker?         @relation(fields: [destinationDockerId], references: [id])
+  fider               Fider?
+  ghost               Ghost?
+  hasura              Hasura?
+  meiliSearch         MeiliSearch?
   minio               Minio?
+  moodle              Moodle?
+  plausibleAnalytics  PlausibleAnalytics?
+  persistentStorage   ServicePersistentStorage[]
+  serviceSecret       ServiceSecret[]
+  umami               Umami?
   vscodeserver        Vscodeserver?
   wordpress           Wordpress?
-  ghost               Ghost?
-  serviceSecret       ServiceSecret[]
-  meiliSearch         MeiliSearch?
-  persistentStorage   ServicePersistentStorage[]
-  umami               Umami?
-  hasura              Hasura?
-  fider               Fider?
+  teams               Team[]
 }
 
 model PlausibleAnalytics {
@@ -325,9 +350,9 @@ model PlausibleAnalytics {
   secretKeyBase        String?
   scriptName           String   @default("plausible.js")
   serviceId            String   @unique
-  service              Service  @relation(fields: [serviceId], references: [id])
   createdAt            DateTime @default(now())
   updatedAt            DateTime @updatedAt
+  service              Service  @relation(fields: [serviceId], references: [id])
 }
 
 model Minio {
@@ -337,18 +362,18 @@ model Minio {
   publicPort       Int?
   apiFqdn          String?
   serviceId        String   @unique
-  service          Service  @relation(fields: [serviceId], references: [id])
   createdAt        DateTime @default(now())
   updatedAt        DateTime @updatedAt
+  service          Service  @relation(fields: [serviceId], references: [id])
 }
 
 model Vscodeserver {
   id        String   @id @default(cuid())
   password  String
   serviceId String   @unique
-  service   Service  @relation(fields: [serviceId], references: [id])
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
+  service   Service  @relation(fields: [serviceId], references: [id])
 }
 
 model Wordpress {
@@ -371,9 +396,9 @@ model Wordpress {
   ftpHostKey            String?
   ftpHostKeyPrivate     String?
   serviceId             String   @unique
-  service               Service  @relation(fields: [serviceId], references: [id])
   createdAt             DateTime @default(now())
   updatedAt             DateTime @updatedAt
+  service               Service  @relation(fields: [serviceId], references: [id])
 }
 
 model Ghost {
@@ -387,18 +412,18 @@ model Ghost {
   mariadbDatabase         String?
   mariadbPublicPort       Int?
   serviceId               String   @unique
-  service                 Service  @relation(fields: [serviceId], references: [id])
   createdAt               DateTime @default(now())
   updatedAt               DateTime @updatedAt
+  service                 Service  @relation(fields: [serviceId], references: [id])
 }
 
 model MeiliSearch {
   id        String   @id @default(cuid())
   masterKey String
   serviceId String   @unique
-  service   Service  @relation(fields: [serviceId], references: [id])
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
+  service   Service  @relation(fields: [serviceId], references: [id])
 }
 
 model Umami {
@@ -410,9 +435,9 @@ model Umami {
   postgresqlPublicPort Int?
   umamiAdminPassword   String
   hashSalt             String
-  service              Service  @relation(fields: [serviceId], references: [id])
   createdAt            DateTime @default(now())
   updatedAt            DateTime @updatedAt
+  service              Service  @relation(fields: [serviceId], references: [id])
 }
 
 model Hasura {
@@ -423,9 +448,9 @@ model Hasura {
   postgresqlDatabase   String
   postgresqlPublicPort Int?
   graphQLAdminPassword String
-  service              Service  @relation(fields: [serviceId], references: [id])
   createdAt            DateTime @default(now())
   updatedAt            DateTime @updatedAt
+  service              Service  @relation(fields: [serviceId], references: [id])
 }
 
 model Fider {
@@ -445,7 +470,24 @@ model Fider {
   emailSmtpUser           String?
   emailSmtpPassword       String?
   emailSmtpEnableStartTls Boolean  @default(false)
-  service                 Service  @relation(fields: [serviceId], references: [id])
   createdAt               DateTime @default(now())
   updatedAt               DateTime @updatedAt
+  service                 Service  @relation(fields: [serviceId], references: [id])
+}
+
+model Moodle {
+  id                      String   @id @default(cuid())
+  serviceId               String   @unique
+  defaultUsername         String
+  defaultPassword         String
+  defaultEmail            String
+  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])
 }

apps/api/prisma/seed.js

@@ -24,7 +24,8 @@ async function main() {
 			data: {
 				isRegistrationEnabled: true,
 				proxyPassword: encrypt(generatePassword()),
-				proxyUser: cuid()
+				proxyUser: cuid(),
+				arch: process.arch
 			}
 		});
 	} else {

apps/api/src/index.ts

@@ -5,7 +5,7 @@ import env from '@fastify/env';
 import cookie from '@fastify/cookie';
 import path, { join } from 'path';
 import autoLoad from '@fastify/autoload';
-import { asyncExecShell, isDev, prisma } from './lib/common';
+import { asyncExecShell, isDev, listSettings, prisma } from './lib/common';
 import { scheduler } from './lib/scheduler';
 
 declare module 'fastify' {
@@ -16,9 +16,9 @@ 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,
 		};
 	}
 }
@@ -26,7 +26,8 @@ declare module 'fastify' {
 const port = isDev ? 3001 : 3000;
 const host = '0.0.0.0';
 const fastify = Fastify({
-	logger: false
+	logger: false,
+	trustProxy: true
 });
 const schema = {
 	type: 'object',
@@ -51,23 +52,24 @@ const schema = {
 			default: 'docker'
 		},
 		COOLIFY_WHITE_LABELED: {
-			type: 'boolean',
-			default: false
+			type: 'string',
+			default: 'false'
 		},
 		COOLIFY_WHITE_LABELED_ICON: {
 			type: 'string',
 			default: null
 		},
 		COOLIFY_AUTO_UPDATE: {
-			type: 'boolean',
-			default: false
+			type: 'string',
+			default: 'false'
 		},
 
 	}
 };
 
 const options = {
-	schema
+	schema,
+	dotenv: true
 };
 fastify.register(env, options);
 if (!isDev) {
@@ -75,7 +77,7 @@ if (!isDev) {
 		root: path.join(__dirname, './public'),
 		preCompressed: true
 	});
-	fastify.setNotFoundHandler(function (request, reply) {
+	fastify.setNotFoundHandler(async function (request, reply) {
 		if (request.raw.url && request.raw.url.startsWith('/api')) {
 			return reply.status(404).send({
 				success: false
@@ -99,34 +101,66 @@ fastify.listen({ port, host }, async (err: any, address: any) => {
 		process.exit(1);
 	}
 	console.log(`Coolify's API is listening on ${host}:${port}`);
-	await initServer()
+	await initServer();
 	await scheduler.start('deployApplication');
 	await scheduler.start('cleanupStorage');
-	await scheduler.start('checkProxies')
+	await scheduler.start('checkProxies');
 
-	// Check if no build is running, try to autoupdate.
+	// Check if no build is running
+
+	// Check for update
 	setInterval(async () => {
 		const { isAutoUpdateEnabled } = await prisma.setting.findFirst();
 		if (isAutoUpdateEnabled) {
 			if (scheduler.workers.has('deployApplication')) {
-				scheduler.workers.get('deployApplication').postMessage("status");
+				scheduler.workers.get('deployApplication').postMessage("status:autoUpdater");
 			}
 		}
-	}, 30000 * 10)
+	}, 60000 * 15)
+
+	// Cleanup storage
+	setInterval(async () => {
+		if (scheduler.workers.has('deployApplication')) {
+			scheduler.workers.get('deployApplication').postMessage("status:cleanupStorage");
+		}
+	}, 60000 * 10)
 
 	scheduler.on('worker deleted', async (name) => {
-		if (name === 'autoUpdater') {
-			await scheduler.start('deployApplication');
+		if (name === 'autoUpdater' || name === 'cleanupStorage') {
+			if (!scheduler.workers.has('deployApplication')) await scheduler.start('deployApplication');
+		}
+	});
+	await getArch();
+	await getIPAddress();
+});
+async function getIPAddress() {
+	const { publicIpv4, publicIpv6 } = await import('public-ip')
+	try {
+		const settings = await listSettings();
+		if (!settings.ipv4) {
+			const ipv4 = await publicIpv4({ timeout: 2000 })
+			await prisma.setting.update({ where: { id: settings.id }, data: { ipv4 } })
 		}
 
-	});
-
-});
+		if (!settings.ipv6) {
+			const ipv6 = await publicIpv6({ timeout: 2000 })
+			await prisma.setting.update({ where: { id: settings.id }, data: { ipv6 } })
+		}
 
+	} catch (error) { }
+}
 async function initServer() {
 	try {
 		await asyncExecShell(`docker network create --attachable coolify`);
 	} catch (error) { }
 }
+async function getArch() {
+	try {
+		const settings = await prisma.setting.findFirst({})
+		if (settings && !settings.arch) {
+			await prisma.setting.update({ where: { id: settings.id }, data: { arch: process.arch } })
+		}
+	} catch (error) { }
+}
 
 

apps/api/src/jobs/checkProxies.ts

@@ -1,24 +1,24 @@
 import { parentPort } from 'node:worker_threads';
-import { prisma, startTraefikTCPProxy, generateDatabaseConfiguration, startTraefikProxy, asyncExecShell } from '../lib/common';
-import { checkContainer, getEngine } from '../lib/docker';
+import { prisma, startTraefikTCPProxy, generateDatabaseConfiguration, startTraefikProxy, executeDockerCmd } from '../lib/common';
+import { checkContainer } from '../lib/docker';
 
 (async () => {
     if (parentPort) {
-        // Coolify Proxy
+        // 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(engine, 'coolify-haproxy');
-            const host = getEngine(engine);
+            const found = await checkContainer({ dockerId: localDocker.id, container: 'coolify-haproxy' });
             if (found) {
-                await asyncExecShell(
-                    `DOCKER_HOST="${host}" docker stop -t 0 coolify-haproxy && docker rm coolify-haproxy`
-                );
+                await executeDockerCmd({
+                    dockerId: localDocker.id,
+                    command: `docker stop -t 0 coolify-haproxy && docker rm coolify-haproxy`
+                })
             }
-            await startTraefikProxy(engine);
+            await startTraefikProxy(localDocker.id);
 
         }
 
@@ -32,12 +32,14 @@ import { checkContainer, getEngine } from '../lib/docker';
             if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
                 const { privatePort } = generateDatabaseConfiguration(database);
                 // Remove HAProxy
-                const found = await checkContainer(engine, `haproxy-for-${publicPort}`);
-                const host = getEngine(engine);
+                const found = await checkContainer({
+                    dockerId: localDocker.id, container: `haproxy-for-${publicPort}`
+                });
                 if (found) {
-                    await asyncExecShell(
-                        `DOCKER_HOST="${host}" docker stop -t 0 haproxy-for-${publicPort} && docker rm haproxy-for-${publicPort}`
-                    );
+                    await executeDockerCmd({
+                        dockerId: localDocker.id,
+                        command: `docker stop -t 0 haproxy-for-${publicPort} && docker rm haproxy-for-${publicPort}`
+                    })
                 }
                 await startTraefikTCPProxy(destinationDocker, id, publicPort, privatePort);
 
@@ -52,12 +54,12 @@ import { checkContainer, getEngine } from '../lib/docker';
             const { destinationDockerId, destinationDocker, id } = service;
             if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
                 // Remove HAProxy
-                const found = await checkContainer(engine, `haproxy-for-${ftpPublicPort}`);
-                const host = getEngine(engine);
+                const found = await checkContainer({ dockerId: localDocker.id, container: `haproxy-for-${ftpPublicPort}` });
                 if (found) {
-                    await asyncExecShell(
-                        `DOCKER_HOST="${host}" docker stop -t 0 haproxy-for-${ftpPublicPort} && docker rm haproxy-for-${ftpPublicPort} `
-                    );
+                    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');
             }
@@ -73,12 +75,12 @@ import { checkContainer, getEngine } from '../lib/docker';
             const { destinationDockerId, destinationDocker, id } = service;
             if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
                 // Remove HAProxy
-                const found = await checkContainer(engine, `${id}-${publicPort}`);
-                const host = getEngine(engine);
+                const found = await checkContainer({ dockerId: localDocker.id, container: `${id}-${publicPort}` });
                 if (found) {
-                    await asyncExecShell(
-                        `DOCKER_HOST="${host}" docker stop -t 0 ${id}-${publicPort} && docker rm ${id}-${publicPort}`
-                    );
+                    await executeDockerCmd({
+                        dockerId: localDocker.id,
+                        command: `docker stop -t 0 ${id}-${publicPort} && docker rm ${id}-${publicPort} `
+                    })
                 }
                 await startTraefikTCPProxy(destinationDocker, id, publicPort, 9000);
             }

apps/api/src/jobs/cleanupStorage.ts

@@ -1,90 +1,60 @@
 import { parentPort } from 'node:worker_threads';
-import { asyncExecShell, isDev, prisma, version } from '../lib/common';
-import { getEngine } from '../lib/docker';
+import { asyncExecShell, cleanupDockerStorage, executeDockerCmd, isDev, prisma, version } from '../lib/common';
 
 (async () => {
     if (parentPort) {
         const destinationDockers = await prisma.destinationDocker.findMany();
-        const engines = [...new Set(destinationDockers.map(({ engine }) => engine))];
-        for (const engine of engines) {
+        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;
-            const host = getEngine(engine);
-            // try {
-            //     let stdout = null
-            //     if (!isDev) {
-            //         const output = await asyncExecShell(
-            //             `DOCKER_HOST=${host} docker exec coolify 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.6) {
-            //             lowDiskSpace = true;
-            //         }
-            //     }
-            // } catch (error) {
-            //     console.log(error);
-            // }
-            if (!isDev) {
-                // Cleanup old coolify images
-                try {
-                    let { stdout: images } = await asyncExecShell(
-                        `DOCKER_HOST=${host} docker images coollabsio/coolify --filter before="coollabsio/coolify:${version}" -q | xargs `
+            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 /`
                     );
-                    images = images.trim();
-                    if (images) {
-                        await asyncExecShell(`DOCKER_HOST=${host} docker rmi -f ${images}`);
+                    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);
                 }
-                try {
-                    await asyncExecShell(`DOCKER_HOST=${host} docker container prune -f`);
-                } catch (error) {
-                    //console.log(error);
-                }
-                try {
-                    await asyncExecShell(`DOCKER_HOST=${host} docker image prune -f`);
-                } catch (error) {
-                    //console.log(error);
-                }
-                try {
-                    await asyncExecShell(`DOCKER_HOST=${host} docker image prune -a -f`);
-                } catch (error) {
-                    //console.log(error);
-                }
-            } else {
-                console.log(`[DEV MODE] Low disk space: ${lowDiskSpace}`);
+            } catch (error) {
+                console.log(error);
             }
+            await cleanupDockerStorage(destination.id, lowDiskSpace, false)
         }
-        await prisma.$disconnect();      
+        await prisma.$disconnect();
     } else process.exit(0);
 })();

apps/api/src/jobs/deployApplication.ts

@@ -4,8 +4,7 @@ import fs from 'fs/promises';
 import yaml from 'js-yaml';
 
 import { copyBaseConfigurationFiles, makeLabelForStandaloneApplication, saveBuildLog, setDefaultConfiguration } from '../lib/buildPacks/common';
-import { asyncExecShell, createDirectories, decrypt, getDomain, prisma } from '../lib/common';
-import { dockerInstance, getEngine } from '../lib/docker';
+import { createDirectories, decrypt, executeDockerCmd, getDomain, prisma } from '../lib/common';
 import * as importers from '../lib/importers';
 import * as buildpacks from '../lib/buildPacks';
 
@@ -21,8 +20,12 @@ import * as buildpacks from '../lib/buildPacks';
 					parentPort.postMessage('cancelled');
 					return;
 				}
-				if (message === 'status') {
-					parentPort.postMessage({ size: queue.size, pending: queue.pending });
+				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;
 				}
 
@@ -51,7 +54,8 @@ import * as buildpacks from '../lib/buildPacks';
 						denoOptions,
 						exposePort,
 						baseImage,
-						baseBuildImage
+						baseBuildImage,
+						deploymentType,
 					} = message
 					let {
 						branch,
@@ -99,9 +103,6 @@ import * as buildpacks from '../lib/buildPacks';
 							destinationType = 'docker';
 						}
 						if (destinationType === 'docker') {
-							const docker = dockerInstance({ destinationDocker });
-							const host = getEngine(destinationDocker.engine);
-
 							await prisma.build.update({ where: { id: buildId }, data: { status: 'running' } });
 							const { workdir, repodir } = await createDirectories({ repository, buildId });
 							const configuration = await setDefaultConfiguration(message);
@@ -122,6 +123,7 @@ import * as buildpacks from '../lib/buildPacks';
 								repodir,
 								githubAppId: gitSource.githubApp?.id,
 								gitlabAppId: gitSource.gitlabApp?.id,
+								customPort: gitSource.customPort,
 								repository,
 								branch,
 								buildId,
@@ -179,18 +181,23 @@ import * as buildpacks from '../lib/buildPacks';
 							} else {
 								deployNeeded = true;
 							}
-							const image = await docker.engine.getImage(`${applicationId}:${tag}`);
+
 							let imageFound = false;
 							try {
-								await image.inspect();
-								imageFound = false;
+								await executeDockerCmd({
+									dockerId: destinationDocker.id,
+									command: `docker image inspect ${applicationId}:${tag}`
+								})
+								imageFound = true;
 							} catch (error) {
 								//
 							}
 							if (!imageFound || deployNeeded) {
+							// if (true) {
 								await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId, baseImage);
 								if (buildpacks[buildPack])
 									await buildpacks[buildPack]({
+										dockerId: destinationDocker.id,
 										buildId,
 										applicationId,
 										domain,
@@ -206,7 +213,6 @@ import * as buildpacks from '../lib/buildPacks';
 										commit,
 										tag,
 										workdir,
-										docker,
 										port: exposePort ? `${exposePort}:${port}` : port,
 										installCommand,
 										buildCommand,
@@ -221,18 +227,19 @@ import * as buildpacks from '../lib/buildPacks';
 										denoMainFile,
 										denoOptions,
 										baseImage,
-										baseBuildImage
+										baseBuildImage,
+										deploymentType
 									});
 								else {
 									await saveBuildLog({ line: `Build pack ${buildPack} not found`, buildId, applicationId });
 									throw new Error(`Build pack ${buildPack} not found.`);
 								}
 							} else {
-								await saveBuildLog({ line: 'Nothing changed.', buildId, applicationId });
+								await saveBuildLog({ line: 'Build image already available - no rebuild required.', buildId, applicationId });
 							}
 							try {
-								await asyncExecShell(`DOCKER_HOST=${host} docker stop -t 0 ${imageId}`);
-								await asyncExecShell(`DOCKER_HOST=${host} docker rm ${imageId}`);
+								await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker stop -t 0 ${imageId}` })
+								await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker rm ${imageId}` })
 							} catch (error) {
 								//
 							}
@@ -292,10 +299,11 @@ import * as buildpacks from '../lib/buildPacks';
 											container_name: imageId,
 											volumes,
 											env_file: envFound ? [`${workdir}/.env`] : [],
-											networks: [docker.network],
+											networks: [destinationDocker.network],
 											labels,
 											depends_on: [],
 											restart: 'always',
+											expose: [port],
 											...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
 											// logging: {
 											// 	driver: 'fluentd',
@@ -311,16 +319,14 @@ import * as buildpacks from '../lib/buildPacks';
 										}
 									},
 									networks: {
-										[docker.network]: {
+										[destinationDocker.network]: {
 											external: true
 										}
 									},
 									volumes: Object.assign({}, ...composeVolumes)
 								};
 								await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(composeFile));
-								await asyncExecShell(
-									`DOCKER_HOST=${host} docker compose --project-directory ${workdir} up -d`
-								);
+								await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose --project-directory ${workdir} up -d` })
 								await saveBuildLog({ line: 'Deployment successful!', buildId, applicationId });
 							} catch (error) {
 								await saveBuildLog({ line: error, buildId, applicationId });

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

@@ -1,7 +1,7 @@
-import { asyncExecShell, base64Encode, generateTimestamp, getDomain, isDev, prisma, version } from "../common";
-import { scheduler } from "../scheduler";
+import { base64Encode, executeDockerCmd, generateTimestamp, getDomain, isDev, prisma, version } from "../common";
 import { promises as fs } from 'fs';
 import { day } from "../dayjs";
+
 const staticApps = ['static', 'react', 'vuejs', 'svelte', 'gatsby', 'astro', 'eleventy'];
 const nodeBased = [
 	'react',
@@ -17,7 +17,7 @@ const nodeBased = [
 	'nextjs'
 ];
 
-export function setDefaultBaseImage(buildPack: string | null) {
+export function setDefaultBaseImage(buildPack: string | null, deploymentType: string | null = null) {
 	const nodeVersions = [
 		{
 			value: 'node:lts',
@@ -259,10 +259,17 @@ export function setDefaultBaseImage(buildPack: string | null) {
 		baseBuildImages: []
 	};
 	if (nodeBased.includes(buildPack)) {
-		payload.baseImage = 'node:lts';
-		payload.baseImages = nodeVersions;
-		payload.baseBuildImage = 'node:lts';
-		payload.baseBuildImages = nodeVersions;
+		if (deploymentType === 'static') {
+			payload.baseImage = 'webdevops/nginx:alpine';
+			payload.baseImages = staticVersions;
+			payload.baseBuildImage = 'node:lts';
+			payload.baseBuildImages = nodeVersions;
+		} else {
+			payload.baseImage = 'node:lts';
+			payload.baseImages = nodeVersions;
+			payload.baseBuildImage = 'node:lts';
+			payload.baseBuildImages = nodeVersions;
+		}
 	}
 	if (staticApps.includes(buildPack)) {
 		payload.baseImage = 'webdevops/nginx:alpine';
@@ -431,7 +438,7 @@ export async function copyBaseConfigurationFiles(
 				buildId,
 				applicationId
 			});
-		} else if (staticApps.includes(buildPack) && baseImage.includes('nginx')) {
+		} else if (baseImage?.includes('nginx')) {
 			await fs.writeFile(
 				`${workdir}/nginx.conf`,
 				`user  nginx;
@@ -504,8 +511,8 @@ export async function buildImage({
 	applicationId,
 	tag,
 	workdir,
-	docker,
 	buildId,
+	dockerId,
 	isCache = false,
 	debug = false,
 	dockerFileLocation = '/Dockerfile'
@@ -515,6 +522,9 @@ 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.`,
@@ -522,16 +532,61 @@ export async function buildImage({
 			applicationId
 		});
 	}
-
-	const stream = await docker.engine.buildImage(
-		{ src: ['.'], context: workdir },
-		{
-			dockerfile: isCache ? `${dockerFileLocation}-cache` : dockerFileLocation,
-			t: `${applicationId}:${tag}${isCache ? '-cache' : ''}`
+	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}` })
+	if (debug) {
+		const array = stderr.split('\n')
+		for (const line of array) {
+			if (line !== '\n') {
+				await saveBuildLog({
+					line: `${line.replace('\n', '')}`,
+					buildId,
+					applicationId
+				});
+			}
 		}
-	);
-	await streamEvents({ stream, docker, buildId, applicationId, debug });
-	await saveBuildLog({ line: `Building image successful!`, 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 {
+		await saveBuildLog({ line: `Building image successful.`, buildId, applicationId });
+	}
 }
 
 export async function streamEvents({ stream, docker, buildId, applicationId, debug }) {
@@ -610,18 +665,16 @@ export function makeLabelForStandaloneApplication({
 
 export async function buildCacheImageWithNode(data, imageForBuild) {
 	const {
-		applicationId,
-		tag,
 		workdir,
-		docker,
 		buildId,
 		baseDirectory,
 		installCommand,
 		buildCommand,
-		debug,
 		secrets,
 		pullmergeRequestId
 	} = data;
+
+
 	const isPnpm = checkPnpm(installCommand, buildCommand);
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${imageForBuild}`);
@@ -652,11 +705,12 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${buildCommand}`);
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
-	await buildImage({ applicationId, tag, workdir, docker, buildId, isCache: true, debug });
+	await buildImage({ ...data, isCache: true });
 }
 
 export async function buildCacheImageForLaravel(data, imageForBuild) {
-	const { applicationId, tag, workdir, docker, buildId, debug, secrets, pullmergeRequestId } = data;
+	const { workdir, buildId, secrets, pullmergeRequestId } = data;
+
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${imageForBuild}`);
 	Dockerfile.push('WORKDIR /app');
@@ -680,22 +734,16 @@ export async function buildCacheImageForLaravel(data, imageForBuild) {
 	Dockerfile.push(`COPY resources /app/resources`);
 	Dockerfile.push(`RUN yarn install && yarn production`);
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
-	await buildImage({ applicationId, tag, workdir, docker, buildId, isCache: true, debug });
+	await buildImage({ ...data, isCache: true });
 }
 
 export async function buildCacheImageWithCargo(data, imageForBuild) {
 	const {
 		applicationId,
-		tag,
 		workdir,
-		docker,
 		buildId,
-		baseDirectory,
-		installCommand,
-		buildCommand,
-		debug,
-		secrets
 	} = data;
+
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${imageForBuild} as planner-${applicationId}`);
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
@@ -710,5 +758,5 @@ export async function buildCacheImageWithCargo(data, imageForBuild) {
 	Dockerfile.push(`COPY --from=planner-${applicationId} /app/recipe.json recipe.json`);
 	Dockerfile.push('RUN cargo chef cook --release --recipe-path recipe.json');
 	await fs.writeFile(`${workdir}/Dockerfile-cache`, Dockerfile.join('\n'));
-	await buildImage({ applicationId, tag, workdir, docker, buildId, isCache: true, debug });
+	await buildImage({ ...data, isCache: true });
 }

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

@@ -42,9 +42,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 		Dockerfile.push(`COPY .${baseDirectory || ''}/deps.ts /app`);
 		Dockerfile.push(`RUN deno cache deps.ts`);
 	}
-	Dockerfile.push(`COPY ${denoMainFile} /app`);
-	Dockerfile.push(`RUN deno cache ${denoMainFile}`);
 	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
+	Dockerfile.push(`RUN deno cache ${denoMainFile}`);
 	Dockerfile.push(`ENV NO_COLOR true`);
 	Dockerfile.push(`EXPOSE ${port}`);
 	Dockerfile.push(`CMD deno run ${denoOptions ? denoOptions.split(' ') : ''} ${denoMainFile}`);

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

@@ -1,18 +1,18 @@
 import { promises as fs } from 'fs';
 import { buildImage } from './common';
 
-export default async function ({
-	applicationId,
-	debug,
-	tag,
-	workdir,
-	docker,
-	buildId,
-	baseDirectory,
-	secrets,
-	pullmergeRequestId,
-	dockerFileLocation
-}) {
+export default async function (data) {
+	let {
+		applicationId,
+		debug,
+		tag,
+		workdir,
+		buildId,
+		baseDirectory,
+		secrets,
+		pullmergeRequestId,
+		dockerFileLocation
+	} = data
 	try {
 		const file = `${workdir}${dockerFileLocation}`;
 		let dockerFileOut = `${workdir}`;
@@ -45,7 +45,7 @@ export default async function ({
 		}
 
 		await fs.writeFile(`${dockerFileOut}${dockerFileLocation}`, Dockerfile.join('\n'));
-		await buildImage({ applicationId, tag, workdir, docker, buildId, debug, dockerFileLocation });
+		await buildImage(data);
 	} catch (error) {
 		throw error;
 	}

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

@@ -9,7 +9,7 @@ const createDockerfile = async (data, imageforBuild): Promise<void> => {
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
-	if (baseImage.includes('nginx')) {
+	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
 	Dockerfile.push(`EXPOSE ${port}`);

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

@@ -0,0 +1,29 @@
+import { executeDockerCmd, prisma } from "../common"
+import { saveBuildLog } from "./common";
+
+export default async function (data: any): Promise<void> {
+    try {
+        const { buildId, applicationId, tag, dockerId, debug, workdir } = data
+        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) {
+        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/buildPacks/nextjs.ts

@@ -1,17 +1,22 @@
 import { promises as fs } from 'fs';
-import { buildImage, checkPnpm } from './common';
+import { buildCacheImageWithNode, buildImage, checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
 	const {
+		applicationId,
 		buildId,
+		tag,
 		workdir,
+		publishDirectory,
 		port,
 		installCommand,
 		buildCommand,
 		startCommand,
 		baseDirectory,
 		secrets,
-		pullmergeRequestId
+		pullmergeRequestId,
+		deploymentType,
+		baseImage
 	} = data;
 	const Dockerfile: Array<string> = [];
 	const isPnpm = checkPnpm(installCommand, buildCommand, startCommand);
@@ -36,22 +41,34 @@ const createDockerfile = async (data, image): Promise<void> => {
 	if (isPnpm) {
 		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7');
 	}
-	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
-	Dockerfile.push(`RUN ${installCommand}`);
-
-	if (buildCommand) {
+	if (deploymentType === 'node') {
+		Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
+		Dockerfile.push(`RUN ${installCommand}`);
 		Dockerfile.push(`RUN ${buildCommand}`);
+		Dockerfile.push(`EXPOSE ${port}`);
+		Dockerfile.push(`CMD ${startCommand}`);
+	} else if (deploymentType === 'static') {
+		if (baseImage?.includes('nginx')) {
+			Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
+		}
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`EXPOSE 80`);
 	}
-	Dockerfile.push(`EXPOSE ${port}`);
-	Dockerfile.push(`CMD ${startCommand}`);
+
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const { baseImage, baseBuildImage } = data;
-		await createDockerfile(data, baseImage);
-		await buildImage(data);
+		const { baseImage, baseBuildImage, deploymentType, buildCommand } = data;
+		if (deploymentType === 'node') {
+			await createDockerfile(data, baseImage);
+			await buildImage(data);
+		} else if (deploymentType === 'static') {
+			if (buildCommand) await buildCacheImageWithNode(data, baseBuildImage);
+			await createDockerfile(data, baseImage);
+			await buildImage(data);
+		}
 	} catch (error) {
 		throw error;
 	}

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

@@ -1,9 +1,13 @@
 import { promises as fs } from 'fs';
-import { buildImage, checkPnpm } from './common';
+import { buildCacheImageWithNode, buildImage, checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
 	const {
+		applicationId,
+		buildId,
+		tag,
 		workdir,
+		publishDirectory,
 		port,
 		installCommand,
 		buildCommand,
@@ -11,7 +15,8 @@ const createDockerfile = async (data, image): Promise<void> => {
 		baseDirectory,
 		secrets,
 		pullmergeRequestId,
-		buildId
+		deploymentType,
+		baseImage
 	} = data;
 	const Dockerfile: Array<string> = [];
 	const isPnpm = checkPnpm(installCommand, buildCommand, startCommand);
@@ -36,21 +41,34 @@ const createDockerfile = async (data, image): Promise<void> => {
 	if (isPnpm) {
 		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7');
 	}
-	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
-	Dockerfile.push(`RUN ${installCommand}`);
-	if (buildCommand) {
+	if (deploymentType === 'node') {
+		Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
+		Dockerfile.push(`RUN ${installCommand}`);
 		Dockerfile.push(`RUN ${buildCommand}`);
+		Dockerfile.push(`EXPOSE ${port}`);
+		Dockerfile.push(`CMD ${startCommand}`);
+	} else if (deploymentType === 'static') {
+		if (baseImage?.includes('nginx')) {
+			Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
+		}
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+		Dockerfile.push(`EXPOSE 80`);
 	}
-	Dockerfile.push(`EXPOSE ${port}`);
-	Dockerfile.push(`CMD ${startCommand}`);
+
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const { baseImage, baseBuildImage } = data;
-		await createDockerfile(data, baseImage);
-		await buildImage(data);
+		const { baseImage, baseBuildImage, deploymentType, buildCommand } = data;
+		if (deploymentType === 'node') {
+			await createDockerfile(data, baseImage);
+			await buildImage(data);
+		} else if (deploymentType === 'static') {
+			if (buildCommand) await buildCacheImageWithNode(data, baseBuildImage);
+			await createDockerfile(data, baseImage);
+			await buildImage(data);
+		}
 	} catch (error) {
 		throw error;
 	}

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

@@ -9,7 +9,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
-	if (baseImage.includes('nginx')) {
+	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
 	Dockerfile.push(`EXPOSE ${port}`);

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

@@ -40,7 +40,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	} else {
 		Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	}
-	if (baseImage.includes('nginx')) {
+	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
 	Dockerfile.push(`EXPOSE ${port}`);

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

@@ -9,7 +9,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
-	if (baseImage.includes('nginx')) {
+	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
 	Dockerfile.push(`EXPOSE ${port}`);

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

@@ -9,7 +9,7 @@ const createDockerfile = async (data, image): Promise<void> => {
 	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(`LABEL coolify.buildId=${buildId}`);
 	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
-	if (baseImage.includes('nginx')) {
+	if (baseImage?.includes('nginx')) {
 		Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	}
 	Dockerfile.push(`EXPOSE ${port}`);

apps/api/src/lib/docker.ts

@@ -1,33 +1,43 @@
-import { asyncExecShell } from './common';
-import Dockerode from 'dockerode';
-export function getEngine(engine: string): string {
-	return engine === '/var/run/docker.sock' ? 'unix:///var/run/docker.sock' : engine;
-}
-export function dockerInstance({ destinationDocker }): { engine: Dockerode; network: string } {
-	return {
-		engine: new Dockerode({
-			socketPath: destinationDocker.engine
-		}),
-		network: destinationDocker.network
-	};
-}
+import { executeDockerCmd } from './common';
 
-export async function checkContainer(engine: string, container: string, remove = false): Promise<boolean> {
-	const host = getEngine(engine);
+export function formatLabelsOnDocker(data) {
+	return data.trim().split('\n').map(a => JSON.parse(a)).map((container) => {
+		const labels = container.Labels.split(',')
+		let jsonLabels = {}
+		labels.forEach(l => {
+			const name = l.split('=')[0]
+			const value = l.split('=')[1]
+			jsonLabels = { ...jsonLabels, ...{ [name]: value } }
+		})
+		container.Labels = jsonLabels;
+		return container
+	})
+}
+export async function checkContainer({ dockerId, container, remove = false }: { dockerId: string, container: string, remove?: boolean }): Promise<boolean> {
 	let containerFound = false;
-
 	try {
-		const { stdout } = await asyncExecShell(
-			`DOCKER_HOST="${host}" docker inspect --format '{{json .State}}' ${container}`
-		);
+		const { stdout } = await executeDockerCmd({
+			dockerId,
+			command:
+				`docker inspect --format '{{json .State}}' ${container}`
+		});
+
 		const parsedStdout = JSON.parse(stdout);
 		const status = parsedStdout.Status;
 		const isRunning = status === 'running';
 		if (status === 'created') {
-			await asyncExecShell(`DOCKER_HOST="${host}" docker rm ${container}`);
+			await executeDockerCmd({
+				dockerId,
+				command:
+					`docker rm ${container}`
+			});
 		}
 		if (remove && status === 'exited') {
-			await asyncExecShell(`DOCKER_HOST="${host}" docker rm ${container}`);
+			await executeDockerCmd({
+				dockerId,
+				command:
+					`docker rm ${container}`
+			});
 		}
 		if (isRunning) {
 			containerFound = true;
@@ -38,13 +48,10 @@ export async function checkContainer(engine: string, container: string, remove =
 	return containerFound;
 }
 
-export async function isContainerExited(engine: string, containerName: string): Promise<boolean> {
+export async function isContainerExited(dockerId: string, containerName: string): Promise<boolean> {
 	let isExited = false;
-	const host = getEngine(engine);
 	try {
-		const { stdout } = await asyncExecShell(
-			`DOCKER_HOST="${host}" docker inspect -f '{{.State.Status}}' ${containerName}`
-		);
+		const { stdout } = await executeDockerCmd({ dockerId, command: `docker inspect -f '{{.State.Status}}' ${containerName}` })
 		if (stdout.trim() === 'exited') {
 			isExited = true;
 		}
@@ -57,19 +64,17 @@ export async function isContainerExited(engine: string, containerName: string):
 
 export async function removeContainer({
 	id,
-	engine
+	dockerId
 }: {
 	id: string;
-	engine: string;
+	dockerId: string;
 }): Promise<void> {
-	const host = getEngine(engine);
 	try {
-		const { stdout } = await asyncExecShell(
-			`DOCKER_HOST=${host} docker inspect --format '{{json .State}}' ${id}`
-		);
+		const { stdout } = await executeDockerCmd({ dockerId, command: `docker inspect --format '{{json .State}}' ${id}` })
+
 		if (JSON.parse(stdout).Running) {
-			await asyncExecShell(`DOCKER_HOST=${host} docker stop -t 0 ${id}`);
-			await asyncExecShell(`DOCKER_HOST=${host} docker rm ${id}`);
+			await executeDockerCmd({ dockerId, command: `docker stop -t 0 ${id}` })
+			await executeDockerCmd({ dockerId, command: `docker rm ${id}` })
 		}
 	} catch (error) {
 		console.log(error);

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

@@ -11,7 +11,8 @@ export default async function ({
 	apiUrl,
 	htmlUrl,
 	branch,
-	buildId
+	buildId,
+	customPort
 }: {
 	applicationId: string;
 	workdir: string;
@@ -21,6 +22,7 @@ export default async function ({
 	htmlUrl: string;
 	branch: string;
 	buildId: string;
+	customPort: number;
 }): Promise<string> {
 	const { default: got } = await import('got')
 	const url = htmlUrl.replace('https://', '').replace('http://', '');
@@ -54,7 +56,7 @@ export default async function ({
 		applicationId
 	});
 	await asyncExecShell(
-		`git clone -q -b ${branch} https://x-access-token:${token}@${url}/${repository}.git ${workdir}/ && cd ${workdir} && git submodule update --init --recursive && git lfs pull && cd .. `
+		`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/importers/gitlab.ts

@@ -9,7 +9,8 @@ export default async function ({
 	repository,
 	branch,
 	buildId,
-	privateSshKey
+	privateSshKey,
+	customPort
 }: {
 	applicationId: string;
 	workdir: string;
@@ -19,6 +20,7 @@ export default async function ({
 	buildId: string;
 	repodir: string;
 	privateSshKey: string;
+	customPort: number;
 }): Promise<string> {
 	const url = htmlUrl.replace('https://', '').replace('http://', '').replace(/\/$/, '');
 	await saveBuildLog({ line: 'GitLab importer started.', buildId, applicationId });
@@ -32,7 +34,7 @@ export default async function ({
 	});
 
 	await asyncExecShell(
-		`git clone -q -b ${branch} git@${url}:${repository}.git --config core.sshCommand="ssh -q -i ${repodir}id.rsa -o StrictHostKeyChecking=no" ${workdir}/ && cd ${workdir}/ && git submodule update --init --recursive && git lfs pull && cd .. `
+		`git clone -q -b ${branch} git@${url}:${repository}.git --config core.sshCommand="ssh -p ${customPort} -q -i ${repodir}id.rsa -o StrictHostKeyChecking=no" ${workdir}/ && cd ${workdir}/ && git submodule update --init --recursive && git lfs pull && cd .. `
 	);
 	const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
 	return commit.replace('\n', '');

apps/api/src/lib/scheduler.ts

@@ -11,11 +11,20 @@ const options: any = {
 	logger: false,
 	workerMessageHandler: async ({ name, message }) => {
 		if (name === 'deployApplication') {
-			if (message.pending === 0) {
-				if (!scheduler.workers.has('autoUpdater')) {
-					await scheduler.stop('deployApplication');
-					await scheduler.run('autoUpdater')
+			if (message.pending === 0 && message.size === 0) {
+				if (message.caller === 'autoUpdater') {
+					if (!scheduler.workers.has('autoUpdater')) {
+						await scheduler.stop('deployApplication');
+						await scheduler.run('autoUpdater')
+					}
 				}
+				if (message.caller === 'cleanupStorage') {
+					if (!scheduler.workers.has('cleanupStorage')) {
+						await scheduler.stop('deployApplication');
+						await scheduler.run('cleanupStorage')
+					}
+				}
+
 			}
 		}
 	},
@@ -25,7 +34,6 @@ const options: any = {
 		},
 		{
 			name: 'cleanupStorage',
-			interval: '10m'
 		},
 		{
 			name: 'checkProxies',

apps/api/src/lib/serviceFields.ts

@@ -15,7 +15,7 @@ export const plausibleAnalytics = [{
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
-},{
+}, {
 	name: 'username',
 	isEditable: true,
 	isLowerCase: false,
@@ -86,7 +86,7 @@ export const minio = [{
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
-},{
+}, {
 	name: 'rootUser',
 	isEditable: false,
 	isLowerCase: false,
@@ -173,6 +173,14 @@ export const wordpress = [{
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
+},
+{
+	name: 'ftpPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
 }]
 export const ghost = [{
 	name: 'defaultEmail',
@@ -317,7 +325,7 @@ export const fider = [{
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: true
-},{
+}, {
 	name: 'postgreslUser',
 	isEditable: false,
 	isLowerCase: false,
@@ -336,7 +344,7 @@ export const fider = [{
 {
 	name: 'emailNoreply',
 	isEditable: true,
-	isLowerCase: true,
+	isLowerCase: false,
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
@@ -344,7 +352,7 @@ export const fider = [{
 {
 	name: 'emailSmtpHost',
 	isEditable: true,
-	isLowerCase: true,
+	isLowerCase: false,
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
@@ -368,7 +376,7 @@ export const fider = [{
 {
 	name: 'emailSmtpUser',
 	isEditable: true,
-	isLowerCase: true,
+	isLowerCase: false,
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
@@ -404,4 +412,68 @@ export const fider = [{
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
+}]
+export const moodle = [{
+	name: 'defaultEmail',
+	isEditable: true,
+	isLowerCase: true,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'defaultUsername',
+	isEditable: true,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: false
+},
+{
+	name: 'defaultPassword',
+	isEditable: false,
+	isLowerCase: false,
+	isNumber: false,
+	isBoolean: false,
+	isEncrypted: true
+},
+{
+	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
 }]

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

@@ -2,25 +2,23 @@ import cuid from 'cuid';
 import crypto from 'node:crypto'
 import jsonwebtoken from 'jsonwebtoken';
 import axios from 'axios';
-import { day } from '../../../../lib/dayjs';
-
-
-import type { FastifyRequest } from 'fastify';
 import { FastifyReply } from 'fastify';
-
-import { CheckDNS, DeleteApplication, DeployApplication, GetApplication, SaveApplication, SaveApplicationSettings } from '.';
+import { day } from '../../../../lib/dayjs';
 import { setDefaultBaseImage, setDefaultConfiguration } from '../../../../lib/buildPacks/common';
-import { asyncExecShell, checkDomainsIsValidInDNS, checkDoubleBranch, decrypt, encrypt, errorHandler, generateSshKeyPair, getContainerUsage, getDomain, isDev, isDomainConfigured, prisma, stopBuild, uniqueName } from '../../../../lib/common';
-import { checkContainer, dockerInstance, getEngine, isContainerExited, removeContainer } from '../../../../lib/docker';
+import { checkDomainsIsValidInDNS, checkDoubleBranch, decrypt, encrypt, errorHandler, executeDockerCmd, generateSshKeyPair, getContainerUsage, getDomain, getFreeExposedPort, isDev, isDomainConfigured, 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';
 
 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 }
+            include: { teams: true, destinationDocker: true }
         });
         const settings = await prisma.setting.findFirst()
         return {
@@ -31,22 +29,69 @@ export async function listApplications(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function getApplication(request: FastifyRequest<GetApplication>) {
+export async function getImages(request: FastifyRequest<GetImages>) {
+    try {
+        const { buildPack, deploymentType } = request.body
+        let publishDirectory = undefined;
+        let port = undefined
+        const { baseImage, baseBuildImage, baseBuildImages, baseImages, } = setDefaultBaseImage(
+            buildPack, deploymentType
+        );
+        if (buildPack === 'nextjs') {
+            if (deploymentType === 'static') {
+                publishDirectory = 'out'
+                port = '80'
+            } else {
+                publishDirectory = ''
+                port = '3000'
+            }
+        }
+        if (buildPack === 'nuxtjs') {
+            if (deploymentType === 'static') {
+                publishDirectory = 'dist'
+                port = '80'
+            } else {
+                publishDirectory = ''
+                port = '3000'
+            }
+        }
+
+
+        return { baseBuildImage, baseBuildImages, publishDirectory, port }
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
+export async function getApplicationStatus(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params
         const { teamId } = request.user
-        const appId = process.env['COOLIFY_APP_ID'];
         let isRunning = false;
         let isExited = false;
-        const application = await getApplicationFromDB(id, teamId);
-        if (application?.destinationDockerId && application.destinationDocker?.engine) {
-            isRunning = await checkContainer(application.destinationDocker.engine, id);
-            isExited = await isContainerExited(application.destinationDocker.engine, id);
+
+        const application: any = await getApplicationFromDB(id, teamId);
+        if (application?.destinationDockerId) {
+            isRunning = await checkContainer({ dockerId: application.destinationDocker.id, container: id });
+            isExited = await isContainerExited(application.destinationDocker.id, id);
         }
         return {
             isQueueActive: scheduler.workers.has('deployApplication'),
             isRunning,
             isExited,
+        };
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
+
+export async function getApplication(request: FastifyRequest<OnlyId>) {
+    try {
+        const { id } = request.params
+        const { teamId } = request.user
+        const appId = process.env['COOLIFY_APP_ID'];
+        const application: any = await getApplicationFromDB(id, teamId);
+
+        return {
             application,
             appId
         };
@@ -184,7 +229,8 @@ export async function saveApplication(request: FastifyRequest<SaveApplication>,
             denoMainFile,
             denoOptions,
             baseImage,
-            baseBuildImage
+            baseBuildImage,
+            deploymentType
         } = request.body
 
         if (port) port = Number(port);
@@ -215,6 +261,7 @@ export async function saveApplication(request: FastifyRequest<SaveApplication>,
                 denoOptions,
                 baseImage,
                 baseBuildImage,
+                deploymentType,
                 ...defaultConfiguration
             }
         });
@@ -231,7 +278,8 @@ export async function saveApplicationSettings(request: FastifyRequest<SaveApplic
         const { debug, previews, dualCerts, autodeploy, branch, projectId } = request.body
         const isDouble = await checkDoubleBranch(branch, projectId);
         if (isDouble && autodeploy) {
-            throw { status: 500, message: 'Application not configured.' }
+            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.' }
         }
         await prisma.application.update({
             where: { id },
@@ -244,16 +292,35 @@ export async function saveApplicationSettings(request: FastifyRequest<SaveApplic
     }
 }
 
-export async function stopApplication(request: FastifyRequest, reply: FastifyReply) {
+export async function stopPreviewApplication(request: FastifyRequest<StopPreviewApplication>, reply: FastifyReply) {
+    try {
+        const { id } = request.params
+        const { pullmergeRequestId } = request.body
+        const { teamId } = request.user
+        const application: any = await getApplicationFromDB(id, teamId);
+        if (application?.destinationDockerId) {
+            const container = `${id}-${pullmergeRequestId}`
+            const { id: dockerId } = application.destinationDocker;
+            const found = await checkContainer({ dockerId, container });
+            if (found) {
+                await removeContainer({ id: container, dockerId: application.destinationDocker.id });
+            }
+        }
+        return reply.code(201).send();
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
+export async function stopApplication(request: FastifyRequest<OnlyId>, reply: FastifyReply) {
     try {
         const { id } = request.params
         const { teamId } = request.user
-        const application = await getApplicationFromDB(id, teamId);
-        if (application?.destinationDockerId && application.destinationDocker?.engine) {
-            const { engine } = application.destinationDocker;
-            const found = await checkContainer(engine, id);
+        const application: any = await getApplicationFromDB(id, teamId);
+        if (application?.destinationDockerId) {
+            const { id: dockerId } = application.destinationDocker;
+            const found = await checkContainer({ dockerId, container: id });
             if (found) {
-                await removeContainer({ id, engine });
+                await removeContainer({ id, dockerId: application.destinationDocker.id });
             }
         }
         return reply.code(201).send();
@@ -269,17 +336,17 @@ export async function deleteApplication(request: FastifyRequest<DeleteApplicatio
             where: { id },
             include: { destinationDocker: true }
         });
-        if (application?.destinationDockerId && application.destinationDocker?.engine && application.destinationDocker?.network) {
-            const host = getEngine(application.destinationDocker.engine);
-            const { stdout: containers } = await asyncExecShell(
-                `DOCKER_HOST=${host} docker ps -a --filter network=${application.destinationDocker.network} --filter name=${id} --format '{{json .}}'`
-            );
+        if (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 .}}'`
+            })
             if (containers) {
                 const containersArray = containers.trim().split('\n');
                 for (const container of containersArray) {
                     const containerObj = JSON.parse(container);
                     const id = containerObj.ID;
-                    await removeContainer({ id, engine: application.destinationDocker.engine });
+                    await removeContainer({ id, dockerId: application.destinationDocker.id });
                 }
             }
         }
@@ -298,33 +365,48 @@ export async function deleteApplication(request: FastifyRequest<DeleteApplicatio
         return errorHandler({ status, message })
     }
 }
-
+export async function checkDomain(request: FastifyRequest<CheckDomain>) {
+    try {
+        const { id } = request.params
+        const { domain } = request.query
+        const { fqdn, settings: { dualCerts } } = await prisma.application.findUnique({ where: { id }, include: { settings: true } })
+        return await checkDomainsIsValidInDNS({ hostname: domain, fqdn, dualCerts });
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
 export async function checkDNS(request: FastifyRequest<CheckDNS>) {
     try {
         const { id } = request.params
 
         let { exposePort, fqdn, forceSave, dualCerts } = request.body
-        fqdn = fqdn.toLowerCase();
 
+        if (fqdn) 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 });
+
+        const found = await isDomainConfigured({ id, fqdn, remoteIpAddress });
         if (found) {
             throw { status: 500, message: `Domain ${getDomain(fqdn).replace('www.', '')} is already in use!` }
         }
         if (exposePort) {
-            exposePort = Number(exposePort);
-
             if (exposePort < 1024 || exposePort > 65535) {
                 throw { status: 500, message: `Exposed Port needs to be between 1024 and 65535.` }
             }
-            const { default: getPort } = await import('get-port');
-            const publicPort = await getPort({ port: exposePort });
-            if (publicPort !== exposePort) {
-                throw { status: 500, message: `Port ${exposePort} is already in use.` }
+
+            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) {
-            return await checkDomainsIsValidInDNS({ hostname: request.hostname, fqdn, dualCerts });
+            let hostname = request.hostname.split(':')[0];
+            if (remoteEngine) hostname = remoteIpAddress;
+            return await checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts });
         }
         return {}
     } catch ({ status, message }) {
@@ -336,10 +418,11 @@ export async function getUsage(request) {
     try {
         const { id } = request.params
         const teamId = request.user?.teamId;
-        const application = await getApplicationFromDB(id, teamId);
         let usage = {};
+
+        const application: any = await getApplicationFromDB(id, teamId);
         if (application.destinationDockerId) {
-            [usage] = await Promise.all([getContainerUsage(application.destinationDocker.engine, id)]);
+            [usage] = await Promise.all([getContainerUsage(application.destinationDocker.id, id)]);
         }
         return {
             usage
@@ -352,7 +435,6 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
     try {
         const { id } = request.params
         const teamId = request.user?.teamId;
-
         const { pullmergeRequestId = null, branch } = request.body
         const buildId = cuid();
         const application = await getApplicationFromDB(id, teamId);
@@ -413,7 +495,7 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
 }
 
 
-export async function saveApplicationSource(request: FastifyRequest, reply: FastifyReply) {
+export async function saveApplicationSource(request: FastifyRequest<SaveApplicationSource>, reply: FastifyReply) {
     try {
         const { id } = request.params
         const { gitSourceId } = request.body
@@ -427,11 +509,11 @@ export async function saveApplicationSource(request: FastifyRequest, reply: Fast
     }
 }
 
-export async function getGitHubToken(request: FastifyRequest, reply: FastifyReply) {
+export async function getGitHubToken(request: FastifyRequest<OnlyId>, reply: FastifyReply) {
     try {
         const { id } = request.params
         const { teamId } = request.user
-        const application = await getApplicationFromDB(id, teamId);
+        const application: any = await getApplicationFromDB(id, teamId);
         const payload = {
             iat: Math.round(new Date().getTime() / 1000),
             exp: Math.round(new Date().getTime() / 1000 + 60),
@@ -453,7 +535,7 @@ export async function getGitHubToken(request: FastifyRequest, reply: FastifyRepl
     }
 }
 
-export async function checkRepository(request: FastifyRequest) {
+export async function checkRepository(request: FastifyRequest<CheckRepository>) {
     try {
         const { id } = request.params
         const { repository, branch } = request.query
@@ -490,13 +572,17 @@ export async function saveRepository(request, reply) {
                 data: { repository, branch, projectId, settings: { update: { autodeploy } } }
             });
         }
+        const isDouble = await checkDoubleBranch(branch, projectId);
+        if (isDouble) {
+            await prisma.applicationSettings.updateMany({ where: { application: { branch, projectId } }, data: { autodeploy: false } })
+        }
         return reply.code(201).send()
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
 }
 
-export async function saveDestination(request: FastifyRequest, reply: FastifyReply) {
+export async function saveDestination(request: FastifyRequest<SaveDestination>, reply: FastifyReply) {
     try {
         const { id } = request.params
         const { destinationId } = request.body
@@ -514,7 +600,7 @@ export async function getBuildPack(request) {
     try {
         const { id } = request.params
         const teamId = request.user?.teamId;
-        const application = await getApplicationFromDB(id, teamId);
+        const application: any = await getApplicationFromDB(id, teamId);
         return {
             type: application.gitSource.type,
             projectId: application.projectId,
@@ -538,7 +624,7 @@ export async function saveBuildPack(request, reply) {
     }
 }
 
-export async function getSecrets(request: FastifyRequest) {
+export async function getSecrets(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params
         let secrets = await prisma.secret.findMany({
@@ -560,7 +646,7 @@ export async function getSecrets(request: FastifyRequest) {
     }
 }
 
-export async function saveSecret(request: FastifyRequest, reply: FastifyReply) {
+export async function saveSecret(request: FastifyRequest<SaveSecret>, reply: FastifyReply) {
     try {
         const { id } = request.params
         let { name, value, isBuildSecret, isPRMRSecret, isNew } = request.body
@@ -595,7 +681,7 @@ export async function saveSecret(request: FastifyRequest, reply: FastifyReply) {
         return errorHandler({ status, message })
     }
 }
-export async function deleteSecret(request: FastifyRequest) {
+export async function deleteSecret(request: FastifyRequest<DeleteSecret>) {
     try {
         const { id } = request.params
         const { name } = request.body
@@ -606,7 +692,7 @@ export async function deleteSecret(request: FastifyRequest) {
     }
 }
 
-export async function getStorages(request: FastifyRequest) {
+export async function getStorages(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params
         const persistentStorages = await prisma.applicationPersistentStorage.findMany({ where: { applicationId: id } });
@@ -618,7 +704,7 @@ export async function getStorages(request: FastifyRequest) {
     }
 }
 
-export async function saveStorage(request: FastifyRequest, reply: FastifyReply) {
+export async function saveStorage(request: FastifyRequest<SaveStorage>, reply: FastifyReply) {
     try {
         const { id } = request.params
         const { path, newStorage, storageId } = request.body
@@ -639,7 +725,7 @@ export async function saveStorage(request: FastifyRequest, reply: FastifyReply)
     }
 }
 
-export async function deleteStorage(request: FastifyRequest) {
+export async function deleteStorage(request: FastifyRequest<DeleteStorage>) {
     try {
         const { id } = request.params
         const { path } = request.body
@@ -650,7 +736,7 @@ export async function deleteStorage(request: FastifyRequest) {
     }
 }
 
-export async function getPreviews(request: FastifyRequest) {
+export async function getPreviews(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params
         const { teamId } = request.user
@@ -662,21 +748,20 @@ export async function getPreviews(request: FastifyRequest) {
             secret.value = decrypt(secret.value);
             return secret;
         });
+
         const applicationSecrets = secrets.filter((secret) => !secret.isPRMRSecret);
         const PRMRSecrets = secrets.filter((secret) => secret.isPRMRSecret);
-        const destinationDocker = await prisma.destinationDocker.findFirst({
-            where: { application: { some: { id } }, teams: { some: { id: teamId } } }
-        });
-        const docker = dockerInstance({ destinationDocker });
-        const listContainers = await docker.engine.listContainers({
-            filters: { network: [destinationDocker.network], name: [id] }
-        });
-        const containers = listContainers.filter((container) => {
-            return (
-                container.Labels['coolify.configuration'] &&
-                container.Labels['coolify.type'] === 'standalone-application'
-            );
-        });
+        const application = await prisma.application.findUnique({ where: { id }, include: { destinationDocker: true } });
+        const { stdout } = await executeDockerCmd({ dockerId: application.destinationDocker.id, command: `docker container ls --filter 'name=${id}-' --format "{{json .}}"` })
+        if (stdout === '') {
+            return {
+                containers: [],
+                applicationSecrets: [],
+                PRMRSecrets: []
+            }
+        }
+        const containers = formatLabelsOnDocker(stdout).filter(container => container.Labels['coolify.configuration'] && container.Labels['coolify.type'] === 'standalone-application')
+
         const jsonContainers = containers
             .map((container) =>
                 JSON.parse(Buffer.from(container.Labels['coolify.configuration'], 'base64').toString())
@@ -694,55 +779,51 @@ export async function getPreviews(request: FastifyRequest) {
             })
         }
     } catch ({ status, message }) {
+        console.log({ status, message })
         return errorHandler({ status, message })
     }
 }
 
-export async function getApplicationLogs(request: FastifyRequest) {
+export async function getApplicationLogs(request: FastifyRequest<GetApplicationLogs>) {
     try {
-        const { id } = request.params
+        const { id } = request.params;
         let { since = 0 } = request.query
         if (since !== 0) {
             since = day(since).unix();
         }
-        const { destinationDockerId, destinationDocker } = await prisma.application.findUnique({
+        const { destinationDockerId, destinationDocker: { id: dockerId } } = await prisma.application.findUnique({
             where: { id },
             include: { destinationDocker: true }
         });
         if (destinationDockerId) {
-            const docker = dockerInstance({ destinationDocker });
             try {
-                const container = await docker.engine.getContainer(id);
-                if (container) {
-                    const { default: ansi } = await import('strip-ansi')
-                    const logs = (
-                        await container.logs({
-                            stdout: true,
-                            stderr: true,
-                            timestamps: true,
-                            since,
-                            tail: 5000
-                        })
-                    )
-                        .toString()
-                        .split('\n')
-                        .map((l) => ansi(l.slice(8)))
-                        .filter((a) => a);
+                // const found = await checkContainer({ dockerId, container: id })
+                // if (found) {
+                const { default: ansi } = await import('strip-ansi')
+                const { stdout, stderr } = await executeDockerCmd({ dockerId, command: `docker logs --since ${since} --tail 5000 --timestamps ${id}` })
+                const stripLogsStdout = stdout.toString().split('\n').map((l) => ansi(l)).filter((a) => a);
+                const stripLogsStderr = stderr.toString().split('\n').map((l) => ansi(l)).filter((a) => a);
+                const logs = stripLogsStderr.concat(stripLogsStdout)
+                const sortedLogs = logs.sort((a, b) => (day(a.split(' ')[0]).isAfter(day(b.split(' ')[0])) ? 1 : -1))
+                return { logs: sortedLogs }
+                // }
+            } catch (error) {
+                const { statusCode } = error;
+                if (statusCode === 404) {
                     return {
-                        logs
+                        logs: []
                     };
                 }
-            } catch (error) {
-                return {
-                    logs: []
-                };
             }
         }
+        return {
+            message: 'No logs found.'
+        }
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
 }
-export async function getBuildLogs(request: FastifyRequest) {
+export async function getBuildLogs(request: FastifyRequest<GetBuildLogs>) {
     try {
         const { id } = request.params
         let { buildId, skip = 0 } = request.query
@@ -779,9 +860,9 @@ export async function getBuildLogs(request: FastifyRequest) {
     }
 }
 
-export async function getBuildIdLogs(request: FastifyRequest) {
+export async function getBuildIdLogs(request: FastifyRequest<GetBuildIdLogs>) {
     try {
-        const { id, buildId } = request.params
+        const { buildId } = request.params
         let { sequence = 0 } = request.query
         if (typeof sequence !== 'number') {
             sequence = Number(sequence)
@@ -800,7 +881,7 @@ export async function getBuildIdLogs(request: FastifyRequest) {
     }
 }
 
-export async function getGitLabSSHKey(request: FastifyRequest) {
+export async function getGitLabSSHKey(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params
         const application = await prisma.application.findUnique({
@@ -813,7 +894,7 @@ export async function getGitLabSSHKey(request: FastifyRequest) {
     }
 }
 
-export async function saveGitLabSSHKey(request: FastifyRequest, reply: FastifyReply) {
+export async function saveGitLabSSHKey(request: FastifyRequest<OnlyId>, reply: FastifyReply) {
     try {
         const { id } = request.params
         const application = await prisma.application.findUnique({
@@ -835,7 +916,7 @@ export async function saveGitLabSSHKey(request: FastifyRequest, reply: FastifyRe
     }
 }
 
-export async function saveDeployKey(request: FastifyRequest, reply: FastifyReply) {
+export async function saveDeployKey(request: FastifyRequest<SaveDeployKey>, reply: FastifyReply) {
     try {
         const { id } = request.params
         let { deployKeyId } = request.body;
@@ -855,9 +936,8 @@ export async function saveDeployKey(request: FastifyRequest, reply: FastifyReply
     }
 }
 
-export async function cancelDeployment(request: FastifyRequest, reply: FastifyReply) {
+export async function cancelDeployment(request: FastifyRequest<CancelDeployment>, reply: FastifyReply) {
     try {
-        const { id } = request.params
         const { buildId, applicationId } = request.body;
         if (!buildId) {
             throw { status: 500, message: 'buildId is required' }

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

@@ -1,89 +1,65 @@
 import { FastifyPluginAsync } from 'fastify';
-import { cancelDeployment, checkDNS, checkRepository, deleteApplication, deleteSecret, deleteStorage, deployApplication, getApplication, getApplicationLogs, getBuildIdLogs, getBuildLogs, getBuildPack, getGitHubToken, getGitLabSSHKey, getPreviews, getSecrets, getStorages, getUsage, listApplications, newApplication, saveApplication, saveApplicationSettings, saveApplicationSource, saveBuildPack, saveDeployKey, saveDestination, saveGitLabSSHKey, saveRepository, saveSecret, saveStorage, stopApplication } from './handlers';
+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';
 
-export interface GetApplication {
-    Params: { id: string; }
-}
+import type { CancelDeployment, CheckDNS, CheckDomain, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, DeployApplication, GetApplicationLogs, GetBuildIdLogs, GetBuildLogs, GetImages, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage, StopPreviewApplication } from './types';
 
-export interface SaveApplication {
-    Params: { id: string; },
-    Body: any
-}
-
-export interface SaveApplicationSettings {
-    Params: { id: string; };
-    Querystring: { domain: string; };
-    Body: { debug: boolean; previews: boolean; dualCerts: boolean; autodeploy: boolean; branch: string; projectId: number; };
-}
-
-export interface DeleteApplication {
-    Params: { id: string; };
-    Querystring: { domain: string; };
-}
-
-export interface CheckDNS {
-    Params: { id: string; };
-    Querystring: { domain: string; };
-}
-
-export interface DeployApplication {
-    Params: { id: string },
-    Querystring: { domain: string }
-    Body: { pullmergeRequestId: string | null, branch: string }
-}
-
-const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
-    fastify.addHook('onRequest', async (request, reply) => {
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
+    fastify.addHook('onRequest', async (request) => {
         return await request.jwtVerify()
     })
     fastify.get('/', async (request) => await listApplications(request));
+    fastify.post<GetImages>('/images', async (request) => await getImages(request));
 
     fastify.post('/new', async (request, reply) => await newApplication(request, reply));
 
-    fastify.get<GetApplication>('/:id', async (request) => await getApplication(request));
+    fastify.get<OnlyId>('/:id', async (request) => await getApplication(request));
     fastify.post<SaveApplication>('/:id', async (request, reply) => await saveApplication(request, reply));
     fastify.delete<DeleteApplication>('/:id', async (request, reply) => await deleteApplication(request, reply));
 
-    fastify.post('/:id/stop', async (request, reply) => await stopApplication(request, reply));
+    fastify.get<OnlyId>('/:id/status', async (request) => await getApplicationStatus(request));
+
+    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));
 
     fastify.post<SaveApplicationSettings>('/:id/settings', async (request, reply) => await saveApplicationSettings(request, reply));
-    fastify.post<SaveApplicationSettings>('/:id/check', async (request) => await checkDNS(request));
 
-    fastify.get('/:id/secrets', async (request) => await getSecrets(request));
-    fastify.post('/:id/secrets', async (request, reply) => await saveSecret(request, reply));
-    fastify.delete('/:id/secrets', async (request) => await deleteSecret(request));
+    fastify.get<CheckDomain>('/:id/check', async (request) => await checkDomain(request));
+    fastify.post<CheckDNS>('/:id/check', async (request) => await checkDNS(request));
 
-    fastify.get('/:id/storages', async (request) => await getStorages(request));
-    fastify.post('/:id/storages', async (request, reply) => await saveStorage(request, reply));
-    fastify.delete('/:id/storages', async (request) => await deleteStorage(request));
+    fastify.get<OnlyId>('/:id/secrets', async (request) => await getSecrets(request));
+    fastify.post<SaveSecret>('/:id/secrets', async (request, reply) => await saveSecret(request, reply));
+    fastify.delete<DeleteSecret>('/:id/secrets', async (request) => await deleteSecret(request));
 
-    fastify.get('/:id/previews', async (request) => await getPreviews(request));
+    fastify.get<OnlyId>('/:id/storages', async (request) => await getStorages(request));
+    fastify.post<SaveStorage>('/:id/storages', async (request, reply) => await saveStorage(request, reply));
+    fastify.delete<DeleteStorage>('/:id/storages', async (request) => await deleteStorage(request));
 
-    fastify.get('/:id/logs', async (request) => await getApplicationLogs(request));
-    fastify.get('/:id/logs/build', async (request) => await getBuildLogs(request));
-    fastify.get('/:id/logs/build/:buildId', async (request) => await getBuildIdLogs(request));
+    fastify.get<OnlyId>('/:id/previews', async (request) => await getPreviews(request));
 
-    fastify.get<DeployApplication>('/:id/usage', async (request) => await getUsage(request))
+    fastify.get<GetApplicationLogs>('/:id/logs', async (request) => await getApplicationLogs(request));
+    fastify.get<GetBuildLogs>('/:id/logs/build', async (request) => await getBuildLogs(request));
+    fastify.get<GetBuildIdLogs>('/:id/logs/build/:buildId', async (request) => await getBuildIdLogs(request));
+
+    fastify.get('/:id/usage', async (request) => await getUsage(request))
 
     fastify.post<DeployApplication>('/:id/deploy', async (request) => await deployApplication(request))
-    fastify.post('/:id/cancel', async (request, reply) => await cancelDeployment(request, reply));
-    
-    fastify.post('/:id/configuration/source', async (request, reply) => await saveApplicationSource(request, reply));
+    fastify.post<CancelDeployment>('/:id/cancel', async (request, reply) => await cancelDeployment(request, reply));
 
-    fastify.get('/:id/configuration/repository', async (request) => await checkRepository(request));
+    fastify.post<SaveApplicationSource>('/:id/configuration/source', async (request, reply) => await saveApplicationSource(request, reply));
+
+    fastify.get<CheckRepository>('/:id/configuration/repository', async (request) => await checkRepository(request));
     fastify.post('/:id/configuration/repository', async (request, reply) => await saveRepository(request, reply));
-    fastify.post('/:id/configuration/destination', async (request, reply) => await saveDestination(request, reply));
+    fastify.post<SaveDestination>('/:id/configuration/destination', async (request, reply) => await saveDestination(request, reply));
     fastify.get('/:id/configuration/buildpack', async (request) => await getBuildPack(request));
     fastify.post('/:id/configuration/buildpack', async (request, reply) => await saveBuildPack(request, reply));
 
-    fastify.get('/:id/configuration/sshkey', async (request) => await getGitLabSSHKey(request));
-    fastify.post('/:id/configuration/sshkey', async (request, reply) => await saveGitLabSSHKey(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));
 
-    fastify.post('/:id/configuration/deploykey', async (request, reply) => await saveDeployKey(request, reply));
+    fastify.post<SaveDeployKey>('/:id/configuration/deploykey', async (request, reply) => await saveDeployKey(request, reply));
 
-
-
-    fastify.get('/:id/configuration/githubToken', async (request, reply) => await getGitHubToken(request, reply));
+    fastify.get<OnlyId>('/:id/configuration/githubToken', async (request, reply) => await getGitHubToken(request, reply));
 };
 
 export default root;

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

@@ -0,0 +1,126 @@
+import type { OnlyId } from "../../../../types";
+
+export interface SaveApplication extends OnlyId {
+    Body: {
+        name: string,
+        buildPack: string,
+        fqdn: string,
+        port: number,
+        exposePort: number,
+        installCommand: string,
+        buildCommand: string,
+        startCommand: string,
+        baseDirectory: string,
+        publishDirectory: string,
+        pythonWSGI: string,
+        pythonModule: string,
+        pythonVariable: string,
+        dockerFileLocation: string,
+        denoMainFile: string,
+        denoOptions: string,
+        baseImage: string,
+        baseBuildImage: string,
+        deploymentType: string
+    }
+}
+export interface SaveApplicationSettings extends OnlyId {
+    Querystring: { domain: string; };
+    Body: { debug: boolean; previews: boolean; dualCerts: boolean; autodeploy: boolean; branch: string; projectId: number; };
+}
+export interface DeleteApplication extends OnlyId {
+    Querystring: { domain: string; };
+}
+export interface CheckDomain extends OnlyId {
+    Querystring: { domain: string; };
+}
+export interface CheckDNS extends OnlyId {
+    Querystring: { domain: string; };
+    Body: {
+        exposePort: number,
+        fqdn: string,
+        forceSave: boolean,
+        dualCerts: boolean
+    }
+}
+export interface DeployApplication {
+    Querystring: { domain: string }
+    Body: { pullmergeRequestId: string | null, branch: string }
+}
+export interface GetImages {
+    Body: { buildPack: string, deploymentType: string }
+}
+export interface SaveApplicationSource extends OnlyId {
+    Body: { gitSourceId: string }
+}
+export interface CheckRepository extends OnlyId {
+    Querystring: { repository: string, branch: string }
+}
+export interface SaveDestination extends OnlyId {
+    Body: { destinationId: string }
+}
+export interface SaveSecret extends OnlyId {
+    Body: {
+        name: string,
+        value: string,
+        isBuildSecret: boolean,
+        isPRMRSecret: boolean,
+        isNew: boolean
+    }
+}
+export interface DeleteSecret extends OnlyId {
+    Body: { name: string }
+}
+export interface SaveStorage extends OnlyId {
+    Body: {
+        path: string,
+        newStorage: boolean,
+        storageId: string
+    }
+}
+export interface DeleteStorage extends OnlyId {
+    Body: {
+        path: string,
+    }
+}
+export interface GetApplicationLogs extends OnlyId {
+    Querystring: {
+        since: number,
+    }
+}
+export interface GetBuildLogs extends OnlyId {
+    Querystring: {
+        buildId: string
+        skip: number,
+    }
+}
+export interface GetBuildIdLogs {
+    Params: {
+        buildId: string
+    },
+    Querystring: {
+        sequence: number
+    }
+}
+export interface SaveDeployKey extends OnlyId {
+    Body: {
+        deployKeyId: number
+    }
+}
+export interface CancelDeployment {
+    Body: {
+        buildId: string,
+        applicationId: string
+    }
+}
+export interface DeployApplication extends OnlyId {
+    Body: {
+        pullmergeRequestId: string | null,
+        branch: string
+    }
+}
+
+export interface StopPreviewApplication extends OnlyId {
+    Body: {
+        pullmergeRequestId: string | null,
+    }
+}

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

@@ -0,0 +1,22 @@
+import { FastifyPluginAsync } from 'fastify';
+import { errorHandler, listSettings, version } from '../../../../lib/common';
+
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
+    fastify.get('/', async () => {
+        const settings = await listSettings()
+        try {
+            return {
+                ipv4: settings.ipv4,
+                ipv6: settings.ipv6,
+                version,
+                whiteLabeled: process.env.COOLIFY_WHITE_LABELED === 'true',
+                whiteLabeledIcon: process.env.COOLIFY_WHITE_LABELED_ICON,
+            }
+        } catch ({ status, message }) {
+            return errorHandler({ status, message })
+        }
+    });
+
+};
+
+export default root;

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

@@ -3,23 +3,20 @@ import type { FastifyRequest } from 'fastify';
 import { FastifyReply } from 'fastify';
 import yaml from 'js-yaml';
 import fs from 'fs/promises';
-import { asyncExecShell, ComposeFile, createDirectories, decrypt, encrypt, errorHandler, generateDatabaseConfiguration, generatePassword, getContainerUsage, getDatabaseImage, getDatabaseVersions, getFreePort, listSettings, makeLabelForStandaloneDatabase, prisma, startTcpProxy, startTraefikTCPProxy, stopDatabaseContainer, stopTcpHttpProxy, supportedDatabaseTypesAndVersions, uniqueName, updatePasswordInDb } from '../../../../lib/common';
-import { dockerInstance, getEngine } from '../../../../lib/docker';
+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';
+
 export async function listDatabases(request: FastifyRequest) {
     try {
-        const userId = request.user.userId;
         const teamId = request.user.teamId;
-        let databases = []
-        if (teamId === '0') {
-            databases = await prisma.database.findMany({ include: { teams: true } });
-        } else {
-            databases = await prisma.database.findMany({
-                where: { teams: { some: { id: teamId } } },
-                include: { teams: true }
-            });
-        }
+        const databases = await prisma.database.findMany({
+            where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } },
+            include: { teams: true, destinationDocker: true }
+        });
         return {
             databases
         }
@@ -55,7 +52,37 @@ export async function newDatabase(request: FastifyRequest, reply: FastifyReply)
         return errorHandler({ status, message })
     }
 }
-export async function getDatabase(request: FastifyRequest) {
+export async function getDatabaseStatus(request: FastifyRequest<OnlyId>) {
+    try {
+        const { id } = request.params;
+        const teamId = request.user.teamId;
+        let isRunning = false;
+
+        const database = await prisma.database.findFirst({
+            where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
+            include: { destinationDocker: true, settings: true }
+        });
+        const { destinationDockerId, destinationDocker } = database;
+        if (destinationDockerId) {
+            try {
+                const { stdout } = await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker inspect --format '{{json .State}}' ${id}` })
+
+                if (JSON.parse(stdout).Running) {
+                    isRunning = true;
+                }
+            } catch (error) {
+                //
+            }
+        }
+        return {
+            isRunning
+        }
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
+
+export async function getDatabase(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params;
         const teamId = request.user.teamId;
@@ -68,29 +95,11 @@ export async function getDatabase(request: FastifyRequest) {
         }
         if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword);
         if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword);
-        const { destinationDockerId, destinationDocker } = database;
-        let isRunning = false;
-        if (destinationDockerId) {
-            const host = getEngine(destinationDocker.engine);
-
-            try {
-                const { stdout } = await asyncExecShell(
-                    `DOCKER_HOST=${host} docker inspect --format '{{json .State}}' ${id}`
-                );
-
-                if (JSON.parse(stdout).Running) {
-                    isRunning = true;
-                }
-            } catch (error) {
-                //
-            }
-        }
         const configuration = generateDatabaseConfiguration(database);
         const settings = await listSettings();
         return {
             privatePort: configuration?.privatePort,
             database,
-            isRunning,
             versions: await getDatabaseVersions(database.type),
             settings
         };
@@ -107,7 +116,7 @@ export async function getDatabaseTypes(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function saveDatabaseType(request: FastifyRequest, reply: FastifyReply) {
+export async function saveDatabaseType(request: FastifyRequest<SaveDatabaseType>, reply: FastifyReply) {
     try {
         const { id } = request.params;
         const { type } = request.body;
@@ -120,7 +129,7 @@ export async function saveDatabaseType(request: FastifyRequest, reply: FastifyRe
         return errorHandler({ status, message })
     }
 }
-export async function getVersions(request: FastifyRequest) {
+export async function getVersions(request: FastifyRequest<OnlyId>) {
     try {
         const teamId = request.user.teamId;
         const { id } = request.params;
@@ -135,7 +144,7 @@ export async function getVersions(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function saveVersion(request: FastifyRequest, reply: FastifyReply) {
+export async function saveVersion(request: FastifyRequest<SaveVersion>, reply: FastifyReply) {
     try {
         const { id } = request.params;
         const { version } = request.body;
@@ -144,7 +153,6 @@ export async function saveVersion(request: FastifyRequest, reply: FastifyReply)
             where: { id },
             data: {
                 version,
-
             }
         });
         return reply.code(201).send({})
@@ -152,7 +160,7 @@ export async function saveVersion(request: FastifyRequest, reply: FastifyReply)
         return errorHandler({ status, message })
     }
 }
-export async function saveDatabaseDestination(request: FastifyRequest, reply: FastifyReply) {
+export async function saveDatabaseDestination(request: FastifyRequest<SaveDatabaseDestination>, reply: FastifyReply) {
     try {
         const { id } = request.params;
         const { destinationId } = request.body;
@@ -164,16 +172,15 @@ export async function saveDatabaseDestination(request: FastifyRequest, reply: Fa
 
         const {
             destinationDockerId,
-            destinationDocker: { engine },
+            destinationDocker: { engine, id: dockerId },
             version,
             type
         } = await prisma.database.findUnique({ where: { id }, include: { destinationDocker: true } });
 
         if (destinationDockerId) {
-            const host = getEngine(engine);
             if (type && version) {
                 const baseImage = getDatabaseImage(type);
-                asyncExecShell(`DOCKER_HOST=${host} docker pull ${baseImage}:${version}`);
+                executeDockerCmd({ dockerId, command: `docker pull ${baseImage}:${version}` })
             }
         }
         return reply.code(201).send({})
@@ -181,7 +188,7 @@ export async function saveDatabaseDestination(request: FastifyRequest, reply: Fa
         return errorHandler({ status, message })
     }
 }
-export async function getDatabaseUsage(request: FastifyRequest) {
+export async function getDatabaseUsage(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params;
         const teamId = request.user.teamId;
@@ -194,7 +201,7 @@ export async function getDatabaseUsage(request: FastifyRequest) {
         if (database.dbUserPassword) database.dbUserPassword = decrypt(database.dbUserPassword);
         if (database.rootUserPassword) database.rootUserPassword = decrypt(database.rootUserPassword);
         if (database.destinationDockerId) {
-            [usage] = await Promise.all([getContainerUsage(database.destinationDocker.engine, id)]);
+            [usage] = await Promise.all([getContainerUsage(database.destinationDocker.id, id)]);
         }
         return {
             usage
@@ -203,7 +210,7 @@ export async function getDatabaseUsage(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function startDatabase(request: FastifyRequest) {
+export async function startDatabase(request: FastifyRequest<OnlyId>) {
     try {
         const teamId = request.user.teamId;
         const { id } = request.params;
@@ -225,8 +232,6 @@ export async function startDatabase(request: FastifyRequest) {
             generateDatabaseConfiguration(database);
 
         const network = destinationDockerId && destinationDocker.network;
-        const host = getEngine(destinationDocker.engine);
-        const engine = destinationDocker.engine;
         const volumeName = volume.split(':')[0];
         const labels = await makeLabelForStandaloneDatabase({ id, image, volume });
 
@@ -268,13 +273,13 @@ export async function startDatabase(request: FastifyRequest) {
         const composeFileDestination = `${workdir}/docker-compose.yaml`;
         await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
         try {
-            await asyncExecShell(`DOCKER_HOST=${host} docker volume create ${volumeName}`);
+            await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker volume create ${volumeName}` })
         } catch (error) {
             console.log(error);
         }
         try {
-            await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
-            if (isPublic) await startTcpProxy(destinationDocker, id, publicPort, privatePort);
+            await executeDockerCmd({ dockerId: destinationDocker.id, command: `docker compose -f ${composeFileDestination} up -d` })
+            if (isPublic) await startTraefikTCPProxy(destinationDocker, id, publicPort, privatePort);
             return {};
         } catch (error) {
             throw {
@@ -285,7 +290,7 @@ export async function startDatabase(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function stopDatabase(request: FastifyRequest) {
+export async function stopDatabase(request: FastifyRequest<OnlyId>) {
     try {
         const teamId = request.user.teamId;
         const { id } = request.params;
@@ -310,41 +315,29 @@ export async function stopDatabase(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function getDatabaseLogs(request: FastifyRequest) {
+export async function getDatabaseLogs(request: FastifyRequest<GetDatabaseLogs>) {
     try {
-        const teamId = request.user.teamId;
         const { id } = request.params;
         let { since = 0 } = request.query
         if (since !== 0) {
             since = day(since).unix();
         }
-        const { destinationDockerId, destinationDocker } = await prisma.database.findUnique({
+        const { destinationDockerId, destinationDocker: { id: dockerId } } = await prisma.database.findUnique({
             where: { id },
             include: { destinationDocker: true }
         });
         if (destinationDockerId) {
-            const docker = dockerInstance({ destinationDocker });
             try {
-                const container = await docker.engine.getContainer(id);
-                if (container) {
-                    const { default: ansi } = await import('strip-ansi')
-                    const logs = (
-                        await container.logs({
-                            stdout: true,
-                            stderr: true,
-                            timestamps: true,
-                            since,
-                            tail: 5000
-                        })
-                    )
-                        .toString()
-                        .split('\n')
-                        .map((l) => ansi(l.slice(8)))
-                        .filter((a) => a);
-                    return {
-                        logs
-                    };
-                }
+                // const found = await checkContainer({ dockerId, container: id })
+                // if (found) {
+                const { default: ansi } = await import('strip-ansi')
+                const { stdout, stderr } = await executeDockerCmd({ dockerId, command: `docker logs --since ${since} --tail 5000 --timestamps ${id}` })
+                const stripLogsStdout = stdout.toString().split('\n').map((l) => ansi(l)).filter((a) => a);
+                const stripLogsStderr = stderr.toString().split('\n').map((l) => ansi(l)).filter((a) => a);
+                const logs = stripLogsStderr.concat(stripLogsStdout)
+                const sortedLogs = logs.sort((a, b) => (day(a.split(' ')[0]).isAfter(day(b.split(' ')[0])) ? 1 : -1))
+                return { logs: sortedLogs }
+                // }
             } catch (error) {
                 const { statusCode } = error;
                 if (statusCode === 404) {
@@ -361,7 +354,7 @@ export async function getDatabaseLogs(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function deleteDatabase(request: FastifyRequest) {
+export async function deleteDatabase(request: FastifyRequest<OnlyId>) {
     try {
         const teamId = request.user.teamId;
         const { id } = request.params;
@@ -382,7 +375,7 @@ export async function deleteDatabase(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function saveDatabase(request: FastifyRequest, reply: FastifyReply) {
+export async function saveDatabase(request: FastifyRequest<SaveDatabase>, reply: FastifyReply) {
     try {
         const teamId = request.user.teamId;
         const { id } = request.params;
@@ -428,13 +421,15 @@ export async function saveDatabase(request: FastifyRequest, reply: FastifyReply)
         return errorHandler({ status, message })
     }
 }
-export async function saveDatabaseSettings(request: FastifyRequest) {
+export async function saveDatabaseSettings(request: FastifyRequest<SaveDatabaseSettings>) {
     try {
         const teamId = request.user.teamId;
         const { id } = request.params;
         const { isPublic, appendOnly = true } = request.body;
-        const publicPort = await getFreePort();
-        const settings = await listSettings();
+
+        const { destinationDocker: { id: dockerId } } = await prisma.database.findUnique({ where: { id }, include: { destinationDocker: true } })
+        const publicPort = await getFreePublicPort(id, dockerId);
+
         await prisma.database.update({
             where: { id },
             data: {
@@ -454,11 +449,7 @@ export async function saveDatabaseSettings(request: FastifyRequest) {
         if (destinationDockerId) {
             if (isPublic) {
                 await prisma.database.update({ where: { id }, data: { publicPort } });
-                if (settings.isTraefikUsed) {
-                    await startTraefikTCPProxy(destinationDocker, id, publicPort, privatePort);
-                } else {
-                    await startTcpProxy(destinationDocker, id, publicPort, privatePort);
-                }
+                await startTraefikTCPProxy(destinationDocker, id, publicPort, privatePort);
             } else {
                 await prisma.database.update({ where: { id }, data: { publicPort: null } });
                 await stopTcpHttpProxy(id, destinationDocker, oldPublicPort);

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

@@ -1,32 +1,37 @@
 import { FastifyPluginAsync } from 'fastify';
-import { deleteDatabase, getDatabase, getDatabaseLogs, getDatabaseTypes, getDatabaseUsage, getVersions, listDatabases, newDatabase, saveDatabase, saveDatabaseDestination, saveDatabaseSettings, saveDatabaseType, saveVersion, startDatabase, stopDatabase } from './handlers';
+import { deleteDatabase, getDatabase, getDatabaseLogs, getDatabaseStatus, getDatabaseTypes, getDatabaseUsage, getVersions, listDatabases, newDatabase, saveDatabase, saveDatabaseDestination, saveDatabaseSettings, saveDatabaseType, saveVersion, startDatabase, stopDatabase } from './handlers';
 
-const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
-    fastify.addHook('onRequest', async (request, reply) => {
+import type { GetDatabaseLogs, OnlyId, SaveDatabase, SaveDatabaseDestination, SaveDatabaseSettings, SaveVersion } from '../../../../types';
+import type { SaveDatabaseType } from './types';
+
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
+    fastify.addHook('onRequest', async (request) => {
         return await request.jwtVerify()
     })
     fastify.get('/', async (request) => await listDatabases(request));
     fastify.post('/new', async (request, reply) => await newDatabase(request, reply));
 
-    fastify.get('/:id', async (request) => await getDatabase(request));
-    fastify.post('/:id', async (request, reply) => await saveDatabase(request, reply));
-    fastify.delete('/:id', async (request) => await deleteDatabase(request));
+    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.post('/:id/settings', async (request) => await saveDatabaseSettings(request));
+    fastify.get<OnlyId>('/:id/status', async (request) => await getDatabaseStatus(request));
+
+    fastify.post<SaveDatabaseSettings>('/:id/settings', async (request) => await saveDatabaseSettings(request));
 
     fastify.get('/:id/configuration/type', async (request) => await getDatabaseTypes(request));
-    fastify.post('/:id/configuration/type', async (request, reply) => await saveDatabaseType(request, reply));
+    fastify.post<SaveDatabaseType>('/:id/configuration/type', async (request, reply) => await saveDatabaseType(request, reply));
 
-    fastify.get('/:id/configuration/version', async (request) => await getVersions(request));
-    fastify.post('/:id/configuration/version', async (request, reply) => await saveVersion(request, reply));
+    fastify.get<OnlyId>('/:id/configuration/version', async (request) => await getVersions(request));
+    fastify.post<SaveVersion>('/:id/configuration/version', async (request, reply) => await saveVersion(request, reply));
 
-    fastify.post('/:id/configuration/destination', async (request, reply) => await saveDatabaseDestination(request, reply));
+    fastify.post<SaveDatabaseDestination>('/:id/configuration/destination', async (request, reply) => await saveDatabaseDestination(request, reply));
 
-    fastify.get('/:id/usage', async (request) => await getDatabaseUsage(request));
-    fastify.get('/:id/logs', async (request) => await getDatabaseLogs(request));
+    fastify.get<OnlyId>('/:id/usage', async (request) => await getDatabaseUsage(request));
+    fastify.get<GetDatabaseLogs>('/:id/logs', async (request) => await getDatabaseLogs(request));
 
-    fastify.post('/:id/start', async (request) => await startDatabase(request));
-    fastify.post('/:id/stop', async (request) => await stopDatabase(request));
+    fastify.post<OnlyId>('/:id/start', async (request) => await startDatabase(request));
+    fastify.post<OnlyId>('/:id/stop', async (request) => await stopDatabase(request));
 };
 
 export default root;

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

@@ -0,0 +1,5 @@
+import type { OnlyId } from "../../../../types";
+
+export interface SaveDatabaseType extends OnlyId {
+    Body: { type: string }
+}

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

@@ -1,11 +1,19 @@
 import type { FastifyRequest } from 'fastify';
 import { FastifyReply } from 'fastify';
-import { asyncExecShell, errorHandler, listSettings, prisma, startCoolifyProxy, startTraefikProxy, stopTraefikProxy } from '../../../../lib/common';
-import { checkContainer, dockerInstance, getEngine } from '../../../../lib/docker';
+import sshConfig from 'ssh-config'
+import fs from 'fs/promises'
+import os from 'os';
 
-export async function listDestinations(request: FastifyRequest) {
+import { asyncExecShell, createRemoteEngineConfiguration, decrypt, errorHandler, executeDockerCmd, listSettings, prisma, startTraefikProxy, stopTraefikProxy } from '../../../../lib/common';
+import { checkContainer } from '../../../../lib/docker';
+
+import type { OnlyId } from '../../../../types';
+import type { CheckDestination, ListDestinations, NewDestination, Proxy, SaveDestinationSettings } from './types';
+
+export async function listDestinations(request: FastifyRequest<ListDestinations>) {
     try {
         const teamId = request.user.teamId;
+        const { onlyVerified = false } = request.query
         let destinations = []
         if (teamId === '0') {
             destinations = await prisma.destinationDocker.findMany({ include: { teams: true } });
@@ -15,14 +23,18 @@ export async function listDestinations(request: FastifyRequest) {
                 include: { teams: true }
             });
         }
+        if (onlyVerified) {
+            destinations = destinations.filter(destination => destination.engine || (destination.remoteEngine && destination.remoteVerified))
+        }
         return {
             destinations
         }
     } catch ({ status, message }) {
+        console.log({ status, message })
         return errorHandler({ status, message })
     }
 }
-export async function checkDestination(request: FastifyRequest) {
+export async function checkDestination(request: FastifyRequest<CheckDestination>) {
     try {
         const { network } = request.body;
         const found = await prisma.destinationDocker.findFirst({ where: { network } });
@@ -36,36 +48,22 @@ export async function checkDestination(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function getDestination(request: FastifyRequest) {
+export async function getDestination(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params
         const teamId = request.user?.teamId;
         const destination = await prisma.destinationDocker.findFirst({
-            where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } }
+            where: { id, teams: { some: { id: teamId === '0' ? undefined : teamId } } },
+            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,
-            state: false
+            settings
         };
-
-        if (destination?.remoteEngine) {
-            // const { stdout } = await asyncExecShell(
-            // 	`ssh -p ${destination.port} ${destination.user}@${destination.ipAddress} "docker ps -a"`
-            // );
-            // console.log(stdout)
-            // const engine = await generateRemoteEngine(destination);
-            // // await saveSshKey(destination);
-            // payload.state = await checkContainer(engine, 'coolify-haproxy');
-        } else {
-            const containerName = 'coolify-proxy';
-            payload.state =
-                destination?.engine && (await checkContainer(destination.engine, containerName));
-        }
         return {
             ...payload
         };
@@ -74,76 +72,76 @@ export async function getDestination(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function newDestination(request: FastifyRequest, reply: FastifyReply) {
+export async function newDestination(request: FastifyRequest<NewDestination>, reply: FastifyReply) {
     try {
-        const { id } = request.params
-        let { name, network, engine, isCoolifyProxyUsed } = request.body
         const teamId = request.user.teamId;
-        if (id === 'new') {
-            const host = getEngine(engine);
-            const docker = dockerInstance({ destinationDocker: { engine, network } });
-            const found = await docker.engine.listNetworks({ filters: { name: [`^${network}$`] } });
-            if (found.length === 0) {
-                await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable ${network}`);
-            }
-            await prisma.destinationDocker.create({
-                data: { name, teams: { connect: { id: teamId } }, engine, network, isCoolifyProxyUsed }
-            });
-            const destinations = await prisma.destinationDocker.findMany({ where: { engine } });
-            const destination = destinations.find((destination) => destination.network === network);
+        const { id } = request.params
 
-            if (destinations.length > 0) {
-                const proxyConfigured = destinations.find(
-                    (destination) => destination.network !== network && destination.isCoolifyProxyUsed === true
-                );
-                if (proxyConfigured) {
-                    isCoolifyProxyUsed = !!proxyConfigured.isCoolifyProxyUsed;
+        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 === '') {
+                    await asyncExecShell(`DOCKER_HOST=unix:///var/run/docker.sock docker network create --attachable ${network}`);
                 }
-                await prisma.destinationDocker.updateMany({ where: { engine }, data: { isCoolifyProxyUsed } });
-            }
-            if (isCoolifyProxyUsed) {
-                const settings = await prisma.setting.findFirst();
-                if (settings?.isTraefikUsed) {
-                    await startTraefikProxy(engine);
-                } else {
-                    await startCoolifyProxy(engine);
+                await prisma.destinationDocker.create({
+                    data: { name, teams: { connect: { id: teamId } }, engine, network, isCoolifyProxyUsed }
+                });
+                const destinations = await prisma.destinationDocker.findMany({ where: { engine } });
+                const destination = destinations.find((destination) => destination.network === network);
+                if (destinations.length > 0) {
+                    const proxyConfigured = destinations.find(
+                        (destination) => destination.network !== network && destination.isCoolifyProxyUsed === true
+                    );
+                    if (proxyConfigured) {
+                        isCoolifyProxyUsed = !!proxyConfigured.isCoolifyProxyUsed;
+                    }
+                    await prisma.destinationDocker.updateMany({ where: { engine }, data: { isCoolifyProxyUsed } });
                 }
+                if (isCoolifyProxyUsed) {
+                    await startTraefikProxy(destination.id);
+                }
+                return reply.code(201).send({ id: destination.id });
+            } else {
+                const destination = await prisma.destinationDocker.create({
+                    data: { name, teams: { connect: { id: teamId } }, engine, network, isCoolifyProxyUsed, remoteEngine: true, remoteIpAddress, remoteUser, remotePort }
+                });
+                return reply.code(201).send({ id: destination.id })
             }
-            return reply.code(201).send({ id: destination.id });
         } else {
             await prisma.destinationDocker.update({ where: { id }, data: { name, engine, network } });
             return reply.code(201).send();
         }
 
     } catch ({ status, message }) {
+        console.log({ status, message })
         return errorHandler({ status, message })
     }
 }
-export async function deleteDestination(request: FastifyRequest) {
+export async function deleteDestination(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params
-        const destination = await prisma.destinationDocker.delete({ where: { id } });
-        if (destination.isCoolifyProxyUsed) {
-            const host = getEngine(destination.engine);
-            const { network } = destination;
-            const settings = await prisma.setting.findFirst();
-            const containerName = settings.isTraefikUsed ? 'coolify-proxy' : 'coolify-haproxy';
-            const { stdout: found } = await asyncExecShell(
-                `DOCKER_HOST=${host} docker ps -a --filter network=${network} --filter name=${containerName} --format '{{.}}'`
-            );
-            if (found) {
-                await asyncExecShell(
-                    `DOCKER_HOST="${host}" docker network disconnect ${network} ${containerName}`
-                );
-                await asyncExecShell(`DOCKER_HOST="${host}" docker network rm ${network}`);
+        const { network, remoteVerified, engine, isCoolifyProxyUsed } = await prisma.destinationDocker.findUnique({ where: { id } });
+        if (isCoolifyProxyUsed) {
+            if (engine || remoteVerified) {
+                const { stdout: found } = await executeDockerCmd({
+                    dockerId: id,
+                    command: `docker ps -a --filter network=${network} --filter name=coolify-proxy --format '{{.}}'`
+                })
+                if (found) {
+                    await executeDockerCmd({ dockerId: id, command: `docker network disconnect ${network} coolify-proxy` })
+                    await executeDockerCmd({ dockerId: id, command: `docker network rm ${network}` })
+                }
             }
         }
+        await prisma.destinationDocker.delete({ where: { id } });
         return {}
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
 }
-export async function saveDestinationSettings(request: FastifyRequest, reply: FastifyReply) {
+export async function saveDestinationSettings(request: FastifyRequest<SaveDestinationSettings>) {
     try {
         const { engine, isCoolifyProxyUsed } = request.body;
         await prisma.destinationDocker.updateMany({
@@ -159,38 +157,88 @@ export async function saveDestinationSettings(request: FastifyRequest, reply: Fa
         return errorHandler({ status, message })
     }
 }
-export async function startProxy(request: FastifyRequest, reply: FastifyReply) {
-    const { engine } = request.body;
+export async function startProxy(request: FastifyRequest<Proxy>) {
+    const { id } = request.params
     try {
-        await startTraefikProxy(engine);
+        await startTraefikProxy(id);
         return {}
     } catch ({ status, message }) {
-        await stopTraefikProxy(engine);
+        console.log({ status, message })
+        await stopTraefikProxy(id);
         return errorHandler({ status, message })
     }
 }
-export async function stopProxy(request: FastifyRequest, reply: FastifyReply) {
-    const settings = await prisma.setting.findFirst({});
-    const { engine } = request.body;
+export async function stopProxy(request: FastifyRequest<Proxy>) {
+    const { id } = request.params
     try {
-        await stopTraefikProxy(engine);
-
+        await stopTraefikProxy(id);
         return {}
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
 }
-export async function restartProxy(request: FastifyRequest, reply: FastifyReply) {
-    const settings = await prisma.setting.findFirst({});
-    const { engine } = request.body;
+export async function restartProxy(request: FastifyRequest<Proxy>) {
+    const { id } = request.params
     try {
-        await stopTraefikProxy(engine);
-        await startTraefikProxy(engine);
-        await prisma.destinationDocker.updateMany({
-            where: { engine },
+        await stopTraefikProxy(id);
+        await startTraefikProxy(id);
+        await prisma.destinationDocker.update({
+            where: { id },
             data: { isCoolifyProxyUsed: true }
         });
         return {}
+    } catch ({ status, message }) {
+        await prisma.destinationDocker.update({
+            where: { id },
+            data: { isCoolifyProxyUsed: false }
+        });
+        return errorHandler({ status, message })
+    }
+}
+
+export async function assignSSHKey(request: FastifyRequest) {
+    try {
+        const { id: sshKeyId } = request.body;
+        const { id } = request.params;
+        await prisma.destinationDocker.update({ where: { id }, data: { sshKey: { connect: { id: sshKeyId } } } })
+        return {}
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
+export async function verifyRemoteDockerEngine(request: FastifyRequest, reply: FastifyReply) {
+    try {
+        const { id } = request.params;
+        await createRemoteEngineConfiguration(id);
+
+        const { remoteIpAddress, remoteUser, network } = await prisma.destinationDocker.findFirst({ where: { id } })
+        const host = `ssh://${remoteUser}@${remoteIpAddress}`
+        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`);
+        }
+        await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } })
+        return reply.code(201).send()
+
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
+
+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' })
+        return {
+            isRunning
+        }
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }

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

@@ -1,24 +1,29 @@
 import { FastifyPluginAsync } from 'fastify';
-import { checkDestination, deleteDestination, getDestination, listDestinations, newDestination, restartProxy, saveDestinationSettings, startProxy, stopProxy } from './handlers';
+import { assignSSHKey, checkDestination, deleteDestination, getDestination, getDestinationStatus, listDestinations, newDestination, restartProxy, saveDestinationSettings, startProxy, stopProxy, verifyRemoteDockerEngine } from './handlers';
 
-const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
-    fastify.addHook('onRequest', async (request, reply) => {
+import type { OnlyId } from '../../../../types';
+import type { CheckDestination, ListDestinations, NewDestination, Proxy, SaveDestinationSettings } from './types';
+
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
+    fastify.addHook('onRequest', async (request) => {
         return await request.jwtVerify()
     })
-    fastify.get('/', async (request) => await listDestinations(request));
-    fastify.post('/check', async (request) => await checkDestination(request));
+    fastify.get<ListDestinations>('/', async (request) => await listDestinations(request));
+    fastify.post<CheckDestination>('/check', async (request) => await checkDestination(request));
 
-    fastify.get('/:id', async (request) => await getDestination(request));
-    fastify.post('/:id', async (request, reply) => await newDestination(request, reply));
-    fastify.delete('/:id', async (request) => await deleteDestination(request));
-
-    fastify.post('/:id/settings', async (request, reply) => await saveDestinationSettings(request, reply));
-    fastify.post('/:id/start', async (request, reply) => await startProxy(request, reply));
-    fastify.post('/:id/stop', async (request, reply) => await stopProxy(request, reply));
-    fastify.post('/:id/restart', async (request, reply) => await restartProxy(request, reply));
+    fastify.get<OnlyId>('/:id', async (request) => await getDestination(request));
+    fastify.post<NewDestination>('/:id', async (request, reply) => await newDestination(request, reply));
+    fastify.delete<OnlyId>('/:id', async (request) => await deleteDestination(request));
+    fastify.get<OnlyId>('/:id/status', async (request) => await getDestinationStatus(request));
 
+    fastify.post<SaveDestinationSettings>('/:id/settings', async (request) => await saveDestinationSettings(request));
+    fastify.post<Proxy>('/:id/start', async (request,) => await startProxy(request));
+    fastify.post<Proxy>('/:id/stop', async (request) => await stopProxy(request));
+    fastify.post<Proxy>('/:id/restart', async (request) => await restartProxy(request));
 
+    fastify.post('/:id/configuration/sshKey', async (request) => await assignSSHKey(request));
 
+    fastify.post('/:id/verify', async (request, reply) => await verifyRemoteDockerEngine(request, reply));
 };
 
 export default root;

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

@@ -0,0 +1,29 @@
+import { OnlyId } from "../../../../types"
+
+export interface ListDestinations {
+    Querystring: {
+        onlyVerified: string
+    }
+}
+export interface CheckDestination {
+    Body: {
+        network: string
+    }
+}
+export interface NewDestination extends OnlyId {
+    Body: {
+        name: string
+        network: string
+        engine: string
+        isCoolifyProxyUsed: boolean
+    }
+}
+export interface SaveDestinationSettings extends OnlyId {
+    Body: {
+        engine: string
+        isCoolifyProxyUsed: boolean
+    }
+}
+export interface Proxy extends OnlyId {
+
+}

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

@@ -4,31 +4,43 @@ import axios from 'axios';
 import compare from 'compare-versions';
 import cuid from 'cuid';
 import bcrypt from 'bcryptjs';
-import { asyncExecShell, asyncSleep, errorHandler, isDev, prisma, uniqueName, version } from '../../../lib/common';
+import { asyncExecShell, asyncSleep, cleanupDockerStorage, errorHandler, isDev, prisma, uniqueName, version } from '../../../lib/common';
 
 import type { FastifyReply, FastifyRequest } from 'fastify';
 import type { Login, Update } from '.';
-
+import type { GetCurrentUser } from './types';
 
 export async function hashPassword(password: string): Promise<string> {
 	const saltRounds = 15;
 	return bcrypt.hash(password, saltRounds);
 }
 
-
+export async function cleanupManually() {
+	try {
+		const destination = await prisma.destinationDocker.findFirst({ where: { engine: '/var/run/docker.sock' } })
+		await cleanupDockerStorage(destination.id, true, true)
+		return {}
+	} catch ({ status, message }) {
+		return errorHandler({ status, message })
+	}
+}
 export async function checkUpdate(request: FastifyRequest) {
 	try {
+		const isStaging = request.hostname === 'staging.coolify.io'
 		const currentVersion = version;
 		const { data: versions } = await axios.get(
 			`https://get.coollabs.io/versions.json?appId=${process.env['COOLIFY_APP_ID']}&version=${currentVersion}`
 		);
-		const latestVersion =
-			request.hostname === 'staging.coolify.io'
-				? versions['coolify'].next.version
-				: versions['coolify'].main.version;
+		const latestVersion = versions['coolify'].main.version			
 		const isUpdateAvailable = compare(latestVersion, currentVersion);
+		if (isStaging) {
+			return {
+				isUpdateAvailable: true,
+				latestVersion: 'next'
+			}
+		}
 		return {
-			isUpdateAvailable: isUpdateAvailable === 1,
+			isUpdateAvailable: isStaging ? true : isUpdateAvailable === 1,
 			latestVersion
 		};
 	} catch ({ status, message }) {
@@ -146,14 +158,21 @@ export async function login(request: FastifyRequest<Login>, reply: FastifyReply)
 		}
 		if (userFound) {
 			if (userFound.type === 'email') {
-				// TODO: Review this one
 				if (userFound.password === 'RESETME') {
 					const hashedPassword = await hashPassword(password);
 					if (userFound.updatedAt < new Date(Date.now() - 1000 * 60 * 10)) {
-						await prisma.user.update({
-							where: { email: userFound.email },
-							data: { password: 'RESETTIMEOUT' }
-						});
+						if (userFound.id === '0') {
+							await prisma.user.update({
+								where: { email: userFound.email },
+								data: { password: 'RESETME' }
+							});
+						} else {
+							await prisma.user.update({
+								where: { email: userFound.email },
+								data: { password: 'RESETTIMEOUT' }
+							});
+						}
+
 						throw {
 							status: 500,
 							message: 'Password reset link has expired. Please request a new one.'
@@ -238,9 +257,9 @@ export async function login(request: FastifyRequest<Login>, reply: FastifyReply)
 	}
 }
 
-export async function getCurrentUser(request: FastifyRequest, fastify) {
+export async function getCurrentUser(request: FastifyRequest<GetCurrentUser>, fastify) {
 	let token = null
-
+	const { teamId } = request.query
 	try {
 		const user = await prisma.user.findUnique({
 			where: { id: request.user.userId }
@@ -251,18 +270,19 @@ export async function getCurrentUser(request: FastifyRequest, fastify) {
 	} catch (error) {
 		throw { status: 401, message: error };
 	}
-	if (request.query.teamId) {
+	if (teamId) {
 		try {
 			const user = await prisma.user.findFirst({
-				where: { id: request.user.userId, teams: { some: { id: request.query.teamId } } },
+				where: { id: request.user.userId, teams: { some: { id: teamId } } },
 				include: { teams: true, permission: true }
 			})
 			if (user) {
+				const permission = user.permission.find(p => p.teamId === teamId).permission
 				const payload = {
 					...request.user,
-					teamId: request.query.teamId,
-					permission: user.permission.find(p => p.teamId === request.query.teamId).permission || null,
-					isAdmin: user.permission.find(p => p.teamId === request.query.teamId).permission === 'owner'
+					teamId,
+					permission: permission || null,
+					isAdmin: permission === 'owner' || permission === 'admin'
 
 				}
 				token = fastify.jwt.sign(payload)

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

@@ -3,6 +3,10 @@ import type { FastifyRequest } from 'fastify';
 import { FastifyReply } from 'fastify';
 import { decrypt, errorHandler, prisma, uniqueName } from '../../../../lib/common';
 import { day } from '../../../../lib/dayjs';
+
+import type { OnlyId } from '../../../../types';
+import type { BodyId, InviteToTeam, SaveTeam, SetPermission } from './types';
+
 export async function listTeams(request: FastifyRequest) {
     try {
         const userId = request.user.userId;
@@ -36,7 +40,7 @@ export async function listTeams(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function deleteTeam(request: FastifyRequest, reply: FastifyReply) {
+export async function deleteTeam(request: FastifyRequest<OnlyId>, reply: FastifyReply) {
     try {
         const userId = request.user.userId;
         const { id } = request.params;
@@ -136,7 +140,7 @@ export async function newTeam(request: FastifyRequest, reply: FastifyReply) {
         return errorHandler({ status, message })
     }
 }
-export async function getTeam(request: FastifyRequest, reply: FastifyReply) {
+export async function getTeam(request: FastifyRequest<OnlyId>, reply: FastifyReply) {
     try {
         const userId = request.user.userId;
         const teamId = request.user.teamId;
@@ -163,7 +167,7 @@ export async function getTeam(request: FastifyRequest, reply: FastifyReply) {
         return errorHandler({ status, message })
     }
 }
-export async function saveTeam(request: FastifyRequest, reply: FastifyReply) {
+export async function saveTeam(request: FastifyRequest<SaveTeam>, reply: FastifyReply) {
     try {
         const { id } = request.params;
         const { name } = request.body;
@@ -263,17 +267,21 @@ export async function saveTeam(request: FastifyRequest, reply: FastifyReply) {
 //     }
 // }
 
-export async function inviteToTeam(request: FastifyRequest, reply: FastifyReply) {
+export async function inviteToTeam(request: FastifyRequest<InviteToTeam>, reply: FastifyReply) {
     try {
         const userId = request.user.userId;
         const { email, permission, teamId, teamName } = request.body;
         const userFound = await prisma.user.findUnique({ where: { email } });
         if (!userFound) {
-            throw `No user found with '${email}' email address.`
+            throw {
+                message: `No user found with '${email}' email address.`
+            };         
         }
         const uid = userFound.id;
-        if (uid === userId) {
-            throw `Invitation to yourself? Whaaaaat?`
+        if (uid === userId) {          
+            throw {
+                message: `Invitation to yourself? Whaaaaat?`
+            };
         }
         const alreadyInTeam = await prisma.team.findFirst({
             where: { id: teamId, users: { some: { id: uid } } }
@@ -306,7 +314,7 @@ export async function inviteToTeam(request: FastifyRequest, reply: FastifyReply)
     }
 }
 
-export async function acceptInvitation(request: FastifyRequest) {
+export async function acceptInvitation(request: FastifyRequest<BodyId>) {
     try {
         const userId = request.user.userId;
         const { id } = request.body;
@@ -331,7 +339,7 @@ export async function acceptInvitation(request: FastifyRequest) {
         return errorHandler({ status, message })
     }
 }
-export async function revokeInvitation(request: FastifyRequest) {
+export async function revokeInvitation(request: FastifyRequest<BodyId>) {
     try {
         const { id } = request.body
         await prisma.teamInvitation.delete({ where: { id } });
@@ -341,15 +349,15 @@ export async function revokeInvitation(request: FastifyRequest) {
     }
 }
 
-export async function removeUser(request: FastifyRequest, reply: FastifyReply) {
+export async function removeUser(request: FastifyRequest<BodyId>, reply: FastifyReply) {
     try {
-        const { uid } = request.body;
-        const user = await prisma.user.findUnique({ where: { id: uid }, include: { teams: true, permission: true } });
+        const { id } = request.body;
+        const user = await prisma.user.findUnique({ where: { id }, include: { teams: true, permission: true } });
         if (user) {
             const permissions = user.permission;
             if (permissions.length > 0) {
                 for (const permission of permissions) {
-                    await prisma.permission.deleteMany({ where: { id: permission.id, userId: uid } });
+                    await prisma.permission.deleteMany({ where: { id: permission.id, userId: id } });
                 }
             }
             const teams = user.teams;
@@ -357,7 +365,7 @@ export async function removeUser(request: FastifyRequest, reply: FastifyReply) {
                 for (const team of teams) {
                     const newTeam = await prisma.team.update({
                         where: { id: team.id },
-                        data: { users: { disconnect: { id: uid } } },
+                        data: { users: { disconnect: { id } } },
                         include: { applications: true, database: true, gitHubApps: true, gitLabApps: true, gitSources: true, destinationDocker: true, service: true, users: true }
                     });
                     if (newTeam.users.length === 0) {
@@ -422,14 +430,14 @@ export async function removeUser(request: FastifyRequest, reply: FastifyReply) {
                 }
             }
         }
-        await prisma.user.delete({ where: { id: uid } });
+        await prisma.user.delete({ where: { id } });
         return reply.code(201).send()
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
 }
 
-export async function setPermission(request: FastifyRequest, reply: FastifyReply) {
+export async function setPermission(request: FastifyRequest<SetPermission>, reply: FastifyReply) {
     try {
         const { userId, newPermission, permissionId } = request.body;
         await prisma.permission.updateMany({
@@ -442,10 +450,10 @@ export async function setPermission(request: FastifyRequest, reply: FastifyReply
     }
 }
 
-export async function changePassword(request: FastifyRequest, reply: FastifyReply) {
+export async function changePassword(request: FastifyRequest<BodyId>, reply: FastifyReply) {
     try {
         const { id } = request.body;
-        await prisma.user.update({ where: { id: undefined }, data: { password: 'RESETME' } });
+        await prisma.user.update({ where: { id }, data: { password: 'RESETME' } });
         return reply.code(201).send()
     } catch ({ status, message }) {
         return errorHandler({ status, message })

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

@@ -1,27 +1,28 @@
 import { FastifyPluginAsync } from 'fastify';
 import { acceptInvitation, changePassword, deleteTeam, getTeam, inviteToTeam, listTeams, newTeam, removeUser, revokeInvitation, saveTeam, setPermission } from './handlers';
 
+import type { OnlyId } from '../../../../types';
+import type { BodyId, InviteToTeam, SaveTeam, SetPermission } from './types';
 
-const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
-    fastify.addHook('onRequest', async (request, reply) => {
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
+    fastify.addHook('onRequest', async (request) => {
         return await request.jwtVerify()
     })
     fastify.get('/', async (request) => await listTeams(request));
     fastify.post('/new', async (request, reply) => await newTeam(request, reply));
 
-    fastify.get('/team/:id', async (request, reply) => await getTeam(request, reply));
-    fastify.post('/team/:id', async (request, reply) => await saveTeam(request, reply));
-    fastify.delete('/team/:id', async (request, reply) => await deleteTeam(request, reply));
+    fastify.get<OnlyId>('/team/:id', async (request, reply) => await getTeam(request, reply));
+    fastify.post<SaveTeam>('/team/:id', async (request, reply) => await saveTeam(request, reply));
+    fastify.delete<OnlyId>('/team/:id', async (request, reply) => await deleteTeam(request, reply));
 
-    fastify.post('/team/:id/invitation/invite', async (request, reply) => await inviteToTeam(request, reply))
-    fastify.post('/team/:id/invitation/accept', async (request) => await acceptInvitation(request));
-    fastify.post('/team/:id/invitation/revoke', async (request) => await revokeInvitation(request));
+    fastify.post<InviteToTeam>('/team/:id/invitation/invite', async (request, reply) => await inviteToTeam(request, reply))
+    fastify.post<BodyId>('/team/:id/invitation/accept', async (request) => await acceptInvitation(request));
+    fastify.post<BodyId>('/team/:id/invitation/revoke', async (request) => await revokeInvitation(request));
 
+    fastify.post<SetPermission>('/team/:id/permission', async (request, reply) => await setPermission(request, reply));
 
-    fastify.post('/team/:id/permission', async (request, reply) => await setPermission(request, reply));
-
-    fastify.delete('/user/remove', async (request, reply) => await removeUser(request, reply));
-    fastify.post('/user/password', async (request, reply) => await changePassword(request, reply));
+    fastify.delete<BodyId>('/user/remove', async (request, reply) => await removeUser(request, reply));
+    fastify.post<BodyId>('/user/password', async (request, reply) => await changePassword(request, reply));
     // fastify.delete('/user', async (request, reply) => await deleteUser(request, reply));
 
 };

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

@@ -0,0 +1,27 @@
+import { OnlyId } from "../../../../types"
+
+export interface SaveTeam extends OnlyId {
+    Body: {
+        name: string
+    }
+}
+export interface InviteToTeam {
+    Body: {
+        email: string,
+        permission: string,
+        teamId: string,
+        teamName: string
+    }
+}
+export interface BodyId {
+    Body: {
+        id: string
+    }
+}
+export interface SetPermission {
+    Body: {
+        userId: string,
+        newPermission: string,
+        permissionId: string
+    }
+}

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

@@ -1,6 +1,6 @@
 import { FastifyPluginAsync } from 'fastify';
-import { scheduler } from '../../../lib/scheduler';
-import { checkUpdate, login, showDashboard, update, showUsage, getCurrentUser } from './handlers';
+import { checkUpdate, login, showDashboard, update, showUsage, getCurrentUser, cleanupManually } from './handlers';
+import { GetCurrentUser } from './types';
 
 export interface Update {
 	Body: { latestVersion: string }
@@ -9,7 +9,7 @@ export interface Login {
 	Body: { email: string, password: string, isLogin: boolean }
 }
 
-const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
 	fastify.get('/', async function (_request, reply) {
 		return reply.redirect(302, '/');
 	});
@@ -19,7 +19,7 @@ const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
 		return { token, payload }
 	});
 
-	fastify.get('/user', {
+	fastify.get<GetCurrentUser>('/user', {
 		onRequest: [fastify.authenticate]
 	}, async (request) => await getCurrentUser(request, fastify));
 
@@ -46,6 +46,10 @@ const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
 	fastify.get('/usage', {
 		onRequest: [fastify.authenticate]
 	}, async () => await showUsage());
+
+	fastify.post('/internal/cleanup', {
+		onRequest: [fastify.authenticate]
+	}, async () => await cleanupManually());
 };
 
 export default root;

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

@@ -1,13 +1,17 @@
 import { FastifyPluginAsync } from 'fastify';
 import {
     activatePlausibleUsers,
+    activateWordpressFtp,
     checkService,
+    checkServiceDomain,
+    cleanupPlausibleLogs,
     deleteService,
     deleteServiceSecret,
     deleteServiceStorage,
     getService,
     getServiceLogs,
     getServiceSecrets,
+    getServiceStatus,
     getServiceStorages,
     getServiceType,
     getServiceUsage,
@@ -26,45 +30,53 @@ import {
     stopService
 } from './handlers';
 
-const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
-    fastify.addHook('onRequest', async (request, reply) => {
+import type { OnlyId } from '../../../../types';
+import type { ActivateWordpressFtp, CheckService, CheckServiceDomain, DeleteServiceSecret, DeleteServiceStorage, GetServiceLogs, SaveService, SaveServiceDestination, SaveServiceSecret, SaveServiceSettings, SaveServiceStorage, SaveServiceType, SaveServiceVersion, ServiceStartStop, SetWordpressSettings } from './types';
+
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
+    fastify.addHook('onRequest', async (request) => {
         return await request.jwtVerify()
     })
     fastify.get('/', async (request) => await listServices(request));
     fastify.post('/new', async (request, reply) => await newService(request, reply));
 
-    fastify.get('/:id', async (request) => await getService(request));
-    fastify.post('/:id', async (request, reply) => await saveService(request, reply));
-    fastify.delete('/:id', async (request) => await deleteService(request));
+    fastify.get<OnlyId>('/:id', async (request) => await getService(request));
+    fastify.post<SaveService>('/:id', async (request, reply) => await saveService(request, reply));
+    fastify.delete<OnlyId>('/:id', async (request) => await deleteService(request));
 
-    fastify.post('/:id/check', async (request) => await checkService(request));
+    fastify.get<OnlyId>('/:id/status', async (request) => await getServiceStatus(request));
 
-    fastify.post('/:id/settings', async (request, reply) => await saveServiceSettings(request, reply));
+    fastify.get<CheckServiceDomain>('/:id/check', async (request) => await checkServiceDomain(request));
+    fastify.post<CheckService>('/:id/check', async (request) => await checkService(request));
 
-    fastify.get('/:id/secrets', async (request) => await getServiceSecrets(request));
-    fastify.post('/:id/secrets', async (request, reply) => await saveServiceSecret(request, reply));
-    fastify.delete('/:id/secrets', async (request) => await deleteServiceSecret(request));
+    fastify.post<SaveServiceSettings>('/:id/settings', async (request, reply) => await saveServiceSettings(request, reply));
 
-    fastify.get('/:id/storages', async (request) => await getServiceStorages(request));
-    fastify.post('/:id/storages', async (request, reply) => await saveServiceStorage(request, reply));
-    fastify.delete('/:id/storages', async (request) => await deleteServiceStorage(request));
+    fastify.get<OnlyId>('/:id/secrets', async (request) => await getServiceSecrets(request));
+    fastify.post<SaveServiceSecret>('/:id/secrets', async (request, reply) => await saveServiceSecret(request, reply));
+    fastify.delete<DeleteServiceSecret>('/:id/secrets', async (request) => await deleteServiceSecret(request));
+
+    fastify.get<OnlyId>('/:id/storages', async (request) => await getServiceStorages(request));
+    fastify.post<SaveServiceStorage>('/:id/storages', async (request, reply) => await saveServiceStorage(request, reply));
+    fastify.delete<DeleteServiceStorage>('/:id/storages', async (request) => await deleteServiceStorage(request));
 
     fastify.get('/:id/configuration/type', async (request) => await getServiceType(request));
-    fastify.post('/:id/configuration/type', async (request, reply) => await saveServiceType(request, reply));
+    fastify.post<SaveServiceType>('/:id/configuration/type', async (request, reply) => await saveServiceType(request, reply));
 
-    fastify.get('/:id/configuration/version', async (request) => await getServiceVersions(request));
-    fastify.post('/:id/configuration/version', async (request, reply) => await saveServiceVersion(request, reply));
+    fastify.get<OnlyId>('/:id/configuration/version', async (request) => await getServiceVersions(request));
+    fastify.post<SaveServiceVersion>('/:id/configuration/version', async (request, reply) => await saveServiceVersion(request, reply));
 
-    fastify.post('/:id/configuration/destination', async (request, reply) => await saveServiceDestination(request, reply));
+    fastify.post<SaveServiceDestination>('/:id/configuration/destination', async (request, reply) => await saveServiceDestination(request, reply));
 
-    fastify.get('/:id/usage', async (request) => await getServiceUsage(request));
-    fastify.get('/:id/logs', async (request) => await getServiceLogs(request));
+    fastify.get<OnlyId>('/:id/usage', async (request) => await getServiceUsage(request));
+    fastify.get<GetServiceLogs>('/:id/logs', async (request) => await getServiceLogs(request));
 
-    fastify.post('/:id/:type/start', async (request) => await startService(request));
-    fastify.post('/:id/:type/stop', async (request) => await stopService(request));
-    fastify.post('/:id/:type/settings', async (request, reply) => await setSettingsService(request, reply));
+    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('/:id/plausibleanalytics/activate', async (request, reply) => await activatePlausibleUsers(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));
 };
 
 export default root;

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

@@ -0,0 +1,94 @@
+import { OnlyId } from "../../../../types";
+
+export interface SaveServiceType extends OnlyId {
+    Body: {
+        type: string
+    }
+}
+export interface SaveServiceVersion extends OnlyId {
+    Body: {
+        version: string
+    }
+}
+export interface SaveServiceDestination extends OnlyId {
+    Body: {
+        destinationId: string
+    }
+}
+export interface GetServiceLogs extends OnlyId {
+    Querystring: {
+        since: number
+    }
+}
+export interface SaveServiceSettings extends OnlyId {
+    Body: {
+        dualCerts: boolean
+    }
+}
+export interface CheckServiceDomain extends OnlyId {
+    Querystring: {
+        domain: string
+    }
+}
+export interface CheckService extends OnlyId {
+    Body: {
+        fqdn: string,
+        forceSave: boolean,
+        dualCerts: boolean,
+        exposePort: number,
+        otherFqdns: Array<string>
+    }
+}
+export interface SaveService extends OnlyId {
+    Body: {
+        name: string,
+        fqdn: string,
+        exposePort: number,
+        type: string
+    }
+}
+export interface SaveServiceSecret extends OnlyId {
+    Body: {
+        name: string,
+        value: string,
+        isNew: string,
+    }
+}
+export interface DeleteServiceSecret extends OnlyId {
+    Body: {
+        name: string,
+    }
+}
+export interface SaveServiceStorage extends OnlyId {
+    Body: {
+        path: string,
+        newStorage: string,
+        storageId: string,
+    }
+}
+
+export interface DeleteServiceStorage extends OnlyId {
+    Body: {
+        path: string,
+    }
+}
+export interface ServiceStartStop {
+    Params: {
+        id?: string,
+        type: string,
+    }
+}
+export interface SetWordpressSettings extends OnlyId {
+    Body: {
+        ownMysql: boolean
+    }
+}
+export interface ActivateWordpressFtp extends OnlyId {
+    Body: {
+        ftpEnabled: boolean
+    }
+}
+
+
+
+

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

@@ -1,20 +1,30 @@
 import { promises as dns } from 'dns';
 
 import type { FastifyReply, FastifyRequest } from 'fastify';
-import { checkDomainsIsValidInDNS, errorHandler, getDomain, isDNSValid, isDomainConfigured, listSettings, prisma } from '../../../../lib/common';
+import { checkDomainsIsValidInDNS, decrypt, encrypt, errorHandler, getDomain, isDNSValid, isDomainConfigured, listSettings, prisma } from '../../../../lib/common';
+import { CheckDNS, CheckDomain, DeleteDomain, DeleteSSHKey, SaveSettings, SaveSSHKey } from './types';
 
 
 export async function listAllSettings(request: FastifyRequest) {
     try {
+        const teamId = request.user.teamId;
         const settings = await listSettings();
+        const sshKeys = await prisma.sshKey.findMany({ where: { team: { id: teamId } } })
+        const unencryptedKeys = []
+        if (sshKeys.length > 0) {
+            for (const key of sshKeys) {
+                unencryptedKeys.push({ id: key.id, name: key.name, privateKey: decrypt(key.privateKey), createdAt: key.createdAt })
+            }
+        }
         return {
-            settings
+            settings,
+            sshKeys: unencryptedKeys
         }
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
 }
-export async function saveSettings(request: FastifyRequest, reply: FastifyReply) {
+export async function saveSettings(request: FastifyRequest<SaveSettings>, reply: FastifyReply) {
     try {
         const {
             fqdn,
@@ -41,7 +51,7 @@ export async function saveSettings(request: FastifyRequest, reply: FastifyReply)
         return errorHandler({ status, message })
     }
 }
-export async function deleteDomain(request: FastifyRequest, reply: FastifyReply) {
+export async function deleteDomain(request: FastifyRequest<DeleteDomain>, reply: FastifyReply) {
     try {
         const { fqdn } = request.body
         let ip;
@@ -57,7 +67,7 @@ export async function deleteDomain(request: FastifyRequest, reply: FastifyReply)
     }
 }
 
-export async function checkDomain(request: FastifyRequest, reply: FastifyReply) {
+export async function checkDomain(request: FastifyRequest<CheckDomain>) {
     try {
         const { id } = request.params;
         let { fqdn, forceSave, dualCerts, isDNSCheckEnabled } = request.body
@@ -67,19 +77,47 @@ export async function checkDomain(request: FastifyRequest, reply: FastifyReply)
             throw "Domain already configured";
         }
         if (isDNSCheckEnabled && !forceSave) {
-            return await checkDomainsIsValidInDNS({ hostname: request.hostname, fqdn, dualCerts });
+            const hostname = request.hostname.split(':')[0]
+            return await checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts });
         }
         return {};
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
 }
-export async function checkDNS(request: FastifyRequest, reply: FastifyReply) {
+export async function checkDNS(request: FastifyRequest<CheckDNS>) {
     try {
-        const { id, domain } = request.params;
+        const { domain } = request.params;
         await isDNSValid(request.hostname, domain);
         return {}
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
+}
+
+export async function saveSSHKey(request: FastifyRequest<SaveSSHKey>, reply: FastifyReply) {
+    try {
+        const teamId = request.user.teamId;
+        const { privateKey, name } = request.body;
+        const found = await prisma.sshKey.findMany({ where: { name } })
+        if (found.length > 0) {
+            throw {
+                message: "Name already used. Choose another one please."
+            }
+        }
+        const encryptedSSHKey = encrypt(privateKey)
+        await prisma.sshKey.create({ data: { name, privateKey: encryptedSSHKey, team: { connect: { id: teamId } } } })
+        return reply.code(201).send()
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
+}
+export async function deleteSSHKey(request: FastifyRequest<DeleteSSHKey>, reply: FastifyReply) {
+    try {
+        const { id } = request.body;
+        await prisma.sshKey.delete({ where: { id } })
+        return reply.code(201).send()
+    } catch ({ status, message }) {
+        return errorHandler({ status, message })
+    }
 }

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

@@ -1,17 +1,21 @@
 import { FastifyPluginAsync } from 'fastify';
-import { checkDNS, checkDomain, deleteDomain, listAllSettings, saveSettings } from './handlers';
+import { checkDNS, checkDomain, deleteDomain, deleteSSHKey, listAllSettings, saveSettings, saveSSHKey } from './handlers';
+import { CheckDNS, CheckDomain, DeleteDomain, DeleteSSHKey, SaveSettings, SaveSSHKey } from './types';
 
 
-const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
-    fastify.addHook('onRequest', async (request, reply) => {
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
+    fastify.addHook('onRequest', async (request) => {
         return await request.jwtVerify()
     })
     fastify.get('/', async (request) => await listAllSettings(request));
-    fastify.post('/', async (request, reply) => await saveSettings(request, reply));
-    fastify.delete('/', async (request, reply) => await deleteDomain(request, reply));
+    fastify.post<SaveSettings>('/', async (request, reply) => await saveSettings(request, reply));
+    fastify.delete<DeleteDomain>('/', async (request, reply) => await deleteDomain(request, reply));
 
-    fastify.get('/check', async (request, reply) => await checkDNS(request, reply));
-    fastify.post('/check', async (request, reply) => await checkDomain(request, reply));
+    fastify.get<CheckDNS>('/check', async (request) => await checkDNS(request));
+    fastify.post<CheckDomain>('/check', async (request) => await checkDomain(request));
+
+    fastify.post<SaveSSHKey>('/sshKey', async (request, reply) => await saveSSHKey(request, reply));
+    fastify.delete<DeleteSSHKey>('/sshKey', async (request, reply) => await deleteSSHKey(request, reply));
 };
 
 export default root;

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

@@ -0,0 +1,42 @@
+import { OnlyId } from "../../../../types"
+
+export interface SaveSettings {
+    Body: {
+        fqdn: string,
+        isRegistrationEnabled: boolean,
+        dualCerts: boolean,
+        minPort: number,
+        maxPort: number,
+        isAutoUpdateEnabled: boolean,
+        isDNSCheckEnabled: boolean
+    }
+}
+export interface DeleteDomain {
+    Body: {
+        fqdn: string
+    }
+}
+export interface CheckDomain extends OnlyId {
+    Body: {
+        fqdn: string, 
+        forceSave: boolean, 
+        dualCerts: boolean, 
+        isDNSCheckEnabled: boolean, 
+    }
+}
+export interface CheckDNS {
+    Params: {
+        domain: string, 
+    }
+}
+export interface SaveSSHKey {
+    Body: {
+        privateKey: string, 
+        name: string
+    }
+}
+export interface DeleteSSHKey {
+    Body: {
+       id: string
+    }
+}

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

@@ -2,6 +2,8 @@ import cuid from 'cuid';
 import type { FastifyRequest } from 'fastify';
 import { FastifyReply } from 'fastify';
 import { decrypt, encrypt, errorHandler, prisma } from '../../../../lib/common';
+import { OnlyId } from '../../../../types';
+import { CheckGitLabOAuthId, SaveGitHubSource, SaveGitLabSource } from './types';
 
 export async function listSources(request: FastifyRequest) {
     try {
@@ -20,17 +22,18 @@ export async function listSources(request: FastifyRequest) {
 export async function saveSource(request, reply) {
     try {
         const { id } = request.params
-        const { name, htmlUrl, apiUrl } = request.body
+        let { name, htmlUrl, apiUrl, customPort } = request.body
+        if (customPort) customPort = Number(customPort)
         await prisma.gitSource.update({
             where: { id },
-            data: { name, htmlUrl, apiUrl }
+            data: { name, htmlUrl, apiUrl, customPort }
         });
         return reply.code(201).send()
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
 }
-export async function getSource(request: FastifyRequest) {
+export async function getSource(request: FastifyRequest<OnlyId>) {
     try {
         const { id } = request.params
         const { teamId } = request.user
@@ -45,7 +48,8 @@ export async function getSource(request: FastifyRequest) {
                     type: null,
                     htmlUrl: null,
                     apiUrl: null,
-                    organization: null
+                    organization: null,
+                    customPort: 22,
                 },
                 settings
             }
@@ -58,7 +62,7 @@ export async function getSource(request: FastifyRequest) {
         if (!source) {
             throw { status: 404, message: 'Source not found.' }
         }
-        
+
         if (source?.githubApp?.clientSecret)
             source.githubApp.clientSecret = decrypt(source.githubApp.clientSecret);
         if (source?.githubApp?.webhookSecret)
@@ -95,11 +99,14 @@ export async function deleteSource(request) {
     }
 
 }
-export async function saveGitHubSource(request: FastifyRequest, reply: FastifyReply) {
+export async function saveGitHubSource(request: FastifyRequest<SaveGitHubSource>) {
     try {
-        const { id } = request.params
-        const { name, type, htmlUrl, apiUrl, organization } = request.body
         const { teamId } = request.user
+
+        const { id } = request.params
+        let { name, htmlUrl, apiUrl, organization, customPort } = request.body
+
+        if (customPort) customPort = Number(customPort)
         if (id === 'new') {
             const newId = cuid()
             await prisma.gitSource.create({
@@ -109,6 +116,7 @@ export async function saveGitHubSource(request: FastifyRequest, reply: FastifyRe
                     htmlUrl,
                     apiUrl,
                     organization,
+                    customPort,
                     type: 'github',
                     teams: { connect: { id: teamId } }
                 }
@@ -122,19 +130,20 @@ export async function saveGitHubSource(request: FastifyRequest, reply: FastifyRe
         return errorHandler({ status, message })
     }
 }
-export async function saveGitLabSource(request: FastifyRequest, reply: FastifyReply) {
+export async function saveGitLabSource(request: FastifyRequest<SaveGitLabSource>) {
     try {
         const { id } = request.params
         const { teamId } = request.user
-        let { type, name, htmlUrl, apiUrl, oauthId, appId, appSecret, groupName } =
+        let { type, name, htmlUrl, apiUrl, oauthId, appId, appSecret, groupName, customPort } =
             request.body
 
-        oauthId = Number(oauthId);
+        if (oauthId) oauthId = Number(oauthId);
+        if (customPort) customPort = Number(customPort)
         const encryptedAppSecret = encrypt(appSecret);
 
         if (id === 'new') {
             const newId = cuid()
-            await prisma.gitSource.create({ data: { id: newId, type, apiUrl, htmlUrl, name, teams: { connect: { id: teamId } } } });
+            await prisma.gitSource.create({ data: { id: newId, type, apiUrl, htmlUrl, name, customPort, teams: { connect: { id: teamId } } } });
             await prisma.gitlabApp.create({
                 data: {
                     teams: { connect: { id: teamId } },
@@ -150,7 +159,7 @@ export async function saveGitLabSource(request: FastifyRequest, reply: FastifyRe
                 id: newId
             }
         } else {
-            await prisma.gitSource.update({ where: { id }, data: { type, apiUrl, htmlUrl, name } });
+            await prisma.gitSource.update({ where: { id }, data: { type, apiUrl, htmlUrl, name, customPort } });
             await prisma.gitlabApp.update({
                 where: { id },
                 data: {
@@ -168,7 +177,7 @@ export async function saveGitLabSource(request: FastifyRequest, reply: FastifyRe
     }
 }
 
-export async function checkGitLabOAuthID(request: FastifyRequest) {
+export async function checkGitLabOAuthID(request: FastifyRequest<CheckGitLabOAuthId>) {
     try {
         const { oauthId } = request.body
         const found = await prisma.gitlabApp.findFirst({ where: { oauthId: Number(oauthId) } });

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

@@ -1,21 +1,22 @@
 import { FastifyPluginAsync } from 'fastify';
 import { checkGitLabOAuthID, deleteSource, getSource, listSources, saveGitHubSource, saveGitLabSource, saveSource } from './handlers';
 
+import type { OnlyId } from '../../../../types';
+import type { CheckGitLabOAuthId, SaveGitHubSource, SaveGitLabSource } from './types';
 
-const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
-    fastify.addHook('onRequest', async (request, reply) => {
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
+    fastify.addHook('onRequest', async (request) => {
         return await request.jwtVerify()
     })
     fastify.get('/', async (request) => await listSources(request));
 
-    fastify.get('/:id', async (request) => await getSource(request));
+    fastify.get<OnlyId>('/:id', async (request) => await getSource(request));
     fastify.post('/:id', async (request, reply) => await saveSource(request, reply));
     fastify.delete('/:id', async (request) => await deleteSource(request));
 
-    fastify.post('/:id/check', async (request) => await checkGitLabOAuthID(request));
-    fastify.post('/:id/github', async (request, reply) => await saveGitHubSource(request, reply));
-    fastify.post('/:id/gitlab', async (request, reply) => await saveGitLabSource(request, reply));
-
+    fastify.post<CheckGitLabOAuthId>('/:id/check', async (request) => await checkGitLabOAuthID(request));
+    fastify.post<SaveGitHubSource>('/:id/github', async (request) => await saveGitHubSource(request));
+    fastify.post<SaveGitLabSource>('/:id/gitlab', async (request) => await saveGitLabSource(request));
 };
 
 export default root;

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

@@ -0,0 +1,29 @@
+import { OnlyId } from "../../../../types";
+
+export interface SaveGitHubSource extends OnlyId {
+    Body: {
+        name: string,
+        htmlUrl: string,
+        apiUrl: string,
+        organization: string,
+        customPort: number,
+    }
+}
+export interface SaveGitLabSource extends OnlyId {
+    Body: {
+        type: string,
+        name: string,
+        htmlUrl: string,
+        apiUrl: string,
+        oauthId: number,
+        appId: string,
+        appSecret: string,
+        groupName: string,
+        customPort: number,
+    }
+}
+export interface CheckGitLabOAuthId extends OnlyId {
+    Body: {
+        oauthId: number,
+    }
+}

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

@@ -0,0 +1,3 @@
+export interface GetCurrentUser {
+    Querystring: { teamId: string }
+}

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

@@ -1,13 +1,15 @@
 import axios from "axios";
 import cuid from "cuid";
 import crypto from "crypto";
-import type { FastifyReply, FastifyRequest } from "fastify";
-import { encrypt, errorHandler, isDev, prisma } from "../../../lib/common";
+import { encrypt, errorHandler, getUIUrl, isDev, prisma } from "../../../lib/common";
 import { checkContainer, removeContainer } from "../../../lib/docker";
 import { scheduler } from "../../../lib/scheduler";
-import { getApplicationFromDB, getApplicationFromDBWebhook } from "../../api/v1/applications/handlers";
+import { getApplicationFromDBWebhook } from "../../api/v1/applications/handlers";
 
-export async function installGithub(request: FastifyRequest, reply: FastifyReply): Promise<any> {
+import type { FastifyReply, FastifyRequest } from "fastify";
+import type { GitHubEvents, InstallGithub } from "./types";
+
+export async function installGithub(request: FastifyRequest<InstallGithub>, reply: FastifyReply): Promise<any> {
     try {
         const { gitSourceId, installation_id } = request.query;
         const source = await prisma.gitSource.findUnique({
@@ -19,7 +21,7 @@ export async function installGithub(request: FastifyRequest, reply: FastifyReply
             data: { installationId: Number(installation_id) }
         });
         if (isDev) {
-            return reply.redirect(`http://localhost:3000/sources/${gitSourceId}`)
+            return reply.redirect(`${getUIUrl()}/sources/${gitSourceId}`)
         } else {
             return reply.redirect(`/sources/${gitSourceId}`)
         }
@@ -55,7 +57,7 @@ export async function configureGitHubApp(request, reply) {
             }
         });
         if (isDev) {
-            return reply.redirect(`http://localhost:3000/sources/${state}`)
+            return reply.redirect(`${getUIUrl()}/sources/${state}`)
         } else {
             return reply.redirect(`/sources/${state}`)
         }
@@ -63,7 +65,7 @@ export async function configureGitHubApp(request, reply) {
         return errorHandler({ status, message })
     }
 }
-export async function gitHubEvents(request: FastifyRequest, reply: FastifyReply): Promise<any> {
+export async function gitHubEvents(request: FastifyRequest<GitHubEvents>): Promise<any> {
     try {
         const buildId = cuid();
         const allowedGithubEvents = ['push', 'pull_request'];
@@ -73,18 +75,18 @@ export async function gitHubEvents(request: FastifyRequest, reply: FastifyReply)
         if (!allowedGithubEvents.includes(githubEvent)) {
             throw { status: 500, message: 'Event not allowed.' }
         }
-        let repository, projectId, branch;
+        let projectId, branch;
         const body = request.body
         if (githubEvent === 'push') {
-            repository = body.repository;
-            projectId = repository.id;
-            branch = body.ref.split('/')[2];
+            projectId = body.repository.id;
+            branch = body.ref.includes('/') ? body.ref.split('/')[2] : body.ref;
         } else if (githubEvent === 'pull_request') {
-            repository = body.pull_request.head.repo;
-            projectId = repository.id;
-            branch = body.pull_request.head.ref.split('/')[2];
+            projectId = body.pull_request.base.repo.id;
+            branch = body.pull_request.base.ref.includes('/') ? body.pull_request.base.ref.split('/')[2] : body.pull_request.base.ref;
+        }
+        if (!projectId || !branch) {
+            throw { status: 500, message: 'Cannot parse projectId or branch from the webhook?!' }
         }
-
         const applicationFound = await getApplicationFromDBWebhook(projectId, branch);
         if (applicationFound) {
             const webhookSecret = applicationFound.gitSource.githubApp.webhookSecret || null;
@@ -152,7 +154,7 @@ export async function gitHubEvents(request: FastifyRequest, reply: FastifyReply)
             } else if (githubEvent === 'pull_request') {
                 const pullmergeRequestId = body.number;
                 const pullmergeRequestAction = body.action;
-                const sourceBranch = body.pull_request.head.ref;
+                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.' }
                 }
@@ -160,8 +162,10 @@ export async function gitHubEvents(request: FastifyRequest, reply: FastifyReply)
                 if (applicationFound.settings.previews) {
                     if (applicationFound.destinationDockerId) {
                         const isRunning = await checkContainer(
-                            applicationFound.destinationDocker.engine,
-                            applicationFound.id
+                            {
+                                dockerId: applicationFound.destinationDocker.id,
+                                container: applicationFound.id
+                            }
                         );
                         if (!isRunning) {
                             throw { status: 500, message: 'Application not running.' }
@@ -202,8 +206,7 @@ export async function gitHubEvents(request: FastifyRequest, reply: FastifyReply)
                     } else if (pullmergeRequestAction === 'closed') {
                         if (applicationFound.destinationDockerId) {
                             const id = `${applicationFound.id}-${pullmergeRequestId}`;
-                            const engine = applicationFound.destinationDocker.engine;
-                            await removeContainer({ id, engine });
+                            await removeContainer({ id, dockerId: applicationFound.destinationDocker.id });
                         }
                         return {
                             message: 'Removed preview. Thank you!'

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

@@ -1,10 +1,12 @@
 import { FastifyPluginAsync } from 'fastify';
 import { configureGitHubApp, gitHubEvents, installGithub } from './handlers';
 
-const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
+import type { GitHubEvents, InstallGithub } from './types';
+
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
     fastify.get('/', async (request, reply) => configureGitHubApp(request, reply));
-    fastify.get('/install', async (request, reply) => installGithub(request, reply));
-    fastify.post('/events', async (request, reply) => gitHubEvents(request, reply));
+    fastify.get<InstallGithub>('/install', async (request, reply) => installGithub(request, reply));
+    fastify.post<GitHubEvents>('/events', async (request, reply) => gitHubEvents(request));
 };
 
 export default root;

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

@@ -0,0 +1,30 @@
+export interface InstallGithub {
+    Querystring: {
+        gitSourceId: string,
+        installation_id: string
+    }
+}
+export interface GitHubEvents {
+    Body: {
+        number: string,
+        action: string,
+        repository: {
+            id: string,
+        },
+        ref: string,
+        pull_request: {
+            base: {
+                ref: string,
+                repo: {
+                    id: string,
+                }
+            },
+            head: {
+                ref: string,
+                repo: {
+                    id: string,
+                }
+            }
+        }
+    }
+}

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

@@ -2,21 +2,23 @@ import axios from "axios";
 import cuid from "cuid";
 import crypto from "crypto";
 import type { FastifyReply, FastifyRequest } from "fastify";
-import { encrypt, errorHandler, isDev, listSettings, prisma } from "../../../lib/common";
+import { errorHandler, getAPIUrl, 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";
 
-export async function configureGitLabApp(request: FastifyRequest, reply: FastifyReply) {
+import type { ConfigureGitLabApp, GitLabEvents } from "./types";
+
+export async function configureGitLabApp(request: FastifyRequest<ConfigureGitLabApp>, reply: FastifyReply) {
     try {
         const { code, state } = request.query;
         const { fqdn } = await listSettings();
-        const { gitSource: { gitlabApp: { appId, appSecret }, htmlUrl } } = await getApplicationFromDB(state, undefined);
+        const { gitSource: { gitlabApp: { appId, appSecret }, htmlUrl } }: any = await getApplicationFromDB(state, undefined);
 
         let domain = `http://${request.hostname}`;
         if (fqdn) domain = fqdn;
         if (isDev) {
-            domain = `http://localhost:3001`;
+            domain = getAPIUrl();
         }
         const params = new URLSearchParams({
             client_id: appId,
@@ -28,20 +30,20 @@ export async function configureGitLabApp(request: FastifyRequest, reply: Fastify
         });
         const { data } = await axios.post(`${htmlUrl}/oauth/token`, params)
         if (isDev) {
-            return reply.redirect(`http://localhost:3000/webhooks/success?token=${data.access_token}`)
+            return reply.redirect(`${getAPIUrl()}/webhooks/success?token=${data.access_token}`)
         }
         return reply.redirect(`/webhooks/success?token=${data.access_token}`)
     } catch ({ status, message, ...other }) {
-        console.log(other)
         return errorHandler({ status, message })
     }
 }
-export async function gitLabEvents(request: FastifyRequest, reply: FastifyReply) {
+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 { object_kind: objectKind, ref, project_id } = request.body
+
         const webhookToken = request.headers['x-gitlab-token'];
         if (!webhookToken) {
             throw { status: 500, message: 'Invalid webhookToken.' }
@@ -114,8 +116,10 @@ export async function gitLabEvents(request: FastifyRequest, reply: FastifyReply)
                 if (applicationFound.settings.previews) {
                     if (applicationFound.destinationDockerId) {
                         const isRunning = await checkContainer(
-                            applicationFound.destinationDocker.engine,
-                            applicationFound.id
+                            {
+                                dockerId: applicationFound.destinationDocker.id,
+                                container: applicationFound.id
+                            }
                         );
                         if (!isRunning) {
                             throw { status: 500, message: 'Application not running.' }
@@ -161,7 +165,7 @@ export async function gitLabEvents(request: FastifyRequest, reply: FastifyReply)
                         if (applicationFound.destinationDockerId) {
                             const id = `${applicationFound.id}-${pullmergeRequestId}`;
                             const engine = applicationFound.destinationDocker.engine;
-                            await removeContainer({ id, engine });
+                            await removeContainer({ id, dockerId: applicationFound.destinationDocker.id });
                         }
                         return {
                             message: 'Removed preview. Thank you!'

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

@@ -1,9 +1,11 @@
 import { FastifyPluginAsync } from 'fastify';
 import { configureGitLabApp, gitLabEvents } from './handlers';
 
-const root: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
-    fastify.get('/', async (request, reply) => configureGitLabApp(request, reply));
-    fastify.post('/events', async (request, reply) => gitLabEvents(request, reply));
+import type { ConfigureGitLabApp, GitLabEvents } from './types';
+
+const root: FastifyPluginAsync = async (fastify): Promise<void> => {
+    fastify.get<ConfigureGitLabApp>('/', async (request, reply) => configureGitLabApp(request, reply));
+    fastify.post<GitLabEvents>('/events', async (request) => gitLabEvents(request));
 };
 
 export default root;

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

@@ -0,0 +1,24 @@
+export interface ConfigureGitLabApp {
+    Querystring: {
+        code: string,
+        state: string
+    }
+}
+export interface GitLabEvents {
+    Body: {
+        object_attributes: {
+            work_in_progress: string
+            isDraft: string
+            action: string
+            source_branch: string
+            target_branch: string
+            iid: string
+        },
+        project: {
+            id: string
+        },
+        object_kind: string,
+        ref: string,
+        project_id: string
+    }
+}

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

@@ -1,6 +1,6 @@
 import { FastifyRequest } from "fastify";
-import { asyncExecShell, errorHandler, getDomain, isDev, listServicesWithIncludes, prisma, supportedServiceTypesAndVersions } from "../../../lib/common";
-import { getEngine } from "../../../lib/docker";
+import { errorHandler, getDomain, isDev, prisma, supportedServiceTypesAndVersions, include, executeDockerCmd } from "../../../lib/common";
+import { TraefikOtherConfiguration } from "./types";
 
 function configureMiddleware(
 	{ id, container, port, domain, nakedDomain, isHttps, isWWW, isDualCerts, scriptName, type },
@@ -166,6 +166,7 @@ export async function traefikConfiguration(request, reply) {
 			}
 		};
 		const applications = await prisma.application.findMany({
+			where: { destinationDocker: { remoteEngine: false } },
 			include: { destinationDocker: true, settings: true }
 		});
 		const data = {
@@ -183,7 +184,7 @@ export async function traefikConfiguration(request, reply) {
 				settings: { previews, dualCerts }
 			} = application;
 			if (destinationDockerId) {
-				const { engine, network } = destinationDocker;
+				const { network, id: dockerId } = destinationDocker;
 				const isRunning = true;
 				if (fqdn) {
 					const domain = getDomain(fqdn);
@@ -204,10 +205,7 @@ export async function traefikConfiguration(request, reply) {
 						});
 					}
 					if (previews) {
-						const host = getEngine(engine);
-						const { stdout } = await asyncExecShell(
-							`DOCKER_HOST=${host} docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"`
-						);
+						const { stdout } = await executeDockerCmd({ dockerId, command: `docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"` })
 						const containers = stdout
 							.trim()
 							.split('\n')
@@ -234,7 +232,11 @@ export async function traefikConfiguration(request, reply) {
 				}
 			}
 		}
-		const services = await listServicesWithIncludes();
+		const services: any = await prisma.service.findMany({
+			where: { destinationDocker: { remoteEngine: false } },
+			include,
+			orderBy: { createdAt: 'desc' },
+		});
 
 		for (const service of services) {
 			const {
@@ -247,7 +249,6 @@ export async function traefikConfiguration(request, reply) {
 				plausibleAnalytics
 			} = service;
 			if (destinationDockerId) {
-				const { engine } = destinationDocker;
 				const found = supportedServiceTypesAndVersions.find((a) => a.name === type);
 				if (found) {
 					const port = found.ports.main;
@@ -362,7 +363,7 @@ export async function traefikConfiguration(request, reply) {
 	}
 }
 
-export async function traefikOtherConfiguration(request: FastifyRequest, reply) {
+export async function traefikOtherConfiguration(request: FastifyRequest<TraefikOtherConfiguration>) {
 	try {
 		const { id } = request.query
 		if (id) {
@@ -486,4 +487,219 @@ export async function traefikOtherConfiguration(request: FastifyRequest, reply)
 		console.log(status, message);
 		return errorHandler({ status, message })
 	}
+}
+
+export async function remoteTraefikConfiguration(request: FastifyRequest) {
+	const { id } = request.params
+	try {
+		const traefik = {
+			http: {
+				routers: {},
+				services: {},
+				middlewares: {
+					'redirect-to-https': {
+						redirectscheme: {
+							scheme: 'https'
+						}
+					},
+					'redirect-to-http': {
+						redirectscheme: {
+							scheme: 'http'
+						}
+					},
+					'redirect-to-non-www': {
+						redirectregex: {
+							regex: '^https?://www\\.(.+)',
+							replacement: 'http://${1}'
+						}
+					},
+					'redirect-to-www': {
+						redirectregex: {
+							regex: '^https?://(?:www\\.)?(.+)',
+							replacement: 'http://www.${1}'
+						}
+					}
+				}
+			}
+		};
+		const applications = await prisma.application.findMany({
+			where: { destinationDocker: { id } },
+			include: { destinationDocker: true, settings: true }
+		});
+		const data = {
+			applications: [],
+			services: [],
+			coolify: []
+		};
+		for (const application of applications) {
+			const {
+				fqdn,
+				id,
+				port,
+				destinationDocker,
+				destinationDockerId,
+				settings: { previews, dualCerts }
+			} = application;
+			if (destinationDockerId) {
+				const { id: dockerId, network } = destinationDocker;
+				const isRunning = true;
+				if (fqdn) {
+					const domain = getDomain(fqdn);
+					const nakedDomain = domain.replace(/^www\./, '');
+					const isHttps = fqdn.startsWith('https://');
+					const isWWW = fqdn.includes('www.');
+					if (isRunning) {
+						data.applications.push({
+							id,
+							container: id,
+							port: port || 3000,
+							domain,
+							nakedDomain,
+							isRunning,
+							isHttps,
+							isWWW,
+							isDualCerts: dualCerts
+						});
+					}
+					if (previews) {
+						const { stdout } = await executeDockerCmd({ dockerId, command: `docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"` })
+						const containers = stdout
+							.trim()
+							.split('\n')
+							.filter((a) => a)
+							.map((c) => c.replace(/"/g, ''));
+						if (containers.length > 0) {
+							for (const container of containers) {
+								const previewDomain = `${container.split('-')[1]}.${domain}`;
+								const nakedDomain = previewDomain.replace(/^www\./, '');
+								data.applications.push({
+									id: container,
+									container,
+									port: port || 3000,
+									domain: previewDomain,
+									isRunning,
+									nakedDomain,
+									isHttps,
+									isWWW,
+									isDualCerts: dualCerts
+								});
+							}
+						}
+					}
+				}
+			}
+		}
+		const services: any = await prisma.service.findMany({
+			where: { destinationDocker: { id } },
+			include,
+			orderBy: { createdAt: 'desc' }
+		});
+
+		for (const service of services) {
+			const {
+				fqdn,
+				id,
+				type,
+				destinationDocker,
+				destinationDockerId,
+				dualCerts,
+				plausibleAnalytics
+			} = service;
+			if (destinationDockerId) {
+				const found = supportedServiceTypesAndVersions.find((a) => a.name === type);
+				if (found) {
+					const port = found.ports.main;
+					const publicPort = service[type]?.publicPort;
+					const isRunning = true;
+					if (fqdn) {
+						const domain = getDomain(fqdn);
+						const nakedDomain = domain.replace(/^www\./, '');
+						const isHttps = fqdn.startsWith('https://');
+						const isWWW = fqdn.includes('www.');
+						if (isRunning) {
+							// Plausible Analytics custom script
+							let scriptName = false;
+							if (type === 'plausibleanalytics' && plausibleAnalytics.scriptName !== 'plausible.js') {
+								scriptName = plausibleAnalytics.scriptName;
+							}
+
+							let container = id;
+							let otherDomain = null;
+							let otherNakedDomain = null;
+							let otherIsHttps = null;
+							let otherIsWWW = null;
+
+							if (type === 'minio' && service.minio.apiFqdn) {
+								otherDomain = getDomain(service.minio.apiFqdn);
+								otherNakedDomain = otherDomain.replace(/^www\./, '');
+								otherIsHttps = service.minio.apiFqdn.startsWith('https://');
+								otherIsWWW = service.minio.apiFqdn.includes('www.');
+							}
+							data.services.push({
+								id,
+								container,
+								type,
+								otherDomain,
+								otherNakedDomain,
+								otherIsHttps,
+								otherIsWWW,
+								port,
+								publicPort,
+								domain,
+								nakedDomain,
+								isRunning,
+								isHttps,
+								isWWW,
+								isDualCerts: dualCerts,
+								scriptName
+							});
+						}
+					}
+				}
+			}
+		}
+
+
+		for (const application of data.applications) {
+			configureMiddleware(application, traefik);
+		}
+		for (const service of data.services) {
+			const { id, scriptName } = service;
+
+			configureMiddleware(service, traefik);
+			if (service.type === 'minio') {
+				service.id = id + '-minio';
+				service.container = id;
+				service.domain = service.otherDomain;
+				service.nakedDomain = service.otherNakedDomain;
+				service.isHttps = service.otherIsHttps;
+				service.isWWW = service.otherIsWWW;
+				service.port = 9000;
+				configureMiddleware(service, traefik);
+			}
+
+			if (scriptName) {
+				traefik.http.middlewares[`${id}-redir`] = {
+					replacepathregex: {
+						regex: `/js/${scriptName}`,
+						replacement: '/js/plausible.js'
+					}
+				};
+			}
+		}
+		for (const coolify of data.coolify) {
+			configureMiddleware(coolify, traefik);
+		}
+		if (Object.keys(traefik.http.routers).length === 0) {
+			traefik.http.routers = null;
+		}
+		if (Object.keys(traefik.http.services).length === 0) {
+			traefik.http.services = null;
+		}
+		return {
+			...traefik
+		}
+	} catch ({ status, message }) {
+		return errorHandler({ status, message })
+	}
 }

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

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

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

@@ -0,0 +1,9 @@
+export interface TraefikOtherConfiguration {
+    Querystring: {
+        id: string,
+        privatePort: number,
+        publicPort: number,
+        type: string,
+        address: string
+    }
+}

apps/api/src/types.ts

@@ -0,0 +1,39 @@
+export interface OnlyId {
+    Params: { id: string },
+}
+export interface SaveVersion extends OnlyId {
+    Body: {
+        version: string
+    }
+}
+export interface SaveDatabaseDestination extends OnlyId {
+    Body: {
+        destinationId: string
+    }
+}
+export interface GetDatabaseLogs extends OnlyId {
+    Querystring: {
+        since: number
+    }
+}
+export interface SaveDatabase extends OnlyId {
+    Body: {
+        name: string,
+        defaultDatabase: string,
+        dbUser: string,
+        dbUserPassword: string,
+        rootUser: string,
+        rootUserPassword: string,
+        version: string,
+        isRunning: boolean
+    }
+}
+export interface SaveDatabaseSettings extends OnlyId {
+    Body: {
+        isPublic: boolean,
+        appendOnly: boolean
+    }
+}
+
+
+

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,33 +14,32 @@
 		"format": "prettier --write --plugin-search-dir=. ."
 	},
 	"devDependencies": {
-		"@playwright/test": "1.23.1",
-		"@sveltejs/adapter-auto": "1.0.0-next.53",
-		"@sveltejs/kit": "1.0.0-next.359",
+		"@playwright/test": "1.24.2",
+		"@sveltejs/kit": "1.0.0-next.405",
 		"@types/js-cookie": "3.0.2",
-		"@typescript-eslint/eslint-plugin": "5.30.5",
-		"@typescript-eslint/parser": "5.30.5",
-		"autoprefixer": "10.4.7",
-		"eslint": "8.19.0",
+		"@typescript-eslint/eslint-plugin": "5.33.0",
+		"@typescript-eslint/parser": "5.33.0",
+		"autoprefixer": "10.4.8",
+		"eslint": "8.21.0",
 		"eslint-config-prettier": "8.5.0",
 		"eslint-plugin-svelte3": "4.0.0",
-		"postcss": "8.4.14",
+		"postcss": "8.4.16",
 		"prettier": "2.7.1",
 		"prettier-plugin-svelte": "2.7.0",
-		"svelte": "3.48.0",
+		"svelte": "3.49.0",
 		"svelte-check": "2.8.0",
 		"svelte-preprocess": "4.10.7",
-		"tailwindcss": "3.1.4",
+		"tailwindcss": "3.1.8",
 		"tailwindcss-scrollbar": "0.1.0",
 		"tslib": "2.4.0",
 		"typescript": "4.7.4",
-		"vite": "^2.9.13"
+		"vite": "3.0.5"
 	},
 	"type": "module",
 	"dependencies": {
-		"@sveltejs/adapter-static": "1.0.0-next.34",
-		"@zerodevx/svelte-toast": "0.7.2",
+		"@sveltejs/adapter-static": "1.0.0-next.39",
 		"cuid": "2.1.8",
+		"daisyui": "2.22.0",
 		"js-cookie": "3.0.1",
 		"p-limit": "4.0.0",
 		"svelte-select": "4.4.7",

apps/ui/src/app.d.ts

@@ -19,3 +19,7 @@ declare namespace App {
 		privatePort: string;
 	}
 }
+
+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

@@ -1,10 +1,39 @@
-import { browser, dev } from '$app/env';
+import { dev } from '$app/env';
 import Cookies from 'js-cookie';
-import { toast } from '@zerodevx/svelte-toast';
 
 export function getAPIUrl() {
+	if (GITPOD_WORKSPACE_URL) {
+		const { href } = new URL(GITPOD_WORKSPACE_URL)
+		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) {
+	if (GITPOD_WORKSPACE_URL) {
+		const { href } = new URL(GITPOD_WORKSPACE_URL)
+		const newURL = href.replace('https://', 'https://3001-').replace(/\/$/, '')
+		if (type === 'github') {
+			return `${newURL}/webhooks/github/events`
+		}
+		if (type === 'gitlab') {
+			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({
 	method,
 	path,
@@ -52,7 +81,7 @@ async function send({
 	}
 
 	if (dev && !path.startsWith('https://')) {
-		path = `http://localhost:3001${path}`;
+		path = `${getAPIUrl()}${path}`;
 	}
 
 	const response = await fetch(`${path}`, opts);
@@ -74,7 +103,7 @@ async function send({
 		return {};
 	}
 	if (!response.ok) {
-		if (response.status === 401 && !path.startsWith('https://api.github')) {
+		if (response.status === 401 && !path.startsWith('https://api.github') && !path.includes('/v4/user')) {
 			Cookies.remove('token');
 		}
 

apps/ui/src/lib/common.ts

@@ -1,260 +1,4 @@
-import { toast } from '@zerodevx/svelte-toast';
-export const asyncSleep = (delay: number) =>
-	new Promise((resolve) => setTimeout(resolve, delay));
-
-export function errorNotification(error: any): void {
-	if (error.message) {
-		toast.push(error.message);
-	} else {
-		toast.push('Ooops, something is not okay, are you okay?');
-	}
-	console.error(JSON.stringify(error));
-}
-
-export function getDomain(domain: string) {
-	return domain?.replace('https://', '').replace('http://', '');
-}
-export function dashify(str: string, options?: any): string {
-	if (typeof str !== 'string') return str;
-	return str
-		.trim()
-		.replace(/\W/g, (m) => (/[À-ž]/.test(m) ? m : '-'))
-		.replace(/^-+|-+$/g, '')
-		.replace(/-{2,}/g, (m) => (options && options.condense ? '-' : m))
-		.toLowerCase();
-}
-
-export const dateOptions: any = {
-	year: 'numeric',
-	month: 'short',
-	day: '2-digit',
-	hour: 'numeric',
-	minute: 'numeric',
-	second: 'numeric',
-	hour12: false
-};
-
-export const staticDeployments = [
-	'react',
-	'vuejs',
-	'static',
-	'svelte',
-	'gatsby',
-	'php',
-	'astro',
-	'eleventy'
-];
-export const notNodeDeployments = ['php', 'docker', 'rust', 'python', 'deno', 'laravel'];
-
-
-export function generateRemoteEngine(destination: any) {
-	return `ssh://${destination.user}@${destination.ipAddress}:${destination.port}`;
-}
-
-export function changeQueryParams(buildId: string) {
-	const queryParams = new URLSearchParams(window.location.search);
-	queryParams.set('buildId', buildId);
-	// @ts-ignore
-	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 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: 'appwrite',
-// 		// 	fancyName: 'AppWrite',
-// 		// 	baseImage: 'appwrite/appwrite',
-// 		// 	images: ['appwrite/influxdb', 'appwrite/telegraf', 'mariadb:10.7', 'redis:6.0-alpine3.12'],
-// 		// 	versions: ['latest', '0.13.0'],
-// 		// 	recommendedVersion: '0.13.0',
-// 		// 	ports: {
-// 		// 		main: 3000
-// 		// 	}
-// 		// }
-// 	}
-// ];
-
-export const getServiceMainPort = (service: string) => {
-	const serviceType = supportedServiceTypesAndVersions.find((s) => s.name === service);
-	if (serviceType) {
-		return serviceType.ports.main;
-	}
-	return null;
-};
+import { addToast } from '$lib/store';
 
 export const supportedServiceTypesAndVersions = [
 	{
@@ -403,9 +147,130 @@ export const supportedServiceTypesAndVersions = [
 		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));
+
+export function errorNotification(error: any): void {
+	if (error.message) {
+		if (error.message === 'Cannot read properties of undefined (reading \'postMessage\')') {
+			return addToast({
+				message: 'Currently there is background process in progress. Please try again later.',
+				type: 'error',
+			});
+		}
+		addToast({
+			message: error.message,
+			type: 'error',
+		});
+	} else {
+		addToast({
+			message: 'Ooops, something is not okay, are you okay?',
+			type: 'error',
+		});
+	}
+	console.error(JSON.stringify(error));
+}
+
+export function getDomain(domain: string) {
+	return domain?.replace('https://', '').replace('http://', '');
+}
+export function dashify(str: string, options?: any): string {
+	if (typeof str !== 'string') return str;
+	return str
+		.trim()
+		.replace(/\W/g, (m) => (/[À-ž]/.test(m) ? m : '-'))
+		.replace(/^-+|-+$/g, '')
+		.replace(/-{2,}/g, (m) => (options && options.condense ? '-' : m))
+		.toLowerCase();
+}
+
+export const dateOptions: any = {
+	year: 'numeric',
+	month: 'short',
+	day: '2-digit',
+	hour: 'numeric',
+	minute: 'numeric',
+	second: 'numeric',
+	hour12: false
+};
+
+export const staticDeployments = [
+	'react',
+	'vuejs',
+	'static',
+	'svelte',
+	'gatsby',
+	'php',
+	'astro',
+	'eleventy'
+];
+export const notNodeDeployments = ['php', 'docker', 'rust', 'python', 'deno', 'laravel'];
+
+
+export function generateRemoteEngine(destination: any) {
+	return `ssh://${destination.user}@${destination.ipAddress}:${destination.port}`;
+}
+
+export function changeQueryParams(buildId: string) {
+	const queryParams = new URLSearchParams(window.location.search);
+	queryParams.set('buildId', buildId);
+	// @ts-ignore
+	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) {
 		return {

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/Setting.svelte

@@ -17,13 +17,14 @@
 	</div>
 </div>
 <div
+	class:tooltip-right={dataTooltip}
+	class:tooltip-primary={dataTooltip}
 	class:tooltip={dataTooltip}
 	class:text-center={isCenter}
-	data-tooltip={dataTooltip}
+	data-tip={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"

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

@@ -0,0 +1,52 @@
+<script>
+	export let type = 'info';
+</script>
+
+<div
+	class="alert shadow-lg text-white rounded"
+	class:alert-success={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,22 @@
+<script lang="ts">
+	import { fade } from 'svelte/transition';
+	import Toast from './Toast.svelte';
+
+	import { toasts } from '$lib/store';
+</script>
+
+{#if $toasts}
+	<section>
+		<article class="toast toast-bottom toast-end rounded-none" role="alert" transition:fade>
+			{#each $toasts as toast (toast.id)}
+				<Toast type={toast.type}>{@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/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 { toast } from '@zerodevx/svelte-toast';
+	import { addToast, appSession, features } from '$lib/store';
 	import { asyncSleep, errorNotification } from '$lib/common';
 	import { onMount } from 'svelte';
 
@@ -22,7 +21,11 @@
 				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 +39,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 +81,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,11 +19,12 @@
 	};
 	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 } from '$lib/api';
+	import { get, post } from '$lib/api';
 	import { errorNotification } from '$lib/common';
 	import Trend from './Trend.svelte';
 	async function getStatus() {
@@ -59,6 +60,20 @@
 		cpu: 'stable',
 		disk: 'stable'
 	};
+	async function manuallyCleanupStorage() {
+		try {
+			loading.cleanup = true
+			await post('/internal/cleanup', {});
+			return addToast({
+				message: "Cleanup done.",
+				type:"success"
+			})
+		} catch(error) {
+			return errorNotification(error);
+		} finally {
+			loading.cleanup = false
+		}
+	}
 </script>
 
 {#if $appSession.teamId === '0'}
@@ -129,6 +144,9 @@
 			<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:loading={loading.cleanup} class="btn btn-sm"
+				>Cleanup Storage</button
+			>
 		</div>
 		<div
 			class="overflow-hidden rounded px-4 py-5 text-center sm:p-6 sm:text-left"
@@ -143,5 +161,6 @@
 			</dd>
 		</div>
 	</dl>
+
 	<div class="px-6 pt-20 text-2xl font-bold">Resources</div>
 {/if}

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

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

apps/ui/src/lib/components/svg/services/index.ts

@@ -0,0 +1,17 @@
+//@ts-nocheck
+export { default as PlausibleAnalytics } from './PlausibleAnalytics.svelte';
+export { default as NocoDb }  from './NocoDB.svelte';
+export { default as MinIo }  from './MinIO.svelte';
+export { default as VsCodeServer }  from './VSCodeServer.svelte';
+export { default as Wordpress }  from './Wordpress.svelte';
+export { default as VaultWarden }  from './VaultWarden.svelte';
+export { default as LanguageTool }  from './LanguageTool.svelte';
+export { default as N8n }  from './N8n.svelte';
+export { default as UptimeKuma }  from './UptimeKuma.svelte';
+export { default as Ghost }  from './Ghost.svelte';
+export { default as MeiliSearch }  from './MeiliSearch.svelte';
+export { default as Umami }  from './Umami.svelte';
+export { default as Hasura }  from './Hasura.svelte';
+export { default as Fider }  from './Fider.svelte';
+export { default as Moodle }  from './Moodle.svelte';
+

apps/ui/src/lib/locales/en.json

@@ -88,7 +88,7 @@
 		"removing": "Removing...",
 		"remove_domain": "Remove domain",
 		"public_port_range": "Public Port Range",
-		"public_port_range_explainer": "Ports used to expose databases/services/internal services.<br> Add them to your firewall (if applicable).<br><br>You can specify a range of ports, eg: <span class='text-yellow-500 font-bold'>9000-9100</span>",
+		"public_port_range_explainer": "Ports used to expose databases/services/internal services.<br> Add them to your firewall (if applicable).<br><br>You can specify a range of ports, eg: <span class='text-settings font-bold'>9000-9100</span>",
 		"no_actions_available": "No actions available",
 		"admin_api_key": "Admin API key"
 	},
@@ -144,8 +144,8 @@
 		},
 		"preview": {
 			"need_during_buildtime": "Need during buildtime?",
-			"setup_secret_app_first": "You can add secrets to PR/MR deployments. Please add secrets to the application first. <br>Useful for creating <span class='text-green-500 font-bold'>staging</span> environments.",
-			"values_overwriting_app_secrets": "These values overwrite application secrets in PR/MR deployments. Useful for creating <span class='text-green-500 font-bold'>staging</span> environments.",
+			"setup_secret_app_first": "You can add secrets to PR/MR deployments. Please add secrets to the application first. <br>Useful for creating <span class='text-applications font-bold'>staging</span> environments.",
+			"values_overwriting_app_secrets": "These values overwrite application secrets in PR/MR deployments. Useful for creating <span class='text-applications font-bold'>staging</span> environments.",
 			"redeploy": "Redeploy",
 			"no_previews_available": "No previews available"
 		},
@@ -167,20 +167,20 @@
 		"permission_denied_stop_application": "You do not have permission to stop the application.",
 		"rebuild_application": "Rebuild application",
 		"permission_denied_rebuild_application": "You do not have permission to rebuild application.",
-		"build_and_start_application": "Build and start application",
-		"permission_denied_build_and_start_application": "You do not have permission to Build and start application.",
+		"build_and_start_application": "Deploy",
+		"permission_denied_build_and_start_application": "You do not have permission to deploy application.",
 		"configurations": "Configurations",
 		"secret": "Secrets",
 		"persistent_storage": "Persistent Storage",
 		"previews": "Previews",
 		"logs": "Application Logs",
 		"build_logs": "Build Logs",
-		"delete_application": "Delete application",
+		"delete_application": "Delete",
 		"permission_denied_delete_application": "You do not have permission to delete this application",
 		"domain_already_in_use": "Domain {{domain}} is already used.",
 		"dns_not_set_error": "DNS not set correctly or propogated for {{domain}}.<br><br>Please check your DNS settings.",
 		"domain_required": "Domain is required.",
-		"settings_saved": "Settings saved.",
+		"settings_saved": "Configuration saved.",
 		"dns_not_set_partial_error": "DNS not set",
 		"domain_not_valid": "Could not resolve domain or it's not pointing to the server IP address.<br><br>Please check your DNS configuration and try again.",
 		"git_source": "Git Source",
@@ -194,14 +194,14 @@
 		"application": "Application",
 		"url_fqdn": "URL (FQDN)",
 		"domain_fqdn": "Domain (FQDN)",
-		"https_explainer": "If you specify <span class='text-green-500 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-green-500 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>",
+		"https_explainer": "If you specify <span class='text-applications font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-applications font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>",
 		"ssl_www_and_non_www": "Generate SSL for www and non-www?",
-		"ssl_explainer": "It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-green-500'>both DNS entries</span> set in advance.<br><br>Useful if you expect to have visitors on both.",
+		"ssl_explainer": "It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-applications'>both DNS entries</span> set in advance.<br><br>Useful if you expect to have visitors on both.",
 		"install_command": "Install Command",
 		"build_command": "Build Command",
 		"start_command": "Start Command",
-		"directory_to_use_explainer": "Directory to use as the base for all commands.<br>Could be useful with <span class='text-green-500 font-bold'>monorepos</span>.",
-		"publish_directory_explainer": "Directory containing all the assets for deployment. <br> For example: <span class='text-green-500 font-bold'>dist</span>,<span class='text-green-500 font-bold'>_site</span> or <span class='text-green-500 font-bold'>public</span>.",
+		"directory_to_use_explainer": "Directory to use as the base for all commands.<br>Could be useful with <span class='text-applications font-bold'>monorepos</span>.",
+		"publish_directory_explainer": "Directory containing all the assets for deployment. <br> For example: <span class='text-applications font-bold'>dist</span>,<span class='text-applications font-bold'>_site</span> or <span class='text-applications font-bold'>public</span>.",
 		"features": "Features",
 		"enable_automatic_deployment": "Enable Automatic Deployment",
 		"enable_auto_deploy_webhooks": "Enable automatic deployment through webhooks.",
@@ -227,17 +227,17 @@
 		"select_database_type": "Select a Database type",
 		"select_database_version": "Select a Database version",
 		"confirm_stop": "Are you sure you would like to stop {{name}}?",
-		"stop_database": "Stop database",
+		"stop_database": "Stop",
 		"permission_denied_stop_database": "You do not have permission to stop the database.",
-		"start_database": "Start database",
+		"start_database": "Start",
 		"permission_denied_start_database": "You do not have permission to start the database.",
-		"delete_database": "Delete Database",
+		"delete_database": "Delete",
 		"permission_denied_delete_database": "You do not have permission to delete a Database",
 		"no_databases_found": "No databases found",
-		"logs": "Database Logs"
+		"logs": "Logs"
 	},
 	"destination": {
-		"delete_destination": "Delete Destination",
+		"delete_destination": "Delete",
 		"permission_denied_delete_destination": "You do not have permission to delete this destination",
 		"add_to_coolify": "Add to Coolify",
 		"coolify_proxy_stopped": "Coolify Proxy stopped!",
@@ -250,7 +250,7 @@
 		"no_destination_found": "No destination found",
 		"new_error_network_already_exists": "Network {{network}} already configured for another team!",
 		"new": {
-			"saving_and_configuring_proxy": "Saving and configuring proxy...",
+			"saving_and_configuring_proxy": "Saving...",
 			"install_proxy": "This will install a proxy on the destination to allow you to access your applications and services without any manual configuration (recommended for Docker).<br><br>Databases will have their own proxy.",
 			"add_new_destination": "Add New Destination",
 			"predefined_destinations": "Predefined destinations"
@@ -267,7 +267,7 @@
 			"official_providers": "Official providers"
 		},
 		"no_git_sources_found": "No git sources found",
-		"delete_git_source": "Delete Git Source",
+		"delete_git_source": "Delete",
 		"permission_denied": "You do not have permission to delete a Git Source",
 		"create_new_app": "Create new {{name}} App",
 		"change_app_settings": "Change {{name}} App Settings",
@@ -293,20 +293,20 @@
 		"generate_www_non_www_ssl": "It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-pink-600'>both DNS entries</span> set in advance.<br><br>Service needs to be restarted."
 	},
 	"service": {
-		"stop_service": "Stop Service",
+		"stop_service": "Stop",
 		"permission_denied_stop_service": "You do not have permission to stop the service.",
-		"start_service": "Start Service",
+		"start_service": "Start",
 		"permission_denied_start_service": "You do not have permission to start the service.",
-		"delete_service": "Delete Service",
+		"delete_service": "Delete",
 		"permission_denied_delete_service": "You do not have permission to delete a service.",
 		"no_service": "No services found",
-		"logs": "Service Logs"
+		"logs": "Logs"
 	},
 	"setting": {
 		"change_language": "Change Language",
 		"permission_denied": "You do not have permission to do this. \\nAsk an admin to modify your permissions.",
 		"domain_removed": "Domain removed",
-		"ssl_explainer": "If you specify <span class='text-yellow-500 font-bold'>https</span>, Coolify will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-yellow-500 font-bold'>www</span>, Coolify will be redirected (302) from non-www and vice versa.<br><br><span class='text-yellow-500 font-bold'>WARNING:</span> If you change an already set domain, it will brake webhooks and other integrations! You need to manually update them.",
+		"ssl_explainer": "If you specify <span class='text-settings font-bold'>https</span>, Coolify will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-settings font-bold'>www</span>, Coolify will be redirected (302) from non-www and vice versa.<br><br><span class='text-settings font-bold'>WARNING:</span> If you change an already set domain, it will brake webhooks and other integrations! You need to manually update them.",
 		"must_remove_domain_before_changing": "Must remove the domain before you can change this setting.",
 		"registration_allowed": "Registration allowed?",
 		"registration_allowed_explainer": "Allow further registrations to the application. <br>It's turned off after the first registration.",
@@ -314,7 +314,7 @@
 		"credential_stat_explainer": "Credentials for <a class=\"text-white font-bold\" href=\"{{link}}\" target=\"_blank\">stats</a> page.",
 		"auto_update_enabled": "Auto update enabled?",
 		"auto_update_enabled_explainer": "Enable automatic updates for Coolify. It will be done automatically behind the scenes, if there is no build process running.",
-		"generate_www_non_www_ssl": "It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-yellow-500'>both DNS entries</span> set in advance.",
+		"generate_www_non_www_ssl": "It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-settings'>both DNS entries</span> set in advance.",
 		"is_dns_check_enabled": "DNS check enabled?",
 		"is_dns_check_enabled_explainer": "You can disable DNS check before creating SSL certificates.<br><br>Turning it off is useful when Coolify is behind a reverse proxy or tunnel."
 	},

apps/ui/src/lib/locales/fr.json

@@ -50,7 +50,7 @@
 		"delete_application": "Supprimer l'application",
 		"deployment_queued": "Déploiement en file d'attente.",
 		"destination": "Destination",
-		"directory_to_use_explainer": "Répertoire à utiliser comme base pour toutes les commandes.<br>Pourrait être utile avec <span class='text-green-500 font-bold'>monorepos</span>.",
+		"directory_to_use_explainer": "Répertoire à utiliser comme base pour toutes les commandes.<br>Pourrait être utile avec <span class='text-applications font-bold'>monorepos</span>.",
 		"dns_not_set_error": "DNS non défini ou propagé pour {{domain}}.<br><br>Veuillez vérifier vos paramètres DNS.",
 		"dns_not_set_partial_error": "DNS non défini",
 		"domain_already_in_use": "Le domaine {{domain}} est déjà utilisé.",
@@ -65,7 +65,7 @@
 		"features": "Caractéristiques",
 		"git_repository": "Dépôt Git",
 		"git_source": "Source Git",
-		"https_explainer": "Si vous spécifiez <span class='text-green-500 font-bold'>https</span>, l'application sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.<br>Si vous spécifiez <span class='text-green-500 font-bold'>www</span>, l'application sera redirigée (302) à partir de non-www et vice versa \n.<br><br>Pour modifier le domaine, vous devez d'abord arrêter l'application.<br><br><span class='text-white font-bold'>Vous devez configurer, en avance, votre DNS pour pointer vers l'IP du serveur.</span>",
+		"https_explainer": "Si vous spécifiez <span class='text-applications font-bold'>https</span>, l'application sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.<br>Si vous spécifiez <span class='text-applications font-bold'>www</span>, l'application sera redirigée (302) à partir de non-www et vice versa \n.<br><br>Pour modifier le domaine, vous devez d'abord arrêter l'application.<br><br><span class='text-white font-bold'>Vous devez configurer, en avance, votre DNS pour pointer vers l'IP du serveur.</span>",
 		"install_command": "Commande d'installation",
 		"logs": "Journaux des applications",
 		"no_applications_found": "Aucune application trouvée",
@@ -78,11 +78,11 @@
 			"need_during_buildtime": "Besoin pendant la build ?",
 			"no_previews_available": "Aucun aperçu disponible",
 			"redeploy": "Redéployer",
-			"setup_secret_app_first": "Vous pouvez ajouter des secrets aux déploiements PR/MR. \nVeuillez d'abord ajouter des secrets à l'application. \n<br>Utile pour créer des environnements <span class='text-green-500 font-bold'>de mise en scène</span>.",
-			"values_overwriting_app_secrets": "Ces valeurs remplacent les secrets d'application dans les déploiements PR/MR. \nUtile pour créer des environnements <span class='text-green-500 font-bold'>de mise en scène</span>."
+			"setup_secret_app_first": "Vous pouvez ajouter des secrets aux déploiements PR/MR. \nVeuillez d'abord ajouter des secrets à l'application. \n<br>Utile pour créer des environnements <span class='text-applications font-bold'>de mise en scène</span>.",
+			"values_overwriting_app_secrets": "Ces valeurs remplacent les secrets d'application dans les déploiements PR/MR. \nUtile pour créer des environnements <span class='text-applications font-bold'>de mise en scène</span>."
 		},
 		"previews": "Aperçus",
-		"publish_directory_explainer": "Répertoire contenant tous les actifs à déployer. \n<br> Par exemple : <span class='text-green-500 font-bold'>dist</span>,<span class='text-green-500 font-bold'>_site</span> ou <span \nclass='text-green-500 font-bold'>public</span>.",
+		"publish_directory_explainer": "Répertoire contenant tous les actifs à déployer. \n<br> Par exemple : <span class='text-applications font-bold'>dist</span>,<span class='text-applications font-bold'>_site</span> ou <span \nclass='text-applications font-bold'>public</span>.",
 		"rebuild_application": "Re-build l'application",
 		"secret": "secrets",
 		"secrets": {
@@ -91,7 +91,7 @@
 			"use_isbuildsecret": "Utiliser isBuildSecret"
 		},
 		"settings_saved": "Paramètres sauvegardés.",
-		"ssl_explainer": "Il générera des certificats pour www et non-www. \n<br>Vous devez avoir <span class='font-bold text-green-500'>les deux entrées DNS</span> définies à l'avance.<br><br>Utile si vous prévoyez d'avoir des visiteurs sur les deux.",
+		"ssl_explainer": "Il générera des certificats pour www et non-www. \n<br>Vous devez avoir <span class='font-bold text-applications'>les deux entrées DNS</span> définies à l'avance.<br><br>Utile si vous prévoyez d'avoir des visiteurs sur les deux.",
 		"ssl_www_and_non_www": "Générer SSL pour www et non-www ?",
 		"start_command": "Démarrer la commande",
 		"stop_application": "Arrêter l'application",
@@ -181,7 +181,7 @@
 		"path": "Chemin",
 		"port": "Port",
 		"public_port_range": "Gamme de ports publics",
-		"public_port_range_explainer": "Ports utilisés pour exposer les bases de données/services/services internes.<br> Ajoutez-les à votre pare-feu (le cas échéant).<br><br>Vous pouvez spécifier une plage de ports, par exemple : <span class='text-yellow-500 \nfont-bold'>9000-9100</span>",
+		"public_port_range_explainer": "Ports utilisés pour exposer les bases de données/services/services internes.<br> Ajoutez-les à votre pare-feu (le cas échéant).<br><br>Vous pouvez spécifier une plage de ports, par exemple : <span class='text-settings \nfont-bold'>9000-9100</span>",
 		"publish_directory": "Publier le répertoire",
 		"remove": "Retirer",
 		"remove_domain": "Supprimer le domaine",
@@ -266,7 +266,7 @@
 		"permission_denied": "Vous n'avez pas la permission de faire cela. \n\\nDemandez à un administrateur de modifier vos autorisations.",
 		"registration_allowed": "Inscription autorisée ?",
 		"registration_allowed_explainer": "Autoriser d'autres inscriptions à l'application. \n<br>Il est désactivé après la première inscription.",
-		"ssl_explainer": "Si vous spécifiez <span class='text-yellow-500 font-bold'>https</span>, Coolify sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.<br>Si vous spécifiez <span class='text-yellow-500 font-bold'>www</span>, Coolify sera redirigé (302) à partir de non-www et vice versa."
+		"ssl_explainer": "Si vous spécifiez <span class='text-settings font-bold'>https</span>, Coolify sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.<br>Si vous spécifiez <span class='text-settings font-bold'>www</span>, Coolify sera redirigé (302) à partir de non-www et vice versa."
 	},
 	"source": {
 		"application_id": "ID d'application",

apps/ui/src/lib/store.ts

@@ -1,8 +1,9 @@
-import { browser } from '$app/env';
-import { writable, readable, type Writable, type Readable } from 'svelte/store';
-// import { version as currentVersion } from '../../package.json';
+import { writable, readable, type Writable } from 'svelte/store';
+
 interface AppSession {
-    version: string
+    ipv4: string | null,
+    ipv6: string | null,
+    version: string | null,
     userId: string | null,
     teamId: string | null,
     permission: string,
@@ -16,9 +17,16 @@ interface AppSession {
         gitlab: string | null,
     }
 }
+interface AddToast {
+    type?: "info" | "success" | "error",
+    message: string,
+    timeout?: number | undefined
+ }
 export const loginEmail: Writable<string | undefined> = writable()
 export const appSession: Writable<AppSession> = writable({
-    version: '3.0.2',
+    ipv4: null,
+    ipv6: null,
+    version: null,
     userId: null,
     teamId: null,
     permission: 'read',
@@ -32,7 +40,6 @@ export const appSession: Writable<AppSession> = writable({
         gitlab: null
     }
 });
-export const isTraefikUsed: Writable<boolean> = writable(false);
 export const disabledButton: Writable<boolean> = writable(false);
 export const status: Writable<any> = writable({
     application: {
@@ -42,14 +49,16 @@ export const status: Writable<any> = writable({
         initialLoading: true
     },
     service: {
-        initialLoading: true,
+        isRunning: false,
+        isExited: false,
         loading: false,
-        isRunning: false
-    }, 
+        initialLoading: true
+    },
     database: {
-        initialLoading: true,
+        isRunning: false,
+        isExited: false,
         loading: false,
-        isRunning: false
+        initialLoading: true
     }
 
 });
@@ -58,3 +67,44 @@ export const features = readable({
     beta: window.localStorage.getItem('beta') === 'true',
     latestVersion: window.localStorage.getItem('latestVersion')
 });
+
+export const location: Writable<null | string> = writable(null)
+export const setLocation = (resource: any) => {
+    if (GITPOD_WORKSPACE_URL && resource.exposePort) {
+        const { href } = new URL(GITPOD_WORKSPACE_URL);
+        const newURL = href
+            .replace('https://', `https://${resource.exposePort}-`)
+            .replace(/\/$/, '');
+        return location.set(newURL)
+    } else if (CODESANDBOX_HOST){
+		 const newURL = `https://${CODESANDBOX_HOST.replace(/\$PORT/,resource.exposePort)}`
+         return location.set(newURL)
+    }
+    return location.set(resource.fqdn)
+}
+
+export const toasts: any = writable([])
+
+export const dismissToast = (id: number) => {
+  toasts.update((all: any) => all.filter((t: any) => t.id !== id))
+}
+
+export const addToast = (toast: AddToast) => {
+  // Create a unique ID so we can easily find/remove it
+  // if it is dismissible/has a timeout.
+  const id = Math.floor(Math.random() * 10000)
+
+  // Setup some sensible defaults for a toast.
+  const defaults = {
+    id,
+    type: 'info',
+    timeout: 2000,
+  }
+
+  // Push the toast to the top of the list of toasts
+  const t = { ...defaults, ...toast }
+  toasts.update((all: any) => [t, ...all])
+
+  // If toast is dismissible, dismiss it after "timeout" amount of time.
+  if (t.timeout) setTimeout(() => dismissToast(id), t.timeout)
+}