Merge pull request #264 from coollabsio/v2.2.7

v2.2.7

.dockerignore

@@ -3,9 +3,14 @@ node_modules
 /build
 /.svelte-kit
 /package
+/yarn.lock
+/.pnpm-store
+/ssl
 
 .env
+.env.prod
 .env.stag
 /db/*.db
 /db/*.db-journal
-/data/haproxy/haproxy.cfg
+/data/haproxy/haproxy.cfg
+/data/haproxy/haproxy.cfg.lkg

.env.template

@@ -1,5 +1,5 @@
 COOLIFY_APP_ID=
-COOLIFY_SECRET_KEY=
-COOLIFY_DATABASE_URL=file:../db/prod.db
+COOLIFY_SECRET_KEY=12341234123412341234123412341234
+COOLIFY_DATABASE_URL=file:../db/dev.db
 COOLIFY_SENTRY_DSN=
 COOLIFY_IS_ON="docker"

.gitignore

@@ -3,6 +3,9 @@ node_modules
 /build
 /.svelte-kit
 /package
+/yarn.lock
+/.pnpm-store
+/ssl
 
 .env
 .env.prod

CONTRIBUTING.md

@@ -0,0 +1,43 @@
+# Welcome
+
+First of all, thank you for considering to contribute to my project! It means a lot 💜.
+
+# Technical skills required
+
+- Node.js / Javascript
+- Svelte / SvelteKit
+- Prisma.io
+
+# Recommended Pull Request Guideline
+
+- Fork the project
+- Clone your fork repo to local
+- Create a new branch
+- Push to your fork repo
+- Create a pull request: https://github.com/coollabsio/compare
+- Write a proper description
+- Click "Change to draft"
+
+# How to start after you set up your local fork?
+
+This repository best with [pnpm](https://pnpm.io) due to the lock file. I recommend you should try and use `pnpm` as well, because it is cool and efficient!
+
+You need to have [Docker Engine](https://docs.docker.com/engine/install/) installed locally.
+
+## Setup development environment
+
+- Copy `.env.template` to `.env` and set the `COOLIFY_APP_ID` environment variable to something cool.
+- Install dependencies with `pnpm install`.
+- Need to create a local SQlite database with `pnpm db:push`.
+  - This will apply all migrations and seed the database at `db/dev.db`.
+- You can start coding after starting `pnpm dev`.
+
+## Database migrations
+
+During development, if you change the database layout, you need to run `pnpm db:push` to migrate the database and create types for Prisma. You also need to restart the development process.
+
+If the schema is finalized, you need to create a migration file with `pnpm db:migrate <nameOfMigration>` where `nameOfMigration` is given by you. Make it sense. :)
+
+## Tricky parts
+
+- BullMQ, the queue system Coolify is using, cannot be hot reloaded. So if you change anything in the files related to it, you need to restart the development process. I'm actively looking of a different queue/scheduler library. I'm open for discussion!

Dockerfile

@@ -1,4 +1,5 @@
 FROM node:16.14.0-alpine
+RUN apk add --no-cache g++ cmake make python3
 WORKDIR /app
 COPY package*.json .
 RUN yarn install

LICENSE

@@ -0,0 +1,661 @@
+                    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/>.

README.md

@@ -2,7 +2,13 @@
 
 An open-source & self-hostable Heroku / Netlify alternative.
 
-## Installation
+## Live Demo
+
+https://demo.coolify.io/
+
+(If it is unresponsible, that means someone overloaded the server. 🙃)
+
+## How to install
 
 Installation is automated with the following command:
 
@@ -10,13 +16,13 @@ Installation is automated with the following command:
 /bin/bash -c "$(curl -fsSL https://get.coollabs.io/coolify/install.sh)"
 ```
 
-## Migration from v1
-
-A fresh installation is necessary. v2 is not compatible with v1.
+If you would like no questions during installation
 
 ## Features
+
 ### Git Sources
-You can use the official ones or your self hosted version!
+
+You can use the following Git Sources to be auto-deployed to your Coolifyt instance! (Self hosted versions also supported.)
 
 - Github
 - GitLab
@@ -24,13 +30,16 @@ You can use the official ones or your self hosted version!
 
 ### Destinations
 
+You can deploy your applications to the following destinations:
+
 - Local Docker Engine
 - Remote Docker Engine (WIP)
 - Kubernetes (WIP)
 
-
 ### Applications
 
+These are the predefined build packs, but with the Docker build pack, you can host basically anything that is hostable with a single Dockerfile.
+
 - Static sites
 - NodeJS
 - VueJS
@@ -42,10 +51,12 @@ You can use the official ones or your self hosted version!
 - Svelte
 - PHP
 - Rust
-- Dockerfile (you can provide it)
+- Docker
 
 ### Databases
 
+One-click database is ready to be used internally or shared over the internet:
+
 - MongoDB
 - MySQL
 - PostgreSQL
@@ -54,13 +65,22 @@ You can use the official ones or your self hosted version!
 
 ### One-click services
 
+You can host cool open-source services as well:
+
 - [WordPress](https://wordpress.org)
+- [Ghost](https://ghost.org)
 - [Plausible Analytics](https://plausible.io)
 - [NocoDB](https://nocodb.com)
 - [VSCode Server](https://github.com/cdr/code-server)
 - [MinIO](https://min.io)
 - [VaultWarden](https://github.com/dani-garcia/vaultwarden)
+- [LanguageTool](https://languagetool.org)
+- [n8n](https://n8n.io)
+- [Uptime Kuma](https://github.com/louislam/uptime-kuma)
 
+## Migration from v1
+
+A fresh installation is necessary. v2 is not compatible with v1.
 
 ## Support
 
@@ -69,11 +89,9 @@ You can use the official ones or your self hosted version!
 - Email: [andras@coollabs.io](mailto:andras@coollabs.io)
 - Discord: [Invitation](https://discord.gg/xhBCC7eGKw)
 
-## Roadmap
+## Contribute
 
-[See the Roadmap here](https://github.com/coollabsio/coolify/projects/1)
-
-(Will be updated soon!)
+See [our contribution guide](./CONTRIBUTING.md).
 
 ## License
 

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.0.8",
+	"version": "2.2.7",
 	"license": "AGPL-3.0",
 	"scripts": {
-		"dev": "docker compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev --host 0.0.0.0",
-		"dev:stop": "docker compose -f docker-compose-dev.yaml down",
-		"dev:logs": "docker compose -f docker-compose-dev.yaml logs -f --tail 10",
+		"dev": "docker-compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev",
+		"dev:stop": "docker-compose -f docker-compose-dev.yaml down",
+		"dev:logs": "docker-compose -f docker-compose-dev.yaml logs -f --tail 10",
 		"studio": "npx prisma studio",
 		"start": "npx prisma migrate deploy && npx prisma generate && npx prisma db seed && node index.js",
 		"build": "svelte-kit build",
@@ -16,6 +16,7 @@
 		"db:generate": "prisma generate",
 		"db:push": "prisma db push && prisma generate",
 		"db:seed": "prisma db seed",
+		"db:migrate": "COOLIFY_DATABASE_URL=file:../db/migration.db prisma migrate dev --skip-seed --name",
 		"release:staging": "cross-var docker build -t coollabsio/coolify:$npm_package_version . && docker push coollabsio/coolify:$npm_package_version",
 		"release:pre": "cross-var docker build -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest .",
 		"release:coolify": "cross-var yarn release:pre && docker push coollabsio/coolify:$npm_package_version && docker push coollabsio/coolify:latest",
@@ -25,58 +26,62 @@
 		"prepare": "husky install"
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-node": "1.0.0-next.67",
-		"@sveltejs/adapter-static": "1.0.0-next.27",
-		"@sveltejs/kit": "1.0.0-next.259",
+		"@sveltejs/adapter-node": "1.0.0-next.73",
+		"@sveltejs/kit": "1.0.0-next.303",
 		"@types/bcrypt": "5.0.0",
 		"@types/js-cookie": "3.0.1",
-		"@types/node": "17.0.16",
-		"@types/node-forge": "1.0.0",
+		"@types/js-yaml": "^4.0.5",
+		"@types/node": "17.0.23",
+		"@types/node-forge": "1.0.1",
 		"@typescript-eslint/eslint-plugin": "4.31.1",
 		"@typescript-eslint/parser": "4.31.1",
-		"@zerodevx/svelte-toast": "0.6.3",
-		"autoprefixer": "10.4.2",
+		"@zerodevx/svelte-toast": "0.7.1",
+		"autoprefixer": "10.4.4",
 		"cross-var": "1.1.0",
 		"eslint": "7.32.0",
-		"eslint-config-prettier": "8.3.0",
-		"eslint-plugin-svelte3": "3.2.1",
+		"eslint-config-prettier": "8.5.0",
+		"eslint-plugin-svelte3": "3.4.1",
 		"husky": "7.0.4",
-		"lint-staged": "12.3.3",
-		"postcss": "8.4.6",
-		"prettier": "2.5.1",
+		"lint-staged": "12.3.7",
+		"postcss": "8.4.12",
+		"prettier": "2.6.1",
 		"prettier-plugin-svelte": "2.6.0",
-		"prettier-plugin-tailwindcss": "0.1.7",
-		"prisma": "3.9.1",
+		"prettier-plugin-tailwindcss": "0.1.8",
+		"prisma": "3.11.1",
 		"svelte": "3.46.4",
-		"svelte-check": "2.4.3",
-		"svelte-preprocess": "4.10.3",
-		"tailwindcss": "3.0.19",
-		"ts-node": "10.5.0",
+		"svelte-check": "2.4.6",
+		"svelte-preprocess": "4.10.4",
+		"svelte-select": "^4.4.7",
+		"tailwindcss": "3.0.23",
+		"ts-node": "10.7.0",
 		"tslib": "2.3.1",
-		"typescript": "4.5.5"
+		"typescript": "4.6.3"
 	},
 	"type": "module",
 	"dependencies": {
 		"@iarna/toml": "2.2.5",
-		"@prisma/client": "3.9.1",
-		"@sentry/node": "6.17.6",
+		"@prisma/client": "3.11.1",
+		"@sentry/node": "6.19.2",
 		"bcrypt": "5.0.1",
-		"bullmq": "1.69.0",
+		"bullmq": "1.78.1",
 		"compare-versions": "4.1.3",
 		"cookie": "0.4.2",
+		"cooltipz-css": "^2.1.0",
 		"cuid": "2.1.8",
-		"dayjs": "1.10.7",
+		"dayjs": "1.11.0",
 		"dockerode": "3.3.1",
 		"dotenv-extended": "2.9.0",
 		"generate-password": "1.7.0",
-		"get-port": "6.0.0",
-		"got": "12.0.1",
+		"get-port": "6.1.2",
+		"got": "12.0.2",
 		"js-cookie": "3.0.1",
 		"js-yaml": "4.1.0",
 		"jsonwebtoken": "8.5.1",
-		"node-forge": "1.2.1",
-		"svelte-kit-cookie-session": "2.0.3",
-		"unique-names-generator": "4.6.0"
+		"mustache": "^4.2.0",
+		"node-forge": "1.3.0",
+		"svelte-kit-cookie-session": "2.1.2",
+		"tailwindcss-scrollbar": "^0.1.0",
+		"unique-names-generator": "4.7.1"
 	},
 	"prisma": {
 		"seed": "node prisma/seed.cjs"

prisma/migrations/20220217211304_dualcerts/migration.sql

@@ -0,0 +1,47 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Setting" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "fqdn" TEXT,
+    "isRegistrationEnabled" BOOLEAN NOT NULL DEFAULT false,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "proxyPassword" TEXT NOT NULL,
+    "proxyUser" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+INSERT INTO "new_Setting" ("createdAt", "fqdn", "id", "isRegistrationEnabled", "proxyPassword", "proxyUser", "updatedAt") SELECT "createdAt", "fqdn", "id", "isRegistrationEnabled", "proxyPassword", "proxyUser", "updatedAt" FROM "Setting";
+DROP TABLE "Setting";
+ALTER TABLE "new_Setting" RENAME TO "Setting";
+CREATE UNIQUE INDEX "Setting_fqdn_key" ON "Setting"("fqdn");
+CREATE TABLE "new_ApplicationSettings" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT NOT NULL,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "debug" BOOLEAN NOT NULL DEFAULT false,
+    "previews" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ApplicationSettings_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_ApplicationSettings" ("applicationId", "createdAt", "debug", "id", "previews", "updatedAt") SELECT "applicationId", "createdAt", "debug", "id", "previews", "updatedAt" FROM "ApplicationSettings";
+DROP TABLE "ApplicationSettings";
+ALTER TABLE "new_ApplicationSettings" RENAME TO "ApplicationSettings";
+CREATE UNIQUE INDEX "ApplicationSettings_applicationId_key" ON "ApplicationSettings"("applicationId");
+CREATE TABLE "new_Service" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "fqdn" TEXT,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "type" TEXT,
+    "version" TEXT,
+    "destinationDockerId" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Service_destinationDockerId_fkey" FOREIGN KEY ("destinationDockerId") REFERENCES "DestinationDocker" ("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+INSERT INTO "new_Service" ("createdAt", "destinationDockerId", "fqdn", "id", "name", "type", "updatedAt", "version") SELECT "createdAt", "destinationDockerId", "fqdn", "id", "name", "type", "updatedAt", "version" FROM "Service";
+DROP TABLE "Service";
+ALTER TABLE "new_Service" RENAME TO "Service";
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

prisma/migrations/20220219231255_prmr_secrets/migration.sql

@@ -0,0 +1,19 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Secret" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "value" TEXT NOT NULL,
+    "isPRMRSecret" BOOLEAN NOT NULL DEFAULT false,
+    "isBuildSecret" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "applicationId" TEXT NOT NULL,
+    CONSTRAINT "Secret_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_Secret" ("applicationId", "createdAt", "id", "isBuildSecret", "name", "updatedAt", "value") SELECT "applicationId", "createdAt", "id", "isBuildSecret", "name", "updatedAt", "value" FROM "Secret";
+DROP TABLE "Secret";
+ALTER TABLE "new_Secret" RENAME TO "Secret";
+CREATE UNIQUE INDEX "Secret_name_applicationId_isPRMRSecret_key" ON "Secret"("name", "applicationId", "isPRMRSecret");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

prisma/migrations/20220220141136_public_portrange/migration.sql

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

prisma/migrations/20220301101928_proxyhash/migration.sql

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

prisma/migrations/20220304141408_service_secrets/migration.sql

@@ -0,0 +1,13 @@
+-- CreateTable
+CREATE TABLE "ServiceSecret" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "value" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "serviceId" TEXT NOT NULL,
+    CONSTRAINT "ServiceSecret_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ServiceSecret_name_serviceId_key" ON "ServiceSecret"("name", "serviceId");

prisma/migrations/20220311213422_autodeploy/migration.sql

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

prisma/migrations/20220320141424_phpmodules/migration.sql

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

prisma/migrations/20220322135800_persistent_storage/migration.sql

@@ -0,0 +1,18 @@
+-- CreateTable
+CREATE TABLE "ApplicationPersistentStorage" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "applicationId" TEXT NOT NULL,
+    "path" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ApplicationPersistentStorage_applicationId_fkey" FOREIGN KEY ("applicationId") REFERENCES "Application" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ApplicationPersistentStorage_applicationId_key" ON "ApplicationPersistentStorage"("applicationId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ApplicationPersistentStorage_path_key" ON "ApplicationPersistentStorage"("path");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ApplicationPersistentStorage_applicationId_path_key" ON "ApplicationPersistentStorage"("applicationId", "path");

prisma/migrations/20220327180323_ghost/migration.sql

@@ -0,0 +1,19 @@
+-- CreateTable
+CREATE TABLE "Ghost" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "defaultEmail" TEXT NOT NULL,
+    "defaultPassword" TEXT NOT NULL,
+    "mariadbUser" TEXT NOT NULL,
+    "mariadbPassword" TEXT NOT NULL,
+    "mariadbRootUser" TEXT NOT NULL,
+    "mariadbRootUserPassword" TEXT NOT NULL,
+    "mariadbDatabase" TEXT,
+    "mariadbPublicPort" INTEGER,
+    "serviceId" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Ghost_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Ghost_serviceId_key" ON "Ghost"("serviceId");

prisma/schema.prisma

@@ -11,8 +11,12 @@ model Setting {
   id                    String   @id @default(cuid())
   fqdn                  String?  @unique
   isRegistrationEnabled Boolean  @default(false)
+  dualCerts             Boolean  @default(false)
+  minPort               Int      @default(9000)
+  maxPort               Int      @default(9100)
   proxyPassword         String
   proxyUser             String
+  proxyHash             String?
   createdAt             DateTime @default(now())
   updatedAt             DateTime @updatedAt
 }
@@ -51,9 +55,9 @@ model Team {
   permissions       Permission[]
   createdAt         DateTime            @default(now())
   updatedAt         DateTime            @updatedAt
-  database          Database[]          @relation(fields: [databaseId], references: [id])
+  database          Database[]          @relation(references: [id])
   databaseId        String?
-  service           Service[]           @relation(fields: [serviceId], references: [id])
+  service           Service[]           @relation(references: [id])
   serviceId         String?
 }
 
@@ -68,9 +72,9 @@ model TeamInvitation {
 }
 
 model Application {
-  id                  String               @id @default(cuid())
+  id                  String                         @id @default(cuid())
   name                String
-  fqdn                String?              @unique
+  fqdn                String?                        @unique
   repository          String?
   configHash          String?
   branch              String?
@@ -82,38 +86,66 @@ model Application {
   startCommand        String?
   baseDirectory       String?
   publishDirectory    String?
-  createdAt           DateTime             @default(now())
-  updatedAt           DateTime             @updatedAt
+  phpModules          String?
+  createdAt           DateTime                       @default(now())
+  updatedAt           DateTime                       @updatedAt
   settings            ApplicationSettings?
   teams               Team[]
   destinationDockerId String?
-  destinationDocker   DestinationDocker?   @relation(fields: [destinationDockerId], references: [id])
+  destinationDocker   DestinationDocker?             @relation(fields: [destinationDockerId], references: [id])
   gitSourceId         String?
-  gitSource           GitSource?           @relation(fields: [gitSourceId], references: [id])
+  gitSource           GitSource?                     @relation(fields: [gitSourceId], references: [id])
   secrets             Secret[]
+  persistentStorage   ApplicationPersistentStorage[]
 }
 
 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)
   previews      Boolean     @default(false)
+  autodeploy    Boolean     @default(true)
   createdAt     DateTime    @default(now())
   updatedAt     DateTime    @updatedAt
 }
 
+model ApplicationPersistentStorage {
+  id            String      @id @default(cuid())
+  application   Application @relation(fields: [applicationId], references: [id])
+  applicationId String      @unique
+  path          String      @unique
+  createdAt     DateTime    @default(now())
+  updatedAt     DateTime    @updatedAt
+
+  @@unique([applicationId, path])
+}
+
 model Secret {
   id            String      @id @default(cuid())
-  name          String      
+  name          String
   value         String
+  isPRMRSecret  Boolean     @default(false)
   isBuildSecret Boolean     @default(false)
   createdAt     DateTime    @default(now())
   updatedAt     DateTime    @updatedAt
   application   Application @relation(fields: [applicationId], references: [id])
   applicationId String
 
-  @@unique([name, applicationId])
+  @@unique([name, applicationId, isPRMRSecret])
+}
+
+model ServiceSecret {
+  id        String   @id @default(cuid())
+  name      String
+  value     String
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  service   Service  @relation(fields: [serviceId], references: [id])
+  serviceId String
+
+  @@unique([name, serviceId])
 }
 
 model BuildLog {
@@ -234,6 +266,7 @@ model Service {
   id                  String              @id @default(cuid())
   name                String
   fqdn                String?
+  dualCerts           Boolean             @default(false)
   type                String?
   version             String?
   teams               Team[]
@@ -245,6 +278,8 @@ model Service {
   minio               Minio?
   vscodeserver        Vscodeserver?
   wordpress           Wordpress?
+  ghost               Ghost?
+  serviceSecret       ServiceSecret[]
 }
 
 model PlausibleAnalytics {
@@ -298,3 +333,19 @@ model Wordpress {
   createdAt             DateTime @default(now())
   updatedAt             DateTime @updatedAt
 }
+
+model Ghost {
+  id                      String   @id @default(cuid())
+  defaultEmail            String
+  defaultPassword         String
+  mariadbUser             String
+  mariadbPassword         String
+  mariadbRootUser         String
+  mariadbRootUserPassword String
+  mariadbDatabase         String?
+  mariadbPublicPort       Int?
+  serviceId               String   @unique
+  service                 Service  @relation(fields: [serviceId], references: [id])
+  createdAt               DateTime @default(now())
+  updatedAt               DateTime @updatedAt
+}

prisma/seed.cjs

@@ -27,6 +27,15 @@ async function main() {
 				proxyUser: cuid()
 			}
 		});
+	} else {
+		await prisma.setting.update({
+			where: {
+				id: settingsFound.id
+			},
+			data: {
+				proxyHash: null
+			}
+		});
 	}
 	const localDocker = await prisma.destinationDocker.findFirst({
 		where: { engine: '/var/run/docker.sock' }

scripts/install.sh

@@ -1,112 +0,0 @@
-#!/usr/bin/env bash
-clear
-ARG1=$1
-WHO=$(whoami)
-APP_ID=$(cat /proc/sys/kernel/random/uuid)
-RANDOM_SECRET=$(echo $(($(date +%s%N) / 1000000)) | sha256sum | base64 | head -c 32)
-SENTRY_DSN="https://9e7a74326f29422584d2d0bebdc8b7d3@o1082494.ingest.sentry.io/6091062"
-DOCKER_MAJOR=20
-DOCKER_MINOR=10
-DOCKER_VERSION_OK="nok"
-
-set -eou pipefail
-
-if [ $ARG1 ] && [ $ARG1 == "-d" ]; then
-    set -x
-fi
-
-function errorchecker() {
-    exitCode=$?
-    if [ $exitCode -ne "0" ]; then
-        echo "$0 exited unexpectedly with status: $exitCode"
-        exit $exitCode
-    fi
-}
-trap 'errorchecker' EXIT
-
-echo -e "Welcome to Coolify installer! \n"
-echo "This script will install all the required packages and services to run Coolify."
-echo -e "If you want to install Coolify on a different OS, please open an issue on Github to get supported version.\n\n"
-
-echo -e "To see what I'm doing, please check:"
-echo -e "https://github.com/coollabsio/get.coollabs.io/blob/main/static/coolify/install_v2.sh\n\n"
-
-if [ $WHO != 'root' ]; then
-    echo 'Run as root please: sudo sh -c "$(curl -fsSL https://get.coollabs.io/coolify/install.sh)"'
-    exit 1
-fi
-
-if [ ! -x "$(command -v docker)" ]; then
-    while true; do
-        read -p "Docker Engine not found, should I install it automatically? [Yy/Nn] " yn
-        case $yn in
-        [Yy]*)
-            sh -c "$(curl -fsSL https://get.docker.com)"
-            break
-            ;;
-        [Nn]*)
-            echo "Please install docker manually and update it to the latest, but at least to $DOCKER_MAJOR.$DOCKER_MINOR"
-            exit 0
-            ;;
-        *) echo "Please answer Y or N." ;;
-        esac
-    done
-fi
-
-SERVER_VERSION=$(docker version -f "{{.Server.Version}}")
-SERVER_VERSION_MAJOR=$(echo "$SERVER_VERSION" | cut -d'.' -f 1)
-SERVER_VERSION_MINOR=$(echo "$SERVER_VERSION" | cut -d'.' -f 2)
-
-if [ "$SERVER_VERSION_MAJOR" -ge "$DOCKER_MAJOR" ] &&
-    [ "$SERVER_VERSION_MINOR" -ge "$DOCKER_MINOR" ]; then
-    DOCKER_VERSION_OK="ok"
-fi
-
-if [ $DOCKER_VERSION_OK == 'nok' ]; then
-    echo "Docker version less than $DOCKER_MAJOR.$DOCKER_MINOR, please update it to at least to $DOCKER_MAJOR.$DOCKER_MINOR"
-    exit 1
-fi
-
-# Adding docker daemon configuration
-cat <<EOF >/etc/docker/daemon.json
-{
-    "log-driver": "json-file",
-    "log-opts": {
-      "max-size": "100m",
-      "max-file": "5"
-    },
-    "features": {
-        "buildkit": true
-    },
-    "live-restore": true
-}
-EOF
-
-# Restarting docker daemon
-sh -c "systemctl daemon-reload && systemctl restart docker"
-
-# Downloading docker compose cli plugin
-mkdir -p ~/.docker/cli-plugins/
-curl -SL https://github.com/docker/compose/releases/download/v2.2.2/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
-chmod +x ~/.docker/cli-plugins/docker-compose
-
-# Making base directory for coolify
-if [ ! -d coolify ]; then
-    mkdir coolify
-fi
-
-if [ -f coolify/.env ]; then
-    echo -e "Coolify is already installed, using some of the existing settings."
-else
-    echo "COOLIFY_APP_ID=$APP_ID
-COOLIFY_SECRET_KEY=$RANDOM_SECRET
-COOLIFY_DATABASE_URL=file:../db/prod.db
-COOLIFY_SENTRY_DSN=$SENTRY_DSN
-COOLIFY_HOSTED_ON=docker" > coolify/.env
-fi
-
-cd coolify && docker run -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db-sqlite coollabsio/coolify:latest /bin/sh -c "env | grep COOLIFY > .env && docker compose up -d --force-recreate"
-
-echo -e "Congratulations! Your coolify is ready to use.\n"
-echo "Please visit http://<Your Public IP Address>:3000/ to get started."
-echo "It will take a few minutes to start up, don't worry."

scripts/install_podman_experiment.sh

@@ -1,114 +0,0 @@
-#!/usr/bin/env bash
-
-clear
-ARG1=$1
-WHO=$(whoami)
-APP_ID=$(cat /proc/sys/kernel/random/uuid)
-RANDOM_SECRET=$(echo $(($(date +%s%N) / 1000000)) | sha256sum | base64 | head -c 32)
-SENTRY_DSN="https://9e7a74326f29422584d2d0bebdc8b7d3@o1082494.ingest.sentry.io/6091062"
-
-UBUNTU_MAJOR_MIN=20
-UBUNTU_MINOR_MIN=04
-OS_OK="nok"
-
-set -eou pipefail
-
-if [ $ARG1 ] && [ $ARG1 == "-d" ]; then
-    set -x
-fi
-
-function errorchecker() {
-    exitCode=$?
-    if [ $exitCode -ne "0" ]; then
-        echo "$0 exited unexpectedly with status: $exitCode"
-        exit $exitCode
-    fi
-}
-trap 'errorchecker' EXIT
-
-if [ $WHO != 'root' ]; then
-    echo 'Run as root please: sudo sh -c "$(curl -fsSL https://get.coollabs.io/coolify/install.sh)"'
-    exit 1
-fi
-
-. /etc/lsb-release
-if [ $DISTRIB_ID != 'Ubuntu' ]; then
-    echo 'Not supported OS, please open an issue on Github to get supported version.'
-    exit 1
-fi
-
-DISTRIB_RELEASE_MAJOR=$(echo "$DISTRIB_RELEASE" | cut -d'.' -f 1)
-DISTRIB_RELEASE_MINOR=$(echo "$DISTRIB_RELEASE" | cut -d'.' -f 2)
-
-if [ "$DISTRIB_RELEASE_MAJOR" -ge "$UBUNTU_MAJOR_MIN" ] &&
-    [ "$DISTRIB_RELEASE_MINOR" -ge "$UBUNTU_MINOR_MIN" ]; then
-    OS_OK="ok"
-fi
-
-if [ $OS_OK == 'nok' ]; then
-    echo "Ubuntu version less than $UBUNTU_MAJOR_MIN.$UBUNTU_MINOR_MIN."
-    exit 1
-fi
-
-function installPodman() {
-    apt-get update -y
-    apt-get install curl wget gnupg2 -y
-    if [ "$DISTRIB_RELEASE_MAJOR" -eq "20" ] && [ "$DISTRIB_RELEASE_MINOR" -eq "04" ]; then
-        echo 'Installing on 20.04'
-        source /etc/os-release
-        sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list"
-        wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_${VERSION_ID}/Release.key -O- | apt-key add -
-        apt-get update -y
-        apt-get -y install podman
-        return 0
-    elif [ "$DISTRIB_RELEASE_MAJOR" -eq "20" ] && [ "$DISTRIB_RELEASE_MINOR" -eq "10" ]; then
-        apt-get -y install podman
-        return 0
-    elif [ "$DISTRIB_RELEASE_MAJOR" -gt "20" ]; then
-        apt-get -y install podman
-        return 0
-    else
-        exit 1
-    fi
-
-}
-
-if [ ! -x "$(command -v podman)" ]; then
-    while true; do
-        read -p "Podman not found, should I install it automatically? [Yy/Nn] " yn
-        case $yn in
-        [Yy]*)
-            installPodman
-            break
-            ;;
-        [Nn]*)
-            echo "Please install docker manually and update it to the latest, but at least to $DOCKER_MAJOR.$DOCKER_MINOR"
-            exit 0
-            ;;
-        *) echo "Please answer Yy or Nn." ;;
-        esac
-    done
-fi
-
-# Making base directory for coolify
-if [ ! -d coolify ]; then
-    mkdir coolify
-fi
-
-echo "COOLIFY_APP_ID=$APP_ID
-COOLIFY_SECRET_KEY=$RANDOM_SECRET
-COOLIFY_DATABASE_URL=file:../db/prod.db
-COOLIFY_SENTRY_DSN=$SENTRY_DSN
-COOLIFY_HOSTED_ON=docker" >coolify/.env
-
-systemctl start podman.socket
-systemctl enable podman.socket
-
-podman volume create coolify-db
-podman volume create coolify-ssl-certs 
-podman volume create coolify-letsencrypt
-
-
-cd coolify && podman run --privileged -tid --env-file .env -v /var/run/podman/podman.sock:/var/run/podman/podman.sock -v coolify-db-sqlite:/app/db docker.io/coollabsio/coolify:latest /bin/sh -c "env | grep COOLIFY > .env && docker-compose up -d --force-recreate"
-echo "Done"
-exit 0

src/app.d.ts

@@ -1,74 +1,34 @@
 /// <reference types="@sveltejs/kit" />
-interface Cookies {
-	teamId?: string;
-	gitlabToken?: string;
-	'kit.session'?: string;
-}
-interface Locals {
-	gitlabToken?: string;
-	user: {
-		teamId: string;
-		permission: string;
-		isAdmin: boolean;
-	};
-	session: {
-		data: {
-			uid?: string;
-			teams?: string[];
-			expires?: string;
-		};
-	};
+
+declare namespace App {
+	interface Locals {
+		session: import('svelte-kit-cookie-session').Session<SessionData>;
+		cookies: Record<string, string>;
+	}
+	interface Platform {}
+	interface Session extends SessionData {}
+	interface Stuff {
+		service: any;
+		application: any;
+		isRunning: boolean;
+		appId: string;
+		readOnly: boolean;
+		source: string;
+		settings: string;
+	}
 }
 
-type Applications = {
-	name: string;
-	domain: string;
-};
-
-interface Hash {
-	iv: string;
-	content: string;
+interface SessionData {
+	version?: string;
+	userId?: string | null;
+	teamId?: string | null;
+	permission?: string;
+	isAdmin?: boolean;
+	expires?: string | null;
+	gitlabToken?: string | null;
+	ghToken?: string | null;
 }
 
-interface BuildPack {
-	name: string;
-}
-
-// TODO: Not used, not working what?!
-enum GitSource {
-	Github = 'github',
-	Gitlab = 'gitlab',
-	Bitbucket = 'bitbucket'
-}
-
-type RawHaproxyConfiguration = {
-	_version: number;
-	data: string;
-};
-
-type NewTransaction = {
-	_version: number;
-	id: string;
-	status: string;
-};
-
-type HttpRequestRuleForceSSL = {
-	return_hdrs: null;
-	cond: string;
-	cond_test: string;
-	index: number;
-	redir_code: number;
-	redir_type: string;
-	redir_value: string;
-	type: string;
-};
-
-// TODO: No any please
-type HttpRequestRule = {
-	_version: number;
-	data: Array<any>;
-};
-
 type DateTimeFormatOptions = {
 	localeMatcher?: 'lookup' | 'best fit';
 	weekday?: 'long' | 'short' | 'narrow';
@@ -84,3 +44,24 @@ type DateTimeFormatOptions = {
 	hour12?: boolean;
 	timeZone?: string;
 };
+
+interface Hash {
+	iv: string;
+	content: string;
+}
+
+type RawHaproxyConfiguration = {
+	_version: number;
+	data: string;
+};
+
+type NewTransaction = {
+	_version: number;
+	id: string;
+	status: string;
+};
+
+type Application = {
+	name: string;
+	domain: string;
+};

src/hooks.ts

@@ -2,7 +2,7 @@ import dotEnvExtended from 'dotenv-extended';
 dotEnvExtended.load();
 import type { GetSession } from '@sveltejs/kit';
 import { handleSession } from 'svelte-kit-cookie-session';
-import { getUserDetails, isTeamIdTokenAvailable, sentry } from '$lib/common';
+import { getUserDetails, sentry } from '$lib/common';
 import { version } from '$lib/common';
 import cookie from 'cookie';
 import { dev } from '$app/env';
@@ -10,27 +10,34 @@ import { dev } from '$app/env';
 export const handle = handleSession(
 	{
 		secret: process.env['COOLIFY_SECRET_KEY'],
-		expires: 30
+		expires: 30,
+		cookie: { secure: false }
 	},
 	async function ({ event, resolve }) {
 		let response;
 		try {
-			const cookies: Cookies = cookie.parse(event.request.headers.get('cookie') || '');
-			if (cookies['kit.session']) {
-				const { permission, teamId } = await getUserDetails(event, false);
-				event.locals.user = {
-					teamId,
-					permission,
-					isAdmin: permission === 'admin' || permission === 'owner'
-				};
-			}
-			if (cookies.gitlabToken) {
-				event.locals.gitlabToken = cookies.gitlabToken;
+			if (event.locals.cookies) {
+				if (event.locals.cookies['kit.session']) {
+					const { permission, teamId, userId } = await getUserDetails(event, false);
+					const newSession = {
+						userId,
+						teamId,
+						permission,
+						isAdmin: permission === 'admin' || permission === 'owner',
+						expires: event.locals.session.data.expires
+					};
+
+					if (JSON.stringify(event.locals.session.data) !== JSON.stringify(newSession)) {
+						event.locals.session.data = { ...newSession };
+					}
+				}
 			}
+
 			response = await resolve(event, {
 				ssr: !event.url.pathname.startsWith('/webhooks/success')
 			});
 		} catch (error) {
+			console.log(error);
 			response = await resolve(event, {
 				ssr: !event.url.pathname.startsWith('/webhooks/success')
 			});
@@ -61,17 +68,13 @@ export const handle = handleSession(
 	}
 );
 
-export const getSession: GetSession = function (request) {
+export const getSession: GetSession = function ({ locals }) {
 	return {
 		version,
-		gitlabToken: request.locals?.gitlabToken || null,
-		uid: request.locals.session.data?.uid || null,
-		teamId: request.locals.user?.teamId || null,
-		permission: request.locals.user?.permission,
-		isAdmin: request.locals.user?.isAdmin || false
+		...locals.session.data
 	};
 };
 
 export async function handleError({ error, event }) {
-	if (!dev) sentry.captureException(error, { event });
+	if (!dev) sentry.captureException(error, event);
 }

src/lib/buildPacks/common.ts

@@ -29,10 +29,10 @@ export function makeLabelForStandaloneApplication({
 		fqdn = `${protocol}://${pullmergeRequestId}.${domain}`;
 	}
 	return [
-		'--label coolify.managed=true',
-		`--label coolify.version=${version}`,
-		`--label coolify.type=standalone-application`,
-		`--label coolify.configuration=${base64Encode(
+		'coolify.managed=true',
+		`coolify.version=${version}`,
+		`coolify.type=standalone-application`,
+		`coolify.configuration=${base64Encode(
 			JSON.stringify({
 				applicationId,
 				fqdn,
@@ -74,31 +74,25 @@ export async function makeLabelForStandaloneDatabase({ id, image, volume }) {
 	];
 }
 
-export async function makeLabelForPlausibleAnalytics({ id, images, volume }) {
-	const service = await db.prisma.service.findFirst({
-		where: { id },
-		include: { plausibleAnalytics: true }
-	});
-	delete service.destinationDockerId;
-	delete service.createdAt;
-	delete service.updatedAt;
+export function makeLabelForServices(type) {
 	return [
 		'coolify.managed=true',
 		`coolify.version=${version}`,
-		`coolify.type=service-plausibleanalytics`,
-		`coolify.configuration=${base64Encode(
-			JSON.stringify({
-				version,
-				images,
-				volume,
-				...service
-			})
-		)}`
+		`coolify.type=service`,
+		`coolify.service.type=${type}`
 	];
 }
 
 export const setDefaultConfiguration = async (data) => {
-	let { buildPack, port, installCommand, startCommand, buildCommand, publishDirectory } = data;
+	let {
+		buildPack,
+		port,
+		installCommand,
+		startCommand,
+		buildCommand,
+		publishDirectory,
+		baseDirectory
+	} = data;
 	const template = scanningTemplates[buildPack];
 	if (!port) {
 		port = template?.port || 3000;
@@ -111,6 +105,10 @@ export const setDefaultConfiguration = async (data) => {
 	if (!startCommand) startCommand = template?.startCommand || 'yarn start';
 	if (!buildCommand) buildCommand = template?.buildCommand || null;
 	if (!publishDirectory) publishDirectory = template?.publishDirectory || null;
+	if (baseDirectory) {
+		if (!baseDirectory.startsWith('/')) baseDirectory = `/${baseDirectory}`;
+		if (!baseDirectory.endsWith('/')) baseDirectory = `${baseDirectory}/`;
+	}
 
 	return {
 		buildPack,
@@ -118,7 +116,8 @@ export const setDefaultConfiguration = async (data) => {
 		installCommand,
 		startCommand,
 		buildCommand,
-		publishDirectory
+		publishDirectory,
+		baseDirectory
 	};
 };
 
@@ -136,6 +135,7 @@ export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, ap
         RewriteRule ^(.+)$ index.php [QSA,L]
         `
 			);
+			await fs.writeFile(`${workdir}/entrypoint.sh`, `chown -R 1000 /app`);
 			saveBuildLog({ line: 'Copied default configuration file for PHP.', buildId, applicationId });
 		} else if (staticDeployments.includes(buildPack)) {
 			await fs.writeFile(
@@ -143,27 +143,35 @@ export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, ap
 				`user  nginx;
             worker_processes  auto;
             
-            error_log  /var/log/nginx/error.log warn;
-            pid        /var/run/nginx.pid;
+            error_log  /docker.stdout;
+            pid        /run/nginx.pid;
             
             events {
                 worker_connections  1024;
             }
             
             http {
-                include       /etc/nginx/mime.types;
-            
-                access_log      off;
-                sendfile        on;
-                #tcp_nopush     on;
-                keepalive_timeout  65;
+				log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+				'$status $body_bytes_sent "$http_referer" '
+				'"$http_user_agent" "$http_x_forwarded_for"';
+
+                access_log  /docker.stdout main;
+
+				sendfile            on;
+				tcp_nopush          on;
+				tcp_nodelay         on;
+				keepalive_timeout   65;
+				types_hash_max_size 2048;
+
+			    include             /etc/nginx/mime.types;
+    			default_type        application/octet-stream;
     
                 server {
                     listen       80;
                     server_name  localhost;
                     
                     location / {
-                        root   /usr/share/nginx/html;
+                        root   /app;
                         index  index.html;
                         try_files $uri $uri/index.html $uri/ /index.html =404;
                     }
@@ -174,7 +182,7 @@ export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, ap
                     #
                     error_page   500 502 503 504  /50x.html;
                     location = /50x.html {
-                        root   /usr/share/nginx/html;
+                        root   /app;
                     }  
             
                 }
@@ -189,3 +197,11 @@ export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, ap
 		throw new Error(error);
 	}
 }
+
+export function checkPnpm(installCommand = null, buildCommand = null, startCommand = null) {
+	return (
+		installCommand?.includes('pnpm') ||
+		buildCommand?.includes('pnpm') ||
+		startCommand?.includes('pnpm')
+	);
+}

src/lib/buildPacks/docker.ts

@@ -9,12 +9,14 @@ export default async function ({
 	docker,
 	buildId,
 	baseDirectory,
-	secrets
+	secrets,
+	pullmergeRequestId
 }) {
 	try {
 		let file = `${workdir}/Dockerfile`;
 		if (baseDirectory) {
 			file = `${workdir}/${baseDirectory}/Dockerfile`;
+			workdir = `${workdir}/${baseDirectory}`;
 		}
 
 		const Dockerfile: Array<string> = (await fs.readFile(`${file}`, 'utf8'))
@@ -24,7 +26,15 @@ export default async function ({
 		if (secrets.length > 0) {
 			secrets.forEach((secret) => {
 				if (secret.isBuildSecret) {
-					Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+					if (pullmergeRequestId) {
+						if (secret.isPRMRSecret) {
+							Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+						}
+					} else {
+						if (!secret.isPRMRSecret) {
+							Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+						}
+					}
 				}
 			});
 		}

src/lib/buildPacks/gatsby.ts

@@ -6,16 +6,17 @@ const createDockerfile = async (data, imageforBuild): Promise<void> => {
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${imageforBuild}`);
-	Dockerfile.push('WORKDIR /usr/share/nginx/html');
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'nginx:stable-alpine';
+		const image = 'webdevops/nginx:alpine';
 		const imageForBuild = 'node:lts';
 
 		await buildCacheImageWithNode(data, imageForBuild);

src/lib/buildPacks/index.ts

@@ -10,6 +10,8 @@ import nuxtjs from './nuxtjs';
 import vuejs from './vuejs';
 import php from './php';
 import rust from './rust';
+import astro from './static';
+import eleventy from './static';
 
 export {
 	node,
@@ -23,5 +25,7 @@ export {
 	nuxtjs,
 	vuejs,
 	php,
-	rust
+	rust,
+	astro,
+	eleventy
 };

src/lib/buildPacks/nestjs.ts

@@ -4,12 +4,17 @@ import { promises as fs } from 'fs';
 const createDockerfile = async (data, image): Promise<void> => {
 	const { applicationId, tag, port, startCommand, workdir, baseDirectory } = data;
 	const Dockerfile: Array<string> = [];
+	const isPnpm = startCommand.includes('pnpm');
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
-	Dockerfile.push(
-		`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${baseDirectory || ''} ./`
-	);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
+	if (isPnpm) {
+		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
+		Dockerfile.push('RUN pnpm add -g pnpm');
+	}
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${baseDirectory || ''} ./`);
+
 	Dockerfile.push(`EXPOSE ${port}`);
 	Dockerfile.push(`CMD ${startCommand}`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));

src/lib/buildPacks/nextjs.ts

@@ -1,31 +1,45 @@
 import { buildImage } from '$lib/docker';
 import { promises as fs } from 'fs';
+import { checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
-	const { workdir, port, installCommand, buildCommand, startCommand, baseDirectory, secrets } =
-		data;
+	const {
+		workdir,
+		port,
+		installCommand,
+		buildCommand,
+		startCommand,
+		baseDirectory,
+		secrets,
+		pullmergeRequestId
+	} = data;
 	const Dockerfile: Array<string> = [];
-
+	const isPnpm = checkPnpm(installCommand, buildCommand, startCommand);
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
 			if (secret.isBuildSecret) {
-				Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+				if (pullmergeRequestId) {
+					if (secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				} else {
+					if (!secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				}
 			}
 		});
 	}
-	Dockerfile.push(`COPY ./${baseDirectory || ''}package*.json ./`);
-	try {
-		await fs.stat(`${workdir}/yarn.lock`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}yarn.lock ./`);
-	} catch (error) {}
-	try {
-		await fs.stat(`${workdir}/pnpm-lock.yaml`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}pnpm-lock.yaml ./`);
-	} catch (error) {}
+	if (isPnpm) {
+		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
+		Dockerfile.push('RUN pnpm add -g pnpm');
+	}
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${installCommand}`);
-	Dockerfile.push(`COPY ./${baseDirectory || ''} ./`);
+
 	if (buildCommand) {
 		Dockerfile.push(`RUN ${buildCommand}`);
 	}

src/lib/buildPacks/node.ts

@@ -1,31 +1,45 @@
 import { buildImage } from '$lib/docker';
 import { promises as fs } from 'fs';
+import { checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
-	const { workdir, port, installCommand, buildCommand, startCommand, baseDirectory, secrets } =
-		data;
+	const {
+		workdir,
+		port,
+		installCommand,
+		buildCommand,
+		startCommand,
+		baseDirectory,
+		secrets,
+		pullmergeRequestId
+	} = data;
 	const Dockerfile: Array<string> = [];
+	const isPnpm = checkPnpm(installCommand, buildCommand, startCommand);
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
 			if (secret.isBuildSecret) {
-				Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+				if (pullmergeRequestId) {
+					if (secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				} else {
+					if (!secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				}
 			}
 		});
 	}
-	Dockerfile.push(`COPY ./${baseDirectory || ''}package*.json ./`);
-	try {
-		await fs.stat(`${workdir}/yarn.lock`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}yarn.lock ./`);
-	} catch (error) {}
-	try {
-		await fs.stat(`${workdir}/pnpm-lock.yaml`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}pnpm-lock.yaml ./`);
-	} catch (error) {}
+	if (isPnpm) {
+		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
+		Dockerfile.push('RUN pnpm add -g pnpm');
+	}
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${installCommand}`);
-	Dockerfile.push(`COPY ./${baseDirectory || ''} ./`);
 	if (buildCommand) {
 		Dockerfile.push(`RUN ${buildCommand}`);
 	}

src/lib/buildPacks/nuxtjs.ts

@@ -1,31 +1,44 @@
 import { buildImage } from '$lib/docker';
 import { promises as fs } from 'fs';
+import { checkPnpm } from './common';
 
 const createDockerfile = async (data, image): Promise<void> => {
-	const { workdir, port, installCommand, buildCommand, startCommand, baseDirectory, secrets } =
-		data;
+	const {
+		workdir,
+		port,
+		installCommand,
+		buildCommand,
+		startCommand,
+		baseDirectory,
+		secrets,
+		pullmergeRequestId
+	} = data;
 	const Dockerfile: Array<string> = [];
-
+	const isPnpm = checkPnpm(installCommand, buildCommand, startCommand);
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
 			if (secret.isBuildSecret) {
-				Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+				if (pullmergeRequestId) {
+					if (secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				} else {
+					if (!secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				}
 			}
 		});
 	}
-	Dockerfile.push(`COPY ./${baseDirectory || ''}package*.json ./`);
-	try {
-		await fs.stat(`${workdir}/yarn.lock`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}yarn.lock ./`);
-	} catch (error) {}
-	try {
-		await fs.stat(`${workdir}/pnpm-lock.yaml`);
-		Dockerfile.push(`COPY ./${baseDirectory || ''}pnpm-lock.yaml ./`);
-	} catch (error) {}
+	if (isPnpm) {
+		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
+		Dockerfile.push('RUN pnpm add -g pnpm');
+	}
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	Dockerfile.push(`RUN ${installCommand}`);
-	Dockerfile.push(`COPY ./${baseDirectory || ''} ./`);
 	if (buildCommand) {
 		Dockerfile.push(`RUN ${buildCommand}`);
 	}

src/lib/buildPacks/php.ts

@@ -4,20 +4,19 @@ import { promises as fs } from 'fs';
 const createDockerfile = async (data, image): Promise<void> => {
 	const { workdir, baseDirectory } = data;
 	const Dockerfile: Array<string> = [];
-
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('RUN a2enmod rewrite');
-	Dockerfile.push('WORKDIR /var/www/html');
-	Dockerfile.push(`COPY ./${baseDirectory || ''} /var/www/html`);
+	Dockerfile.push(`LABEL coolify.image=true`);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`COPY .${baseDirectory || ''} /app`);
+	Dockerfile.push(`COPY /.htaccess .`);
+	Dockerfile.push(`COPY /entrypoint.sh /opt/docker/provision/entrypoint.d/30-entrypoint.sh`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["apache2-foreground"]');
-	Dockerfile.push('RUN chown -R www-data /var/www/html');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'php:apache';
+		const image = 'webdevops/php-nginx';
 		await createDockerfile(data, image);
 		await buildImage(data);
 	} catch (error) {

src/lib/buildPacks/react.ts

@@ -6,16 +6,17 @@ const createDockerfile = async (data, image): Promise<void> => {
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/share/nginx/html');
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`);
+	Dockerfile.push(`LABEL coolify.image=true`);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'nginx:stable-alpine';
+		const image = 'webdevops/nginx:alpine';
 		const imageForBuild = 'node:lts';
 		await buildCacheImageWithNode(data, imageForBuild);
 		await createDockerfile(data, image);

src/lib/buildPacks/rust.ts

@@ -7,22 +7,21 @@ const createDockerfile = async (data, image, name): Promise<void> => {
 	const { workdir, port, applicationId, tag } = data;
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/target target`);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/target target`);
 	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/local/cargo /usr/local/cargo`);
 	Dockerfile.push(`COPY . .`);
 	Dockerfile.push(`RUN cargo build --release --bin ${name}`);
 	Dockerfile.push('FROM debian:buster-slim');
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push(
 		`RUN apt-get update -y && apt-get install -y --no-install-recommends openssl libcurl4 ca-certificates && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*`
 	);
 	Dockerfile.push(`RUN update-ca-certificates`);
-	Dockerfile.push(
-		`COPY --from=${applicationId}:${tag}-cache /usr/src/app/target/release/${name} ${name}`
-	);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/target/release/${name} ${name}`);
 	Dockerfile.push(`EXPOSE ${port}`);
-	Dockerfile.push(`CMD ["/usr/src/app/${name}"]`);
+	Dockerfile.push(`CMD ["/app/${name}"]`);
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 

src/lib/buildPacks/static.ts

@@ -2,34 +2,49 @@ import { buildCacheImageWithNode, buildImage } from '$lib/docker';
 import { promises as fs } from 'fs';
 
 const createDockerfile = async (data, image): Promise<void> => {
-	const { applicationId, tag, workdir, buildCommand, baseDirectory, publishDirectory, secrets } =
-		data;
+	const {
+		applicationId,
+		tag,
+		workdir,
+		buildCommand,
+		baseDirectory,
+		publishDirectory,
+		secrets,
+		pullmergeRequestId
+	} = data;
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/share/nginx/html');
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
 			if (secret.isBuildSecret) {
-				Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+				if (pullmergeRequestId) {
+					if (secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				} else {
+					if (!secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				}
 			}
 		});
 	}
 	if (buildCommand) {
-		Dockerfile.push(
-			`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`
-		);
+		Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
 	} else {
-		Dockerfile.push(`COPY ./${baseDirectory || ''} ./`);
+		Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	}
+	Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'nginx:stable-alpine';
+		const image = 'webdevops/nginx:alpine';
 		const imageForBuild = 'node:lts';
 		if (data.buildCommand) await buildCacheImageWithNode(data, imageForBuild);
 		await createDockerfile(data, image);

src/lib/buildPacks/svelte.ts

@@ -6,16 +6,17 @@ const createDockerfile = async (data, image): Promise<void> => {
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/share/nginx/html');
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'nginx:stable-alpine';
+		const image = 'webdevops/nginx:alpine';
 		const imageForBuild = 'node:lts';
 
 		await buildCacheImageWithNode(data, imageForBuild);

src/lib/buildPacks/vuejs.ts

@@ -6,16 +6,17 @@ const createDockerfile = async (data, image): Promise<void> => {
 	const Dockerfile: Array<string> = [];
 
 	Dockerfile.push(`FROM ${image}`);
-	Dockerfile.push('WORKDIR /usr/share/nginx/html');
-	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /usr/src/app/${publishDirectory} ./`);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
+	Dockerfile.push(`COPY --from=${applicationId}:${tag}-cache /app/${publishDirectory} ./`);
+	Dockerfile.push(`COPY /nginx.conf /etc/nginx/nginx.conf`);
 	Dockerfile.push(`EXPOSE 80`);
-	Dockerfile.push('CMD ["nginx", "-g", "daemon off;"]');
 	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
 };
 
 export default async function (data) {
 	try {
-		const image = 'nginx:stable-alpine';
+		const image = 'webdevops/nginx:alpine';
 		const imageForBuild = 'node:lts';
 		await buildCacheImageWithNode(data, imageForBuild);
 		await createDockerfile(data, image);

src/lib/common.ts

@@ -2,7 +2,8 @@ import child from 'child_process';
 import util from 'util';
 import { dev } from '$app/env';
 import * as Sentry from '@sentry/node';
-import { uniqueNamesGenerator, Config, adjectives, colors, animals } from 'unique-names-generator';
+import { uniqueNamesGenerator, adjectives, colors, animals } from 'unique-names-generator';
+import type { Config } from 'unique-names-generator';
 
 import * as db from '$lib/database';
 import { buildLogQueue } from './queues';
@@ -11,6 +12,7 @@ import { version as currentVersion } from '../../package.json';
 import dayjs from 'dayjs';
 import Cookie from 'cookie';
 import os from 'os';
+import cuid from 'cuid';
 
 try {
 	if (!dev) {
@@ -67,10 +69,10 @@ export const isTeamIdTokenAvailable = (request) => {
 };
 
 export const getTeam = (event) => {
-	const cookies: Cookies = Cookie.parse(event.request.headers.get('cookie'));
-	if (cookies.teamId) {
+	const cookies = Cookie.parse(event.request.headers.get('cookie'));
+	if (cookies?.teamId) {
 		return cookies.teamId;
-	} else if (event.locals.session.data.teamId) {
+	} else if (event.locals.session.data?.teamId) {
 		return event.locals.session.data.teamId;
 	}
 	return null;
@@ -78,7 +80,7 @@ export const getTeam = (event) => {
 
 export const getUserDetails = async (event, isAdminRequired = true) => {
 	const teamId = getTeam(event);
-	const userId = event.locals.session.data.uid || null;
+	const userId = event.locals.session.data.userId || null;
 	const { permission = 'read' } = await db.prisma.permission.findFirst({
 		where: { teamId, userId },
 		select: { permission: true },
@@ -103,7 +105,7 @@ export const getUserDetails = async (event, isAdminRequired = true) => {
 };
 
 export function getEngine(engine) {
-	return engine === '/var/run/docker.sock' ? 'unix:///var/run/docker.sock' : `tcp://${engine}:2375`;
+	return engine === '/var/run/docker.sock' ? 'unix:///var/run/docker.sock' : engine;
 }
 
 export async function removeContainer(id, engine) {
@@ -145,3 +147,13 @@ export function generateTimestamp() {
 export function getDomain(domain) {
 	return domain?.replace('https://', '').replace('http://', '');
 }
+
+export function dashify(str: string, options?: any): string {
+	if (typeof str !== 'string') return str;
+	return str
+		.trim()
+		.replace(/\W/g, (m) => (/[À-ž]/.test(m) ? m : '-'))
+		.replace(/^-+|-+$/g, '')
+		.replace(/-{2,}/g, (m) => (options && options.condense ? '-' : m))
+		.toLowerCase();
+}

src/lib/components/CopyPasswordField.svelte

@@ -1,9 +1,9 @@
 <script>
 	import { browser } from '$app/env';
 	import { toast } from '@zerodevx/svelte-toast';
-	export let value;
 	let showPassword = false;
 
+	export let value;
 	export let disabled = false;
 	export let isPasswordField = false;
 	export let readonly = false;
@@ -14,31 +14,25 @@
 	export let name;
 	export let placeholder = '';
 
-	let disabledClass = 'bg-coolback disabled:bg-coolblack select-all';
-	let actionsShow = false;
+	let disabledClass = 'bg-coolback disabled:bg-coolblack';
 	let isHttps = browser && window.location.protocol === 'https:';
 
-	function showActions(value) {
-		actionsShow = value;
-	}
 	function copyToClipboard() {
 		if (isHttps && navigator.clipboard) {
 			navigator.clipboard.writeText(value);
-			toast.push('Copied to clipboard');
+			toast.push('Copied to clipboard.');
 		}
 	}
 </script>
 
-<span
-	class="relative"
-	on:mouseenter={() => showActions(true)}
-	on:mouseleave={() => showActions(false)}
->
+<div class="relative">
 	{#if !isPasswordField || showPassword}
 		{#if textarea}
 			<textarea
-				rows="3"
+				rows="5"
 				class={disabledClass}
+				class:pr-10={true}
+				class:pr-20={value && isHttps}
 				{placeholder}
 				type="text"
 				{id}
@@ -52,6 +46,8 @@
 			<input
 				class={disabledClass}
 				type="text"
+				class:pr-10={true}
+				class:pr-20={value && isHttps}
 				{id}
 				{name}
 				{required}
@@ -65,6 +61,8 @@
 	{:else}
 		<input
 			class={disabledClass}
+			class:pr-10={true}
+			class:pr-20={value && isHttps}
 			type="password"
 			{id}
 			{name}
@@ -77,69 +75,67 @@
 		/>
 	{/if}
 
-	{#if actionsShow}
-		<div class="absolute top-0 right-0 mx-2 cursor-pointer text-warmGray-600 hover:text-white">
-			<div class="flex space-x-2">
-				{#if isPasswordField}
-					<div on:click={() => (showPassword = !showPassword)}>
-						{#if showPassword}
-							<svg
-								xmlns="http://www.w3.org/2000/svg"
-								class="h-6 w-6"
-								fill="none"
-								viewBox="0 0 24 24"
-								stroke="currentColor"
-							>
-								<path
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									stroke-width="2"
-									d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21"
-								/>
-							</svg>
-						{:else}
-							<svg
-								xmlns="http://www.w3.org/2000/svg"
-								class="h-6 w-6"
-								fill="none"
-								viewBox="0 0 24 24"
-								stroke="currentColor"
-							>
-								<path
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									stroke-width="2"
-									d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
-								/>
-								<path
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									stroke-width="2"
-									d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"
-								/>
-							</svg>
-						{/if}
-					</div>
-				{/if}
-				{#if value && isHttps}
-					<div on:click={copyToClipboard}>
+	<div class="absolute top-0 right-0 m-3  cursor-pointer text-stone-600 hover:text-white">
+		<div class="flex space-x-2">
+			{#if isPasswordField}
+				<div on:click={() => (showPassword = !showPassword)}>
+					{#if showPassword}
 						<svg
 							xmlns="http://www.w3.org/2000/svg"
 							class="h-6 w-6"
-							viewBox="0 0 24 24"
-							stroke-width="1.5"
-							stroke="currentColor"
 							fill="none"
-							stroke-linecap="round"
-							stroke-linejoin="round"
+							viewBox="0 0 24 24"
+							stroke="currentColor"
 						>
-							<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-							<rect x="8" y="8" width="12" height="12" rx="2" />
-							<path d="M16 8v-2a2 2 0 0 0 -2 -2h-8a2 2 0 0 0 -2 2v8a2 2 0 0 0 2 2h2" />
+							<path
+								stroke-linecap="round"
+								stroke-linejoin="round"
+								stroke-width="2"
+								d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21"
+							/>
 						</svg>
-					</div>
-				{/if}
-			</div>
+					{:else}
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							class="h-6 w-6"
+							fill="none"
+							viewBox="0 0 24 24"
+							stroke="currentColor"
+						>
+							<path
+								stroke-linecap="round"
+								stroke-linejoin="round"
+								stroke-width="2"
+								d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
+							/>
+							<path
+								stroke-linecap="round"
+								stroke-linejoin="round"
+								stroke-width="2"
+								d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"
+							/>
+						</svg>
+					{/if}
+				</div>
+			{/if}
+			{#if value && isHttps}
+				<div on:click={copyToClipboard}>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="h-6 w-6"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<rect x="8" y="8" width="12" height="12" rx="2" />
+						<path d="M16 8v-2a2 2 0 0 0 -2 -2h-8a2 2 0 0 0 -2 2v8a2 2 0 0 0 2 2h2" />
+					</svg>
+				</div>
+			{/if}
 		</div>
-	{/if}
-</span>
+	</div>
+</div>

src/lib/components/Explainer.svelte

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

src/lib/components/Loading.svelte

@@ -11,7 +11,7 @@
 		<span class="loader" />
 	</div>
 {:else}
-	<div class=" main h-64 py-24 left-0 top-0 flex flex-wrap content-center mx-auto">
+	<div class="main h-64 py-24 left-0 top-0 flex flex-wrap content-center mx-auto">
 		<span class="loader" />
 	</div>
 {/if}

src/lib/components/Setting.svelte

@@ -4,15 +4,23 @@
 	export let setting;
 	export let title;
 	export let description;
-	export let isPadding = true;
+	export let isCenter = true;
 	export let disabled = false;
+	export let dataTooltip = null;
 </script>
 
-<li class="flex items-center py-4">
-	<div class="flex w-96 flex-col" class:px-4={isPadding} class:pr-32={!isPadding}>
-		<p class="text-xs font-bold text-stone-100 md:text-base">{title}</p>
+<div class="flex items-center py-4 pr-8">
+	<div class="flex w-96 flex-col">
+		<div class="text-xs font-bold text-stone-100 md:text-base">{title}</div>
 		<Explainer text={description} />
 	</div>
+</div>
+<div
+	class:tooltip={dataTooltip}
+	class:text-center={isCenter}
+	data-tooltip={dataTooltip}
+	class="flex justify-center"
+>
 	<div
 		type="button"
 		on:click
@@ -58,5 +66,4 @@
 			</span>
 		</span>
 	</div>
-	<!-- {/if} -->
-</li>
+</div>

src/lib/components/common.ts

@@ -9,25 +9,31 @@ export const dateOptions: DateTimeFormatOptions = {
 	hour12: false
 };
 
-export async function getGithubToken({ apiUrl, application, githubToken }): Promise<void> {
-	const response = await fetch(
-		`${apiUrl}/app/installations/${application.gitSource.githubApp.installationId}/access_tokens`,
-		{
-			method: 'POST',
-			headers: {
-				Authorization: `Bearer ${githubToken}`
-			}
-		}
-	);
-	if (!response.ok) {
-		throw new Error('Git Source not configured.');
-	}
-	const data = await response.json();
-	return data.token;
-}
-export const staticDeployments = ['react', 'vuejs', 'static', 'svelte', 'gatsby', 'php'];
+export const staticDeployments = [
+	'react',
+	'vuejs',
+	'static',
+	'svelte',
+	'gatsby',
+	'php',
+	'astro',
+	'eleventy'
+];
 export const notNodeDeployments = ['php', 'docker', 'rust'];
 
 export function getDomain(domain) {
 	return domain?.replace('https://', '').replace('http://', '');
 }
+export function generateRemoteEngine(destination) {
+	return `ssh://${destination.user}@${destination.ipAddress}:${destination.port}`;
+}
+
+export function dashify(str: string, options?: any): string {
+	if (typeof str !== 'string') return str;
+	return str
+		.trim()
+		.replace(/\W/g, (m) => (/[À-ž]/.test(m) ? m : '-'))
+		.replace(/^-+|-+$/g, '')
+		.replace(/-{2,}/g, (m) => (options && options.condense ? '-' : m))
+		.toLowerCase();
+}

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

@@ -0,0 +1,21 @@
+<svg
+	class="absolute top-0 left-0 -m-6 h-14 w-14"
+	viewBox="0 0 256 256"
+	fill="none"
+	xmlns="http://www.w3.org/2000/svg"
+>
+	<path
+		id="a"
+		fill="#302649"
+		fill-rule="evenodd"
+		clip-rule="evenodd"
+		d="M163.008 18.929c1.944 2.413 2.935 5.67 4.917 12.181l43.309 142.27a180.277 180.277 0 00-51.778-17.53l-28.198-95.29a3.67 3.67 0 00-7.042.01l-27.857 95.232a180.225 180.225 0 00-52.01 17.557l43.52-142.281c1.99-6.502 2.983-9.752 4.927-12.16a15.999 15.999 0 016.484-4.798c2.872-1.154 6.271-1.154 13.07-1.154h31.085c6.807 0 10.211 0 13.086 1.157a16.004 16.004 0 016.487 4.806z"
+	/>
+	<path
+		id="flame"
+		fill="#EF661E"
+		fill-rule="evenodd"
+		clip-rule="evenodd"
+		d="M168.19 180.151c-7.139 6.105-21.39 10.268-37.804 10.268-20.147 0-37.033-6.272-41.513-14.707-1.602 4.835-1.961 10.367-1.961 13.902 0 0-1.056 17.355 11.015 29.426 0-6.268 5.081-11.349 11.349-11.349 10.743 0 10.731 9.373 10.721 16.977v.679c0 11.542 7.054 21.436 17.086 25.606a23.27 23.27 0 01-2.339-10.2c0-11.008 6.463-15.107 13.974-19.87 5.976-3.79 12.616-8.001 17.192-16.449a31.024 31.024 0 003.743-14.82c0-3.299-.513-6.479-1.463-9.463z"
+	/>
+</svg>

src/lib/components/svg/applications/Eleventy.svelte

@@ -0,0 +1,6 @@
+<svg viewBox="0 0 128 128" class="absolute top-0 left-0 -m-8 h-16 w-16">
+	<path fill="transparent" d="M18 0h92v128H18z" /><path
+		d="M55.3 36.3h.4c1.1 0 1.5.9 1.5 2.3v41.8c0 1.8-.4 3-1.6 3l-4.8-.1c-1.2 0-1.6-1-1.6-3V45.5l-2.1.5c-1 0-1.5-.8-1.5-2.2v-3c0-1.2.4-2 1.4-2.2l8.3-2.2zm16 36.1l.1 3 .6 1.3.6.6.8.1h2.2c1 0 1.7.8 1.7 2v1.9c0 1.2-.6 2-1.8 2h-3.2l-2.3-.1c-.7-.2-1.4-.5-2.2-1a5.7 5.7 0 01-2-1.9c-.4-.8-.8-1.9-1-3.2-.4-1.4-.5-3-.5-4.8v-16h-1.5c-1.1 0-1.6-1-1.6-2.4v-1.7c0-1.4.5-2.3 1.6-2.3h1.5v-.1l.6-12.3c0-1.5.5-2.5 1.6-2.5h3.1c1.2 0 1.6 1 1.6 2.5v12.3h3.6c1.1 0 1.6 1 1.6 2.4V54c0 1.4-.5 2.3-1.6 2.3h-3.6v16.2zm9.4 15.7c0-2 .3-3.2 1.5-3.2.2 0 .4 0 1.4.4l1.1.3.2-.1.4-.7c.3-.6.4-1.6.4-3l-.6-3.3L79 52.7v-.9c0-1.2.3-2 1.2-2H84c.5 0 1 .3 1.3.6.3.4.5.9.6 1.6l3.4 18 2.6-17.8c.1-.8.3-1.3.6-1.7.3-.4.8-.6 1.3-.6h2.6c1 0 1.4.8 1.4 2l-.1.8L92 82.2c-.5 2.5-1 4.4-1.5 5.7a6.6 6.6 0 01-2 3c-.9.6-1.9.9-3.1.9h-.3c-2 0-3.3-.6-4.1-1.7-.3-.4-.4-1-.4-2zM31.3 38.8l8.2-2.1h.5c1 0 1.4.8 1.4 2.2v41.9c0 1.8-.4 2.9-1.6 2.9h-4.7c-1.2 0-1.6-1.1-1.6-3v-35l-2 .6c-1.2 0-1.6-.9-1.6-2.2v-3c0-1.2.4-2 1.4-2.3z"
+		fill="#FFF"
+	/>
+</svg>

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

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

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

@@ -0,0 +1,27 @@
+<script lang="ts">
+	export let isAbsolute = false;
+</script>
+
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	fill="none"
+	viewBox="0 0 140 140"
+	data-lt-extension-installed="true"
+	><g clip-path="url(#clip0)"
+		><path
+			fill="#fff"
+			fill-rule="evenodd"
+			d="M140 43.602c0-1.662.001-3.324-.01-4.987-.008-1.4-.024-2.8-.062-4.2-.082-3.05-.262-6.126-.805-9.142-.55-3.06-1.448-5.907-2.864-8.688A29.227 29.227 0 0 0 123.476 3.81c-2.783-1.416-5.634-2.314-8.697-2.864-3.016-.542-6.094-.722-9.144-.804-1.4-.038-2.801-.054-4.202-.063C99.77.068 98.107.07 96.444.07L77.135 0H62.694L43.726.07c-1.666 0-3.332-.002-4.998.008-1.404.01-2.807.025-4.21.063-3.058.082-6.142.262-9.166.805-3.067.55-5.922 1.447-8.709 2.862a29.293 29.293 0 0 0-7.419 5.377 29.223 29.223 0 0 0-5.389 7.4c-1.42 2.78-2.32 5.63-2.871 8.691-.543 3.016-.723 6.091-.806 9.14-.038 1.4-.054 2.8-.062 4.2C.086 40.277 0 42.342 0 44.004v33.3l.086 19.102c0 1.665 0 3.33.01 4.994a200.6 200.6 0 0 0 .062 4.205c.083 3.054.263 6.135.807 9.155.551 3.064 1.451 5.916 2.87 8.7a29.294 29.294 0 0 0 12.807 12.794c2.788 1.418 5.645 2.317 8.714 2.868 3.022.542 6.105.722 9.162.804 1.403.038 2.806.054 4.21.063 1.666.01 3.332.009 4.998.009l19.14.001h14.477l19.101-.001c1.663 0 3.326.001 4.989-.009a202.92 202.92 0 0 0 4.202-.063c3.052-.082 6.13-.262 9.148-.805 3.061-.551 5.911-1.45 8.692-2.867a29.215 29.215 0 0 0 7.405-5.384 29.22 29.22 0 0 0 5.378-7.409c1.417-2.785 2.315-5.639 2.866-8.704.542-3.02.722-6.099.804-9.152.038-1.402.054-2.804.062-4.205.011-1.665.01-3.33.01-4.993l-.001-19.103V62.694L140 43.602"
+			clip-rule="evenodd"
+		/><path
+			fill="#000"
+			fill-rule="evenodd"
+			d="M39.375 40.188h8.313a6.25 6.25 0 0 1 6.25 6.25v24.25h16.25v8.75h-18.75a6.25 6.25 0 0 1-6.25-6.25v-24.25h-5.813v-8.75zm63.563 6.25v6.5h-8.75v-4h-6.876v30.5h-8.75v-30.5h-6.874v4h-8.75v-6.5a6.25 6.25 0 0 1 6.25-6.25h27.5a6.25 6.25 0 0 1 6.25 6.25z"
+			clip-rule="evenodd"
+		/><path
+			fill="#239AFF"
+			d="M35.319 102.906l-8.138-5.812c2.39-3.347 4.857-5.936 7.452-7.753 2.884-2.018 5.948-3.091 9.117-3.091 2.942 0 5.491.714 7.768 2.08a17.622 17.622 0 0 1 2.615 1.94c.589.518 1.009.926 1.903 1.82 1.355 1.354 1.917 1.851 2.591 2.255.731.439 1.503.655 2.623.655 1.121 0 1.896-.217 2.631-.657.677-.405 1.245-.905 2.6-2.257l.012-.012c.89-.888 1.314-1.299 1.902-1.817a17.643 17.643 0 0 1 2.61-1.933c2.273-1.362 4.814-2.074 7.745-2.074s5.472.712 7.745 2.074c.916.55 1.758 1.183 2.61 1.933.589.518 1.013.929 1.902 1.817l.013.012c1.354 1.352 1.922 1.852 2.599 2.257.735.44 1.51.657 2.631.657.998 0 2.1-.386 3.383-1.284 1.572-1.1 3.272-2.886 5.048-5.372l8.138 5.812c-2.391 3.347-4.857 5.936-7.452 7.753-2.884 2.018-5.948 3.091-9.117 3.091-2.941 0-5.49-.713-7.769-2.078a17.627 17.627 0 0 1-2.619-1.938c-.59-.519-1.015-.93-1.906-1.82l-.013-.013c-1.351-1.348-1.917-1.846-2.59-2.25-.728-.436-1.494-.651-2.603-.651-1.109 0-1.875.215-2.603.651-.673.404-1.239.902-2.59 2.25l-.012.013c-.892.89-1.317 1.301-1.907 1.82-.855.752-1.7 1.388-2.62 1.938C66.74 104.287 64.192 105 61.25 105c-2.942 0-5.49-.714-7.768-2.08a17.654 17.654 0 0 1-2.615-1.939c-.588-.519-1.009-.927-1.902-1.82-1.355-1.355-1.918-1.852-2.592-2.256-.731-.439-1.503-.655-2.623-.655-.998 0-2.1.386-3.383 1.284-1.572 1.1-3.272 2.886-5.048 5.372z"
+		/></g
+	><defs><clipPath id="clip0"><path fill="#fff" d="M0 0h140v140H0z" /></clipPath></defs></svg
+>

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

@@ -0,0 +1,24 @@
+<script lang="ts">
+	export let isAbsolute = false;
+</script>
+
+<svg
+	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+	viewBox="0 0 220 105"
+>
+	<g>
+		<path
+			fill="#FF6D5A"
+			d="M183.9,0.2c-9.8,0-18,6.7-20.3,15.8h-29.2c-11.5,0-20.8,9.3-20.8,20.8c0,5.7-4.7,10.4-10.4,10.4H99
+		c-2.3-9.1-10.5-15.8-20.3-15.8c-9.8,0-18,6.7-20.3,15.8H41.7c-2.3-9.1-10.5-15.8-20.3-15.8c-11.6,0-21,9.4-21,21
+		c0,11.6,9.4,21,21,21c9.8,0,18-6.7,20.3-15.8h16.7c2.3,9.1,10.5,15.8,20.3,15.8c9.7,0,17.9-6.6,20.3-15.6h4.2
+		c5.7,0,10.4,4.7,10.4,10.4c0,11.5,9.3,20.8,20.8,20.8h6.8c2.3,9.1,10.5,15.8,20.3,15.8c11.6,0,21-9.4,21-21c0-11.6-9.4-21-21-21
+		c-9.8,0-18,6.7-20.3,15.8h-6.8c-5.7,0-10.4-4.7-10.4-10.4c0-6.3-2.8-11.9-7.2-15.7c4.4-3.8,7.2-9.4,7.2-15.7
+		c0-5.7,4.7-10.4,10.4-10.4h29.2c2.3,9.1,10.5,15.8,20.3,15.8c11.6,0,21-9.4,21-21C204.9,9.6,195.5,0.2,183.9,0.2z M21.4,63
+		c-5.8,0-10.6-4.8-10.6-10.6s4.8-10.6,10.6-10.6S32,46.6,32,52.4S27.3,63,21.4,63z M78.7,63c-5.8,0-10.6-4.8-10.6-10.6
+		s4.8-10.6,10.6-10.6s10.6,4.8,10.6,10.6S84.6,63,78.7,63z M161.5,73.2c5.8,0,10.6,4.8,10.6,10.6s-4.8,10.6-10.6,10.6
+		s-10.6-4.8-10.6-10.6C150.9,77.9,155.7,73.2,161.5,73.2z M183.9,31.8c-5.8,0-10.6-4.8-10.6-10.6s4.8-10.6,10.6-10.6
+		s10.6,4.8,10.6,10.6C194.5,27,189.8,31.8,183.9,31.8z"
+		/>
+	</g>
+</svg>

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

@@ -0,0 +1,159 @@
+<script lang="ts">
+	export let isAbsolute = false;
+</script>
+
+<svg
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-10 h-10 mx-auto'}
+	xmlns="http://www.w3.org/2000/svg"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	version="1.1"
+	preserveAspectRatio="xMidYMid meet"
+	viewBox="0 0 640 640"
+	width="640"
+	height="640"
+	><defs
+		><path
+			d="M407.55 916.24C471.25 916.24 522.89 967.88 522.89 1031.57C522.89 1113.88 522.89 1245.44 522.89 1327.74C522.89 1391.44 471.25 1443.08 407.55 1443.08C325.25 1443.08 193.68 1443.08 111.38 1443.08C47.69 1443.08 -3.95 1391.44 -3.95 1327.74C-3.95 1245.44 -3.95 1113.88 -3.95 1031.57C-3.95 967.88 47.69 916.24 111.38 916.24C193.68 916.24 325.25 916.24 407.55 916.24Z"
+			id="a1LdTs1gvU"
+		/><linearGradient
+			id="gradientcoH7TNh19"
+			gradientUnits="userSpaceOnUse"
+			x1="256.07"
+			y1="1132.14"
+			x2="609.11"
+			y2="1480.42"
+			><stop style="stop-color: #c2efd2;stop-opacity: 1" offset="0%" /><stop
+				style="stop-color: #8ff0e5;stop-opacity: 1"
+				offset="100%"
+			/></linearGradient
+		><path
+			d="M-467.41 394.63C-467.41 554.76 -597.42 684.76 -757.55 684.76C-917.68 684.76 -1047.69 554.76 -1047.69 394.63C-1047.69 234.5 -917.68 104.49 -757.55 104.49C-597.42 104.49 -467.41 234.5 -467.41 394.63Z"
+			id="a1uaEBd4xM"
+		/><path
+			d="M-96.99 -586.14C-57.24 -619.85 -5.79 -604.75 19.26 -580.46C31.43 -568.66 56.57 -546.36 40.97 -491.67C32.76 -462.87 10.41 -436.4 -26.05 -412.27C-15.07 -377.85 -5.6 -344.76 2.36 -313C14.29 -265.36 13.55 -189.67 -26.05 -155.4C-67.27 -119.73 -166.91 -104.09 -234.24 -103.09C-301.57 -102.1 -406.19 -113.09 -461.6 -155.4C-517.01 -197.7 -512.24 -257.07 -498.04 -313C-488.58 -350.28 -476.43 -383.38 -461.6 -412.27C-505.54 -441.3 -530.54 -467.76 -536.6 -491.67C-545.68 -527.54 -530.93 -565.61 -501.12 -586.14C-471.31 -606.67 -435.18 -606.9 -400.45 -586.14C-377.3 -572.3 -354.79 -542.13 -332.92 -495.62C-287.85 -505.25 -254.96 -509.57 -234.24 -508.6C-214.74 -507.68 -186.57 -503.36 -149.72 -495.62C-135.81 -537.95 -118.23 -568.12 -96.99 -586.14Z"
+			id="f8p7QlEjN3"
+		/><linearGradient
+			id="gradienta4Tg99ZOOp"
+			gradientUnits="userSpaceOnUse"
+			x1="-440.25"
+			y1="-388.59"
+			x2="-100.49"
+			y2="-147.33"
+			><stop style="stop-color: #5cdd8b;stop-opacity: 1" offset="0%" /><stop
+				style="stop-color: #7ae6a1;stop-opacity: 1"
+				offset="100%"
+			/></linearGradient
+		><path
+			d="M-86.03 -10.69C-61.35 -10.69 -41.34 9.32 -41.34 34.01C-41.34 119.07 -41.34 329.58 -41.34 414.65C-41.34 439.33 -61.35 459.34 -86.03 459.34C-136.01 459.34 -241.25 459.34 -291.23 459.34C-315.92 459.34 -335.93 439.33 -335.93 414.65C-335.93 329.58 -335.93 119.07 -335.93 34.01C-335.93 9.32 -315.92 -10.69 -291.23 -10.69C-241.25 -10.69 -136.01 -10.69 -86.03 -10.69Z"
+			id="d32ZZRxd1S"
+		/><linearGradient
+			id="gradientb1JxIe4xUm"
+			gradientUnits="userSpaceOnUse"
+			x1="-791.65"
+			y1="-33.27"
+			x2="892.1"
+			y2="418.94"
+			><stop style="stop-color: #5cdd8b;stop-opacity: 1" offset="0%" /><stop
+				style="stop-color: #5ae98f;stop-opacity: 1"
+				offset="100%"
+			/></linearGradient
+		><path
+			d="M-257.95 458.12C-247.92 449.62 -234.93 453.43 -228.61 459.56C-225.54 462.54 -219.19 468.17 -223.13 481.97C-225.2 489.24 -230.84 495.92 -240.05 502.01C-237.27 510.7 -234.88 519.06 -232.88 527.07C-229.86 539.1 -230.05 558.21 -240.05 566.86C-250.45 575.86 -275.6 579.81 -292.6 580.06C-309.6 580.31 -336.01 577.54 -349.99 566.86C-363.98 556.18 -362.77 541.19 -359.19 527.07C-356.8 517.66 -353.73 509.31 -349.99 502.01C-361.08 494.69 -367.39 488.01 -368.92 481.97C-371.22 472.92 -367.49 463.31 -359.97 458.12C-352.44 452.94 -343.32 452.88 -334.56 458.12C-328.71 461.62 -323.03 469.23 -317.51 480.97C-306.13 478.54 -297.83 477.45 -292.6 477.7C-287.68 477.93 -280.56 479.02 -271.26 480.97C-267.75 470.29 -263.32 462.67 -257.95 458.12Z"
+			id="b19LRRbPrG"
+		/><path
+			d="M490.4 235.64C544.09 358.38 544.09 435.34 490.4 466.5C409.85 513.24 199.96 527.49 139.54 455.64C99.26 407.74 99.26 334.4 139.54 235.64C180.5 168.18 238.71 134.45 314.17 134.45C389.64 134.45 448.38 168.18 490.4 235.64Z"
+			id="bN5StdyPU"
+		/><linearGradient
+			id="gradientb1HT15TsY0"
+			gradientUnits="userSpaceOnUse"
+			x1="259.78"
+			y1="261.15"
+			x2="463.85"
+			y2="456.49"
+			><stop style="stop-color: #5cdd8b;stop-opacity: 1" offset="0%" /><stop
+				style="stop-color: #86e6a9;stop-opacity: 1"
+				offset="100%"
+			/></linearGradient
+		><path
+			d="M393.81 -775.89C428.26 -748.09 439.99 -725.54 429 -708.22C412.51 -682.24 353.16 -646.07 324.5 -657.93C305.39 -665.83 294.22 -687.32 290.97 -722.41C292.69 -748.43 304.61 -767.19 326.73 -778.69C348.85 -790.19 371.21 -789.26 393.81 -775.89Z"
+			id="arh6miPP2"
+		/><linearGradient
+			id="gradientc2g6rBSAiq"
+			gradientUnits="userSpaceOnUse"
+			x1="330.1"
+			y1="-733.26"
+			x2="419.69"
+			y2="-707.1"
+			><stop style="stop-color: #5cdd8b;stop-opacity: 1" offset="0%" /><stop
+				style="stop-color: #86e6a9;stop-opacity: 1"
+				offset="100%"
+			/></linearGradient
+		><path
+			d="M675.36 -369.24C669.97 -325.31 657.02 -303.43 636.51 -303.61C605.74 -303.87 543.67 -335.15 538.59 -365.74C535.2 -386.14 547.54 -406.99 575.61 -428.29C598.61 -440.58 620.83 -440.37 642.29 -427.67C663.74 -414.97 674.77 -395.49 675.36 -369.24Z"
+			id="a2VENFzCvL"
+		/><linearGradient
+			id="gradientc18GuJy4sZ"
+			gradientUnits="userSpaceOnUse"
+			x1="605.5"
+			y1="-400.8"
+			x2="630.64"
+			y2="-310.92"
+			><stop style="stop-color: #5cdd8b;stop-opacity: 1" offset="0%" /><stop
+				style="stop-color: #86e6a9;stop-opacity: 1"
+				offset="100%"
+			/></linearGradient
+		></defs
+	><g
+		><g
+			><g><use xlink:href="#a1LdTs1gvU" opacity="1" fill="url(#gradientcoH7TNh19)" /></g><g
+				><use xlink:href="#a1uaEBd4xM" opacity="1" fill="#ebf0ed" fill-opacity="1" /></g
+			><g
+				><use xlink:href="#f8p7QlEjN3" opacity="1" fill="url(#gradienta4Tg99ZOOp)" /><g
+					><use
+						xlink:href="#f8p7QlEjN3"
+						opacity="1"
+						fill-opacity="0"
+						stroke="#ffffff"
+						stroke-width="98"
+						stroke-opacity="0.57"
+					/></g
+				></g
+			><g
+				><use xlink:href="#d32ZZRxd1S" opacity="1" fill="url(#gradientb1JxIe4xUm)" /><g
+					><use
+						xlink:href="#d32ZZRxd1S"
+						opacity="1"
+						fill-opacity="0"
+						stroke="#f2f2f2"
+						stroke-width="60"
+						stroke-opacity="0.51"
+					/></g
+				></g
+			><g
+				><use xlink:href="#b19LRRbPrG" opacity="1" fill="#d8ad9a" fill-opacity="1" /><g
+					><use
+						xlink:href="#b19LRRbPrG"
+						opacity="1"
+						fill-opacity="0"
+						stroke="#ffffff"
+						stroke-width="17"
+						stroke-opacity="1"
+					/></g
+				></g
+			><g
+				><use xlink:href="#bN5StdyPU" opacity="1" fill="url(#gradientb1HT15TsY0)" /><g
+					><use
+						xlink:href="#bN5StdyPU"
+						opacity="1"
+						fill-opacity="0"
+						stroke="#f2f2f2"
+						stroke-width="200"
+						stroke-opacity="0.51"
+					/></g
+				></g
+			><g><use xlink:href="#arh6miPP2" opacity="1" fill="url(#gradientc2g6rBSAiq)" /></g><g
+				><use xlink:href="#a2VENFzCvL" opacity="1" fill="url(#gradientc18GuJy4sZ)" /></g
+			></g
+		></g
+	></svg
+>

src/lib/components/templates.ts

@@ -1,127 +1,266 @@
-const defaultBuildAndDeploy = {
-	installCommand: 'yarn install',
-	buildCommand: 'yarn build',
-	startCommand: 'yarn start'
-};
-export const buildPacks = [
-	{
+function defaultBuildAndDeploy(packageManager) {
+	return {
+		installCommand:
+			packageManager === 'npm' ? `${packageManager} install` : `${packageManager} install`,
+		buildCommand:
+			packageManager === 'npm' ? `${packageManager} run build` : `${packageManager} build`,
+		startCommand:
+			packageManager === 'npm' ? `${packageManager} run start` : `${packageManager} start`
+	};
+}
+export function findBuildPack(pack, packageManager = 'npm') {
+	const metaData = buildPacks.find((b) => b.name === pack);
+	if (pack === 'node') {
+		return {
+			...metaData,
+			...defaultBuildAndDeploy(packageManager),
+			buildCommand: null,
+			startCommand: null,
+			publishDirectory: null,
+			port: null
+		};
+	}
+	if (pack === 'static') {
+		return {
+			...metaData,
+			installCommand: null,
+			buildCommand: null,
+			startCommand: null,
+			publishDirectory: null,
+			port: 80
+		};
+	}
+	if (pack === 'docker') {
+		return {
+			...metaData,
+			installCommand: null,
+			buildCommand: null,
+			startCommand: null,
+			publishDirectory: null,
+			port: null
+		};
+	}
+	if (pack === 'svelte') {
+		return {
+			...metaData,
+			...defaultBuildAndDeploy(packageManager),
+			publishDirectory: 'public',
+			port: 80
+		};
+	}
+	if (pack === 'nestjs') {
+		return {
+			...metaData,
+			...defaultBuildAndDeploy(packageManager),
+			startCommand:
+				packageManager === 'npm' ? 'npm run start:prod' : `${packageManager} run start:prod`,
+			publishDirectory: null,
+			port: 3000
+		};
+	}
+	if (pack === 'react') {
+		return {
+			...metaData,
+			...defaultBuildAndDeploy(packageManager),
+			publishDirectory: 'build',
+			port: 80
+		};
+	}
+	if (pack === 'nextjs') {
+		return {
+			...metaData,
+			...defaultBuildAndDeploy(packageManager),
+			publishDirectory: null,
+			port: 3000
+		};
+	}
+	if (pack === 'gatsby') {
+		return {
+			...metaData,
+			...defaultBuildAndDeploy(packageManager),
+			publishDirectory: 'public',
+			port: 80
+		};
+	}
+	if (pack === 'vuejs') {
+		return {
+			...metaData,
+			...defaultBuildAndDeploy(packageManager),
+			publishDirectory: 'dist',
+			port: 80
+		};
+	}
+	if (pack === 'nuxtjs') {
+		return {
+			...metaData,
+			...defaultBuildAndDeploy(packageManager),
+			publishDirectory: null,
+			port: 3000
+		};
+	}
+	if (pack === 'preact') {
+		return {
+			...metaData,
+			...defaultBuildAndDeploy(packageManager),
+			publishDirectory: 'build',
+			port: 80
+		};
+	}
+	if (pack === 'php') {
+		return {
+			...metaData,
+			installCommand: null,
+			buildCommand: null,
+			startCommand: null,
+			publishDirectory: null,
+			port: 80
+		};
+	}
+	if (pack === 'rust') {
+		return {
+			...metaData,
+			installCommand: null,
+			buildCommand: null,
+			startCommand: null,
+			publishDirectory: null,
+			port: 3000
+		};
+	}
+	if (pack === 'astro') {
+		return {
+			...metaData,
+			installCommand: `yarn install`,
+			buildCommand: `yarn build`,
+			startCommand: null,
+			publishDirectory: `dist`,
+			port: 80
+		};
+	}
+	if (pack === 'eleventy') {
+		return {
+			...metaData,
+			installCommand: `yarn install`,
+			buildCommand: `yarn build`,
+			startCommand: null,
+			publishDirectory: `_site`,
+			port: 80
+		};
+	}
+	return {
 		name: 'node',
+		fancyName: 'Node.js',
+		hoverColor: 'hover:bg-green-700',
+		color: 'bg-green-700',
 		installCommand: null,
 		buildCommand: null,
 		startCommand: null,
 		publishDirectory: null,
-		port: null,
+		port: null
+	};
+}
+export const buildPacks = [
+	{
+		name: 'node',
 		fancyName: 'Node.js',
 		hoverColor: 'hover:bg-green-700',
 		color: 'bg-green-700'
 	},
-
 	{
 		name: 'static',
-		...defaultBuildAndDeploy,
-		publishDirectory: 'dist',
-		port: 80,
 		fancyName: 'Static',
 		hoverColor: 'hover:bg-orange-700',
 		color: 'bg-orange-700'
 	},
 	{
 		name: 'docker',
-		installCommand: null,
-		buildCommand: null,
-		startCommand: null,
-		publishDirectory: null,
-		port: null,
 		fancyName: 'Docker',
 		hoverColor: 'hover:bg-sky-700',
 		color: 'bg-sky-700'
 	},
+	{
+		name: 'php',
+		fancyName: 'PHP',
+		hoverColor: 'hover:bg-indigo-700',
+		color: 'bg-indigo-700'
+	},
 	{
 		name: 'svelte',
-		...defaultBuildAndDeploy,
-		publishDirectory: 'public',
-		port: 80,
 		fancyName: 'Svelte',
 		hoverColor: 'hover:bg-orange-700',
 		color: 'bg-orange-700'
 	},
-	{
-		name: 'nestjs',
-		...defaultBuildAndDeploy,
-		startCommand: 'yarn start:prod',
-		port: 3000,
-		fancyName: 'NestJS',
-		hoverColor: 'hover:bg-red-700',
-		color: 'bg-red-700'
-	},
-	{
-		name: 'react',
-		...defaultBuildAndDeploy,
-		publishDirectory: 'build',
-		port: 80,
-		fancyName: 'React',
-		hoverColor: 'hover:bg-blue-700',
-		color: 'bg-blue-700'
-	},
-	{
-		name: 'nextjs',
-		...defaultBuildAndDeploy,
-		port: 3000,
-		fancyName: 'NextJS',
-		hoverColor: 'hover:bg-blue-700',
-		color: 'bg-blue-700'
-	},
-	{
-		name: 'gatsby',
-		...defaultBuildAndDeploy,
-		publishDirectory: 'public',
-		port: 80,
-		fancyName: 'Gatsby',
-		hoverColor: 'hover:bg-blue-700',
-		color: 'bg-blue-700'
-	},
 	{
 		name: 'vuejs',
-		...defaultBuildAndDeploy,
-		publishDirectory: 'dist',
-		port: 80,
 		fancyName: 'VueJS',
 		hoverColor: 'hover:bg-green-700',
 		color: 'bg-green-700'
 	},
 	{
 		name: 'nuxtjs',
-		...defaultBuildAndDeploy,
-		port: 3000,
 		fancyName: 'NuxtJS',
 		hoverColor: 'hover:bg-green-700',
 		color: 'bg-green-700'
 	},
+	{
+		name: 'gatsby',
+		fancyName: 'Gatsby',
+		hoverColor: 'hover:bg-blue-700',
+		color: 'bg-blue-700'
+	},
+	{
+		name: 'astro',
+		fancyName: 'Astro',
+		hoverColor: 'hover:bg-pink-700',
+		color: 'bg-pink-700'
+	},
+	{
+		name: 'eleventy',
+		fancyName: 'Eleventy',
+		hoverColor: 'hover:bg-red-700',
+		color: 'bg-red-700'
+	},
+
+	{
+		name: 'react',
+		fancyName: 'React',
+		hoverColor: 'hover:bg-blue-700',
+		color: 'bg-blue-700'
+	},
 	{
 		name: 'preact',
-		...defaultBuildAndDeploy,
-		publishDirectory: 'build',
-		port: 80,
 		fancyName: 'Preact',
 		hoverColor: 'hover:bg-blue-700',
 		color: 'bg-blue-700'
 	},
 	{
-		name: 'php',
-		port: 80,
-		fancyName: 'PHP',
-		hoverColor: 'hover:bg-indigo-700',
-		color: 'bg-indigo-700'
+		name: 'nextjs',
+		fancyName: 'NextJS',
+		hoverColor: 'hover:bg-blue-700',
+		color: 'bg-blue-700'
+	},
+	{
+		name: 'nestjs',
+		fancyName: 'NestJS',
+		hoverColor: 'hover:bg-red-700',
+		color: 'bg-red-700'
 	},
 	{
 		name: 'rust',
-		port: 3000,
 		fancyName: 'Rust',
 		hoverColor: 'hover:bg-pink-700',
 		color: 'bg-pink-700'
 	}
 ];
 export const scanningTemplates = {
+	'@sveltejs/kit': {
+		buildPack: 'nodejs'
+	},
+	astro: {
+		buildPack: 'astro'
+	},
+	'@11ty/eleventy': {
+		buildPack: 'eleventy'
+	},
 	svelte: {
 		buildPack: 'svelte'
 	},

src/lib/database/applications.ts

@@ -1,5 +1,4 @@
 import { decrypt, encrypt } from '$lib/crypto';
-import { removeProxyConfiguration, removeWwwRedirection } from '$lib/haproxy';
 import { asyncExecShell, getEngine } from '$lib/common';
 
 import { getDomain, removeDestinationDocker } from '$lib/common';
@@ -59,63 +58,73 @@ export async function removeApplication({ id, teamId }) {
 				const id = containerObj.ID;
 				const preview = containerObj.Image.split('-')[1];
 				await removeDestinationDocker({ id, engine: destinationDocker.engine });
-				if (preview) {
-					await removeProxyConfiguration({ domain: `${preview}.${domain}` });
-				} else {
-					await removeProxyConfiguration({ domain });
-				}
 			}
 		}
 	}
 
 	await prisma.applicationSettings.deleteMany({ where: { application: { id } } });
 	await prisma.buildLog.deleteMany({ where: { applicationId: id } });
+	await prisma.build.deleteMany({ where: { applicationId: id } });
 	await prisma.secret.deleteMany({ where: { applicationId: id } });
+	await prisma.applicationPersistentStorage.deleteMany({ where: { applicationId: id } });
 	await prisma.application.deleteMany({ where: { id, teams: { some: { id: teamId } } } });
 }
 
 export async function getApplicationWebhook({ projectId, branch }) {
 	try {
-		let body = await prisma.application.findFirst({
-			where: { projectId, branch },
+		let application = await prisma.application.findFirst({
+			where: { projectId, branch, settings: { autodeploy: true } },
 			include: {
 				destinationDocker: true,
 				settings: true,
 				gitSource: { include: { githubApp: true, gitlabApp: true } },
-				secrets: true
+				secrets: true,
+				persistentStorage: true
 			}
 		});
-
-		if (body.gitSource?.githubApp?.clientSecret) {
-			body.gitSource.githubApp.clientSecret = decrypt(body.gitSource.githubApp.clientSecret);
+		if (!application) {
+			return null;
 		}
-		if (body.gitSource?.githubApp?.webhookSecret) {
-			body.gitSource.githubApp.webhookSecret = decrypt(body.gitSource.githubApp.webhookSecret);
+		if (application?.gitSource?.githubApp?.clientSecret) {
+			application.gitSource.githubApp.clientSecret = decrypt(
+				application.gitSource.githubApp.clientSecret
+			);
 		}
-		if (body.gitSource?.githubApp?.privateKey) {
-			body.gitSource.githubApp.privateKey = decrypt(body.gitSource.githubApp.privateKey);
+		if (application?.gitSource?.githubApp?.webhookSecret) {
+			application.gitSource.githubApp.webhookSecret = decrypt(
+				application.gitSource.githubApp.webhookSecret
+			);
 		}
-		if (body?.gitSource?.gitlabApp?.appSecret) {
-			body.gitSource.gitlabApp.appSecret = decrypt(body.gitSource.gitlabApp.appSecret);
+		if (application?.gitSource?.githubApp?.privateKey) {
+			application.gitSource.githubApp.privateKey = decrypt(
+				application.gitSource.githubApp.privateKey
+			);
 		}
-		if (body?.gitSource?.gitlabApp?.webhookToken) {
-			body.gitSource.gitlabApp.webhookToken = decrypt(body.gitSource.gitlabApp.webhookToken);
+		if (application?.gitSource?.gitlabApp?.appSecret) {
+			application.gitSource.gitlabApp.appSecret = decrypt(
+				application.gitSource.gitlabApp.appSecret
+			);
 		}
-		if (body?.secrets.length > 0) {
-			body.secrets = body.secrets.map((s) => {
+		if (application?.gitSource?.gitlabApp?.webhookToken) {
+			application.gitSource.gitlabApp.webhookToken = decrypt(
+				application.gitSource.gitlabApp.webhookToken
+			);
+		}
+		if (application?.secrets.length > 0) {
+			application.secrets = application.secrets.map((s) => {
 				s.value = decrypt(s.value);
 				return s;
 			});
 		}
-
-		return { ...body };
+		return { ...application };
 	} catch (e) {
 		throw { status: 404, body: { message: e.message } };
 	}
 }
 export async function getApplicationById({ id }) {
 	const body = await prisma.application.findFirst({
-		where: { id }
+		where: { id },
+		include: { destinationDocker: true }
 	});
 
 	return { ...body };
@@ -127,17 +136,18 @@ export async function getApplication({ id, teamId }) {
 			destinationDocker: true,
 			settings: true,
 			gitSource: { include: { githubApp: true, gitlabApp: true } },
-			secrets: true
+			secrets: true,
+			persistentStorage: true
 		}
 	});
 
-	if (body.gitSource?.githubApp?.clientSecret) {
+	if (body?.gitSource?.githubApp?.clientSecret) {
 		body.gitSource.githubApp.clientSecret = decrypt(body.gitSource.githubApp.clientSecret);
 	}
-	if (body.gitSource?.githubApp?.webhookSecret) {
+	if (body?.gitSource?.githubApp?.webhookSecret) {
 		body.gitSource.githubApp.webhookSecret = decrypt(body.gitSource.githubApp.webhookSecret);
 	}
-	if (body.gitSource?.githubApp?.privateKey) {
+	if (body?.gitSource?.githubApp?.privateKey) {
 		body.gitSource.githubApp.privateKey = decrypt(body.gitSource.githubApp.privateKey);
 	}
 	if (body?.gitSource?.gitlabApp?.appSecret) {
@@ -153,24 +163,41 @@ export async function getApplication({ id, teamId }) {
 	return { ...body };
 }
 
-export async function configureGitRepository({ id, repository, branch, projectId, webhookToken }) {
+export async function configureGitRepository({
+	id,
+	repository,
+	branch,
+	projectId,
+	webhookToken,
+	autodeploy
+}) {
 	if (webhookToken) {
 		const encryptedWebhookToken = encrypt(webhookToken);
-		return await prisma.application.update({
+		await prisma.application.update({
 			where: { id },
 			data: {
 				repository,
 				branch,
 				projectId,
-				gitSource: { update: { gitlabApp: { update: { webhookToken: encryptedWebhookToken } } } }
+				gitSource: { update: { gitlabApp: { update: { webhookToken: encryptedWebhookToken } } } },
+				settings: { update: { autodeploy } }
 			}
 		});
 	} else {
-		return await prisma.application.update({
+		await prisma.application.update({
 			where: { id },
-			data: { repository, branch, projectId }
+			data: { repository, branch, projectId, settings: { update: { autodeploy } } }
 		});
 	}
+	if (!autodeploy) {
+		const applications = await prisma.application.findMany({ where: { branch, projectId } });
+		for (const application of applications) {
+			await prisma.applicationSettings.updateMany({
+				where: { applicationId: application.id },
+				data: { autodeploy: false }
+			});
+		}
+	}
 }
 
 export async function configureBuildPack({ id, buildPack }) {
@@ -205,10 +232,14 @@ export async function configureApplication({
 	});
 }
 
-export async function setApplicationSettings({ id, debug, previews }) {
+export async function checkDoubleBranch(branch, projectId) {
+	const applications = await prisma.application.findMany({ where: { branch, projectId } });
+	return applications.length > 1;
+}
+export async function setApplicationSettings({ id, debug, previews, dualCerts, autodeploy }) {
 	return await prisma.application.update({
 		where: { id },
-		data: { settings: { update: { debug, previews } } },
+		data: { settings: { update: { debug, previews, dualCerts, autodeploy } } },
 		include: { destinationDocker: true }
 	});
 }
@@ -235,3 +266,7 @@ export async function createBuild({
 		}
 	});
 }
+
+export async function getPersistentStorage(id) {
+	return await prisma.applicationPersistentStorage.findMany({ where: { applicationId: id } });
+}

src/lib/database/checks.ts

@@ -15,22 +15,44 @@ export async function isDockerNetworkExists({ network }) {
 	return await prisma.destinationDocker.findFirst({ where: { network } });
 }
 
-export async function isSecretExists({ id, name }) {
-	return await prisma.secret.findFirst({ where: { name, applicationId: id } });
+export async function isServiceSecretExists({ id, name }) {
+	return await prisma.serviceSecret.findFirst({ where: { name, serviceId: id } });
+}
+export async function isSecretExists({ id, name, isPRMRSecret }) {
+	return await prisma.secret.findFirst({ where: { name, applicationId: id, isPRMRSecret } });
 }
 
 export async function isDomainConfigured({ id, fqdn }) {
 	const domain = getDomain(fqdn);
+	const nakedDomain = domain.replace('www.', '');
 	const foundApp = await prisma.application.findFirst({
-		where: { fqdn: { endsWith: domain }, id: { not: id } },
+		where: {
+			OR: [
+				{ fqdn: { endsWith: `//${nakedDomain}` } },
+				{ fqdn: { endsWith: `//www.${nakedDomain}` } }
+			],
+			id: { not: id }
+		},
 		select: { fqdn: true }
 	});
 	const foundService = await prisma.service.findFirst({
-		where: { fqdn: { endsWith: domain }, id: { not: id } },
+		where: {
+			OR: [
+				{ fqdn: { endsWith: `//${nakedDomain}` } },
+				{ fqdn: { endsWith: `//www.${nakedDomain}` } }
+			],
+			id: { not: id }
+		},
 		select: { fqdn: true }
 	});
 	const coolifyFqdn = await prisma.setting.findFirst({
-		where: { fqdn: { endsWith: domain }, id: { not: id } },
+		where: {
+			OR: [
+				{ fqdn: { endsWith: `//${nakedDomain}` } },
+				{ fqdn: { endsWith: `//www.${nakedDomain}` } }
+			],
+			id: { not: id }
+		},
 		select: { fqdn: true }
 	});
 	if (foundApp || foundService || coolifyFqdn) return true;

src/lib/database/common.ts

@@ -2,6 +2,7 @@ import { dev } from '$app/env';
 import { sentry } from '$lib/common';
 import * as Prisma from '@prisma/client';
 import { default as ProdPrisma } from '@prisma/client';
+import type { PrismaClientOptions } from '@prisma/client/runtime';
 import generator from 'generate-password';
 import forge from 'node-forge';
 
@@ -19,29 +20,21 @@ if (!dev) {
 	PrismaClient = ProdPrisma.PrismaClient;
 	P = ProdPrisma.Prisma;
 }
-let prismaOptions = {
+
+export const prisma = new PrismaClient({
+	errorFormat: 'pretty',
 	rejectOnNotFound: false
-};
-if (dev) {
-	prismaOptions = {
-		errorFormat: 'pretty',
-		rejectOnNotFound: false,
-		log: [
-			{
-				emit: 'event',
-				level: 'query'
-			}
-		]
-	};
-}
-export const prisma = new PrismaClient(prismaOptions);
+});
 
 export function ErrorHandler(e) {
 	if (e! instanceof Error) {
 		e = new Error(e.toString());
 	}
 	let truncatedError = e;
-	if (e.message.includes('docker run')) {
+	if (e.stdout) {
+		truncatedError = e.stdout;
+	}
+	if (e.message?.includes('docker run')) {
 		let truncatedArray = [];
 		truncatedArray = truncatedError.message.split('-').filter((line) => {
 			if (!line.startsWith('e ')) {
@@ -50,7 +43,7 @@ export function ErrorHandler(e) {
 		});
 		truncatedError.message = truncatedArray.join('-');
 	}
-	if (e.message.includes('git clone')) {
+	if (e.message?.includes('git clone')) {
 		truncatedError.message = 'git clone failed';
 	}
 	sentry.captureException(truncatedError);
@@ -61,11 +54,11 @@ export function ErrorHandler(e) {
 			error: truncatedError.error || truncatedError.message
 		}
 	};
-	if (truncatedError.name === 'NotFoundError') {
+	if (truncatedError?.name === 'NotFoundError') {
 		payload.status = 404;
 	}
 	if (truncatedError instanceof P.PrismaClientKnownRequestError) {
-		if (truncatedError.code === 'P2002') {
+		if (truncatedError?.code === 'P2002') {
 			payload.body.message = 'Already exists. Choose another name.';
 		}
 	}
@@ -114,27 +107,94 @@ export const supportedServiceTypesAndVersions = [
 		name: 'plausibleanalytics',
 		fancyName: 'Plausible Analytics',
 		baseImage: 'plausible/analytics',
-		versions: ['latest']
+		images: ['bitnami/postgresql:13.2.0', 'yandex/clickhouse-server:21.3.2.5'],
+		versions: ['latest'],
+		ports: {
+			main: 8000
+		}
+	},
+	{
+		name: 'nocodb',
+		fancyName: 'NocoDB',
+		baseImage: 'nocodb/nocodb',
+		versions: ['latest'],
+		ports: {
+			main: 8080
+		}
+	},
+	{
+		name: 'minio',
+		fancyName: 'MinIO',
+		baseImage: 'minio/minio',
+		versions: ['latest'],
+		ports: {
+			main: 9001
+		}
 	},
-	{ name: 'nocodb', fancyName: 'NocoDB', baseImage: 'nocodb/nocodb', versions: ['latest'] },
-	{ name: 'minio', fancyName: 'MinIO', baseImage: 'minio/minio', versions: ['latest'] },
 	{
 		name: 'vscodeserver',
 		fancyName: 'VSCode Server',
 		baseImage: 'codercom/code-server',
-		versions: ['latest']
+		versions: ['latest'],
+		ports: {
+			main: 8080
+		}
 	},
 	{
 		name: 'wordpress',
 		fancyName: 'Wordpress',
 		baseImage: 'wordpress',
-		versions: ['latest', 'php8.1', 'php8.0', 'php7.4', 'php7.3']
+		images: ['bitnami/mysql:5.7'],
+		versions: ['latest', 'php8.1', 'php8.0', 'php7.4', 'php7.3'],
+		ports: {
+			main: 80
+		}
 	},
 	{
 		name: 'vaultwarden',
 		fancyName: 'Vaultwarden',
 		baseImage: 'vaultwarden/server',
-		versions: ['latest']
+		versions: ['latest'],
+		ports: {
+			main: 80
+		}
+	},
+	{
+		name: 'languagetool',
+		fancyName: 'LanguageTool',
+		baseImage: 'silviof/docker-languagetool',
+		versions: ['latest'],
+		ports: {
+			main: 8010
+		}
+	},
+	{
+		name: 'n8n',
+		fancyName: 'n8n',
+		baseImage: 'n8nio/n8n',
+		versions: ['latest'],
+		ports: {
+			main: 5678
+		}
+	},
+	{
+		name: 'uptimekuma',
+		fancyName: 'Uptime Kuma',
+		baseImage: 'louislam/uptime-kuma',
+		versions: ['latest'],
+		ports: {
+			main: 3001
+		}
+	},
+	{
+		name: 'ghost',
+		fancyName: 'Ghost',
+		baseImage: 'bitnami/ghost',
+		images: ['bitnami/mariadb'],
+		versions: ['latest'],
+		ports: {
+			main: 2368
+		}
 	}
 ];
 
@@ -159,6 +219,13 @@ export function getServiceImage(type) {
 	}
 	return '';
 }
+export function getServiceImages(type) {
+	const found = supportedServiceTypesAndVersions.find((t) => t.name === type);
+	if (found) {
+		return found.images;
+	}
+	return [];
+}
 export function generateDatabaseConfiguration(database) {
 	const {
 		id,

src/lib/database/databases.ts

@@ -1,9 +1,9 @@
 import { decrypt, encrypt } from '$lib/crypto';
-import { dockerInstance } from '$lib/docker';
+import * as db from '$lib/database';
 import cuid from 'cuid';
 import { generatePassword } from '.';
 import { prisma, ErrorHandler } from './common';
-import getPort from 'get-port';
+import getPort, { portNumbers } from 'get-port';
 import { asyncExecShell, getEngine, removeContainer } from '$lib/common';
 
 export async function listDatabases(teamId) {
@@ -16,24 +16,9 @@ export async function newDatabase({ name, teamId }) {
 	const rootUserPassword = encrypt(generatePassword());
 	const defaultDatabase = cuid();
 
-	let publicPort = await getPort();
-	let i = 0;
-
-	do {
-		const usedPorts = await prisma.database.findMany({ where: { publicPort } });
-		if (usedPorts.length === 0) break;
-		publicPort = await getPort();
-		i++;
-	} while (i < 10);
-	if (i === 9) {
-		throw {
-			error: 'No free port found!? Is it possible?'
-		};
-	}
 	return await prisma.database.create({
 		data: {
 			name,
-			publicPort,
 			defaultDatabase,
 			dbUser,
 			dbUserPassword,

src/lib/database/destinations.ts

@@ -1,4 +1,5 @@
 import { asyncExecShell, getEngine } from '$lib/common';
+import { decrypt, encrypt } from '$lib/crypto';
 import { dockerInstance } from '$lib/docker';
 import { startCoolifyProxy } from '$lib/haproxy';
 import { getDatabaseImage } from '.';
@@ -38,7 +39,7 @@ export async function configureDestinationForDatabase({ id, destinationId }) {
 		if (type && version) {
 			const baseImage = getDatabaseImage(type);
 			asyncExecShell(
-				`DOCKER_HOST=${host} docker pull ${baseImage}:${version} && echo "FROM ${baseImage}:${version}" | docker build --label coolify.managed="true" -t "${baseImage}:${version}" -`
+				`DOCKER_HOST=${host} docker pull ${baseImage}:${version} && echo "FROM ${baseImage}:${version}" | docker build --label coolify.image="true" -t "${baseImage}:${version}" -`
 			);
 		}
 	}
@@ -47,7 +48,36 @@ export async function updateDestination({ id, name, engine, network }) {
 	return await prisma.destinationDocker.update({ where: { id }, data: { name, engine, network } });
 }
 
-export async function newDestination({ name, teamId, engine, network, isCoolifyProxyUsed }) {
+export async function newRemoteDestination({
+	name,
+	teamId,
+	engine,
+	network,
+	isCoolifyProxyUsed,
+	remoteEngine,
+	ipAddress,
+	user,
+	port,
+	sshPrivateKey
+}) {
+	const encryptedPrivateKey = encrypt(sshPrivateKey);
+	const destination = await prisma.destinationDocker.create({
+		data: {
+			name,
+			teams: { connect: { id: teamId } },
+			engine,
+			network,
+			isCoolifyProxyUsed,
+			remoteEngine,
+			ipAddress,
+			user,
+			port,
+			sshPrivateKey: encryptedPrivateKey
+		}
+	});
+	return destination.id;
+}
+export async function newLocalDestination({ name, teamId, engine, network, isCoolifyProxyUsed }) {
 	const host = getEngine(engine);
 	const docker = dockerInstance({ destinationDocker: { engine, network } });
 	const found = await docker.engine.listNetworks({ filters: { name: [`^${network}$`] } });
@@ -94,9 +124,13 @@ export async function removeDestination({ id }) {
 }
 
 export async function getDestination({ id, teamId }) {
-	return await prisma.destinationDocker.findFirst({
+	let destination = await prisma.destinationDocker.findFirst({
 		where: { id, teams: { some: { id: teamId } } }
 	});
+	if (destination.remoteEngine) {
+		destination.sshPrivateKey = decrypt(destination.sshPrivateKey);
+	}
+	return destination;
 }
 export async function getDestinationByApplicationId({ id, teamId }) {
 	return await prisma.destinationDocker.findFirst({

src/lib/database/secrets.ts

@@ -1,19 +1,78 @@
-import { encrypt } from '$lib/crypto';
+import { encrypt, decrypt } from '$lib/crypto';
 import { prisma } from './common';
 
-export async function listSecrets({ applicationId }) {
-	return await prisma.secret.findMany({
+export async function listServiceSecrets(serviceId: string) {
+	let secrets = await prisma.serviceSecret.findMany({
+		where: { serviceId },
+		orderBy: { createdAt: 'desc' }
+	});
+	secrets = secrets.map((secret) => {
+		secret.value = decrypt(secret.value);
+		return secret;
+	});
+
+	return secrets;
+}
+
+export async function listSecrets(applicationId: string) {
+	let secrets = await prisma.secret.findMany({
 		where: { applicationId },
-		orderBy: { createdAt: 'desc' },
-		select: { id: true, createdAt: true, name: true, isBuildSecret: true }
+		orderBy: { createdAt: 'desc' }
+	});
+	secrets = secrets.map((secret) => {
+		secret.value = decrypt(secret.value);
+		return secret;
+	});
+
+	return secrets;
+}
+
+export async function createServiceSecret({ id, name, value }) {
+	value = encrypt(value);
+	return await prisma.serviceSecret.create({
+		data: { name, value, service: { connect: { id } } }
+	});
+}
+export async function createSecret({ id, name, value, isBuildSecret, isPRMRSecret }) {
+	value = encrypt(value);
+	return await prisma.secret.create({
+		data: { name, value, isBuildSecret, isPRMRSecret, application: { connect: { id } } }
 	});
 }
 
-export async function createSecret({ id, name, value, isBuildSecret }) {
+export async function updateServiceSecret({ id, name, value }) {
 	value = encrypt(value);
-	return await prisma.secret.create({
-		data: { name, value, isBuildSecret, application: { connect: { id } } }
-	});
+	const found = await prisma.serviceSecret.findFirst({ where: { serviceId: id, name } });
+
+	if (found) {
+		return await prisma.serviceSecret.updateMany({
+			where: { serviceId: id, name },
+			data: { value }
+		});
+	} else {
+		return await prisma.serviceSecret.create({
+			data: { name, value, service: { connect: { id } } }
+		});
+	}
+}
+export async function updateSecret({ id, name, value, isBuildSecret, isPRMRSecret }) {
+	value = encrypt(value);
+	const found = await prisma.secret.findFirst({ where: { applicationId: id, name, isPRMRSecret } });
+
+	if (found) {
+		return await prisma.secret.updateMany({
+			where: { applicationId: id, name, isPRMRSecret },
+			data: { value, isBuildSecret, isPRMRSecret }
+		});
+	} else {
+		return await prisma.secret.create({
+			data: { name, value, isBuildSecret, isPRMRSecret, application: { connect: { id } } }
+		});
+	}
+}
+
+export async function removeServiceSecret({ id, name }) {
+	return await prisma.serviceSecret.deleteMany({ where: { serviceId: id, name } });
 }
 
 export async function removeSecret({ id, name }) {

src/lib/database/services.ts

@@ -1,3 +1,4 @@
+import { asyncExecShell, getEngine } from '$lib/common';
 import { decrypt, encrypt } from '$lib/crypto';
 import cuid from 'cuid';
 import { generatePassword } from '.';
@@ -19,7 +20,9 @@ export async function getService({ id, teamId }) {
 			plausibleAnalytics: true,
 			minio: true,
 			vscodeserver: true,
-			wordpress: true
+			wordpress: true,
+			ghost: true,
+			serviceSecret: true
 		}
 	});
 
@@ -42,6 +45,18 @@ export async function getService({ id, teamId }) {
 	if (body.wordpress?.mysqlRootUserPassword)
 		body.wordpress.mysqlRootUserPassword = decrypt(body.wordpress.mysqlRootUserPassword);
 
+	if (body.ghost?.mariadbPassword) body.ghost.mariadbPassword = decrypt(body.ghost.mariadbPassword);
+	if (body.ghost?.mariadbRootUserPassword)
+		body.ghost.mariadbRootUserPassword = decrypt(body.ghost.mariadbRootUserPassword);
+	if (body.ghost?.defaultPassword) body.ghost.defaultPassword = decrypt(body.ghost.defaultPassword);
+
+	if (body?.serviceSecret.length > 0) {
+		body.serviceSecret = body.serviceSecret.map((s) => {
+			s.value = decrypt(s.value);
+			return s;
+		});
+	}
+
 	return { ...body };
 }
 
@@ -105,20 +120,75 @@ export async function configureServiceType({ id, type }) {
 				type
 			}
 		});
+	} else if (type === 'languagetool') {
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type
+			}
+		});
+	} else if (type === 'n8n') {
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type
+			}
+		});
+	} else if (type === 'uptimekuma') {
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type
+			}
+		});
+	} else if (type === 'ghost') {
+		const defaultEmail = `${cuid()}@coolify.io`;
+		const defaultPassword = encrypt(generatePassword());
+		const mariadbUser = cuid();
+		const mariadbPassword = encrypt(generatePassword());
+		const mariadbRootUser = cuid();
+		const mariadbRootUserPassword = encrypt(generatePassword());
+
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				ghost: {
+					create: {
+						defaultEmail,
+						defaultPassword,
+						mariadbUser,
+						mariadbPassword,
+						mariadbRootUser,
+						mariadbRootUserPassword
+					}
+				}
+			}
+		});
 	}
 }
-export async function setService({ id, version }) {
+export async function setServiceVersion({ id, version }) {
 	return await prisma.service.update({
 		where: { id },
 		data: { version }
 	});
 }
 
+export async function setServiceSettings({ id, dualCerts }) {
+	return await prisma.service.update({
+		where: { id },
+		data: { dualCerts }
+	});
+}
+
 export async function updatePlausibleAnalyticsService({ id, fqdn, email, username, name }) {
 	await prisma.plausibleAnalytics.update({ where: { serviceId: id }, data: { email, username } });
 	await prisma.service.update({ where: { id }, data: { name, fqdn } });
 }
-export async function updateNocoDbOrMinioService({ id, fqdn, name }) {
+export async function updateService({ id, fqdn, name }) {
+	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
+}
+export async function updateLanguageToolService({ id, fqdn, name }) {
 	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
 }
 export async function updateVaultWardenService({ id, fqdn, name }) {
@@ -136,11 +206,20 @@ export async function updateWordpress({ id, fqdn, name, mysqlDatabase, extraConf
 export async function updateMinioService({ id, publicPort }) {
 	return await prisma.minio.update({ where: { serviceId: id }, data: { publicPort } });
 }
+export async function updateGhostService({ id, fqdn, name, mariadbDatabase }) {
+	return await prisma.service.update({
+		where: { id },
+		data: { fqdn, name, ghost: { update: { mariadbDatabase } } }
+	});
+}
 
 export async function removeService({ id }) {
+	await prisma.ghost.deleteMany({ where: { serviceId: id } });
 	await prisma.plausibleAnalytics.deleteMany({ where: { serviceId: id } });
 	await prisma.minio.deleteMany({ where: { serviceId: id } });
 	await prisma.vscodeserver.deleteMany({ where: { serviceId: id } });
 	await prisma.wordpress.deleteMany({ where: { serviceId: id } });
+	await prisma.serviceSecret.deleteMany({ where: { serviceId: id } });
+
 	await prisma.service.delete({ where: { id } });
 }

src/lib/database/users.ts

@@ -6,19 +6,28 @@ import { asyncExecShell, uniqueName } from '$lib/common';
 
 import * as db from '$lib/database';
 import { startCoolifyProxy } from '$lib/haproxy';
-
-export async function login({ email, password }) {
+export async function hashPassword(password: string) {
 	const saltRounds = 15;
+	return bcrypt.hash(password, saltRounds);
+}
+export async function login({ email, password, isLogin }) {
 	const users = await prisma.user.count();
 	const userFound = await prisma.user.findUnique({
 		where: { email },
-		include: { teams: true },
+		include: { teams: true, permission: true },
 		rejectOnNotFound: false
 	});
+	if (!userFound && isLogin) {
+		throw {
+			error: 'Wrong password or email address.'
+		};
+	}
 	// Registration disabled if database is not seeded properly
 	const { isRegistrationEnabled, id } = await db.listSettings();
 
 	let uid = cuid();
+	let permission = 'read';
+	let isAdmin = false;
 	// Disable registration if we are registering the first user.
 	if (users === 0) {
 		await prisma.setting.update({ where: { id }, data: { isRegistrationEnabled: false } });
@@ -50,6 +59,8 @@ export async function login({ email, password }) {
 				};
 			}
 			uid = userFound.id;
+			// permission = userFound.permission;
+			isAdmin = true;
 		}
 	} else {
 		// If registration disabled, return 403
@@ -59,8 +70,10 @@ export async function login({ email, password }) {
 			};
 		}
 
-		const hashedPassword = await bcrypt.hash(password, saltRounds);
+		const hashedPassword = await hashPassword(password);
 		if (users === 0) {
+			permission = 'owner';
+			isAdmin = true;
 			await prisma.user.create({
 				data: {
 					id: uid,
@@ -103,8 +116,10 @@ export async function login({ email, password }) {
 			'Set-Cookie': `teamId=${uid}; HttpOnly; Path=/; Max-Age=15778800;`
 		},
 		body: {
-			uid,
-			teamId: uid
+			userId: uid,
+			teamId: uid,
+			permission,
+			isAdmin
 		}
 	};
 }

src/lib/docker.ts

@@ -1,5 +1,6 @@
 import Dockerode from 'dockerode';
 import { promises as fs } from 'fs';
+import { checkPnpm } from './buildPacks/common';
 import { saveBuildLog } from './common';
 
 export async function buildCacheImageWithNode(data, imageForBuild) {
@@ -13,32 +14,37 @@ export async function buildCacheImageWithNode(data, imageForBuild) {
 		installCommand,
 		buildCommand,
 		debug,
-		secrets
+		secrets,
+		pullmergeRequestId
 	} = data;
+	const isPnpm = checkPnpm(installCommand, buildCommand);
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${imageForBuild}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
 	if (secrets.length > 0) {
 		secrets.forEach((secret) => {
-			if (!secret.isBuildSecret) {
-				Dockerfile.push(`ARG ${secret.name} ${secret.value}`);
+			if (secret.isBuildSecret) {
+				if (pullmergeRequestId) {
+					if (secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				} else {
+					if (!secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				}
 			}
 		});
 	}
-	// TODO: If build command defined, install command should be the default yarn install
+	if (isPnpm) {
+		Dockerfile.push('RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm');
+		Dockerfile.push('RUN pnpm add -g pnpm');
+	}
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
 	if (installCommand) {
-		Dockerfile.push(`COPY ./${baseDirectory || ''}package*.json ./`);
-		try {
-			await fs.stat(`${workdir}/yarn.lock`);
-			Dockerfile.push(`COPY ./${baseDirectory || ''}yarn.lock ./`);
-		} catch (error) {}
-		try {
-			await fs.stat(`${workdir}/pnpm-lock.yaml`);
-			Dockerfile.push(`COPY ./${baseDirectory || ''}pnpm-lock.yaml ./`);
-		} catch (error) {}
 		Dockerfile.push(`RUN ${installCommand}`);
 	}
-	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 });
@@ -59,14 +65,14 @@ export async function buildCacheImageWithCargo(data, imageForBuild) {
 	} = data;
 	const Dockerfile: Array<string> = [];
 	Dockerfile.push(`FROM ${imageForBuild} as planner-${applicationId}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push('RUN cargo install cargo-chef');
 	Dockerfile.push('COPY . .');
 	Dockerfile.push('RUN cargo chef prepare --recipe-path recipe.json');
 	Dockerfile.push(`FROM ${imageForBuild}`);
-	Dockerfile.push('WORKDIR /usr/src/app');
+	Dockerfile.push('WORKDIR /app');
 	Dockerfile.push('RUN cargo install cargo-chef');
-	Dockerfile.push(`COPY --from=planner-${applicationId} /usr/src/app/recipe.json recipe.json`);
+	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 });

src/lib/github.ts

@@ -1,9 +0,0 @@
-export function dashify(str: string, options?: any): string {
-	if (typeof str !== 'string') return str;
-	return str
-		.trim()
-		.replace(/\W/g, (m) => (/[À-ž]/.test(m) ? m : '-'))
-		.replace(/^-+|-+$/g, '')
-		.replace(/-{2,}/g, (m) => (options && options.condense ? '-' : m))
-		.toLowerCase();
-}

src/lib/haproxy/configuration.ts

@@ -0,0 +1,286 @@
+import { dev } from '$app/env';
+import got from 'got';
+import mustache from 'mustache';
+import crypto from 'crypto';
+
+import * as db from '$lib/database';
+import { checkContainer, checkHAProxy } from '.';
+import { asyncExecShell, getDomain, getEngine } from '$lib/common';
+
+const url = dev ? 'http://localhost:5555' : 'http://coolify-haproxy:5555';
+
+let template = `program api 
+  command /usr/bin/dataplaneapi -f /usr/local/etc/haproxy/dataplaneapi.hcl --userlist haproxy-dataplaneapi
+  no option start-on-reload
+	
+global
+  stats socket /var/run/api.sock user haproxy group haproxy mode 660 level admin expose-fd listeners
+  log stdout format raw local0 debug
+		 
+defaults 
+  mode http
+  log global
+  timeout http-request 60s
+  timeout connect 10s
+  timeout client 60s
+  timeout server 60s
+
+userlist haproxy-dataplaneapi 
+  user admin insecure-password "\${HAPROXY_PASSWORD}"
+
+frontend http
+  mode http
+  bind :80
+  bind :443 ssl crt /usr/local/etc/haproxy/ssl/ alpn h2,http/1.1
+  acl is_certbot path_beg /.well-known/acme-challenge/
+
+  {{#applications}}
+  {{#isHttps}}
+  http-request redirect scheme https code ${
+		dev ? 302 : 301
+	} if { hdr(host) -i {{domain}} } !{ ssl_fc }
+  {{/isHttps}}
+  http-request redirect location {{{redirectValue}}} code ${
+		dev ? 302 : 301
+	} if { req.hdr(host) -i {{redirectTo}} }
+  {{/applications}}
+
+  {{#services}}
+  {{#isHttps}}
+  http-request redirect scheme https code ${
+		dev ? 302 : 301
+	} if { hdr(host) -i {{domain}} } !{ ssl_fc }
+  {{/isHttps}}
+  http-request redirect location {{{redirectValue}}} code ${
+		dev ? 302 : 301
+	} if { req.hdr(host) -i {{redirectTo}} }
+  {{/services}}
+
+  {{#coolify}}
+  {{#isHttps}}
+  http-request redirect scheme https code ${
+		dev ? 302 : 301
+	} if { hdr(host) -i {{domain}} } !{ ssl_fc }
+  {{/isHttps}}
+  http-request redirect location {{{redirectValue}}} code ${
+		dev ? 302 : 301
+	} if { req.hdr(host) -i {{redirectTo}} }
+  {{/coolify}}
+
+  use_backend backend-certbot if is_certbot
+  use_backend %[req.hdr(host),lower]
+
+frontend stats 
+  bind *:8404
+  stats enable
+  stats uri /
+  stats admin if TRUE
+  stats auth "\${HAPROXY_USERNAME}:\${HAPROXY_PASSWORD}"
+
+backend backend-certbot 
+  mode http
+  server certbot host.docker.internal:9080
+
+{{#applications}}
+{{#isRunning}}
+# updatedAt={{updatedAt}}
+backend {{domain}}
+  option forwardfor
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
+  server {{id}} {{id}}:{{port}}
+{{/isRunning}}
+{{/applications}}
+
+{{#services}}
+{{#isRunning}}
+# updatedAt={{updatedAt}}
+backend {{domain}}
+  option forwardfor
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
+  server {{id}} {{id}}:{{port}}
+{{/isRunning}}
+{{/services}}
+
+{{#coolify}}
+backend {{domain}}
+  option forwardfor
+  option httpchk GET /undead.json
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
+  server {{id}} {{id}}:{{port}} check fall 10
+{{/coolify}}
+`;
+export async function haproxyInstance() {
+	const { proxyPassword } = await db.listSettings();
+	return got.extend({
+		prefixUrl: url,
+		username: 'admin',
+		password: proxyPassword
+	});
+}
+
+export async function configureHAProxy() {
+	const haproxy = await haproxyInstance();
+	await checkHAProxy(haproxy);
+
+	try {
+		const data = {
+			applications: [],
+			services: [],
+			coolify: []
+		};
+		const applications = await db.prisma.application.findMany({
+			include: { destinationDocker: true, settings: true }
+		});
+		for (const application of applications) {
+			const {
+				fqdn,
+				id,
+				port,
+				destinationDocker,
+				destinationDockerId,
+				settings: { previews },
+				updatedAt
+			} = application;
+			if (destinationDockerId) {
+				const { engine, network } = destinationDocker;
+				const isRunning = await checkContainer(engine, id);
+				if (fqdn) {
+					const domain = getDomain(fqdn);
+					const isHttps = fqdn.startsWith('https://');
+					const isWWW = fqdn.includes('www.');
+					const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
+					if (isRunning) {
+						data.applications.push({
+							id,
+							port: port || 3000,
+							domain,
+							isRunning,
+							isHttps,
+							redirectValue,
+							redirectTo: isWWW ? domain : 'www.' + domain,
+							updatedAt: updatedAt.getTime()
+						});
+					}
+					if (previews) {
+						const host = getEngine(engine);
+						const { stdout } = await asyncExecShell(
+							`DOCKER_HOST=${host} docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"`
+						);
+						const containers = stdout
+							.trim()
+							.split('\n')
+							.filter((a) => a)
+							.map((c) => c.replace(/"/g, ''));
+						if (containers.length > 0) {
+							for (const container of containers) {
+								let previewDomain = `${container.split('-')[1]}.${domain}`;
+								data.applications.push({
+									id: container,
+									port: port || 3000,
+									domain: previewDomain,
+									isRunning,
+									isHttps,
+									redirectValue,
+									redirectTo: isWWW ? previewDomain : 'www.' + previewDomain,
+									updatedAt: updatedAt.getTime()
+								});
+							}
+						}
+					}
+				}
+			}
+		}
+		const services = await db.prisma.service.findMany({
+			include: {
+				destinationDocker: true,
+				minio: true,
+				plausibleAnalytics: true,
+				vscodeserver: true,
+				wordpress: true,
+				ghost: true
+			}
+		});
+
+		for (const service of services) {
+			const { fqdn, id, type, destinationDocker, destinationDockerId, updatedAt } = service;
+			if (destinationDockerId) {
+				const { engine } = destinationDocker;
+				const found = db.supportedServiceTypesAndVersions.find((a) => a.name === type);
+				if (found) {
+					const port = found.ports.main;
+					const publicPort = service[type]?.publicPort;
+					const isRunning = await checkContainer(engine, id);
+					if (fqdn) {
+						const domain = getDomain(fqdn);
+						const isHttps = fqdn.startsWith('https://');
+						const isWWW = fqdn.includes('www.');
+						const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
+						if (isRunning) {
+							data.services.push({
+								id,
+								port,
+								publicPort,
+								domain,
+								isRunning,
+								isHttps,
+								redirectValue,
+								redirectTo: isWWW ? domain : 'www.' + domain,
+								updatedAt: updatedAt.getTime()
+							});
+						}
+					}
+				}
+			}
+		}
+		const { fqdn } = await db.prisma.setting.findFirst();
+		if (fqdn) {
+			const domain = getDomain(fqdn);
+			const isHttps = fqdn.startsWith('https://');
+			const isWWW = fqdn.includes('www.');
+			const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
+			data.coolify.push({
+				id: dev ? 'host.docker.internal' : 'coolify',
+				port: 3000,
+				domain,
+				isHttps,
+				redirectValue,
+				redirectTo: isWWW ? domain : 'www.' + domain
+			});
+		}
+		const output = mustache.render(template, data);
+		const newHash = crypto.createHash('md5').update(output).digest('hex');
+		const { proxyHash, id } = await db.listSettings();
+		if (proxyHash !== newHash) {
+			await db.prisma.setting.update({ where: { id }, data: { proxyHash: newHash } });
+			await haproxy.post(`v2/services/haproxy/configuration/raw`, {
+				searchParams: {
+					skip_version: true
+				},
+				body: output,
+				headers: {
+					'Content-Type': 'text/plain'
+				}
+			});
+		}
+	} catch (error) {
+		throw error;
+	}
+}

src/lib/haproxy/index.ts

@@ -1,8 +1,7 @@
 import { dev } from '$app/env';
-import { asyncExecShell, getDomain, getEngine } from '$lib/common';
+import { asyncExecShell, getEngine } from '$lib/common';
 import got from 'got';
 import * as db from '$lib/database';
-import { letsEncrypt } from '$lib/letsencrypt';
 
 const url = dev ? 'http://localhost:5555' : 'http://coolify-haproxy:5555';
 
@@ -48,128 +47,14 @@ export async function completeTransaction(transactionId) {
 	const haproxy = await haproxyInstance();
 	return await haproxy.put(`v2/services/haproxy/transactions/${transactionId}`);
 }
-
-export async function removeProxyConfiguration({ domain }) {
-	const haproxy = await haproxyInstance();
-	const backendFound = await haproxy
-		.get(`v2/services/haproxy/configuration/backends/${domain}`)
-		.json();
-	if (backendFound) {
-		const transactionId = await getNextTransactionId();
-		await haproxy
-			.delete(`v2/services/haproxy/configuration/backends/${domain}`, {
-				searchParams: {
-					transaction_id: transactionId
-				}
-			})
-			.json();
-		await completeTransaction(transactionId);
-	}
-	await removeWwwRedirection(domain);
-}
-export async function forceSSLOffApplication({ domain }) {
-	if (!dev) {
-		const haproxy = await haproxyInstance();
-		await checkHAProxy(haproxy);
-		const transactionId = await getNextTransactionId();
-		try {
-			const rules: any = await haproxy
-				.get(`v2/services/haproxy/configuration/http_request_rules`, {
-					searchParams: {
-						parent_name: 'http',
-						parent_type: 'frontend'
-					}
-				})
-				.json();
-			if (rules.data.length > 0) {
-				const rule = rules.data.find((rule) => rule.cond_test.includes(`-i ${domain}`));
-				if (rule) {
-					await haproxy
-						.delete(`v2/services/haproxy/configuration/http_request_rules/${rule.index}`, {
-							searchParams: {
-								transaction_id: transactionId,
-								parent_name: 'http',
-								parent_type: 'frontend'
-							}
-						})
-						.json();
-				}
-			}
-		} catch (error) {
-			console.log(error);
-		} finally {
-			await completeTransaction(transactionId);
-		}
-	} else {
-		console.log(`[DEBUG] Removing ssl for ${domain}`);
-	}
-}
-export async function forceSSLOnApplication({ domain }) {
-	if (!dev) {
-		const haproxy = await haproxyInstance();
-		try {
-			await checkHAProxy(haproxy);
-		} catch (error) {
-			return;
-		}
-		const transactionId = await getNextTransactionId();
-
-		try {
-			const rules: any = await haproxy
-				.get(`v2/services/haproxy/configuration/http_request_rules`, {
-					searchParams: {
-						parent_name: 'http',
-						parent_type: 'frontend'
-					}
-				})
-				.json();
-			let nextRule = 0;
-			if (rules.data.length > 0) {
-				const rule = rules.data.find((rule) =>
-					rule.cond_test.includes(`{ hdr(host) -i ${domain} } !{ ssl_fc }`)
-				);
-				if (rule) return;
-				nextRule = rules.data[rules.data.length - 1].index + 1;
-			}
-			await haproxy
-				.post(`v2/services/haproxy/configuration/http_request_rules`, {
-					searchParams: {
-						transaction_id: transactionId,
-						parent_name: 'http',
-						parent_type: 'frontend'
-					},
-					json: {
-						index: nextRule,
-						cond: 'if',
-						cond_test: `{ hdr(host) -i ${domain} } !{ ssl_fc }`,
-						type: 'redirect',
-						redir_type: 'scheme',
-						redir_value: 'https',
-						redir_code: 301
-					}
-				})
-				.json();
-		} catch (error) {
-			console.log(error);
-			throw error;
-		} finally {
-			await completeTransaction(transactionId);
-		}
-	} else {
-		console.log(`[DEBUG] Adding ssl for ${domain}`);
-	}
-}
-
 export async function deleteProxy({ id }) {
 	const haproxy = await haproxyInstance();
-	try {
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return;
-	}
-	const transactionId = await getNextTransactionId();
+	await checkHAProxy(haproxy);
+
+	let transactionId;
 	try {
 		await haproxy.get(`v2/services/haproxy/configuration/backends/${id}`).json();
+		transactionId = await getNextTransactionId();
 		await haproxy
 			.delete(`v2/services/haproxy/configuration/backends/${id}`, {
 				searchParams: {
@@ -186,9 +71,9 @@ export async function deleteProxy({ id }) {
 			})
 			.json();
 	} catch (error) {
-		console.log(error.response.body);
+		console.log(error.response?.body || error);
 	} finally {
-		await completeTransaction(transactionId);
+		if (transactionId) await completeTransaction(transactionId);
 	}
 }
 
@@ -196,198 +81,15 @@ export async function reloadHaproxy(engine) {
 	const host = getEngine(engine);
 	return await asyncExecShell(`DOCKER_HOST=${host} docker exec coolify-haproxy kill -HUP 1`);
 }
-export async function configureProxyForApplication({ domain, imageId, applicationId, port }) {
-	const haproxy = await haproxyInstance();
-	try {
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return;
-	}
-
-	let serverConfigured = false;
-	let backendAvailable: any = null;
-
-	try {
-		backendAvailable = await haproxy
-			.get(`v2/services/haproxy/configuration/backends/${domain}`)
-			.json();
-		const server: any = await haproxy
-			.get(`v2/services/haproxy/configuration/servers/${imageId}`, {
-				searchParams: {
-					backend: domain
-				}
-			})
-			.json();
-
-		if (backendAvailable && server) {
-			// Very sophisticated way to check if the server is already configured in proxy
-			if (backendAvailable.data.forwardfor.enabled === 'enabled') {
-				if (backendAvailable.data.name === domain) {
-					if (server.data.check === 'enabled') {
-						if (server.data.address === applicationId) {
-							if (server.data.port === port) {
-								serverConfigured = true;
-							}
-						}
-					}
-				}
-			}
-		}
-	} catch (error) {
-		//console.log('error getting backend or server', error?.response?.body);
-		//
-	}
-
-	if (serverConfigured) return;
-	const transactionId = await getNextTransactionId();
-	if (backendAvailable) {
-		await haproxy
-			.delete(`v2/services/haproxy/configuration/backends/${domain}`, {
-				searchParams: {
-					transaction_id: transactionId
-				}
-			})
-			.json();
-	}
-	try {
-		await haproxy.post('v2/services/haproxy/configuration/backends', {
-			searchParams: {
-				transaction_id: transactionId
-			},
-			json: {
-				'init-addr': 'last,libc,none',
-				forwardfor: { enabled: 'enabled' },
-				name: domain
-			}
-		});
-
-		await haproxy.post('v2/services/haproxy/configuration/servers', {
-			searchParams: {
-				transaction_id: transactionId,
-				backend: domain
-			},
-			json: {
-				address: imageId,
-				check: 'enabled',
-				name: imageId,
-				port: port
-			}
-		});
-	} catch (error) {
-		throw error?.response?.body || error;
-	} finally {
-		await completeTransaction(transactionId);
-	}
-}
-
-export async function configureCoolifyProxyOff(fqdn) {
-	const domain = getDomain(fqdn);
-	const haproxy = await haproxyInstance();
-	try {
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return;
-	}
-
-	try {
-		const transactionId = await getNextTransactionId();
-		await haproxy.get(`v2/services/haproxy/configuration/backends/${domain}`).json();
-		await haproxy
-			.delete(`v2/services/haproxy/configuration/backends/${domain}`, {
-				searchParams: {
-					transaction_id: transactionId
-				}
-			})
-			.json();
-		await completeTransaction(transactionId);
-		if (!dev) {
-			await forceSSLOffApplication({ domain });
-		}
-		await setWwwRedirection(fqdn);
-	} catch (error) {
-		throw error?.response?.body || error;
-	}
-}
-export async function checkHAProxy(haproxy) {
+export async function checkHAProxy(haproxy?: any) {
 	if (!haproxy) haproxy = await haproxyInstance();
 	try {
 		await haproxy.get('v2/info');
 	} catch (error) {
-		throw 'HAProxy is not running, but it should be!';
-	}
-}
-export async function configureCoolifyProxyOn(fqdn) {
-	const domain = getDomain(fqdn);
-	const haproxy = await haproxyInstance();
-	try {
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return;
-	}
-	let serverConfigured = false;
-	let backendAvailable: any = null;
-	try {
-		backendAvailable = await haproxy
-			.get(`v2/services/haproxy/configuration/backends/${domain}`)
-			.json();
-		const server: any = await haproxy
-			.get(`v2/services/haproxy/configuration/servers/coolify`, {
-				searchParams: {
-					backend: domain
-				}
-			})
-			.json();
-		if (backendAvailable && server) {
-			// Very sophisticated way to check if the server is already configured in proxy
-			if (backendAvailable.data.forwardfor.enabled === 'enabled') {
-				if (backendAvailable.data.name === domain) {
-					if (server.data.check === 'enabled') {
-						if (server.data.address === dev ? 'host.docker.internal' : 'coolify') {
-							if (server.data.port === 3000) {
-								serverConfigured = true;
-							}
-						}
-					}
-				}
-			}
-		}
-	} catch (error) {}
-	if (serverConfigured) return;
-	const transactionId = await getNextTransactionId();
-	try {
-		await haproxy.post('v2/services/haproxy/configuration/backends', {
-			searchParams: {
-				transaction_id: transactionId
-			},
-			json: {
-				adv_check: 'httpchk',
-				httpchk_params: {
-					method: 'GET',
-					uri: '/undead.json'
-				},
-				'init-addr': 'last,libc,none',
-				forwardfor: { enabled: 'enabled' },
-				name: domain
-			}
-		});
-		await haproxy.post('v2/services/haproxy/configuration/servers', {
-			searchParams: {
-				transaction_id: transactionId,
-				backend: domain
-			},
-			json: {
-				address: dev ? 'host.docker.internal' : 'coolify',
-				check: 'enabled',
-				fall: 10,
-				name: 'coolify',
-				port: 3000
-			}
-		});
-	} catch (error) {
-		console.log(error);
-		throw error;
-	} finally {
-		await completeTransaction(transactionId);
+		throw {
+			message:
+				'Coolify Proxy is not running, but it should be!<br><br>Start it in the "Destinations" menu.'
+		};
 	}
 }
 
@@ -453,15 +155,16 @@ export async function startHttpProxy(destinationDocker, id, publicPort, privateP
 export async function startCoolifyProxy(engine) {
 	const host = getEngine(engine);
 	const found = await checkContainer(engine, 'coolify-haproxy');
-	const { proxyPassword, proxyUser } = await db.listSettings();
+	const { proxyPassword, proxyUser, id } = await db.listSettings();
 	if (!found) {
 		const { stdout: Config } = await asyncExecShell(
 			`DOCKER_HOST="${host}" docker network inspect bridge --format '{{json .IPAM.Config }}'`
 		);
 		const ip = JSON.parse(Config)[0].Gateway;
 		await asyncExecShell(
-			`DOCKER_HOST="${host}" docker run -e HAPROXY_USERNAME=${proxyUser} -e HAPROXY_PASSWORD=${proxyPassword} --restarts always --add-host 'host.docker.internal:host-gateway' --add-host 'host.docker.internal:${ip}' -v coolify-ssl-certs:/usr/local/etc/haproxy/ssl --network coolify-infra -p "80:80" -p "443:443" -p "8404:8404" -p "5555:5555" -p "5000:5000" --name coolify-haproxy -d coollabsio/${defaultProxyImage}`
+			`DOCKER_HOST="${host}" docker run -e HAPROXY_USERNAME=${proxyUser} -e HAPROXY_PASSWORD=${proxyPassword} --restart always --add-host 'host.docker.internal:host-gateway' --add-host 'host.docker.internal:${ip}' -v coolify-ssl-certs:/usr/local/etc/haproxy/ssl --network coolify-infra -p "80:80" -p "443:443" -p "8404:8404" -p "5555:5555" -p "5000:5000" --name coolify-haproxy -d coollabsio/${defaultProxyImage}`
 		);
+		await db.prisma.setting.update({ where: { id }, data: { proxyHash: null } });
 	}
 	await configureNetworkCoolifyProxy(engine);
 }
@@ -473,11 +176,9 @@ export async function checkContainer(engine, container) {
 		const { stdout } = await asyncExecShell(
 			`DOCKER_HOST="${host}" docker inspect --format '{{json .State}}' ${container}`
 		);
-
 		const parsedStdout = JSON.parse(stdout);
 		const status = parsedStdout.Status;
-		const isRunning = parsedStdout.Running;
-
+		const isRunning = status === 'running' ? true : false;
 		if (status === 'exited' || status === 'created') {
 			await asyncExecShell(`DOCKER_HOST="${host}" docker rm ${container}`);
 		}
@@ -494,6 +195,8 @@ export async function stopCoolifyProxy(engine) {
 	const host = getEngine(engine);
 	const found = await checkContainer(engine, 'coolify-haproxy');
 	await db.setDestinationSettings({ engine, isCoolifyProxyUsed: false });
+	const { id } = await db.prisma.setting.findFirst({});
+	await db.prisma.setting.update({ where: { id }, data: { proxyHash: null } });
 	try {
 		if (found) {
 			await asyncExecShell(
@@ -518,170 +221,3 @@ export async function configureNetworkCoolifyProxy(engine) {
 		}
 	});
 }
-
-export async function configureSimpleServiceProxyOn({ id, domain, port }) {
-	const haproxy = await haproxyInstance();
-	await checkHAProxy(haproxy);
-	try {
-		await haproxy.get(`v2/services/haproxy/configuration/backends/${domain}`).json();
-		const transactionId = await getNextTransactionId();
-		await haproxy
-			.delete(`v2/services/haproxy/configuration/backends/${domain}`, {
-				searchParams: {
-					transaction_id: transactionId
-				}
-			})
-			.json();
-		await completeTransaction(transactionId);
-	} catch (error) {}
-	try {
-		const transactionId = await getNextTransactionId();
-		await haproxy.post('v2/services/haproxy/configuration/backends', {
-			searchParams: {
-				transaction_id: transactionId
-			},
-			json: {
-				'init-addr': 'last,libc,none',
-				forwardfor: { enabled: 'enabled' },
-				name: domain
-			}
-		});
-		await haproxy.post('v2/services/haproxy/configuration/servers', {
-			searchParams: {
-				transaction_id: transactionId,
-				backend: domain
-			},
-			json: {
-				address: id,
-				check: 'enabled',
-				name: id,
-				port: port
-			}
-		});
-		console.log({
-			address: id,
-			check: 'enabled',
-			name: id,
-			port: port
-		});
-		await completeTransaction(transactionId);
-	} catch (error) {
-		console.log(error);
-	}
-}
-
-export async function configureSimpleServiceProxyOff({ domain }) {
-	const haproxy = await haproxyInstance();
-	try {
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return;
-	}
-
-	try {
-		await haproxy.get(`v2/services/haproxy/configuration/backends/${domain}`).json();
-		const transactionId = await getNextTransactionId();
-		await haproxy
-			.delete(`v2/services/haproxy/configuration/backends/${domain}`, {
-				searchParams: {
-					transaction_id: transactionId
-				}
-			})
-			.json();
-		await completeTransaction(transactionId);
-	} catch (error) {}
-	await removeWwwRedirection(domain);
-	return;
-}
-
-export async function removeWwwRedirection(domain) {
-	const haproxy = await haproxyInstance();
-	try {
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return;
-	}
-
-	const rules: any = await haproxy
-		.get(`v2/services/haproxy/configuration/http_request_rules`, {
-			searchParams: {
-				parent_name: 'http',
-				parent_type: 'frontend'
-			}
-		})
-		.json();
-	if (rules.data.length > 0) {
-		const rule = rules.data.find((rule) =>
-			rule.redir_value.includes(`${domain}%[capture.req.uri]`)
-		);
-		if (rule) {
-			const transactionId = await getNextTransactionId();
-			await haproxy
-				.delete(`v2/services/haproxy/configuration/http_request_rules/${rule.index}`, {
-					searchParams: {
-						transaction_id: transactionId,
-						parent_name: 'http',
-						parent_type: 'frontend'
-					}
-				})
-				.json();
-			await completeTransaction(transactionId);
-		}
-	}
-}
-export async function setWwwRedirection(fqdn) {
-	const haproxy = await haproxyInstance();
-	try {
-		await checkHAProxy(haproxy);
-	} catch (error) {
-		return;
-	}
-	const transactionId = await getNextTransactionId();
-
-	try {
-		const domain = getDomain(fqdn);
-		const isHttps = fqdn.startsWith('https://');
-		const isWWW = fqdn.includes('www.');
-		const contTest = `{ req.hdr(host) -i ${isWWW ? domain.replace('www.', '') : `www.${domain}`} }`;
-		const rules: any = await haproxy
-			.get(`v2/services/haproxy/configuration/http_request_rules`, {
-				searchParams: {
-					parent_name: 'http',
-					parent_type: 'frontend'
-				}
-			})
-			.json();
-		let nextRule = 0;
-		if (rules.data.length > 0) {
-			const rule = rules.data.find((rule) =>
-				rule.redir_value.includes(`${domain}%[capture.req.uri]`)
-			);
-			if (rule) return;
-			nextRule = rules.data[rules.data.length - 1].index + 1;
-		}
-		const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
-		await haproxy
-			.post(`v2/services/haproxy/configuration/http_request_rules`, {
-				searchParams: {
-					transaction_id: transactionId,
-					parent_name: 'http',
-					parent_type: 'frontend'
-				},
-				json: {
-					index: nextRule,
-					cond: 'if',
-					cond_test: contTest,
-					type: 'redirect',
-					redir_type: 'location',
-					redir_value: redirectValue,
-					redir_code: dev ? 302 : 301
-				}
-			})
-			.json();
-	} catch (error) {
-		console.log(error);
-		throw error;
-	} finally {
-		await completeTransaction(transactionId);
-	}
-}

src/lib/importers/github.ts

@@ -14,7 +14,7 @@ export default async function ({
 	buildId
 }): Promise<any> {
 	try {
-		saveBuildLog({ line: 'GitHub importer started', buildId, applicationId });
+		saveBuildLog({ line: 'GitHub importer started.', buildId, applicationId });
 		const { privateKey, appId, installationId } = await db.getUniqueGithubApp({ githubAppId });
 		const githubPrivateKey = privateKey.replace(/\\n/g, '\n').replace(/"/g, '');
 
@@ -45,6 +45,7 @@ export default async function ({
 		const { stdout: commit } = await asyncExecShell(`cd ${workdir}/ && git rev-parse HEAD`);
 		return commit.replace('\n', '');
 	} catch (error) {
+		console.log({ error });
 		return ErrorHandler(error);
 	}
 }

src/lib/letsencrypt.ts

@@ -1,50 +0,0 @@
-import { dev } from '$app/env';
-import { forceSSLOffApplication, forceSSLOnApplication, getNextTransactionId } from '$lib/haproxy';
-import { asyncExecShell, getEngine } from './common';
-import * as db from '$lib/database';
-import cuid from 'cuid';
-
-export async function letsEncrypt({ domain, isCoolify = false, id = null }) {
-	try {
-		const randomCuid = cuid();
-		if (dev) {
-			return await forceSSLOnApplication({ domain });
-		} else {
-			if (isCoolify) {
-				await asyncExecShell(
-					`docker run --rm --name certbot-${randomCuid} -p 9080:9080 -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port 9080 -d ${domain} --agree-tos --non-interactive --register-unsafely-without-email`
-				);
-
-				const { stderr } = await asyncExecShell(
-					`docker run --rm -v "coolify-letsencrypt:/etc/letsencrypt" -v "coolify-ssl-certs:/app/ssl" alpine:latest cat /etc/letsencrypt/live/${domain}/fullchain.pem /etc/letsencrypt/live/${domain}/privkey.pem > /app/ssl/${domain}.pem`
-				);
-				if (stderr) throw new Error(stderr);
-				return;
-			}
-			let data: any = await db.prisma.application.findUnique({
-				where: { id },
-				include: { destinationDocker: true }
-			});
-			if (!data) {
-				data = await db.prisma.service.findUnique({
-					where: { id },
-					include: { destinationDocker: true }
-				});
-			}
-			// Set SSL with Let's encrypt
-			if (data.destinationDockerId && data.destinationDocker) {
-				const host = getEngine(data.destinationDocker.engine);
-				await asyncExecShell(
-					`DOCKER_HOST=${host} docker run --rm --name certbot-${randomCuid} -p 9080:9080 -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port 9080 -d ${domain} --agree-tos --non-interactive --register-unsafely-without-email`
-				);
-				const { stderr } = await asyncExecShell(
-					`DOCKER_HOST=${host} docker run --rm --name bash-${randomCuid} -v "coolify-letsencrypt:/etc/letsencrypt" -v "coolify-ssl-certs:/app/ssl" alpine:latest cat /etc/letsencrypt/live/${domain}/fullchain.pem /etc/letsencrypt/live/${domain}/privkey.pem > /app/ssl/${domain}.pem`
-				);
-				if (stderr) throw new Error(stderr);
-				await forceSSLOnApplication({ domain });
-			}
-		}
-	} catch (error) {
-		throw error;
-	}
-}

src/lib/letsencrypt/index.ts

@@ -0,0 +1,193 @@
+import { asyncExecShell, getDomain, getEngine } from '$lib/common';
+import { checkContainer, reloadHaproxy } from '$lib/haproxy';
+import * as db from '$lib/database';
+import { dev } from '$app/env';
+import cuid from 'cuid';
+import getPort, { portNumbers } from 'get-port';
+
+export async function letsEncrypt(domain, id = null, isCoolify = false) {
+	try {
+		const data = await db.prisma.setting.findFirst();
+		const { minPort, maxPort } = data;
+
+		const nakedDomain = domain.replace('www.', '');
+		const wwwDomain = `www.${nakedDomain}`;
+		const randomCuid = cuid();
+		const randomPort = await getPort({ port: portNumbers(minPort, maxPort) });
+
+		let host;
+		let dualCerts = false;
+		if (isCoolify) {
+			dualCerts = data.dualCerts;
+			host = 'unix:///var/run/docker.sock';
+		} else {
+			const applicationData = await db.prisma.application.findUnique({
+				where: { id },
+				include: { destinationDocker: true, settings: true }
+			});
+			if (applicationData) {
+				if (applicationData?.destinationDockerId && applicationData?.destinationDocker) {
+					host = getEngine(applicationData.destinationDocker.engine);
+				}
+				if (applicationData?.settings?.dualCerts) {
+					dualCerts = applicationData.settings.dualCerts;
+				}
+			}
+			// Check Service
+			const serviceData = await db.prisma.service.findUnique({
+				where: { id },
+				include: { destinationDocker: true }
+			});
+			if (serviceData) {
+				if (serviceData?.destinationDockerId && serviceData?.destinationDocker) {
+					host = getEngine(serviceData.destinationDocker.engine);
+				}
+				if (serviceData?.dualCerts) {
+					dualCerts = serviceData.dualCerts;
+				}
+			}
+		}
+		if (dualCerts) {
+			let found = false;
+			try {
+				await asyncExecShell(
+					`DOCKER_HOST=${host} docker run --rm -v "coolify-letsencrypt:/etc/letsencrypt" -v "coolify-ssl-certs:/app/ssl" alpine:latest sh -c "ls -1 /app/ssl/${wwwDomain}.pem"`
+				);
+				found = true;
+			} catch (error) {
+				//
+			}
+			if (found) return;
+
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker run --rm --name certbot-${randomCuid} -p 9080:${randomPort} -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port ${randomPort} -d ${nakedDomain} -d ${wwwDomain} --expand --agree-tos --non-interactive --register-unsafely-without-email ${
+					dev ? '--test-cert' : ''
+				}`
+			);
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker run --rm -v "coolify-letsencrypt:/etc/letsencrypt" -v "coolify-ssl-certs:/app/ssl" alpine:latest sh -c "test -d /etc/letsencrypt/live/${nakedDomain}/ && cat /etc/letsencrypt/live/${nakedDomain}/fullchain.pem /etc/letsencrypt/live/${nakedDomain}/privkey.pem > /app/ssl/${nakedDomain}.pem || cat /etc/letsencrypt/live/${wwwDomain}/fullchain.pem /etc/letsencrypt/live/${wwwDomain}/privkey.pem > /app/ssl/${wwwDomain}.pem"`
+			);
+			await reloadHaproxy(host);
+		} else {
+			let found = false;
+			try {
+				await asyncExecShell(
+					`DOCKER_HOST=${host} docker run --rm -v "coolify-letsencrypt:/etc/letsencrypt" -v "coolify-ssl-certs:/app/ssl" alpine:latest sh -c "ls -1 /app/ssl/${domain}.pem"`
+				);
+				found = true;
+			} catch (error) {
+				//
+			}
+			if (found) return;
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker run --rm --name certbot-${randomCuid} -p 9080:${randomPort} -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port ${randomPort} -d ${domain} --expand --agree-tos --non-interactive --register-unsafely-without-email ${
+					dev ? '--test-cert' : ''
+				}`
+			);
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker run --rm -v "coolify-letsencrypt:/etc/letsencrypt" -v "coolify-ssl-certs:/app/ssl" alpine:latest sh -c "cat /etc/letsencrypt/live/${domain}/fullchain.pem /etc/letsencrypt/live/${domain}/privkey.pem > /app/ssl/${domain}.pem"`
+			);
+			await reloadHaproxy(host);
+		}
+	} catch (error) {
+		if (error.code !== 0) {
+			throw error;
+		}
+	}
+}
+
+export async function generateSSLCerts() {
+	const ssls = [];
+	const applications = await db.prisma.application.findMany({
+		include: { destinationDocker: true, settings: true },
+		orderBy: { createdAt: 'desc' }
+	});
+	for (const application of applications) {
+		try {
+			if (application.fqdn && application.destinationDockerId) {
+				const {
+					fqdn,
+					id,
+					destinationDocker: { engine, network },
+					settings: { previews }
+				} = application;
+				const isRunning = await checkContainer(engine, id);
+				const domain = getDomain(fqdn);
+				const isHttps = fqdn.startsWith('https://');
+				if (isRunning) {
+					if (isHttps) ssls.push({ domain, id, isCoolify: false });
+				}
+				if (previews) {
+					const host = getEngine(engine);
+					const { stdout } = await asyncExecShell(
+						`DOCKER_HOST=${host} docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"`
+					);
+					const containers = stdout
+						.trim()
+						.split('\n')
+						.filter((a) => a)
+						.map((c) => c.replace(/"/g, ''));
+					if (containers.length > 0) {
+						for (const container of containers) {
+							let previewDomain = `${container.split('-')[1]}.${domain}`;
+							if (isHttps) ssls.push({ domain: previewDomain, id, isCoolify: false });
+						}
+					}
+				}
+			}
+		} catch (error) {
+			console.log(`Error during generateSSLCerts with ${application.fqdn}: ${error}`);
+		}
+	}
+	const services = await db.prisma.service.findMany({
+		include: {
+			destinationDocker: true,
+			minio: true,
+			plausibleAnalytics: true,
+			vscodeserver: true,
+			wordpress: true,
+			ghost: true
+		},
+		orderBy: { createdAt: 'desc' }
+	});
+
+	for (const service of services) {
+		try {
+			if (service.fqdn && service.destinationDockerId) {
+				const {
+					fqdn,
+					id,
+					type,
+					destinationDocker: { engine }
+				} = service;
+				const found = db.supportedServiceTypesAndVersions.find((a) => a.name === type);
+				if (found) {
+					const domain = getDomain(fqdn);
+					const isHttps = fqdn.startsWith('https://');
+					const isRunning = await checkContainer(engine, id);
+					if (isRunning) {
+						if (isHttps) ssls.push({ domain, id, isCoolify: false });
+					}
+				}
+			}
+		} catch (error) {
+			console.log(`Error during generateSSLCerts with ${service.fqdn}: ${error}`);
+		}
+	}
+	const { fqdn } = await db.prisma.setting.findFirst();
+	if (fqdn) {
+		const domain = getDomain(fqdn);
+		const isHttps = fqdn.startsWith('https://');
+		if (isHttps) ssls.push({ domain, id: 'coolify', isCoolify: true });
+	}
+	if (ssls.length > 0) {
+		for (const ssl of ssls) {
+			if (!dev) {
+				console.log('Checking SSL for', ssl.domain);
+				await letsEncrypt(ssl.domain, ssl.id, ssl.isCoolify);
+			} else {
+				console.log('Checking SSL for', ssl.domain);
+			}
+		}
+	}
+}

src/lib/queues/builder.ts

@@ -3,8 +3,14 @@ import fs from 'fs/promises';
 import * as buildpacks from '../buildPacks';
 import * as importers from '../importers';
 import { dockerInstance } from '../docker';
-import { asyncExecShell, createDirectories, getDomain, getEngine, saveBuildLog } from '../common';
-import { configureProxyForApplication, reloadHaproxy, setWwwRedirection } from '../haproxy';
+import {
+	asyncExecShell,
+	asyncSleep,
+	createDirectories,
+	getDomain,
+	getEngine,
+	saveBuildLog
+} from '../common';
 import * as db from '$lib/database';
 import { decrypt } from '$lib/crypto';
 import { sentry } from '$lib/common';
@@ -13,7 +19,7 @@ import {
 	makeLabelForStandaloneApplication,
 	setDefaultConfiguration
 } from '$lib/buildPacks/common';
-import { letsEncrypt } from '$lib/letsencrypt';
+import yaml from 'js-yaml';
 
 export default async function (job) {
 	/*
@@ -40,17 +46,33 @@ export default async function (job) {
 		publishDirectory,
 		projectId,
 		secrets,
+		phpModules,
 		type,
 		pullmergeRequestId = null,
 		sourceBranch = null,
-		settings
+		settings,
+		persistentStorage
 	} = job.data;
 	const { debug } = settings;
 
+	await asyncSleep(500);
+	await db.prisma.build.updateMany({
+		where: {
+			status: 'queued',
+			id: { not: buildId },
+			applicationId,
+			createdAt: { lt: new Date(new Date().getTime() - 60 * 60 * 1000) }
+		},
+		data: { status: 'failed' }
+	});
 	let imageId = applicationId;
 	let domain = getDomain(fqdn);
-	const isHttps = fqdn.startsWith('https://');
-
+	let volumes =
+		persistentStorage?.map((storage) => {
+			return `${applicationId}${storage.path.replace(/\//gi, '-')}:${
+				buildPack !== 'docker' ? '/app' : ''
+			}${storage.path}`;
+		}) || [];
 	// Previews, we need to get the source branch and set subdomain
 	if (pullmergeRequestId) {
 		branch = sourceBranch;
@@ -64,22 +86,12 @@ export default async function (job) {
 	if (destinationDockerId) {
 		destinationType = 'docker';
 	}
-
 	if (destinationType === 'docker') {
 		const docker = dockerInstance({ destinationDocker });
 		const host = getEngine(destinationDocker.engine);
 
-		const build = await db.createBuild({
-			id: buildId,
-			applicationId,
-			destinationDockerId: destinationDocker.id,
-			gitSourceId: gitSource.id,
-			githubAppId: gitSource.githubApp?.id,
-			gitlabAppId: gitSource.gitlabApp?.id,
-			type
-		});
-
-		const { workdir, repodir } = await createDirectories({ repository, buildId: build.id });
+		await db.prisma.build.update({ where: { id: buildId }, data: { status: 'running' } });
+		const { workdir, repodir } = await createDirectories({ repository, buildId });
 
 		const configuration = await setDefaultConfiguration(job.data);
 
@@ -89,6 +101,7 @@ export default async function (job) {
 		startCommand = configuration.startCommand;
 		buildCommand = configuration.buildCommand;
 		publishDirectory = configuration.publishDirectory;
+		baseDirectory = configuration.baseDirectory;
 
 		let commit = await importers[gitSource.type]({
 			applicationId,
@@ -99,19 +112,22 @@ export default async function (job) {
 			gitlabAppId: gitSource.gitlabApp?.id,
 			repository,
 			branch,
-			buildId: build.id,
+			buildId,
 			apiUrl: gitSource.apiUrl,
 			projectId,
 			deployKeyId: gitSource.gitlabApp?.deployKeyId || null,
 			privateSshKey: decrypt(gitSource.gitlabApp?.privateSshKey) || null
 		});
+		if (!commit) {
+			throw new Error('No commit found?');
+		}
 		let tag = commit.slice(0, 7);
 		if (pullmergeRequestId) {
 			tag = `${commit.slice(0, 7)}-${pullmergeRequestId}`;
 		}
 
 		try {
-			await db.prisma.build.update({ where: { id: build.id }, data: { commit } });
+			db.prisma.build.update({ where: { id: buildId }, data: { commit } });
 		} catch (err) {
 			console.log(err);
 		}
@@ -162,7 +178,7 @@ export default async function (job) {
 			await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId);
 			if (buildpacks[buildPack])
 				await buildpacks[buildPack]({
-					buildId: build.id,
+					buildId,
 					applicationId,
 					domain,
 					name,
@@ -183,7 +199,8 @@ export default async function (job) {
 					buildCommand,
 					startCommand,
 					baseDirectory,
-					secrets
+					secrets,
+					phpModules
 				});
 			else {
 				saveBuildLog({ line: `Build pack ${buildPack} not found`, buildId, applicationId });
@@ -205,7 +222,15 @@ export default async function (job) {
 		const envs = [];
 		if (secrets.length > 0) {
 			secrets.forEach((secret) => {
-				envs.push(`${secret.name}=${secret.value}`);
+				if (pullmergeRequestId) {
+					if (secret.isPRMRSecret) {
+						envs.push(`${secret.name}=${secret.value}`);
+					}
+				} else {
+					if (!secret.isPRMRSecret) {
+						envs.push(`${secret.name}=${secret.value}`);
+					}
+				}
 			});
 		}
 		await fs.writeFile(`${workdir}/.env`, envs.join('\n'));
@@ -227,37 +252,67 @@ export default async function (job) {
 			baseDirectory,
 			publishDirectory
 		});
+		let envFound = false;
+		try {
+			envFound = !!(await fs.stat(`${workdir}/.env`));
+		} catch (error) {
+			//
+		}
 		try {
 			saveBuildLog({ line: 'Deployment started.', buildId, applicationId });
-			const { stderr } = await asyncExecShell(
-				`DOCKER_HOST=${host} docker run --env-file=${workdir}/.env ${labels.join(
-					' '
-				)} --name ${imageId} --network ${
-					docker.network
-				} --restart always -d ${applicationId}:${tag}`
+			// for await (const volume of volumes) {
+			// 	const id = volume.split(':')[0];
+			// 	try {
+			// 		await asyncExecShell(`DOCKER_HOST=${host} docker volume inspect ${id}`);
+			// 	} catch (error) {
+			// 		await asyncExecShell(`DOCKER_HOST=${host} docker volume create ${id}`);
+			// 	}
+			// }
+			const composeVolumes = volumes.map((volume) => {
+				return {
+					[`${volume.split(':')[0]}`]: {
+						name: volume.split(':')[0]
+					}
+				};
+			});
+			const compose = {
+				version: '3.8',
+				services: {
+					[imageId]: {
+						image: `${applicationId}:${tag}`,
+						container_name: imageId,
+						volumes,
+						env_file: envFound ? [`${workdir}/.env`] : [],
+						networks: [docker.network],
+						labels: labels,
+						depends_on: [],
+						restart: 'always'
+					}
+				},
+				networks: {
+					[docker.network]: {
+						external: true
+					}
+				},
+				volumes: Object.assign({}, ...composeVolumes)
+			};
+			await fs.writeFile(`${workdir}/docker-compose.yml`, yaml.dump(compose));
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker compose --project-directory ${workdir} up -d`
 			);
-			if (stderr) console.log(stderr);
+
+			// const { stderr } = await asyncExecShell(
+			// 	`DOCKER_HOST=${host} docker run ${envFound && `--env-file=${workdir}/.env`} ${labels.join(
+			// 		' '
+			// 	)} --name ${imageId} --network ${docker.network} --restart always ${volumes.length > 0 ? volumes : ''
+			// 	} -d ${applicationId}:${tag}`
+			// );
 			saveBuildLog({ line: 'Deployment successful!', buildId, applicationId });
 		} catch (error) {
+			saveBuildLog({ line: error, buildId, applicationId });
+			sentry.captureException(error);
 			throw new Error(error);
 		}
-		try {
-			if (destinationDockerId && destinationDocker.isCoolifyProxyUsed) {
-				saveBuildLog({ line: 'Proxy configuration started!', buildId, applicationId });
-				await configureProxyForApplication({ domain, imageId, applicationId, port });
-				if (isHttps) await letsEncrypt({ domain, id: applicationId });
-				await setWwwRedirection(fqdn);
-				await reloadHaproxy(destinationDocker.engine);
-				saveBuildLog({ line: 'Proxy configuration successful!', buildId, applicationId });
-			} else {
-				saveBuildLog({
-					line: 'Coolify Proxy is not configured for this destination. Nothing else to do.',
-					buildId,
-					applicationId
-				});
-			}
-		} catch (error) {
-			sentry.captureException(error);
-		}
+		saveBuildLog({ line: 'Proxy will be updated shortly.', buildId, applicationId });
 	}
 }

src/lib/queues/cleanup.ts

@@ -1,45 +1,71 @@
 import { dev } from '$app/env';
-import { asyncExecShell, getEngine } from '$lib/common';
+import { asyncExecShell, getEngine, version } from '$lib/common';
 import { prisma } from '$lib/database';
 import { defaultProxyImageHttp, defaultProxyImageTcp } from '$lib/haproxy';
-
 export default async function () {
-	if (!dev) {
-		const destinationDockers = await prisma.destinationDocker.findMany();
-		for (const destinationDocker of destinationDockers) {
-			const host = getEngine(destinationDocker.engine);
-			// Tagging images with labels
-			try {
-				const images = [
-					`coollabsio/${defaultProxyImageTcp}`,
-					`coollabsio/${defaultProxyImageHttp}`,
-					'certbot/certbot:latest',
-					'node:16.14.0-alpine',
-					'alpine:latest',
-					'nginx:stable-alpine',
-					'node:lts',
-					'php:apache',
-					'rust:latest'
-				];
-				for (const image of images) {
-					await asyncExecShell(
-						`DOCKER_HOST=${host} docker pull ${image} && echo "FROM ${image}" | docker build --label coolify.managed="true" -t "${image}" -`
-					);
-				}
-			} catch (error) {}
-			try {
-				await asyncExecShell(`DOCKER_HOST=${host} docker container prune -f`);
-			} catch (error) {
-				console.log(error);
-			}
-			// Cleanup images that are not managed by coolify
-			try {
-				await asyncExecShell(
-					`DOCKER_HOST=${host} docker image prune --filter 'label!=coolify.managed=true' -a -f`
-				);
-			} catch (error) {
-				console.log(error);
+	const destinationDockers = await prisma.destinationDocker.findMany();
+	for (const destinationDocker of destinationDockers) {
+		const host = getEngine(destinationDocker.engine);
+		// Cleanup old coolify images
+		try {
+			let { stdout: images } = await asyncExecShell(
+				`DOCKER_HOST=${host} docker images coollabsio/coolify --filter before="coollabsio/coolify:${version}" -q | xargs `
+			);
+			images = images.trim();
+			if (images) {
+				await asyncExecShell(`DOCKER_HOST=${host} docker rmi -f ${images}`);
 			}
+		} 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 --filter "until=2h"`);
+		} catch (error) {
+			console.log(error);
+		}
+		// Tagging images with labels
+		// try {
+		// 	const images = [
+		// 		`coollabsio/${defaultProxyImageTcp}`,
+		// 		`coollabsio/${defaultProxyImageHttp}`,
+		// 		'certbot/certbot:latest',
+		// 		'node:16.14.0-alpine',
+		// 		'alpine:latest',
+		// 		'nginx:stable-alpine',
+		// 		'node:lts',
+		// 		'php:apache',
+		// 		'rust:latest'
+		// 	];
+		// 	for (const image of images) {
+		// 		try {
+		// 			await asyncExecShell(`DOCKER_HOST=${host} docker image inspect ${image}`);
+		// 		} catch (error) {
+		// 			await asyncExecShell(
+		// 				`DOCKER_HOST=${host} docker pull ${image} && echo "FROM ${image}" | docker build --label coolify.image="true" -t "${image}" -`
+		// 			);
+		// 		}
+		// 	}
+		// } catch (error) {}
+		// if (!dev) {
+		// 	// Cleanup images that are not managed by coolify
+		// 	try {
+		// 		await asyncExecShell(
+		// 			`DOCKER_HOST=${host} docker image prune --filter 'label!=coolify.image=true' -a -f`
+		// 		);
+		// 	} catch (error) {
+		// 		console.log(error);
+		// 	}
+		// 	// Cleanup old images >3 days
+		// 	try {
+		// 		await asyncExecShell(`DOCKER_HOST=${host} docker image prune --filter "until=72h" -a -f`);
+		// 	} catch (error) {
+		// 		console.log(error);
+		// 	}
+		// }
 	}
 }

src/lib/queues/index.ts

@@ -86,8 +86,8 @@ const cron = async () => {
 	);
 
 	await queue.proxy.add('proxy', {}, { repeat: { every: 10000 } });
-	// await queue.ssl.add('ssl', {}, { repeat: { every: 10000 } });
-	await queue.cleanup.add('cleanup', {}, { repeat: { every: 3600000 } });
+	await queue.ssl.add('ssl', {}, { repeat: { every: dev ? 10000 : 60000 } });
+	if (!dev) await queue.cleanup.add('cleanup', {}, { repeat: { every: 300000 } });
 	await queue.sslRenew.add('sslRenew', {}, { repeat: { every: 1800000 } });
 
 	const events = {
@@ -110,33 +110,36 @@ cron().catch((error) => {
 const buildQueueName = 'build_queue';
 const buildQueue = new Queue(buildQueueName, connectionOptions);
 const buildWorker = new Worker(buildQueueName, async (job) => await builder(job), {
-	concurrency: 2,
+	concurrency: 1,
 	...connectionOptions
 });
 
 buildWorker.on('completed', async (job: Bullmq.Job) => {
 	try {
 		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'success' } });
-	} catch (err) {
-		console.log(err);
+	} catch (error) {
+		console.log(error);
 	} finally {
-		const workdir = `/tmp/build-sources/${job.data.repository}/`;
-		await asyncExecShell(`rm -fr ${workdir}`);
+		const workdir = `/tmp/build-sources/${job.data.repository}/${job.data.build_id}`;
+		if (!dev) await asyncExecShell(`rm -fr ${workdir}`);
 	}
 	return;
 });
 
 buildWorker.on('failed', async (job: Bullmq.Job, failedReason) => {
-	console.log(failedReason);
 	try {
 		await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'failed' } });
 	} catch (error) {
 		console.log(error);
 	} finally {
 		const workdir = `/tmp/build-sources/${job.data.repository}`;
-		await asyncExecShell(`rm -fr ${workdir}`);
+		if (!dev) await asyncExecShell(`rm -fr ${workdir}`);
 	}
-	saveBuildLog({ line: 'Failed build!', buildId: job.data.build_id, applicationId: job.data.id });
+	saveBuildLog({
+		line: 'Failed to deploy!',
+		buildId: job.data.build_id,
+		applicationId: job.data.id
+	});
 	saveBuildLog({
 		line: `Reason: ${failedReason.toString()}`,
 		buildId: job.data.build_id,
@@ -144,7 +147,7 @@ buildWorker.on('failed', async (job: Bullmq.Job, failedReason) => {
 	});
 });
 
-const buildLogQueueName = dev ? cuid() : 'log_queue';
+const buildLogQueueName = 'log_queue';
 const buildLogQueue = new Queue(buildLogQueueName, connectionOptions);
 const buildLogWorker = new Worker(buildLogQueueName, async (job) => await logger(job), {
 	concurrency: 1,

src/lib/queues/proxy.ts

@@ -1,70 +1,10 @@
-import { getDomain } from '$lib/common';
-import { getApplicationById, prisma } from '$lib/database';
-import { dockerInstance } from '$lib/docker';
-import {
-	checkContainer,
-	configureCoolifyProxyOn,
-	configureProxyForApplication,
-	forceSSLOnApplication,
-	reloadHaproxy,
-	setWwwRedirection,
-	startCoolifyProxy
-} from '$lib/haproxy';
-import * as db from '$lib/database';
+import { ErrorHandler } from '$lib/database';
+import { configureHAProxy } from '$lib/haproxy/configuration';
 
 export default async function () {
 	try {
-		// Check destination containers and configure proxy if needed
-		const destinationDockers = await prisma.destinationDocker.findMany({});
-		for (const destination of destinationDockers) {
-			if (destination.isCoolifyProxyUsed) {
-				const docker = dockerInstance({ destinationDocker: destination });
-				const containers = await docker.engine.listContainers();
-				const configurations = containers.filter(
-					(container) => container.Labels['coolify.managed']
-				);
-				for (const configuration of configurations) {
-					const parsedConfiguration = JSON.parse(
-						Buffer.from(configuration.Labels['coolify.configuration'], 'base64').toString()
-					);
-					if (configuration.Labels['coolify.type'] === 'standalone-application') {
-						const { fqdn, applicationId, port, pullmergeRequestId } = parsedConfiguration;
-						if (fqdn) {
-							const found = await getApplicationById({ id: applicationId });
-							if (found) {
-								const domain = getDomain(fqdn);
-								await configureProxyForApplication({
-									domain,
-									imageId: pullmergeRequestId
-										? `${applicationId}-${pullmergeRequestId}`
-										: applicationId,
-									applicationId,
-									port
-								});
-								const isHttps = fqdn.startsWith('https://');
-								if (isHttps) await forceSSLOnApplication({ domain });
-								await setWwwRedirection(fqdn);
-							}
-						}
-					}
-				}
-			}
-		}
-		// Check Coolify FQDN and configure proxy if needed
-		const { fqdn } = await db.listSettings();
-		if (fqdn) {
-			const domain = getDomain(fqdn);
-			const found = await checkContainer('/var/run/docker.sock', 'coolify-haproxy');
-			if (!found) await startCoolifyProxy('/var/run/docker.sock');
-			await configureCoolifyProxyOn({ domain });
-			await setWwwRedirection(fqdn);
-			const isHttps = fqdn.startsWith('https://');
-			if (isHttps) await forceSSLOnApplication({ domain });
-		}
+		return await configureHAProxy();
 	} catch (error) {
-		console.log(error);
-		throw error;
-	} finally {
-		// await reloadHaproxy('/var/run/docker.sock');
+		return ErrorHandler(error.response?.body || error);
 	}
 }

src/lib/queues/ssl.ts

@@ -1,67 +1,8 @@
-import { asyncExecShell, getDomain, getEngine } from '$lib/common';
-import { prisma } from '$lib/database';
-import { dockerInstance } from '$lib/docker';
-import { forceSSLOnApplication } from '$lib/haproxy';
-import * as db from '$lib/database';
-import { dev } from '$app/env';
+import { generateSSLCerts } from '$lib/letsencrypt';
 
 export default async function () {
 	try {
-		const destinationDockers = await prisma.destinationDocker.findMany({});
-		for (const destination of destinationDockers) {
-			if (destination.isCoolifyProxyUsed) {
-				const docker = dockerInstance({ destinationDocker: destination });
-				const containers = await docker.engine.listContainers();
-				const configurations = containers.filter(
-					(container) => container.Labels['coolify.managed']
-				);
-				for (const configuration of configurations) {
-					const parsedConfiguration = JSON.parse(
-						Buffer.from(configuration.Labels['coolify.configuration'], 'base64').toString()
-					);
-					if (configuration.Labels['coolify.type'] === 'standalone-application') {
-						const { fqdn } = parsedConfiguration;
-						if (fqdn) {
-							const domain = getDomain(fqdn);
-							const isHttps = fqdn.startsWith('https://');
-							if (isHttps) {
-								if (dev) {
-									console.log('DEV MODE: SSL is enabled');
-								} else {
-									const host = getEngine(destination.engine);
-									await asyncExecShell(
-										`DOCKER_HOST=${host} docker run --rm --name certbot -p 9080:9080 -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port 9080 -d ${domain} --agree-tos --non-interactive --register-unsafely-without-email`
-									);
-									const { stderr } = await asyncExecShell(
-										`DOCKER_HOST=${host} docker run --rm --name bash -v "coolify-letsencrypt:/etc/letsencrypt" -v "coolify-ssl-certs:/app/ssl" alpine:latest cat /etc/letsencrypt/live/${domain}/fullchain.pem /etc/letsencrypt/live/${domain}/privkey.pem > /app/ssl/${domain}.pem`
-									);
-									if (stderr) throw new Error(stderr);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		const { fqdn } = await db.listSettings();
-		if (fqdn) {
-			const domain = getDomain(fqdn);
-			const isHttps = fqdn.startsWith('https://');
-			if (isHttps) {
-				if (dev) {
-					console.log('DEV MODE: SSL is enabled');
-				} else {
-					await asyncExecShell(
-						`docker run --rm --name certbot -p 9080:9080 -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port 9080 -d ${domain} --agree-tos --non-interactive --register-unsafely-without-email`
-					);
-
-					const { stderr } = await asyncExecShell(
-						`docker run --rm -v "coolify-letsencrypt:/etc/letsencrypt" -v "coolify-ssl-certs:/app/ssl" alpine:latest cat /etc/letsencrypt/live/${domain}/fullchain.pem /etc/letsencrypt/live/${domain}/privkey.pem > /app/ssl/${domain}.pem`
-					);
-					if (stderr) throw new Error(stderr);
-				}
-			}
-		}
+		return await generateSSLCerts();
 	} catch (error) {
 		console.log(error);
 		throw error;

src/lib/queues/sslrenewal.ts

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

src/lib/settings.ts

@@ -1,5 +1,8 @@
 export const publicPaths = [
 	'/login',
+	'/register',
+	'/reset',
+	'/reset/password',
 	'/webhooks/success',
 	'/webhooks/github',
 	'/webhooks/github/install',

src/lib/store.ts

@@ -0,0 +1,6 @@
+import { writable } from 'svelte/store';
+
+export const gitTokens = writable({
+	githubToken: null,
+	gitlabToken: null
+});

src/routes/__layout.svelte

@@ -2,14 +2,14 @@
 	import type { Load } from '@sveltejs/kit';
 	import { publicPaths } from '$lib/settings';
 
-	export const load: Load = async ({ fetch, url, params, session }) => {
-		if (!session.uid && !publicPaths.includes(url.pathname)) {
+	export const load: Load = async ({ fetch, url, session }) => {
+		if (!session.userId && !publicPaths.includes(url.pathname)) {
 			return {
 				status: 302,
 				redirect: '/login'
 			};
 		}
-		if (!session.uid) {
+		if (!session.userId) {
 			return {};
 		}
 		const endpoint = `/teams.json`;
@@ -30,7 +30,6 @@
 <script>
 	export let teams;
 	export let selectedTeamId;
-	import { fade } from 'svelte/transition';
 
 	import '../tailwind.css';
 	import { SvelteToast, toast } from '@zerodevx/svelte-toast';
@@ -39,17 +38,18 @@
 	import { errorNotification } from '$lib/form';
 	import { asyncSleep } from '$lib/components/common';
 	import { del, get, post } from '$lib/api';
-	import { browser } from '$app/env';
+	import { browser, dev } from '$app/env';
 
 	let isUpdateAvailable = false;
+
 	let updateStatus = {
+		found: false,
 		loading: false,
-		checking: false,
 		success: null
 	};
 	let latestVersion = 'latest';
 	onMount(async () => {
-		if ($session.uid) {
+		if ($session.userId) {
 			const overrideVersion = browser && window.localStorage.getItem('latestVersion');
 			try {
 				await get(`/login.json`);
@@ -59,17 +59,18 @@
 				return errorNotification(error);
 			}
 			if ($session.teamId === '0') {
-				updateStatus.checking = true;
 				try {
 					const data = await get(`/update.json`);
 					if (overrideVersion || data?.isUpdateAvailable) {
 						latestVersion = overrideVersion || data.latestVersion;
-						isUpdateAvailable = overrideVersion ? true : data?.isUpdateAvailable;
-						await post(`/update.json`, { type: 'pull', latestVersion });
+						if (overrideVersion) {
+							isUpdateAvailable = true;
+						} else {
+							isUpdateAvailable = data.isUpdateAvailable;
+						}
 					}
 				} catch (error) {
 				} finally {
-					updateStatus.checking = false;
 				}
 			}
 		}
@@ -84,7 +85,7 @@
 	}
 	async function switchTeam() {
 		try {
-			await post(`/index.json?from=${$page.url.pathname}`, {
+			await post(`/dashboard.json?from=${$page.url.pathname}`, {
 				cookie: 'teamId',
 				value: selectedTeamId
 			});
@@ -96,33 +97,37 @@
 
 	async function update() {
 		updateStatus.loading = true;
-		// if (!dev) {
 		try {
-			await post(`/update.json`, { type: 'update', latestVersion });
-			toast.push('Update completed. Waiting for the new version to start...');
-			let reachable = false;
-			let tries = 0;
-			do {
+			if (dev) {
+				console.log(`updating to ${latestVersion}`);
 				await asyncSleep(4000);
-				try {
-					await get(`/undead.json`);
-					reachable = true;
-				} catch (error) {
-					reachable = false;
-				}
-				if (reachable) break;
-				tries++;
-			} while (!reachable || tries < 120);
-			toast.push('New version reachable. Reloading...');
-			updateStatus.loading = false;
-			updateStatus.success = true;
-			await asyncSleep(3000);
-			return window.location.reload();
+				return window.location.reload();
+			} else {
+				await post(`/update.json`, { type: 'update', latestVersion });
+				toast.push('Update completed.<br><br>Waiting for the new version to start...');
+				let reachable = false;
+				let tries = 0;
+				do {
+					await asyncSleep(4000);
+					try {
+						await get(`/undead.json`);
+						reachable = true;
+					} catch (error) {
+						reachable = false;
+					}
+					if (reachable) break;
+					tries++;
+				} while (!reachable || tries < 120);
+				toast.push('New version reachable. Reloading...');
+				updateStatus.loading = false;
+				updateStatus.success = true;
+				await asyncSleep(3000);
+				return window.location.reload();
+			}
 		} catch ({ error }) {
-			return errorNotification(error);
-		} finally {
 			updateStatus.success = false;
 			updateStatus.loading = false;
+			return errorNotification(error);
 		}
 	}
 </script>
@@ -131,7 +136,7 @@
 	<title>Coolify</title>
 </svelte:head>
 <SvelteToast options={{ intro: { y: -64 }, duration: 3000, pausable: true }} />
-{#if $session.uid}
+{#if $session.userId}
 	<nav class="nav-main">
 		<div class="flex h-screen w-full flex-col items-center transition-all duration-100">
 			<div class="my-4 h-10 w-10"><img src="/favicon.png" alt="coolLabs logo" /></div>
@@ -313,42 +318,17 @@
 
 			<div class="flex flex-col space-y-4 py-2">
 				{#if $session.teamId === '0'}
-					{#if updateStatus.checking}
-						<button
-							disabled
-							in:fade={{ duration: 150 }}
-							class="icons tooltip-right bg-gradient-to-r from-purple-500 via-pink-500 to-red-500 text-white duration-75 hover:scale-105"
-							data-tooltip="Checking for updates..."
-							><svg
-								xmlns="http://www.w3.org/2000/svg"
-								class="h-9 w-8 animate-spin"
-								viewBox="0 0 24 24"
-								stroke-width="1.5"
-								stroke="currentColor"
-								fill="none"
-								stroke-linecap="round"
-								stroke-linejoin="round"
-							>
-								<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-								<path d="M9 4.55a8 8 0 0 1 6 14.9m0 -4.45v5h5" />
-								<line x1="5.63" y1="7.16" x2="5.63" y2="7.17" />
-								<line x1="4.06" y1="11" x2="4.06" y2="11.01" />
-								<line x1="4.63" y1="15.1" x2="4.63" y2="15.11" />
-								<line x1="7.16" y1="18.37" x2="7.16" y2="18.38" />
-								<line x1="11" y1="19.94" x2="11" y2="19.95" />
-							</svg></button
-						>
-					{:else if isUpdateAvailable}
+					{#if isUpdateAvailable}
 						<button
 							disabled={updateStatus.success === false}
-							data-tooltip="Update available"
+							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"
 						>
 							{#if updateStatus.loading}
 								<svg
 									xmlns="http://www.w3.org/2000/svg"
-									class="w-8 h-9 lds-heart"
+									class="lds-heart h-9 w-8"
 									viewBox="0 0 24 24"
 									stroke-width="1.5"
 									stroke="currentColor"
@@ -446,7 +426,8 @@
 						</button>
 					{/if}
 				{/if}
-
+			</div>
+			<div class="flex flex-col space-y-4 py-2">
 				<a
 					sveltekit:prefetch
 					href="/teams"
@@ -521,20 +502,20 @@
 						<path d="M7 12h14l-3 -3m0 6l3 -3" />
 					</svg>
 				</div>
-			</div>
-			<div
-				class="w-full text-center font-bold text-stone-400 hover:bg-coolgray-200 hover:text-white"
-			>
-				<a
-					class="text-[10px] no-underline"
-					href={`https://github.com/coollabsio/coolify/releases/tag/v${$session.version}`}
-					target="_blank">v{$session.version}</a
+				<div
+					class="w-full text-center font-bold text-stone-400 hover:bg-coolgray-200 hover:text-white"
 				>
+					<a
+						class="text-[10px] no-underline"
+						href={`https://github.com/coollabsio/coolify/releases/tag/v${$session.version}`}
+						target="_blank">v{$session.version}</a
+					>
+				</div>
 			</div>
 		</div>
 	</nav>
 	<select
-		class="fixed right-0 bottom-0 z-50 m-2 p-2 px-4"
+		class="fixed right-0 bottom-0 z-50 m-2 w-64 bg-opacity-30 p-2 px-4"
 		bind:value={selectedTeamId}
 		on:change={switchTeam}
 	>

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

@@ -17,13 +17,20 @@
 		const endpoint = `/applications/${params.id}.json`;
 		const res = await fetch(endpoint);
 		if (res.ok) {
-			const { application, githubToken, ghToken, isRunning, appId } = await res.json();
+			let { application, isRunning, appId, githubToken, gitlabToken } = await res.json();
 			if (!application || Object.entries(application).length === 0) {
 				return {
 					status: 302,
 					redirect: '/applications'
 				};
 			}
+			if (application.gitSource?.githubAppId && !githubToken) {
+				const response = await fetch(`/applications/${params.id}/configuration/githubToken.json`);
+				if (response.ok) {
+					const { token } = await response.json();
+					githubToken = token;
+				}
+			}
 			const configurationPhase = checkConfiguration(application);
 			if (
 				configurationPhase &&
@@ -38,12 +45,12 @@
 			return {
 				props: {
 					application,
-					isRunning
+					isRunning,
+					githubToken,
+					gitlabToken
 				},
 				stuff: {
 					isRunning,
-					ghToken,
-					githubToken,
 					application,
 					appId
 				}
@@ -60,12 +67,19 @@
 <script lang="ts">
 	export let application;
 	export let isRunning;
+	export let githubToken;
+	export let gitlabToken;
 	import { page, session } from '$app/stores';
 	import { errorNotification } from '$lib/form';
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import Loading from '$lib/components/Loading.svelte';
 	import { del, post } from '$lib/api';
 	import { goto } from '$app/navigation';
+	import { gitTokens } from '$lib/store';
+	import { toast } from '@zerodevx/svelte-toast';
+
+	if (githubToken) $gitTokens.githubToken = githubToken;
+	if (gitlabToken) $gitTokens.gitlabToken = gitlabToken;
 
 	let loading = false;
 	const { id } = $page.params;
@@ -73,7 +87,15 @@
 	async function handleDeploySubmit() {
 		try {
 			const { buildId } = await post(`/applications/${id}/deploy.json`, { ...application });
-			return await goto(`/applications/${id}/logs/build?buildId=${buildId}`);
+			toast.push('Deployment queued.');
+			console.log($page.url);
+			if ($page.url.pathname.startsWith(`/applications/${id}/logs/build`)) {
+				return window.location.assign(`/applications/${id}/logs/build?buildId=${buildId}`);
+			} else {
+				return await goto(`/applications/${id}/logs/build?buildId=${buildId}`, {
+					replaceState: true
+				});
+			}
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
@@ -98,8 +120,6 @@
 			return window.location.reload();
 		} catch ({ error }) {
 			return errorNotification(error);
-		} finally {
-			loading = false;
 		}
 	}
 </script>
@@ -115,7 +135,7 @@
 					title="Stop application"
 					type="submit"
 					disabled={!$session.isAdmin}
-					class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 hover:bg-green-600 hover:text-white"
+					class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 text-red-500"
 					data-tooltip={$session.isAdmin
 						? 'Stop application'
 						: 'You do not have permission to stop the application.'}
@@ -140,7 +160,7 @@
 						title="Rebuild application"
 						type="submit"
 						disabled={!$session.isAdmin}
-						class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 hover:bg-green-600 hover:text-white"
+						class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 hover:text-green-500"
 						data-tooltip={$session.isAdmin
 							? 'Rebuild application'
 							: 'You do not have permission to rebuild application.'}
@@ -169,7 +189,7 @@
 						title="Build and start application"
 						type="submit"
 						disabled={!$session.isAdmin}
-						class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 hover:bg-green-600 hover:text-white"
+						class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 text-green-500"
 						data-tooltip={$session.isAdmin
 							? 'Build and start application'
 							: 'You do not have permission to Build and start application.'}
@@ -258,6 +278,35 @@
 					</svg></button
 				></a
 			>
+			<a
+				href="/applications/{id}/storage"
+				sveltekit:prefetch
+				class="hover:text-pink-500 rounded"
+				class:text-pink-500={$page.url.pathname === `/applications/${id}/storage`}
+				class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/storage`}
+			>
+				<button
+					title="Persistent Storage"
+					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
+					data-tooltip="Persistent Storage"
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="w-6 h-6"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<ellipse cx="12" cy="6" rx="8" ry="3" />
+						<path d="M4 6v6a8 3 0 0 0 16 0v-6" />
+						<path d="M4 12v6a8 3 0 0 0 16 0v-6" />
+					</svg>
+				</button></a
+			>
 			<a
 				href="/applications/{id}/previews"
 				sveltekit:prefetch

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

@@ -1,24 +1,47 @@
-import { asyncExecShell, getDomain, getEngine, getUserDetails } from '$lib/common';
+import { dev } from '$app/env';
+import { getDomain, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
+import { promises as dns } from 'dns';
 
 export const post: RequestHandler = async (event) => {
 	const { status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
-
-	let { fqdn } = await event.request.json();
+	let { fqdn, forceSave } = await event.request.json();
 	fqdn = fqdn.toLowerCase();
 
 	try {
+		const domain = getDomain(fqdn);
 		const found = await db.isDomainConfigured({ id, fqdn });
 		if (found) {
 			throw {
-				message: `Domain ${getDomain(fqdn)} is already configured.`
+				message: `Domain ${getDomain(fqdn).replace('www.', '')} is already used.`
 			};
 		}
+		if (!dev && !forceSave) {
+			let ip = [];
+			let localIp = [];
+			dns.setServers(['1.1.1.1', '8.8.8.8']);
+
+			try {
+				localIp = await dns.resolve4(event.url.hostname);
+			} catch (error) {}
+			try {
+				ip = await dns.resolve4(domain);
+			} catch (error) {}
+
+			if (localIp?.length > 0) {
+				if (ip?.length === 0 || !ip.includes(localIp[0])) {
+					throw {
+						message: `DNS not set or propogated for ${domain}.<br><br>Please check your DNS settings.`
+					};
+				}
+			}
+		}
+
 		return {
 			status: 200
 		};

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

@@ -3,6 +3,7 @@
 
 	import { page } from '$app/stores';
 	import { post } from '$lib/api';
+	import { findBuildPack } from '$lib/components/templates';
 	import { errorNotification } from '$lib/form';
 
 	const { id } = $page.params;
@@ -11,10 +12,13 @@
 	export let buildPack;
 	export let foundConfig;
 	export let scanning;
+	export let packageManager;
 
 	async function handleSubmit(name) {
 		try {
-			const tempBuildPack = JSON.parse(JSON.stringify(buildPack));
+			const tempBuildPack = JSON.parse(
+				JSON.stringify(findBuildPack(buildPack.name, packageManager))
+			);
 			delete tempBuildPack.name;
 			delete tempBuildPack.fancyName;
 			delete tempBuildPack.color;

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

@@ -1,14 +1,12 @@
 <script lang="ts">
-	import { goto } from '$app/navigation';
-
-	export let githubToken;
 	export let application;
-
+	import Select from 'svelte-select';
+	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 	import { get, post } from '$lib/api';
-	import { getGithubToken } from '$lib/components/common';
-	import { enhance, errorNotification } from '$lib/form';
+	import { errorNotification } from '$lib/form';
 	import { onMount } from 'svelte';
+	import { gitTokens } from '$lib/store';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -27,22 +25,20 @@
 	let selected = {
 		projectId: undefined,
 		repository: undefined,
-		branch: undefined
+		branch: undefined,
+		autodeploy: application.settings.autodeploy || true
 	};
 	let showSave = false;
-	let token = null;
 
 	async function loadRepositoriesByPage(page = 0) {
-		try {
-			return await get(`${apiUrl}/installation/repositories?per_page=100&page=${page}`, {
-				Authorization: `token ${token}`
-			});
-		} catch ({ error }) {
-			return errorNotification(error);
-		}
+		return await get(`${apiUrl}/installation/repositories?per_page=100&page=${page}`, {
+			Authorization: `token ${$gitTokens.githubToken}`
+		});
 	}
+
+	let reposSelectOptions;
+	let branchSelectOptions;
 	async function loadRepositories() {
-		token = await getGithubToken({ apiUrl, githubToken, application });
 		let page = 1;
 		let reposCount = 0;
 		const loadedRepos = await loadRepositoriesByPage();
@@ -56,15 +52,24 @@
 			}
 		}
 		loading.repositories = false;
+		reposSelectOptions = repositories.map((repo) => ({
+			value: repo.full_name,
+			label: repo.name
+		}));
 	}
-	async function loadBranches() {
+	async function loadBranches(event) {
+		selected.repository = event.detail.value;
 		loading.branches = true;
 		selected.branch = undefined;
 		selected.projectId = repositories.find((repo) => repo.full_name === selected.repository).id;
 		try {
 			branches = await get(`${apiUrl}/repos/${selected.repository}/branches`, {
-				Authorization: `token ${token}`
+				Authorization: `token ${$gitTokens.githubToken}`
 			});
+			branchSelectOptions = branches.map((branch) => ({
+				value: branch.name,
+				label: branch.name
+			}));
 			return;
 		} catch ({ error }) {
 			return errorNotification(error);
@@ -72,13 +77,21 @@
 			loading.branches = false;
 		}
 	}
-	async function isBranchAlreadyUsed() {
+	async function isBranchAlreadyUsed(event) {
+		selected.branch = event.detail.value;
 		try {
 			const data = await get(
 				`/applications/${id}/configuration/repository.json?repository=${selected.repository}&branch=${selected.branch}`
 			);
 			if (data.used) {
-				errorNotification('This branch is already used by another application.');
+				const sure = confirm(
+					`This branch is already used by another application. Webhooks won't work in this case for both applications. Are you sure you want to use it?`
+				);
+				if (sure) {
+					selected.autodeploy = false;
+					showSave = true;
+					return true;
+				}
 				showSave = false;
 				return true;
 			}
@@ -90,7 +103,47 @@
 	}
 
 	onMount(async () => {
-		await loadRepositories();
+		try {
+			if (!$gitTokens.githubToken) {
+				const { token } = await get(`/applications/${id}/configuration/githubToken.json`);
+				$gitTokens.githubToken = token;
+			}
+			await loadRepositories();
+		} catch (error) {
+			if (
+				error.error === 'invalid_token' ||
+				error.error_description ===
+					'Token is expired. You can either do re-authorization or token refresh.' ||
+				error.message === '401 Unauthorized'
+			) {
+				if (application.gitSource.gitlabAppId) {
+					let htmlUrl = application.gitSource.htmlUrl;
+					const left = screen.width / 2 - 1020 / 2;
+					const top = screen.height / 2 - 618 / 2;
+					const newWindow = open(
+						`${htmlUrl}/oauth/authorize?client_id=${application.gitSource.gitlabApp.appId}&redirect_uri=${window.location.origin}/webhooks/gitlab&response_type=code&scope=api+email+read_repository&state=${$page.params.id}`,
+						'GitLab',
+						'resizable=1, scrollbars=1, fullscreen=0, height=618, width=1020,top=' +
+							top +
+							', left=' +
+							left +
+							', toolbar=0, menubar=0, status=0'
+					);
+					const timer = setInterval(() => {
+						if (newWindow?.closed) {
+							clearInterval(timer);
+							window.location.reload();
+						}
+					}, 100);
+				}
+			}
+			if (error.message === 'Bad credentials') {
+				const { token } = await get(`/applications/${id}/configuration/githubToken.json`);
+				$gitTokens.githubToken = token;
+				return await loadRepositories();
+			}
+			return errorNotification(error);
+		}
 	});
 	async function handleSubmit() {
 		try {
@@ -111,49 +164,35 @@
 		<a href={`/sources/${application.gitSource.id}`}><button>Configure it now</button></a>
 	</div>
 {:else}
-	<form on:submit|preventDefault={handleSubmit}>
-		<div>
-			{#if loading.repositories}
-				<select name="repository" disabled class="w-96">
-					<option selected value="">Loading repositories...</option>
-				</select>
-			{:else}
-				<select
-					name="repository"
-					class="w-96"
-					bind:value={selected.repository}
-					on:change={loadBranches}
-				>
-					<option value="" disabled selected>Please select a repository</option>
-					{#each repositories as repository}
-						<option value={repository.full_name}>{repository.name}</option>
-					{/each}
-				</select>
-			{/if}
-			<input class="hidden" bind:value={selected.projectId} name="projectId" />
-			{#if loading.branches}
-				<select name="branch" disabled class="w-96">
-					<option selected value="">Loading branches...</option>
-				</select>
-			{:else}
-				<select
-					name="branch"
-					class="w-96"
-					disabled={!selected.repository}
-					bind:value={selected.branch}
-					on:change={isBranchAlreadyUsed}
-				>
-					{#if !selected.repository}
-						<option value="" disabled selected>Select a repository first</option>
-					{:else}
-						<option value="" disabled selected>Please select a branch</option>
-					{/if}
-
-					{#each branches as branch}
-						<option value={branch.name}>{branch.name}</option>
-					{/each}
-				</select>
-			{/if}
+	<form on:submit|preventDefault={handleSubmit} class="flex flex-col justify-center text-center">
+		<div class="flex-col space-y-3 md:space-y-0 space-x-1">
+			<div class="flex gap-4">
+				<div class="custom-select-wrapper">
+					<Select
+						placeholder={loading.repositories
+							? 'Loading repositories ...'
+							: 'Please select a repository'}
+						id="repository"
+						on:select={loadBranches}
+						items={reposSelectOptions}
+						isDisabled={loading.repositories}
+					/>
+				</div>
+				<input class="hidden" bind:value={selected.projectId} name="projectId" />
+				<div class="custom-select-wrapper">
+					<Select
+						placeholder={loading.branches
+							? 'Loading branches ...'
+							: !selected.repository
+							? 'Please select a repository first'
+							: 'Please select a branch'}
+						id="repository"
+						on:select={isBranchAlreadyUsed}
+						items={branchSelectOptions}
+						isDisabled={loading.branches || !selected.repository}
+					/>
+				</div>
+			</div>
 		</div>
 		<div class="pt-5 flex-col flex justify-center items-center space-y-4">
 			<button

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

@@ -8,6 +8,7 @@
 	import cuid from 'cuid';
 	import { goto } from '$app/navigation';
 	import { del, get, post, put } from '$lib/api';
+	import { gitTokens } from '$lib/store';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -29,6 +30,7 @@
 	let projects = [];
 	let branches = [];
 	let showSave = false;
+	let autodeploy = application.settings.autodeploy || true;
 
 	let selected = {
 		group: undefined,
@@ -36,13 +38,13 @@
 		branch: undefined
 	};
 	onMount(async () => {
-		if (!$session.gitlabToken) {
+		if (!$gitTokens.gitlabToken) {
 			getGitlabToken();
 		} else {
 			loading.base = true;
 			try {
 				const user = await get(`${apiUrl}/v4/user`, {
-					Authorization: `Bearer ${$session.gitlabToken}`
+					Authorization: `Bearer ${$gitTokens.gitlabToken}`
 				});
 				username = user.username;
 			} catch (error) {
@@ -50,7 +52,7 @@
 			}
 			try {
 				groups = await get(`${apiUrl}/v4/groups?per_page=5000`, {
-					Authorization: `Bearer ${$session.gitlabToken}`
+					Authorization: `Bearer ${$gitTokens.gitlabToken}`
 				});
 			} catch (error) {
 				errorNotification(error);
@@ -88,7 +90,7 @@
 				projects = await get(
 					`${apiUrl}/v4/users/${selected.group.name}/projects?min_access_level=40&page=1&per_page=25&archived=false`,
 					{
-						Authorization: `Bearer ${$session.gitlabToken}`
+						Authorization: `Bearer ${$gitTokens.gitlabToken}`
 					}
 				);
 			} catch (error) {
@@ -102,7 +104,7 @@
 				projects = await get(
 					`${apiUrl}/v4/groups/${selected.group.id}/projects?page=1&per_page=25&archived=false`,
 					{
-						Authorization: `Bearer ${$session.gitlabToken}`
+						Authorization: `Bearer ${$gitTokens.gitlabToken}`
 					}
 				);
 			} catch (error) {
@@ -120,7 +122,7 @@
 			branches = await get(
 				`${apiUrl}/v4/projects/${selected.project.id}/repository/branches?per_page=100&page=1`,
 				{
-					Authorization: `Bearer ${$session.gitlabToken}`
+					Authorization: `Bearer ${$gitTokens.gitlabToken}`
 				}
 			);
 		} catch (error) {
@@ -137,7 +139,14 @@
 				`/applications/${id}/configuration/repository.json?repository=${selected.project.path_with_namespace}&branch=${selected.branch.name}`
 			);
 			if (data.used) {
-				errorNotification('This branch is already used by another application.');
+				const sure = confirm(
+					`This branch is already used by another application. Webhooks won't work in this case for both applications. Are you sure you want to use it?`
+				);
+				if (sure) {
+					autodeploy = false;
+					showSave = true;
+					return true;
+				}
 				showSave = false;
 				return true;
 			}
@@ -170,7 +179,7 @@
 					merge_requests_events: true
 				},
 				{
-					Authorization: `Bearer ${$session.gitlabToken}`
+					Authorization: `Bearer ${$gitTokens.gitlabToken}`
 				}
 			);
 		} catch (error) {
@@ -194,7 +203,7 @@
 				publicSshKey = publicKey;
 			}
 			const deployKeys = await get(deployKeyUrl, {
-				Authorization: `Bearer ${$session.gitlabToken}`
+				Authorization: `Bearer ${$gitTokens.gitlabToken}`
 			});
 			const deployKeyFound = deployKeys.filter((dk) => dk.title === `${appId}-coolify-deploy-key`);
 			if (deployKeyFound.length > 0) {
@@ -203,7 +212,7 @@
 						`${deployKeyUrl}/${deployKey.id}`,
 						{},
 						{
-							Authorization: `Bearer ${$session.gitlabToken}`
+							Authorization: `Bearer ${$gitTokens.gitlabToken}`
 						}
 					);
 				}
@@ -216,7 +225,7 @@
 					can_push: false
 				},
 				{
-					Authorization: `Bearer ${$session.gitlabToken}`
+					Authorization: `Bearer ${$gitTokens.gitlabToken}`
 				}
 			);
 			await post(updateDeployKeyIdUrl, { deployKeyId: id });
@@ -234,10 +243,12 @@
 
 		const url = `/applications/${id}/configuration/repository.json`;
 		try {
+			const repository = selected.project.path_with_namespace;
 			await post(url, {
-				repository: `${selected.group.full_path}/${selected.project.name}`,
+				repository,
 				branch: selected.branch.name,
 				projectId: selected.project.id,
+				autodeploy,
 				webhookToken
 			});
 			return await goto(from || `/applications/${id}/configuration/buildpack`);

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

@@ -1,7 +1,7 @@
 <script context="module" lang="ts">
 	import type { Load } from '@sveltejs/kit';
 	export const load: Load = async ({ fetch, params, url, stuff }) => {
-		const { application, ghToken } = stuff;
+		const { application } = stuff;
 		if (application?.buildPack && !url.searchParams.get('from')) {
 			return {
 				status: 302,
@@ -14,8 +14,7 @@
 			return {
 				props: {
 					...(await res.json()),
-					application,
-					ghToken
+					application
 				}
 			};
 		}
@@ -30,30 +29,35 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
 
-	import { buildPacks, scanningTemplates } from '$lib/components/templates';
+	import { buildPacks, findBuildPack, scanningTemplates } from '$lib/components/templates';
 	import BuildPack from './_BuildPack.svelte';
 	import { page, session } from '$app/stores';
 	import { get } from '$lib/api';
 	import { errorNotification } from '$lib/form';
+	import { gitTokens } from '$lib/store';
+	import { browser } from '$app/env';
+
+	const { id } = $page.params;
 
 	let scanning = true;
 	let foundConfig = null;
+	let packageManager = 'npm';
 
 	export let apiUrl;
 	export let projectId;
 	export let repository;
 	export let branch;
-	export let ghToken;
 	export let type;
 	export let application;
 
 	function checkPackageJSONContents({ key, json }) {
 		return json?.dependencies?.hasOwnProperty(key) || json?.devDependencies?.hasOwnProperty(key);
 	}
-	function checkTemplates({ json }) {
+	function checkTemplates({ json, packageManager }) {
 		for (const [key, value] of Object.entries(scanningTemplates)) {
 			if (checkPackageJSONContents({ key, json })) {
-				return buildPacks.find((bp) => bp.name === value.buildPack);
+				foundConfig = findBuildPack(value.buildPack, packageManager);
+				break;
 			}
 		}
 	}
@@ -61,11 +65,15 @@
 		try {
 			if (type === 'gitlab') {
 				const files = await get(`${apiUrl}/v4/projects/${projectId}/repository/tree`, {
-					Authorization: `Bearer ${$session.gitlabToken}`
+					Authorization: `Bearer ${$gitTokens.gitlabToken}`
 				});
 				const packageJson = files.find(
 					(file) => file.name === 'package.json' && file.type === 'blob'
 				);
+				const yarnLock = files.find((file) => file.name === 'yarn.lock' && file.type === 'blob');
+				const pnpmLock = files.find(
+					(file) => file.name === 'pnpm-lock.yaml' && file.type === 'blob'
+				);
 				const dockerfile = files.find((file) => file.name === 'Dockerfile' && file.type === 'blob');
 				const cargoToml = files.find((file) => file.name === 'Cargo.toml' && file.type === 'blob');
 				const requirementsTxt = files.find(
@@ -73,35 +81,45 @@
 				);
 				const indexHtml = files.find((file) => file.name === 'index.html' && file.type === 'blob');
 				const indexPHP = files.find((file) => file.name === 'index.php' && file.type === 'blob');
+
+				if (yarnLock) packageManager = 'yarn';
+				if (pnpmLock) packageManager = 'pnpm';
+
 				if (dockerfile) {
-					foundConfig.buildPack = 'docker';
+					foundConfig = findBuildPack('docker', packageManager);
 				} else if (packageJson) {
 					const path = packageJson.path;
 					const data = await get(
 						`${apiUrl}/v4/projects/${projectId}/repository/files/${path}/raw?ref=${branch}`,
 						{
-							Authorization: `Bearer ${$session.gitlabToken}`
+							Authorization: `Bearer ${$gitTokens.gitlabToken}`
 						}
 					);
 					const json = JSON.parse(data) || {};
-					foundConfig = checkTemplates({ json });
+					checkTemplates({ json, packageManager });
 				} else if (cargoToml) {
-					foundConfig = buildPacks.find((bp) => bp.name === 'rust');
+					foundConfig = findBuildPack('rust');
 				} else if (requirementsTxt) {
-					foundConfig = buildPacks.find((bp) => bp.name === 'python');
+					foundConfig = findBuildPack('python');
 				} else if (indexHtml) {
-					foundConfig = buildPacks.find((bp) => bp.name === 'static');
+					foundConfig = findBuildPack('static', packageManager);
 				} else if (indexPHP) {
-					foundConfig = buildPacks.find((bp) => bp.name === 'php');
+					foundConfig = findBuildPack('php');
+				} else {
+					foundConfig = findBuildPack('node', packageManager);
 				}
 			} else if (type === 'github') {
 				const files = await get(`${apiUrl}/repos/${repository}/contents?ref=${branch}`, {
-					Authorization: `Bearer ${ghToken}`,
+					Authorization: `Bearer ${$gitTokens.githubToken}`,
 					Accept: 'application/vnd.github.v2.json'
 				});
 				const packageJson = files.find(
 					(file) => file.name === 'package.json' && file.type === 'file'
 				);
+				const yarnLock = files.find((file) => file.name === 'yarn.lock' && file.type === 'file');
+				const pnpmLock = files.find(
+					(file) => file.name === 'pnpm-lock.yaml' && file.type === 'file'
+				);
 				const dockerfile = files.find((file) => file.name === 'Dockerfile' && file.type === 'file');
 				const cargoToml = files.find((file) => file.name === 'Cargo.toml' && file.type === 'file');
 				const requirementsTxt = files.find(
@@ -109,26 +127,33 @@
 				);
 				const indexHtml = files.find((file) => file.name === 'index.html' && file.type === 'file');
 				const indexPHP = files.find((file) => file.name === 'index.php' && file.type === 'file');
+
+				if (yarnLock) packageManager = 'yarn';
+				if (pnpmLock) packageManager = 'pnpm';
+
 				if (dockerfile) {
-					foundConfig.buildPack = 'docker';
+					foundConfig = findBuildPack('docker', packageManager);
 				} else if (packageJson) {
 					const data = await get(`${packageJson.git_url}`, {
-						Authorization: `Bearer ${ghToken}`,
+						Authorization: `Bearer ${$gitTokens.githubToken}`,
 						Accept: 'application/vnd.github.v2.raw'
 					});
 					const json = JSON.parse(data) || {};
-					foundConfig = checkTemplates({ json });
+					checkTemplates({ json, packageManager });
 				} else if (cargoToml) {
-					foundConfig = buildPacks.find((bp) => bp.name === 'rust');
+					foundConfig = findBuildPack('rust');
 				} else if (requirementsTxt) {
-					foundConfig = buildPacks.find((bp) => bp.name === 'python');
+					foundConfig = findBuildPack('python');
 				} else if (indexHtml) {
-					foundConfig = buildPacks.find((bp) => bp.name === 'static');
+					foundConfig = findBuildPack('static', packageManager);
 				} else if (indexPHP) {
-					foundConfig = buildPacks.find((bp) => bp.name === 'php');
+					foundConfig = findBuildPack('php');
+				} else {
+					foundConfig = findBuildPack('node', packageManager);
 				}
 			}
 		} catch (error) {
+			scanning = true;
 			if (
 				error.error === 'invalid_token' ||
 				error.error_description ===
@@ -156,9 +181,14 @@
 					}, 100);
 				}
 			}
+			if (error.message === 'Bad credentials') {
+				const { token } = await get(`/applications/${id}/configuration/githubToken.json`);
+				$gitTokens.githubToken = token;
+				browser && window.location.reload();
+			}
 			return errorNotification(error);
 		} finally {
-			if (!foundConfig) foundConfig = buildPacks.find((bp) => bp.name === 'node');
+			if (!foundConfig) foundConfig = findBuildPack('node', packageManager);
 			scanning = false;
 		}
 	}
@@ -176,10 +206,16 @@
 		<div class="text-xl tracking-tight">Scanning repository to suggest a build pack for you...</div>
 	</div>
 {:else}
+	{#if packageManager === 'yarn' || packageManager === 'pnpm'}
+		<div class="flex justify-center p-6">
+			Found lock file for <span class="font-bold text-orange-500 pl-1">{packageManager}</span>.
+			Using it for predefined commands commands.
+		</div>
+	{/if}
 	<div class="max-w-7xl mx-auto flex flex-wrap justify-center">
 		{#each buildPacks as buildPack}
 			<div class="p-2">
-				<BuildPack {buildPack} {scanning} bind:foundConfig />
+				<BuildPack {buildPack} {scanning} {packageManager} bind:foundConfig />
 			</div>
 		{/each}
 	</div>

src/routes/applications/[id]/configuration/githubToken.json.ts

@@ -0,0 +1,45 @@
+import { getUserDetails } from '$lib/common';
+import * as db from '$lib/database';
+import { ErrorHandler } from '$lib/database';
+import type { RequestHandler } from '@sveltejs/kit';
+import jsonwebtoken from 'jsonwebtoken';
+
+export const get: RequestHandler = async (event) => {
+	const { teamId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+	try {
+		const application = await db.getApplication({ id, teamId });
+		const payload = {
+			iat: Math.round(new Date().getTime() / 1000),
+			exp: Math.round(new Date().getTime() / 1000 + 60),
+			iss: application.gitSource.githubApp.appId
+		};
+		const githubToken = jsonwebtoken.sign(payload, application.gitSource.githubApp.privateKey, {
+			algorithm: 'RS256'
+		});
+		const response = await fetch(
+			`${application.gitSource.apiUrl}/app/installations/${application.gitSource.githubApp.installationId}/access_tokens`,
+			{
+				method: 'POST',
+				headers: {
+					Authorization: `Bearer ${githubToken}`
+				}
+			}
+		);
+		if (!response.ok) {
+			throw new Error(`${response.status} ${response.statusText}`);
+		}
+		const data = await response.json();
+		return {
+			status: 201,
+			body: { token: data.token },
+			headers: {
+				'Set-Cookie': `githubToken=${data.token}; Path=/; HttpOnly; Max-Age=15778800;`
+			}
+		};
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};

src/routes/applications/[id]/configuration/repository.json.ts

@@ -30,14 +30,21 @@ export const post: RequestHandler = async (event) => {
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
-	let { repository, branch, projectId, webhookToken } = await event.request.json();
+	let { repository, branch, projectId, webhookToken, autodeploy } = await event.request.json();
 
 	repository = repository.toLowerCase();
 	branch = branch.toLowerCase();
 	projectId = Number(projectId);
 
 	try {
-		await db.configureGitRepository({ id, repository, branch, projectId, webhookToken });
+		await db.configureGitRepository({
+			id,
+			repository,
+			branch,
+			projectId,
+			webhookToken,
+			autodeploy
+		});
 		return { status: 201 };
 	} catch (error) {
 		return ErrorHandler(error);

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

@@ -1,7 +1,7 @@
 <script context="module" lang="ts">
 	import type { Load } from '@sveltejs/kit';
 	export const load: Load = async ({ params, url, stuff }) => {
-		const { application, githubToken, appId } = stuff;
+		const { application, appId } = stuff;
 		if (application?.branch && application?.repository && !url.searchParams.get('from')) {
 			return {
 				status: 302,
@@ -10,7 +10,6 @@
 		}
 		return {
 			props: {
-				githubToken,
 				application,
 				appId
 			}
@@ -20,8 +19,8 @@
 
 <script lang="ts">
 	export let application;
-	export let githubToken;
 	export let appId;
+
 	import GithubRepositories from './_GithubRepositories.svelte';
 	import GitlabRepositories from './_GitlabRepositories.svelte';
 </script>
@@ -31,7 +30,7 @@
 </div>
 <div class="flex flex-wrap justify-center">
 	{#if application.gitSource.type === 'github'}
-		<GithubRepositories {application} {githubToken} />
+		<GithubRepositories {application} />
 	{:else if application.gitSource.type === 'gitlab'}
 		<GitlabRepositories {application} {appId} />
 	{/if}

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

@@ -30,7 +30,7 @@
 	import type Prisma from '@prisma/client';
 
 	import { page } from '$app/stores';
-	import { enhance, errorNotification } from '$lib/form';
+	import { errorNotification } from '$lib/form';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
 
@@ -41,7 +41,7 @@
 		gitlabApp: Prisma.GitlabApp;
 		githubApp: Prisma.GithubApp;
 	};
-	sources = sources.filter(
+	const filteredSources = sources.filter(
 		(source) =>
 			(source.type === 'github' && source.githubAppId && source.githubApp.installationId) ||
 			(source.type === 'gitlab' && source.gitlabAppId)
@@ -59,8 +59,8 @@
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">Select a Git Source</div>
 </div>
-<div class="flex justify-center">
-	{#if !sources || sources.length === 0}
+<div class="flex flex-col justify-center">
+	{#if !filteredSources || filteredSources.length === 0}
 		<div class="flex-col">
 			<div class="pb-2">No configurable Git Source found</div>
 			<div class="flex justify-center">
@@ -83,7 +83,7 @@
 		</div>
 	{:else}
 		<div class="flex flex-wrap justify-center">
-			{#each sources as source}
+			{#each filteredSources as source}
 				<div class="p-2">
 					<form on:submit|preventDefault={() => handleSubmit(source.id)}>
 						<button

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

@@ -11,6 +11,7 @@ export const post: RequestHandler = async (event) => {
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
+	const { pullmergeRequestId = null, branch } = await event.request.json();
 	try {
 		const buildId = cuid();
 		const applicationFound = await db.getApplication({ id, teamId });
@@ -29,7 +30,30 @@ export const post: RequestHandler = async (event) => {
 				.digest('hex');
 			await db.prisma.application.update({ where: { id }, data: { configHash } });
 		}
-		await buildQueue.add(buildId, { build_id: buildId, type: 'manual', ...applicationFound });
+		await db.prisma.application.update({ where: { id }, data: { updatedAt: new Date() } });
+		await db.prisma.build.create({
+			data: {
+				id: buildId,
+				applicationId: id,
+				destinationDockerId: applicationFound.destinationDocker.id,
+				gitSourceId: applicationFound.gitSource.id,
+				githubAppId: applicationFound.gitSource.githubApp?.id,
+				gitlabAppId: applicationFound.gitSource.gitlabApp?.id,
+				status: 'queued',
+				type: 'manual'
+			}
+		});
+		if (pullmergeRequestId) {
+			await buildQueue.add(buildId, {
+				build_id: buildId,
+				type: 'manual',
+				...applicationFound,
+				sourceBranch: branch,
+				pullmergeRequestId
+			});
+		} else {
+			await buildQueue.add(buildId, { build_id: buildId, type: 'manual', ...applicationFound });
+		}
 		return {
 			status: 200,
 			body: {

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

@@ -1,46 +1,36 @@
-import { getTeam, getUserDetails } from '$lib/common';
-import { getGithubToken } from '$lib/components/common';
+import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
 import { checkContainer } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 import jsonwebtoken from 'jsonwebtoken';
+import { get as getRequest } from '$lib/api';
 
 export const get: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 
-	const appId = process.env['COOLIFY_APP_ID'];
-	let githubToken = null;
-	let ghToken = null;
-	let isRunning = false;
-
 	const { id } = event.params;
+
+	const appId = process.env['COOLIFY_APP_ID'];
+	let isRunning = false;
+	let githubToken = event.locals.cookies?.githubToken || null;
+	let gitlabToken = event.locals.cookies?.gitlabToken || null;
 	try {
 		const application = await db.getApplication({ id, teamId });
-		const { gitSource } = application;
-		if (gitSource?.type === 'github' && gitSource?.githubApp) {
-			const payload = {
-				iat: Math.round(new Date().getTime() / 1000),
-				exp: Math.round(new Date().getTime() / 1000 + 60),
-				iss: gitSource.githubApp.appId
-			};
-			githubToken = jsonwebtoken.sign(payload, gitSource.githubApp.privateKey, {
-				algorithm: 'RS256'
-			});
-			ghToken = await getGithubToken({ apiUrl: gitSource.apiUrl, application, githubToken });
-		}
 		if (application.destinationDockerId) {
 			isRunning = await checkContainer(application.destinationDocker.engine, id);
 		}
 		return {
+			status: 200,
 			body: {
 				isRunning,
-				ghToken,
-				githubToken,
 				application,
-				appId
-			}
+				appId,
+				githubToken,
+				gitlabToken
+			},
+			headers: {}
 		};
 	} catch (error) {
 		console.log(error);

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

@@ -42,16 +42,24 @@
 	import Explainer from '$lib/components/Explainer.svelte';
 	import Setting from '$lib/components/Setting.svelte';
 	import type Prisma from '@prisma/client';
-	import { getDomain, notNodeDeployments, staticDeployments } from '$lib/components/common';
+	import { notNodeDeployments, staticDeployments } from '$lib/components/common';
 	import { toast } from '@zerodevx/svelte-toast';
 	import { post } from '$lib/api';
+	import cuid from 'cuid';
+	import { browser } from '$app/env';
 	const { id } = $page.params;
 
 	let domainEl: HTMLInputElement;
 
 	let loading = false;
+	let forceSave = false;
 	let debug = application.settings.debug;
 	let previews = application.settings.previews;
+	let dualCerts = application.settings.dualCerts;
+	let autodeploy = application.settings.autodeploy;
+	if (browser && window.location.hostname === 'demo.coolify.io' && !application.fqdn) {
+		application.fqdn = `http://${cuid()}.demo.coolify.io`;
+	}
 
 	onMount(() => {
 		domainEl.focus();
@@ -64,20 +72,48 @@
 		if (name === 'previews') {
 			previews = !previews;
 		}
+		if (name === 'dualCerts') {
+			dualCerts = !dualCerts;
+		}
+		if (name === 'autodeploy') {
+			autodeploy = !autodeploy;
+		}
 		try {
-			await post(`/applications/${id}/settings.json`, { previews, debug });
+			await post(`/applications/${id}/settings.json`, {
+				previews,
+				debug,
+				dualCerts,
+				autodeploy,
+				branch: application.branch,
+				projectId: application.projectId
+			});
 			return toast.push('Settings saved.');
 		} catch ({ error }) {
+			if (name === 'debug') {
+				debug = !debug;
+			}
+			if (name === 'previews') {
+				previews = !previews;
+			}
+			if (name === 'dualCerts') {
+				dualCerts = !dualCerts;
+			}
+			if (name === 'autodeploy') {
+				autodeploy = !autodeploy;
+			}
 			return errorNotification(error);
 		}
 	}
 	async function handleSubmit() {
 		loading = true;
 		try {
-			await post(`/applications/${id}/check.json`, { fqdn: application.fqdn });
+			await post(`/applications/${id}/check.json`, { fqdn: application.fqdn, forceSave });
 			await post(`/applications/${id}.json`, { ...application });
 			return window.location.reload();
 		} catch ({ error }) {
+			if (error.startsWith('DNS not set')) {
+				forceSave = true;
+			}
 			return errorNotification(error);
 		} finally {
 			loading = false;
@@ -163,197 +199,204 @@
 				<button
 					type="submit"
 					class:bg-green-600={!loading}
+					class:bg-orange-600={forceSave}
 					class:hover:bg-green-500={!loading}
-					disabled={loading}>{loading ? 'Saving...' : 'Save'}</button
+					class:hover:bg-orange-400={forceSave}
+					disabled={loading}
+					>{loading ? 'Saving...' : forceSave ? 'Are you sure to continue?' : 'Save'}</button
 				>
 			{/if}
 		</div>
 		<div class="grid grid-flow-row gap-2 px-10">
-			<div class="mt-2 grid grid-cols-3 items-center">
-				<label for="name">Name</label>
-				<div class="col-span-2 ">
+			<div class="mt-2 grid grid-cols-2 items-center">
+				<label for="name" class="text-base font-bold text-stone-100">Name</label>
+				<input
+					readonly={!$session.isAdmin}
+					name="name"
+					id="name"
+					bind:value={application.name}
+					required
+				/>
+			</div>
+			<div class="grid grid-cols-2 items-center">
+				<label for="gitSource" class="text-base font-bold text-stone-100">Git Source</label>
+				<a
+					href={$session.isAdmin
+						? `/applications/${id}/configuration/source?from=/applications/${id}`
+						: ''}
+					class="no-underline"
+					><input
+						value={application.gitSource.name}
+						id="gitSource"
+						disabled
+						class="cursor-pointer hover:bg-coolgray-500"
+					/></a
+				>
+			</div>
+			<div class="grid grid-cols-2 items-center">
+				<label for="repository" class="text-base font-bold text-stone-100">Git Repository</label>
+				<a
+					href={$session.isAdmin
+						? `/applications/${id}/configuration/repository?from=/applications/${id}&to=/applications/${id}/configuration/buildpack`
+						: ''}
+					class="no-underline"
+					><input
+						value="{application.repository}/{application.branch}"
+						id="repository"
+						disabled
+						class="cursor-pointer hover:bg-coolgray-500"
+					/></a
+				>
+			</div>
+			<div class="grid grid-cols-2 items-center">
+				<label for="buildPack" class="text-base font-bold text-stone-100">Build Pack</label>
+				<a
+					href={$session.isAdmin
+						? `/applications/${id}/configuration/buildpack?from=/applications/${id}`
+						: ''}
+					class="no-underline "
+				>
 					<input
-						readonly={!$session.isAdmin}
-						name="name"
-						id="name"
-						bind:value={application.name}
-						required
+						value={application.buildPack}
+						id="buildPack"
+						disabled
+						class="cursor-pointer hover:bg-coolgray-500"
+					/></a
+				>
+			</div>
+			<div class="grid grid-cols-2 items-center pb-8">
+				<label for="destination" class="text-base font-bold text-stone-100">Destination</label>
+				<div class="no-underline">
+					<input
+						value={application.destinationDocker.name}
+						id="destination"
+						disabled
+						class="bg-transparent "
 					/>
 				</div>
 			</div>
-			<div class="grid grid-cols-3 items-center">
-				<label for="gitSource">Git Source</label>
-				<div class="col-span-2">
-					<a
-						href={$session.isAdmin
-							? `/applications/${id}/configuration/source?from=/applications/${id}`
-							: ''}
-						class="no-underline"
-						><input
-							value={application.gitSource.name}
-							id="gitSource"
-							disabled
-							class="cursor-pointer bg-coolgray-200 hover:bg-coolgray-500"
-						/></a
-					>
-				</div>
-			</div>
-			<div class="grid grid-cols-3 items-center">
-				<label for="repository">Git Repository</label>
-				<div class="col-span-2">
-					<a
-						href={$session.isAdmin
-							? `/applications/${id}/configuration/repository?from=/applications/${id}&to=/applications/${id}/configuration/buildpack`
-							: ''}
-						class="no-underline"
-						><input
-							value="{application.repository}/{application.branch}"
-							id="repository"
-							disabled
-							class="cursor-pointer bg-coolgray-200 hover:bg-coolgray-500"
-						/></a
-					>
-				</div>
-			</div>
-			<div class="grid grid-cols-3 items-center">
-				<label for="buildPack">Build Pack</label>
-				<div class="col-span-2">
-					<a
-						href={$session.isAdmin
-							? `/applications/${id}/configuration/buildpack?from=/applications/${id}`
-							: ''}
-						class="no-underline "
-					>
-						<input
-							value={application.buildPack}
-							id="buildPack"
-							disabled
-							class="cursor-pointer bg-coolgray-200 hover:bg-coolgray-500"
-						/></a
-					>
-				</div>
-			</div>
-			<div class="grid grid-cols-3 items-center pb-8">
-				<label for="destination">Destination</label>
-				<div class="col-span-2">
-					<div class="no-underline">
-						<input
-							value={application.destinationDocker.name}
-							id="destination"
-							disabled
-							class="bg-transparent "
-						/>
-					</div>
-				</div>
-			</div>
 		</div>
 		<div class="flex space-x-1 py-5 font-bold">
 			<div class="title">Application</div>
 		</div>
 		<div class="grid grid-flow-row gap-2 px-10">
-			<div class="grid grid-cols-3">
-				<label for="fqdn" class="pt-2">Domain (FQDN)</label>
-				<div class="col-span-2">
-					<input
-						readonly={!$session.isAdmin || isRunning}
-						disabled={!$session.isAdmin || isRunning}
-						bind:this={domainEl}
-						name="fqdn"
-						id="fqdn"
-						bind:value={application.fqdn}
-						pattern="^https?://([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{'{'}2,{'}'}$"
-						placeholder="eg: https://coollabs.io"
-						required
-					/>
+			<div class="grid grid-cols-2">
+				<div class="flex-col">
+					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100">Domain (FQDN)</label>
+					{#if browser && window.location.hostname === 'demo.coolify.io'}
+						<Explainer
+							text="<span class='text-white font-bold'>You can use the predefined random domain name or enter your own domain name.</span>"
+						/>
+					{/if}
 					<Explainer
-						text="If you specify <span class='text-green-600 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-600 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."
+						text="If you specify <span class='text-green-500 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-green-500 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>"
 					/>
 				</div>
+				<input
+					readonly={!$session.isAdmin || isRunning}
+					disabled={!$session.isAdmin || isRunning}
+					bind:this={domainEl}
+					name="fqdn"
+					id="fqdn"
+					bind:value={application.fqdn}
+					pattern="^https?://([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{'{'}2,{'}'}$"
+					placeholder="eg: https://coollabs.io"
+					required
+				/>
+			</div>
+			<div class="grid grid-cols-2 items-center pb-8">
+				<Setting
+					dataTooltip="Must be stopped to modify."
+					disabled={isRunning}
+					isCenter={false}
+					bind:setting={dualCerts}
+					title="Generate SSL for www and non-www?"
+					description="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."
+					on:click={() => !isRunning && changeSettings('dualCerts')}
+				/>
 			</div>
-
 			{#if !staticDeployments.includes(application.buildPack)}
-				<div class="grid grid-cols-3 items-center">
-					<label for="port">Port</label>
-					<div class="col-span-2">
-						<input
-							readonly={!$session.isAdmin}
-							name="port"
-							id="port"
-							bind:value={application.port}
-							placeholder="default: 3000"
-						/>
-					</div>
-				</div>
-			{/if}
-			{#if !notNodeDeployments.includes(application.buildPack)}
-				<div class="grid grid-cols-3 items-center">
-					<label for="installCommand">Install Command</label>
-					<div class="col-span-2">
-						<input
-							readonly={!$session.isAdmin}
-							name="installCommand"
-							id="installCommand"
-							bind:value={application.installCommand}
-							placeholder="default: yarn install"
-						/>
-					</div>
-				</div>
-				<div class="grid grid-cols-3 items-center">
-					<label for="buildCommand">Build Command</label>
-					<div class="col-span-2">
-						<input
-							readonly={!$session.isAdmin}
-							name="buildCommand"
-							id="buildCommand"
-							bind:value={application.buildCommand}
-							placeholder="default: yarn build"
-						/>
-					</div>
-				</div>
-				<div class="grid grid-cols-3 items-center">
-					<label for="startCommand" class="">Start Command</label>
-					<div class="col-span-2">
-						<input
-							readonly={!$session.isAdmin}
-							name="startCommand"
-							id="startCommand"
-							bind:value={application.startCommand}
-							placeholder="default: yarn start"
-						/>
-					</div>
-				</div>
-			{/if}
-
-			<div class="grid grid-cols-3">
-				<label for="baseDirectory" class="pt-2">Base Directory</label>
-				<div class="col-span-2">
+				<div class="grid grid-cols-2 items-center">
+					<label for="port" class="text-base font-bold text-stone-100">Port</label>
 					<input
 						readonly={!$session.isAdmin}
-						name="baseDirectory"
-						id="baseDirectory"
-						bind:value={application.baseDirectory}
-						placeholder="default: /"
-					/>
-					<Explainer
-						text="Directory to use as the base of all commands. <br> Could be useful with monorepos."
+						name="port"
+						id="port"
+						bind:value={application.port}
+						placeholder="default: 3000"
 					/>
 				</div>
+			{/if}
+
+			{#if !notNodeDeployments.includes(application.buildPack)}
+				<div class="grid grid-cols-2 items-center">
+					<label for="installCommand" class="text-base font-bold text-stone-100"
+						>Install Command</label
+					>
+					<input
+						readonly={!$session.isAdmin}
+						name="installCommand"
+						id="installCommand"
+						bind:value={application.installCommand}
+						placeholder="default: yarn install"
+					/>
+				</div>
+				<div class="grid grid-cols-2 items-center">
+					<label for="buildCommand" class="text-base font-bold text-stone-100">Build Command</label>
+					<input
+						readonly={!$session.isAdmin}
+						name="buildCommand"
+						id="buildCommand"
+						bind:value={application.buildCommand}
+						placeholder="default: yarn build"
+					/>
+				</div>
+				<div class="grid grid-cols-2 items-center">
+					<label for="startCommand" class="text-base font-bold text-stone-100">Start Command</label>
+					<input
+						readonly={!$session.isAdmin}
+						name="startCommand"
+						id="startCommand"
+						bind:value={application.startCommand}
+						placeholder="default: yarn start"
+					/>
+				</div>
+			{/if}
+			<div class="grid grid-cols-2 items-center">
+				<div class="flex-col">
+					<label for="baseDirectory" class="pt-2 text-base font-bold text-stone-100"
+						>Base Directory</label
+					>
+					<Explainer
+						text="Directory to use as the base for all commands.<br>Could be useful with <span class='text-green-500 font-bold'>monorepos</span>."
+					/>
+				</div>
+				<input
+					readonly={!$session.isAdmin}
+					name="baseDirectory"
+					id="baseDirectory"
+					bind:value={application.baseDirectory}
+					placeholder="default: /"
+				/>
 			</div>
 			{#if !notNodeDeployments.includes(application.buildPack)}
-				<div class="grid grid-cols-3">
-					<label for="publishDirectory" class="pt-2">Publish Directory</label>
-					<div class="col-span-2">
-						<input
-							readonly={!$session.isAdmin}
-							name="publishDirectory"
-							id="publishDirectory"
-							bind:value={application.publishDirectory}
-							placeholder=" default: /"
-						/>
+				<div class="grid grid-cols-2 items-center">
+					<div class="flex-col">
+						<label for="publishDirectory" class="pt-2 text-base font-bold text-stone-100"
+							>Publish Directory</label
+						>
 						<Explainer
-							text="Directory containing all the assets for deployment. <br> For example: <span class='text-green-600 font-bold'>dist</span>,<span class='text-green-600 font-bold'>_site</span> or <span class='text-green-600 font-bold'>public</span>."
+							text="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>."
 						/>
 					</div>
+
+					<input
+						readonly={!$session.isAdmin}
+						name="publishDirectory"
+						id="publishDirectory"
+						bind:value={application.publishDirectory}
+						placeholder=" default: /"
+					/>
 				</div>
 			{/if}
 		</div>
@@ -361,30 +404,33 @@
 	<div class="flex space-x-1 pb-5 font-bold">
 		<div class="title">Features</div>
 	</div>
-	<div class="px-4 pb-10 sm:px-6">
-		<!-- <ul class="mt-2 divide-y divide-stone-800">
+	<div class="px-10 pb-10">
+		<div class="grid grid-cols-2 items-center">
 			<Setting
-				bind:setting={forceSSL}
-				on:click={() => changeSettings('forceSSL')}
-				title="Force https"
-				description="Creates a https redirect for all requests from http and also generates a https certificate for the domain through Let's Encrypt."
+				isCenter={false}
+				bind:setting={autodeploy}
+				on:click={() => changeSettings('autodeploy')}
+				title="Enable Automatic Deployment"
+				description="Enable automatic deployment through webhooks."
 			/>
-		</ul> -->
-		<ul class="mt-2 divide-y divide-stone-800">
+		</div>
+		<div class="grid grid-cols-2 items-center">
 			<Setting
+				isCenter={false}
 				bind:setting={previews}
 				on:click={() => changeSettings('previews')}
 				title="Enable MR/PR Previews"
-				description="Creates previews from pull and merge requests."
+				description="Enable preview deployments from pull or merge requests."
 			/>
-		</ul>
-		<ul class="mt-2 divide-y divide-stone-800">
+		</div>
+		<div class="grid grid-cols-2 items-center">
 			<Setting
+				isCenter={false}
 				bind:setting={debug}
 				on:click={() => changeSettings('debug')}
 				title="Debug Logs"
-				description="Enable debug logs during build phase. <br>(<span class='text-red-500'>sensitive information</span> could be visible in logs)"
+				description="Enable debug logs during build phase.<br><span class='text-red-500 font-bold'>Sensitive information</span> could be visible and saved in logs."
 			/>
-		</ul>
+		</div>
 	</div>
 </div>

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

@@ -15,41 +15,60 @@
 	let loading = true;
 	let currentStatus;
 	let streamInterval;
+	let followingBuild;
+	let followingInterval;
+	let logsEl;
 
 	const { id } = $page.params;
 
+	const cleanAnsiCodes = (str: string) => str.replace(/\x1B\[(\d+)m/g, '');
+
+	function followBuild() {
+		followingBuild = !followingBuild;
+		if (followingBuild) {
+			followingInterval = setInterval(() => {
+				logsEl.scrollTop = logsEl.scrollHeight;
+				window.scrollTo(0, document.body.scrollHeight);
+			}, 100);
+		} else {
+			window.clearInterval(followingInterval);
+		}
+	}
 	async function streamLogs(sequence = 0) {
 		try {
 			let { logs: responseLogs, status } = await get(
 				`/applications/${id}/logs/build/build.json?buildId=${buildId}&sequence=${sequence}`
 			);
 			currentStatus = status;
-			logs = logs.concat(responseLogs);
+			logs = logs.concat(responseLogs.map((log) => ({ ...log, line: cleanAnsiCodes(log.line) })));
 			loading = false;
 			streamInterval = setInterval(async () => {
-				if (status !== 'running') {
+				if (status !== 'running' && status !== 'queued') {
 					clearInterval(streamInterval);
 					return;
 				}
-				const nextSequence = logs[logs.length - 1].time;
+				const nextSequence = logs[logs.length - 1]?.time || 0;
 				try {
 					const data = await get(
 						`/applications/${id}/logs/build/build.json?buildId=${buildId}&sequence=${nextSequence}`
 					);
 					status = data.status;
 					currentStatus = status;
-					logs = logs.concat(data.logs);
+
+					logs = logs.concat(data.logs.map((log) => ({ ...log, line: cleanAnsiCodes(log.line) })));
 					dispatch('updateBuildStatus', { status });
 				} catch ({ error }) {
 					return errorNotification(error);
 				}
 			}, 1000);
 		} catch ({ error }) {
+			console.log(error);
 			return errorNotification(error);
 		}
 	}
 	onDestroy(() => {
 		clearInterval(streamInterval);
+		clearInterval(followingInterval);
 	});
 	onMount(async () => {
 		window.scrollTo(0, 0);
@@ -60,16 +79,46 @@
 {#if loading}
 	<Loading />
 {:else}
-	<div class="relative">
+	<div class="relative ">
 		{#if currentStatus === 'running'}
 			<LoadingLogs />
 		{/if}
-		<div
-			class="font-mono leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words"
-		>
-			{#each logs as log}
-				<div>{log.line + '\n'}</div>
-			{/each}
-		</div>
+		{#if currentStatus === 'queued'}
+			<div class="text-center font-bold text-xl">Queued and waiting for execution.</div>
+		{:else}
+			<div class="flex justify-end sticky top-0 p-2">
+				<button
+					on:click={followBuild}
+					class="bg-transparent"
+					data-tooltip="Follow logs"
+					class:text-green-500={followingBuild}
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="w-6 h-6"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<circle cx="12" cy="12" r="9" />
+						<line x1="8" y1="12" x2="12" y2="16" />
+						<line x1="12" y1="8" x2="12" y2="16" />
+						<line x1="16" y1="12" x2="12" y2="16" />
+					</svg>
+				</button>
+			</div>
+			<div
+				class="font-mono leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
+				bind:this={logsEl}
+			>
+				{#each logs as log}
+					<div>{log.line + '\n'}</div>
+				{/each}
+			</div>
+		{/if}
 	</div>
 {/if}

src/routes/applications/[id]/logs/build/build.json.ts

@@ -19,7 +19,7 @@ export const get: RequestHandler = async (event) => {
 		return {
 			body: {
 				logs,
-				status: data?.status || 'running'
+				status: data?.status
 			}
 		};
 	} catch (error) {

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

@@ -33,7 +33,6 @@
 	export let buildCount;
 
 	let buildId;
-	$: buildId;
 
 	let skip = 0;
 	let noMoreBuilds = buildCount < 5 || buildCount <= skip;
@@ -52,10 +51,9 @@
 						build.took = data.builds[0].took;
 						build.since = data.builds[0].since;
 					}
-					window.location.reload();
+
 					return build;
 				});
-				return;
 			} catch ({ error }) {
 				return errorNotification(error);
 			}
@@ -83,7 +81,7 @@
 	}
 	async function loadBuild(build) {
 		buildId = build;
-		goto(`/applications/${id}/logs/build?buildId=${buildId}`);
+		await goto(`/applications/${id}/logs/build?buildId=${buildId}`);
 	}
 </script>
 
@@ -92,45 +90,51 @@
 		Build logs of <a href={application.fqdn} target="_blank">{getDomain(application.fqdn)}</a>
 	</div>
 </div>
-<div class="flex flex-row justify-start space-x-2 px-10 pt-6 ">
-	<div class="min-w-[16rem] space-y-2">
-		{#each builds as build (build.id)}
-			<div
-				data-tooltip={new Intl.DateTimeFormat('default', dateOptions).format(
-					new Date(build.createdAt)
-				) + `\n${build.status}`}
-				on:click={() => loadBuild(build.id)}
-				class="tooltip-top flex cursor-pointer items-center justify-center rounded-r border-l-2 border-transparent py-4 no-underline transition-all duration-100 hover:bg-coolgray-400 hover:shadow-xl"
-				class:bg-coolgray-400={buildId === build.id}
-				class:border-red-500={build.status === 'failed'}
-				class:border-green-500={build.status === 'success'}
-				class:border-yellow-500={build.status === 'inprogress'}
-			>
-				<div class="flex-col px-2">
-					<div class="text-sm font-bold">
-						{application.branch}
+<div class="block flex-row justify-start space-x-2 px-5 pt-6 sm:px-10 md:flex">
+	<div class="mb-4 min-w-[16rem] space-y-2 md:mb-0 ">
+		<div class="top-4 md:sticky">
+			{#each builds as build, index (build.id)}
+				<div
+					data-tooltip={new Intl.DateTimeFormat('default', dateOptions).format(
+						new Date(build.createdAt)
+					) + `\n${build.status}`}
+					on:click={() => loadBuild(build.id)}
+					class:rounded-tr={index === 0}
+					class:rounded-br={index === builds.length - 1}
+					class="tooltip-top flex cursor-pointer items-center justify-center border-l-2 border-transparent py-4 no-underline transition-all duration-100 hover:bg-coolgray-400 hover:shadow-xl "
+					class:bg-coolgray-400={buildId === build.id}
+					class:border-red-500={build.status === 'failed'}
+					class:border-green-500={build.status === 'success'}
+					class:border-yellow-500={build.status === 'running'}
+				>
+					<div class="flex-col px-2">
+						<div class="text-sm font-bold">
+							{application.branch}
+						</div>
+						<div class="text-xs">
+							{build.type}
+						</div>
 					</div>
-					<div class="text-xs">
-						{build.type}
-					</div>
-				</div>
-				<div class="flex-1" />
+					<div class="flex-1" />
 
-				<div class="w-48 text-center text-xs">
-					{#if build.status === 'running'}
-						<div class="font-bold">Running</div>
-					{:else}
-						<div>{build.since}</div>
-						<div>Finished in <span class="font-bold">{build.took}s</span></div>
-					{/if}
+					<div class="w-48 text-center text-xs">
+						{#if build.status === 'running'}
+							<div class="font-bold">Running</div>
+						{:else if build.status === 'queued'}
+							<div class="font-bold">Queued</div>
+						{:else}
+							<div>{build.since}</div>
+							<div>Finished in <span class="font-bold">{build.took}s</span></div>
+						{/if}
+					</div>
 				</div>
-			</div>
-		{/each}
-		{#if buildCount > 0 && !noMoreBuilds}
-			<button class="w-full" on:click={loadMoreBuilds}>Load More</button>
-		{/if}
+			{/each}
+		</div>
+		<div class="flex space-x-2">
+			<button disabled={noMoreBuilds} class="w-full" on:click={loadMoreBuilds}>Load More</button>
+		</div>
 	</div>
-	<div class="w-96 flex-1">
+	<div class="flex-1 md:w-96">
 		{#if buildId}
 			{#key buildId}
 				<svelte:component this={BuildLog} {buildId} on:updateBuildStatus={updateBuildStatus} />

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

@@ -27,19 +27,23 @@
 	import { getDomain } from '$lib/components/common';
 	import { get } from '$lib/api';
 	import { errorNotification } from '$lib/form';
+
 	let loadLogsInterval = null;
 	let logs = [];
+	let followingBuild;
+	let followingInterval;
+	let logsEl;
 
 	const { id } = $page.params;
-
 	onMount(async () => {
 		loadLogs();
 		loadLogsInterval = setInterval(() => {
 			loadLogs();
-		}, 3000);
+		}, 1000);
 	});
 	onDestroy(() => {
 		clearInterval(loadLogsInterval);
+		clearInterval(followingInterval);
 	});
 	async function loadLogs() {
 		try {
@@ -50,6 +54,18 @@
 			return errorNotification(error);
 		}
 	}
+
+	function followBuild() {
+		followingBuild = !followingBuild;
+		if (followingBuild) {
+			followingInterval = setInterval(() => {
+				logsEl.scrollTop = logsEl.scrollHeight;
+				window.scrollTo(0, document.body.scrollHeight);
+			}, 100);
+		} else {
+			window.clearInterval(followingInterval);
+		}
+	}
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -61,14 +77,42 @@
 	{#if logs.length === 0}
 		<div class="text-xl font-bold tracking-tighter">Waiting for the logs...</div>
 	{:else}
-		<div class="relative w-full">
+		<div class="relative">
 			<LoadingLogs />
+			<div class="flex justify-end sticky top-0 p-2">
+				<button
+					on:click={followBuild}
+					class="bg-transparent"
+					data-tooltip="Follow logs"
+					class:text-green-500={followingBuild}
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="w-6 h-6"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<circle cx="12" cy="12" r="9" />
+						<line x1="8" y1="12" x2="12" y2="16" />
+						<line x1="12" y1="8" x2="12" y2="16" />
+						<line x1="16" y1="12" x2="12" y2="16" />
+					</svg>
+				</button>
+			</div>
 			<div
-				class="font-mono leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 p-6 whitespace-pre-wrap break-words w-full"
+				class="font-mono leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
+				bind:this={logsEl}
 			>
-				{#each logs as log}
-					{log + '\n'}
-				{/each}
+				<div class="px-2">
+					{#each logs as log}
+						{log + '\n'}
+					{/each}
+				</div>
 			</div>
 		</div>
 	{/if}

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

@@ -11,6 +11,9 @@ export const get: RequestHandler = async (event) => {
 
 	const { id } = event.params;
 	try {
+		const secrets = await db.listSecrets(id);
+		const applicationSecrets = secrets.filter((secret) => !secret.isPRMRSecret);
+		const PRMRSecrets = secrets.filter((secret) => secret.isPRMRSecret);
 		const destinationDocker = await db.getDestinationByApplicationId({ id, teamId });
 		const docker = dockerInstance({ destinationDocker });
 		const listContainers = await docker.engine.listContainers({
@@ -35,7 +38,13 @@ export const get: RequestHandler = async (event) => {
 			});
 		return {
 			body: {
-				containers: jsonContainers
+				containers: jsonContainers,
+				applicationSecrets: applicationSecrets.sort((a, b) => {
+					return ('' + a.name).localeCompare(b.name);
+				}),
+				PRMRSecrets: PRMRSecrets.sort((a, b) => {
+					return ('' + a.name).localeCompare(b.name);
+				})
 			}
 		};
 	} catch (error) {

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

@@ -22,8 +22,32 @@
 <script lang="ts">
 	export let containers;
 	export let application;
-
+	export let PRMRSecrets;
+	export let applicationSecrets;
 	import { getDomain } from '$lib/components/common';
+	import Secret from '../secrets/_Secret.svelte';
+	import { get, post } from '$lib/api';
+	import { page } from '$app/stores';
+	import Explainer from '$lib/components/Explainer.svelte';
+	import { errorNotification } from '$lib/form';
+	import { toast } from '@zerodevx/svelte-toast';
+
+	const { id } = $page.params;
+	async function refreshSecrets() {
+		const data = await get(`/applications/${id}/secrets.json`);
+		PRMRSecrets = [...data.secrets];
+	}
+	async function redeploy(container) {
+		try {
+			await post(`/applications/${id}/deploy.json`, {
+				pullmergeRequestId: container.pullmergeRequestId,
+				branch: container.branch
+			});
+			toast.push('Application redeployed queued.');
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -32,7 +56,45 @@
 	</div>
 </div>
 
-<div class="mx-auto max-w-4xl px-6">
+{#if applicationSecrets.length !== 0}
+	<div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
+		<table class="mx-auto border-separate text-left">
+			<thead>
+				<tr class="h-12">
+					<th scope="col">Name</th>
+					<th scope="col">Value</th>
+					<th scope="col" class="w-64 text-center">Need during buildtime?</th>
+					<th scope="col" class="w-96 text-center">Action</th>
+				</tr>
+			</thead>
+			<tbody>
+				{#each applicationSecrets as secret}
+					{#key secret.id}
+						<tr>
+							<Secret
+								PRMRSecret={PRMRSecrets.find((s) => s.name === secret.name)}
+								isPRMRSecret
+								name={secret.name}
+								value={secret.value}
+								isBuildSecret={secret.isBuildSecret}
+								on:refresh={refreshSecrets}
+							/>
+						</tr>
+					{/key}
+				{/each}
+			</tbody>
+		</table>
+	</div>
+{/if}
+<div class="flex justify-center py-4 text-center">
+	<Explainer
+		customClass="w-full"
+		text={applicationSecrets.length === 0
+			? "You can add secrets to PR/MR deployments. Please add secrets to the application first. <br>Useful for creating <span class='text-green-500 font-bold'>staging</span> environments."
+			: "These values overwrite application secrets in PR/MR deployments. Useful for creating <span class='text-green-500 font-bold'>staging</span> environments."}
+	/>
+</div>
+<div class="mx-auto max-w-4xl py-10">
 	<div class="flex flex-wrap justify-center space-x-2">
 		{#if containers.length > 0}
 			{#each containers as container}
@@ -41,6 +103,11 @@
 						<div class="truncate text-center text-xl font-bold">{getDomain(container.fqdn)}</div>
 					</div>
 				</a>
+				<div class="flex items-center justify-center">
+					<button class="bg-coollabs hover:bg-coollabs-100" on:click={() => redeploy(container)}
+						>Redeploy</button
+					>
+				</div>
 			{/each}
 		{:else}
 			<div class="flex-col">

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

@@ -3,14 +3,19 @@
 	export let value = '';
 	export let isBuildSecret = false;
 	export let isNewSecret = false;
+	export let isPRMRSecret = false;
+	export let PRMRSecret = {};
+
+	if (isPRMRSecret) value = PRMRSecret.value;
+
 	import { page } from '$app/stores';
 	import { del, post } from '$lib/api';
+	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import { errorNotification } from '$lib/form';
+	import { toast } from '@zerodevx/svelte-toast';
 	import { createEventDispatcher } from 'svelte';
 
 	const dispatch = createEventDispatcher();
-	let nameEl;
-	let valueEl;
 	const { id } = $page.params;
 	async function removeSecret() {
 		try {
@@ -25,24 +30,24 @@
 			return errorNotification(error);
 		}
 	}
-	async function saveSecret() {
-		const nameValid = nameEl.checkValidity();
-		const valueValid = valueEl.checkValidity();
-		if (!nameValid) {
-			return nameEl.reportValidity();
-		}
-		if (!valueValid) {
-			return valueEl.reportValidity();
-		}
-
+	async function saveSecret(isNew = false) {
+		if (!name) return errorNotification('Name is required.');
+		if (!value) return errorNotification('Value is required.');
 		try {
-			await post(`/applications/${id}/secrets.json`, { name, value, isBuildSecret });
+			await post(`/applications/${id}/secrets.json`, {
+				name,
+				value,
+				isBuildSecret,
+				isPRMRSecret,
+				isNew
+			});
 			dispatch('refresh');
 			if (isNewSecret) {
 				name = '';
 				value = '';
 				isBuildSecret = false;
 			}
+			toast.push('Secret saved.');
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
@@ -54,33 +59,29 @@
 	}
 </script>
 
-<td class="whitespace-nowrap px-6 py-2 text-sm font-medium text-white">
+<td>
 	<input
-		id="secretName"
-		bind:this={nameEl}
+		id={isNewSecret ? 'secretName' : 'secretNameNew'}
 		bind:value={name}
 		required
 		placeholder="EXAMPLE_VARIABLE"
-		class="-mx-2 w-64 border-2 border-transparent"
+		class=" border border-dashed border-coolgray-300"
 		readonly={!isNewSecret}
 		class:bg-transparent={!isNewSecret}
 		class:cursor-not-allowed={!isNewSecret}
 	/>
 </td>
-<td class="whitespace-nowrap px-6 py-2 text-sm font-medium text-white">
-	<input
-		id="secretValue"
+<td>
+	<CopyPasswordField
+		id={isNewSecret ? 'secretValue' : 'secretValueNew'}
+		name={isNewSecret ? 'secretValue' : 'secretValueNew'}
+		isPasswordField={true}
 		bind:value
-		bind:this={valueEl}
 		required
 		placeholder="J$#@UIO%HO#$U%H"
-		class="-mx-2 w-64 border-2 border-transparent"
-		class:bg-transparent={!isNewSecret}
-		class:cursor-not-allowed={!isNewSecret}
-		readonly={!isNewSecret}
 	/>
 </td>
-<td class="whitespace-nowrap px-6 py-2 text-center text-sm font-medium text-white">
+<td class="text-center">
 	<div
 		type="button"
 		on:click={setSecretValue}
@@ -129,14 +130,21 @@
 		</span>
 	</div>
 </td>
-<td class="whitespace-nowrap px-6 py-2 text-sm font-medium text-white">
+<td>
 	{#if isNewSecret}
 		<div class="flex items-center justify-center">
-			<button class="w-24 bg-green-600 hover:bg-green-500" on:click={saveSecret}>Add</button>
+			<button class="bg-green-600 hover:bg-green-500" on:click={() => saveSecret(true)}>Add</button>
 		</div>
 	{:else}
-		<div class="flex justify-center items-end">
-			<button class="w-24 bg-red-600 hover:bg-red-500" on:click={removeSecret}>Remove</button>
+		<div class="flex flex-row justify-center space-x-2">
+			<div class="flex items-center justify-center">
+				<button class="" on:click={() => saveSecret(false)}>Set</button>
+			</div>
+			{#if !isPRMRSecret}
+				<div class="flex justify-center items-end">
+					<button class="bg-red-600 hover:bg-red-500" on:click={removeSecret}>Remove</button>
+				</div>
+			{/if}
 		</div>
 	{/if}
 </td>

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

@@ -7,8 +7,9 @@ export const get: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 
+	const { id } = event.params;
 	try {
-		const secrets = await db.listSecrets({ applicationId: event.params.id });
+		const secrets = await (await db.listSecrets(id)).filter((secret) => !secret.isPRMRSecret);
 		return {
 			status: 200,
 			body: {
@@ -27,16 +28,22 @@ export const post: RequestHandler = async (event) => {
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
-	const { name, value, isBuildSecret } = await event.request.json();
-
+	const { name, value, isBuildSecret, isPRMRSecret, isNew } = await event.request.json();
 	try {
-		const found = await db.isSecretExists({ id, name });
-		if (found) {
-			throw {
-				error: `Secret ${name} already exists.`
-			};
+		if (isNew) {
+			const found = await db.isSecretExists({ id, name, isPRMRSecret });
+			if (found) {
+				throw {
+					error: `Secret ${name} already exists.`
+				};
+			} else {
+				await db.createSecret({ id, name, value, isBuildSecret, isPRMRSecret });
+				return {
+					status: 201
+				};
+			}
 		} else {
-			await db.createSecret({ id, name, value, isBuildSecret });
+			await db.updateSecret({ id, name, value, isBuildSecret, isPRMRSecret });
 			return {
 				status: 201
 			};

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

@@ -41,37 +41,22 @@
 	</div>
 </div>
 <div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
-	<table class="mx-auto">
-		<thead class=" rounded-xl border-b border-coolgray-500">
-			<tr>
-				<th
-					scope="col"
-					class="px-6 py-3 text-left text-xs font-bold uppercase tracking-wider text-warmGray-400"
-					>Name</th
-				>
-				<th
-					scope="col"
-					class="px-6 py-3 text-left text-xs font-bold uppercase tracking-wider text-warmGray-400"
-					>Value</th
-				>
-				<th
-					scope="col"
-					class="px-6 py-3 text-left text-xs font-bold uppercase tracking-wider text-warmGray-400"
-					>Need during buildtime?</th
-				>
-				<th
-					scope="col"
-					class="px-6 py-3 text-left text-xs font-bold uppercase tracking-wider text-warmGray-400"
-				/>
+	<table class="mx-auto border-separate text-left">
+		<thead>
+			<tr class="h-12">
+				<th scope="col">Name</th>
+				<th scope="col">Value</th>
+				<th scope="col" class="w-64 text-center">Need during buildtime?</th>
+				<th scope="col" class="w-96 text-center">Action</th>
 			</tr>
 		</thead>
-		<tbody class="">
+		<tbody>
 			{#each secrets as secret}
 				{#key secret.id}
-					<tr class="hover:bg-coolgray-200">
+					<tr>
 						<Secret
 							name={secret.name}
-							value={secret.value ? secret.value : 'ENCRYPTED'}
+							value={secret.value}
 							isBuildSecret={secret.isBuildSecret}
 							on:refresh={refreshSecrets}
 						/>

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

@@ -8,10 +8,17 @@ export const post: RequestHandler = async (event) => {
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
-	const { debug, previews } = await event.request.json();
+	const { debug, previews, dualCerts, autodeploy, branch, projectId } = await event.request.json();
 
 	try {
-		await db.setApplicationSettings({ id, debug, previews });
+		const isDouble = await db.checkDoubleBranch(branch, projectId);
+		if (isDouble && autodeploy) {
+			throw {
+				message:
+					'Cannot activate automatic deployments until only one application is defined for this repository / branch.'
+			};
+		}
+		await db.setApplicationSettings({ id, debug, previews, dualCerts, autodeploy });
 		return { status: 201 };
 	} catch (error) {
 		return ErrorHandler(error);

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

@@ -1,8 +1,7 @@
-import { getDomain, getUserDetails } from '$lib/common';
+import { asyncExecShell, getEngine, getUserDetails, removeDestinationDocker } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
-import { dockerInstance } from '$lib/docker';
-import { removeProxyConfiguration } from '$lib/haproxy';
+import { checkContainer } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -16,12 +15,13 @@ export const post: RequestHandler = async (event) => {
 			id,
 			teamId
 		});
-		const domain = getDomain(fqdn);
 		if (destinationDockerId) {
-			const docker = dockerInstance({ destinationDocker });
-			await docker.engine.getContainer(id).stop();
+			const { engine } = destinationDocker;
+			const found = await checkContainer(engine, id);
+			if (found) {
+				await removeDestinationDocker({ id, engine });
+			}
 		}
-		await removeProxyConfiguration({ domain });
 		return {
 			status: 200
 		};

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

@@ -0,0 +1,73 @@
+<script lang="ts">
+	export let isNew = false;
+	export let storage = {
+		id: null,
+		path: null
+	};
+	import { del, post } from '$lib/api';
+	import { page } from '$app/stores';
+	import { createEventDispatcher } from 'svelte';
+
+	import { errorNotification } from '$lib/form';
+	import { toast } from '@zerodevx/svelte-toast';
+	const { id } = $page.params;
+
+	const dispatch = createEventDispatcher();
+	async function saveStorage(newStorage = false) {
+		try {
+			if (!storage.path) return errorNotification('Path is required.');
+			storage.path = storage.path.startsWith('/') ? storage.path : `/${storage.path}`;
+			storage.path = storage.path.endsWith('/') ? storage.path.slice(0, -1) : storage.path;
+			storage.path.replace(/\/\//g, '/');
+			await post(`/applications/${id}/storage.json`, {
+				path: storage.path,
+				storageId: storage.id,
+				newStorage
+			});
+			dispatch('refresh');
+			if (isNew) {
+				storage.path = null;
+				storage.id = null;
+			}
+			if (newStorage) toast.push('Storage saved.');
+			else toast.push('Storage updated.');
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
+	async function removeStorage() {
+		try {
+			await del(`/applications/${id}/storage.json`, { path: storage.path });
+			dispatch('refresh');
+			toast.push('Storage deleted.');
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
+</script>
+
+<td>
+	<input
+		bind:value={storage.path}
+		required
+		placeholder="eg: /sqlite.db"
+		class=" border border-dashed border-coolgray-300"
+	/>
+</td>
+<td>
+	{#if isNew}
+		<div class="flex items-center justify-center">
+			<button class="bg-green-600 hover:bg-green-500" on:click={() => saveStorage(true)}>Add</button
+			>
+		</div>
+	{:else}
+		<div class="flex flex-row justify-center space-x-2">
+			<div class="flex items-center justify-center">
+				<button class="" on:click={() => saveStorage(false)}>Set</button>
+			</div>
+			<div class="flex justify-center items-end">
+				<button class="bg-red-600 hover:bg-red-500" on:click={removeStorage}>Remove</button>
+			</div>
+		</div>
+	{/if}
+</td>