v1.0.6 (#30)

Features:
- Rust support 🦀 (Thanks to @pepoviola)
- Add a default rewrite rule to PHP apps (to index.php)
- Able to control upgrades in a straightforward way

Fixes:
- Improved upgrade scripts
- Simplified prechecks before deployment
- Fixed path deployments
- Fixed already defined apps redirections
- Better error handling - still needs a lot of improvement here!

.dockerignore

@@ -1,3 +1,4 @@
 node_modules
 dist
-.routify
+.routify
+.pnpm-store

.github/FUNDING.yml

@@ -0,0 +1 @@
+ko_fi: andrasbacsai

.gitignore

@@ -7,4 +7,6 @@ dist-ssr
 .env
 yarn-error.log
 api/development/console.log
-.pnpm-debug.log
+.pnpm-debug.log
+yarn.lock
+.pnpm-store

.prettierrc

@@ -11,4 +11,4 @@
     "svelteBracketNewLine": true,
     "svelteAllowShorthand": true,
     "plugins": ["prettier-plugin-svelte"]
-  }
+  }

README.md

@@ -3,7 +3,7 @@
 https://andrasbacsai.com/farewell-netlify-and-heroku-after-3-days-of-coding
 
 # Features
-- Deploy your Node.js and static sites just by pushing code to git.
+- Deploy your Node.js, static sites, PHP or any custom application (with custom Dockerfile) just by pushing code to git.
 - Hassle-free installation and upgrade process.
 - One-click MongoDB, MySQL, PostgreSQL, CouchDB deployments!
 
@@ -14,15 +14,11 @@ https://andrasbacsai.com/farewell-netlify-and-heroku-after-3-days-of-coding
 
 
 # FAQ
-Q: What does Buildpack means?
+Q: What is a buildpack?
 
-A: It defines your application's final form. Static means that it will be hosted as a static site in the end. (see next question below 👇)
-
----
-
-Q: How can I build a static site, like Next.js, Sapper (prerendered), etc ?
-
-A: Use `static` builder and set your `Build command`.
+A: It defines your application's final form. 
+`Static` means that it will be hosted as a static site.
+`NodeJs` means that it will be started as a node application.
 
 # Screenshots
 
@@ -40,7 +36,7 @@ A: Use `static` builder and set your `Build command`.
 
 # Getting Started
 
-Automatically: `sh <(curl -fsSL https://get.coollabs.io/install.sh) coolify`
+Automatically: `/bin/bash -c "$(curl -fsSL https://get.coollabs.io/coolify/install.sh)"`
 
 Manually:
 ### Requirements before installation

api/app.js

@@ -12,6 +12,7 @@ module.exports = async function (fastify, opts) {
     server.register(require('./routes/v1/application/deploy'), { prefix: '/application/deploy' })
     server.register(require('./routes/v1/application/deploy/logs'), { prefix: '/application/deploy/logs' })
     server.register(require('./routes/v1/databases'), { prefix: '/databases' })
+    server.register(require('./routes/v1/server'), { prefix: '/server' })
   })
   // Public routes
   fastify.register(require('./routes/v1/verify'), { prefix: '/verify' })

api/buildPacks/custom/index.js

@@ -0,0 +1,19 @@
+const fs = require('fs').promises
+const { streamEvents, docker } = require('../../libs/docker')
+
+module.exports = async function (configuration) {
+  try {
+    const path = `${configuration.general.workdir}/${configuration.build.directory ? configuration.build.directory : ''}`
+    if (fs.stat(`${path}/Dockerfile`)) {
+      const stream = await docker.engine.buildImage(
+        { src: ['.'], context: path },
+        { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+      )
+      await streamEvents(stream, configuration)
+    } else {
+      throw { error: 'No custom dockerfile found.', type: 'app' }
+    }
+  } catch (error) {
+    throw { error, type: 'server' }
+  }
+}

api/buildPacks/helpers.js

@@ -0,0 +1,27 @@
+const fs = require('fs').promises
+const { streamEvents, docker } = require('../libs/docker')
+const buildImageNodeDocker = (configuration) => {
+  return [
+    'FROM node:lts',
+    'WORKDIR /usr/src/app',
+    `COPY ${configuration.build.directory} ./`,
+    configuration.build.command.installation && `RUN ${configuration.build.command.installation}`,
+    `RUN ${configuration.build.command.build}`
+  ].join('\n')
+}
+async function buildImage (configuration) {
+  try {
+    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, buildImageNodeDocker(configuration))
+    const stream = await docker.engine.buildImage(
+      { src: ['.'], context: configuration.general.workdir },
+      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+    )
+    await streamEvents(stream, configuration)
+  } catch (error) {
+    throw { error, type: 'server' }
+  }
+}
+
+module.exports = {
+  buildImage
+}

api/buildPacks/index.js

@@ -0,0 +1,7 @@
+const static = require('./static')
+const nodejs = require('./nodejs')
+const php = require('./php')
+const custom = require('./custom')
+const rust = require('./rust')
+
+module.exports = { static, nodejs, php, custom, rust }

api/buildPacks/nodejs/index.js

@@ -0,0 +1,30 @@
+const fs = require('fs').promises
+const { buildImage } = require('../helpers')
+const { streamEvents, docker } = require('../../libs/docker')
+//  `HEALTHCHECK --timeout=10s --start-period=10s --interval=5s CMD curl -I -s -f http://localhost:${configuration.publish.port}${configuration.publish.path} || exit 1`,
+const publishNodejsDocker = (configuration) => {
+  return [
+    'FROM node:lts',
+    'WORKDIR /usr/src/app',
+    configuration.build.command.build
+      ? `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} ./`
+      : `COPY ${configuration.build.directory} ./`,
+    configuration.build.command.installation && `RUN ${configuration.build.command.installation}`,
+    `EXPOSE ${configuration.publish.port}`,
+    'CMD [ "yarn", "start" ]'
+  ].join('\n')
+}
+
+module.exports = async function (configuration) {
+  try {
+    if (configuration.build.command.build) await buildImage(configuration)
+    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishNodejsDocker(configuration))
+    const stream = await docker.engine.buildImage(
+      { src: ['.'], context: configuration.general.workdir },
+      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+    )
+    await streamEvents(stream, configuration)
+  } catch (error) {
+    throw { error, type: 'server' }
+  }
+}

api/buildPacks/php/index.js

@@ -0,0 +1,26 @@
+const fs = require('fs').promises
+const { streamEvents, docker } = require('../../libs/docker')
+//   'HEALTHCHECK --timeout=10s --start-period=10s --interval=5s CMD curl -I -s -f http://localhost/ || exit 1',
+const publishPHPDocker = (configuration) => {
+  return [
+    'FROM php:apache',
+    'RUN a2enmod rewrite',
+    'WORKDIR /usr/src/app',
+    `COPY .${configuration.build.directory} /var/www/html`,
+    'EXPOSE 80',
+    ' CMD ["apache2-foreground"]'
+  ].join('\n')
+}
+
+module.exports = async function (configuration) {
+  try {
+    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishPHPDocker(configuration))
+    const stream = await docker.engine.buildImage(
+      { src: ['.'], context: configuration.general.workdir },
+      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+    )
+    await streamEvents(stream, configuration)
+  } catch (error) {
+    throw { error, type: 'server' }
+  }
+}

api/buildPacks/rust/index.js

@@ -0,0 +1,64 @@
+const fs = require('fs').promises
+const { streamEvents, docker } = require('../../libs/docker')
+const { execShellAsync } = require('../../libs/common')
+const TOML = require('@iarna/toml')
+
+const publishRustDocker = (configuration, custom) => {
+  return [
+    'FROM rust:latest',
+    'WORKDIR /app',
+    `COPY --from=${configuration.build.container.name}:cache /app/target target`,
+    `COPY --from=${configuration.build.container.name}:cache /usr/local/cargo /usr/local/cargo`,
+    'COPY . .',
+    `RUN cargo build --release --bin ${custom.name}`,
+    'FROM debian:buster-slim',
+    'WORKDIR /app',
+    '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/*',
+    'RUN update-ca-certificates',
+    `COPY --from=${configuration.build.container.name}:cache /app/target/release/${custom.name} ${custom.name}`,
+    `EXPOSE ${configuration.publish.port}`,
+    `CMD ["/app/${custom.name}"]`
+  ].join('\n')
+}
+
+const cacheRustDocker = (configuration, custom) => {
+  return [
+    `FROM rust:latest AS planner-${configuration.build.container.name}`,
+    'WORKDIR /app',
+    'RUN cargo install cargo-chef',
+    'COPY . .',
+    'RUN cargo chef prepare --recipe-path recipe.json',
+    'FROM rust:latest',
+    'WORKDIR /app',
+    'RUN cargo install cargo-chef',
+    `COPY --from=planner-${configuration.build.container.name} /app/recipe.json recipe.json`,
+    'RUN cargo chef cook --release --recipe-path recipe.json'
+  ].join('\n')
+}
+
+module.exports = async function (configuration) {
+  try {
+    const cargoToml = await execShellAsync(`cat ${configuration.general.workdir}/Cargo.toml`)
+    const parsedToml = TOML.parse(cargoToml)
+    const custom = {
+      name: parsedToml.package.name
+    }
+    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, cacheRustDocker(configuration, custom))
+
+    let stream = await docker.engine.buildImage(
+      { src: ['.'], context: configuration.general.workdir },
+      { t: `${configuration.build.container.name}:cache` }
+    )
+    await streamEvents(stream, configuration)
+
+    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishRustDocker(configuration, custom))
+
+    stream = await docker.engine.buildImage(
+      { src: ['.'], context: configuration.general.workdir },
+      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+    )
+    await streamEvents(stream, configuration)
+  } catch (error) {
+    throw { error, type: 'server' }
+  }
+}

api/buildPacks/static/index.js

@@ -0,0 +1,32 @@
+const fs = require('fs').promises
+const { buildImage } = require('../helpers')
+const { streamEvents, docker } = require('../../libs/docker')
+
+//    'HEALTHCHECK --timeout=10s --start-period=10s --interval=5s CMD curl -I -s -f http://localhost/ || exit 1',
+const publishStaticDocker = (configuration) => {
+  return [
+    'FROM nginx:stable-alpine',
+    'COPY nginx.conf /etc/nginx/nginx.conf',
+    'WORKDIR /usr/share/nginx/html',
+    configuration.build.command.build
+      ? `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} ./`
+      : `COPY ${configuration.build.directory} ./`,
+    'EXPOSE 80',
+    'CMD ["nginx", "-g", "daemon off;"]'
+  ].join('\n')
+}
+
+module.exports = async function (configuration) {
+  try {
+    if (configuration.build.command.build) await buildImage(configuration)
+    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishStaticDocker(configuration))
+
+    const stream = await docker.engine.buildImage(
+      { src: ['.'], context: configuration.general.workdir },
+      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+    )
+    await streamEvents(stream, configuration)
+  } catch (error) {
+    throw { error, type: 'server' }
+  }
+}

api/libs/applications/build/container.js

@@ -1,4 +1,4 @@
-const packs = require('../../../packs')
+const packs = require('../../../buildPacks')
 const { saveAppLog } = require('../../logging')
 const Deployment = require('../../../models/Deployment')
 
@@ -26,9 +26,14 @@ module.exports = async function (configuration) {
       throw { error, type: 'app' }
     }
   } else {
-    await Deployment.findOneAndUpdate(
-      { repoId: id, branch, deployId, organization, name, domain },
-      { repoId: id, branch, deployId, organization, name, domain, progress: 'failed' })
+    try {
+      await Deployment.findOneAndUpdate(
+        { repoId: id, branch, deployId, organization, name, domain },
+        { repoId: id, branch, deployId, organization, name, domain, progress: 'failed' })
+    } catch (error) {
+      // Hmm.
+    }
+
     throw { error: 'No buildpack found.', type: 'app' }
   }
 }

api/libs/applications/cleanup/index.js

@@ -1,17 +1,17 @@
 const { docker } = require('../../docker')
-const { execShellAsync, delay } = require('../../common')
+const { execShellAsync } = require('../../common')
 const Deployment = require('../../../models/Deployment')
 
-async function purgeOldThings () {
+async function purgeImagesContainers () {
   try {
-    await docker.engine.pruneImages()
-    await docker.engine.pruneContainers()
+    await execShellAsync('docker container prune -f')
+    await execShellAsync('docker image prune -f --filter=label!=coolify-reserve=true')
   } catch (error) {
     throw { error, type: 'server' }
   }
 }
 
-async function cleanup (configuration) {
+async function cleanupStuckedDeploymentsInDB (configuration) {
   const { id } = configuration.repository
   const deployId = configuration.general.deployId
   try {
@@ -38,4 +38,4 @@ async function deleteSameDeployments (configuration) {
   }
 }
 
-module.exports = { cleanup, deleteSameDeployments, purgeOldThings }
+module.exports = { cleanupStuckedDeploymentsInDB, deleteSameDeployments, purgeImagesContainers }

api/libs/applications/configuration.js

@@ -1,7 +1,8 @@
 const { uniqueNamesGenerator, adjectives, colors, animals } = require('unique-names-generator')
 const cuid = require('cuid')
-const { execShellAsync } = require('../common')
 const crypto = require('crypto')
+const { docker } = require('../docker')
+const { execShellAsync } = require('../common')
 
 function getUniq () {
   return uniqueNamesGenerator({ dictionaries: [adjectives, animals, colors], length: 2 })
@@ -15,6 +16,25 @@ function setDefaultConfiguration (configuration) {
     const shaBase = JSON.stringify({ repository: configuration.repository })
     const sha256 = crypto.createHash('sha256').update(shaBase).digest('hex')
 
+    const baseServiceConfiguration = {
+      replicas: 1,
+      restart_policy: {
+        condition: 'any',
+        max_attempts: 3
+      },
+      update_config: {
+        parallelism: 1,
+        delay: '10s',
+        order: 'start-first'
+      },
+      rollback_config: {
+        parallelism: 1,
+        delay: '10s',
+        order: 'start-first',
+        failure_action: 'rollback'
+      }
+    }
+
     configuration.build.container.name = sha256.slice(0, 15)
 
     configuration.general.nickname = nickname
@@ -22,17 +42,31 @@ function setDefaultConfiguration (configuration) {
     configuration.general.workdir = `/tmp/${deployId}`
 
     if (!configuration.publish.path) configuration.publish.path = '/'
-    if (!configuration.publish.port) configuration.publish.port = configuration.build.pack === 'static' ? 80 : 3000
-
-    if (configuration.build.pack === 'static') {
-      if (!configuration.build.command.installation) configuration.build.command.installation = 'yarn install'
-      if (!configuration.build.directory) configuration.build.directory = '/'
+    if (!configuration.publish.port) {
+      if (configuration.build.pack === 'php') {
+        configuration.publish.port = 80
+      } else if (configuration.build.pack === 'static') {
+        configuration.publish.port = 80
+      } else if (configuration.build.pack === 'nodejs') {
+        configuration.publish.port = 3000
+      } else if (configuration.build.pack === 'rust') {
+        configuration.publish.port = 3000
+      }
     }
 
-    if (configuration.build.pack === 'nodejs') {
-      if (!configuration.build.command.installation) configuration.build.command.installation = 'yarn install'
-      if (!configuration.build.directory) configuration.build.directory = '/'
+    if (!configuration.build.directory) {
+      configuration.build.directory = '/'
     }
+    if (!configuration.publish.directory) {
+      configuration.publish.directory = '/'
+    }
+
+    if (configuration.build.pack === 'static' || configuration.build.pack === 'nodejs') {
+      if (!configuration.build.command.installation) configuration.build.command.installation = 'yarn install'
+    }
+
+    configuration.build.container.baseSHA = crypto.createHash('sha256').update(JSON.stringify(baseServiceConfiguration)).digest('hex')
+    configuration.baseServiceConfiguration = baseServiceConfiguration
 
     return configuration
   } catch (error) {
@@ -40,8 +74,9 @@ function setDefaultConfiguration (configuration) {
   }
 }
 
-async function updateServiceLabels (configuration, services) {
+async function updateServiceLabels (configuration) {
   // In case of any failure during deployment, still update the current configuration.
+  const services = (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application')
   const found = services.find(s => {
     const config = JSON.parse(s.Spec.Labels.configuration)
     if (config.repository.id === configuration.repository.id && config.repository.branch === configuration.repository.branch) {
@@ -53,10 +88,58 @@ async function updateServiceLabels (configuration, services) {
     const { ID } = found
     try {
       const Labels = { ...JSON.parse(found.Spec.Labels.configuration), ...configuration }
-      execShellAsync(`docker service update --label-add configuration='${JSON.stringify(Labels)}' --label-add com.docker.stack.image='${configuration.build.container.name}:${configuration.build.container.tag}' ${ID}`)
+      await execShellAsync(`docker service update --label-add configuration='${JSON.stringify(Labels)}' --label-add com.docker.stack.image='${configuration.build.container.name}:${configuration.build.container.tag}' ${ID}`)
     } catch (error) {
       console.log(error)
     }
   }
 }
-module.exports = { setDefaultConfiguration, updateServiceLabels }
+
+async function precheckDeployment ({ services, configuration }) {
+  let foundService = false
+  let configChanged = false
+  let imageChanged = false
+
+  let forceUpdate = false
+
+  for (const service of services) {
+    const running = JSON.parse(service.Spec.Labels.configuration)
+    if (running) {
+      if (running.repository.id === configuration.repository.id && running.repository.branch === configuration.repository.branch) {
+        // Base service configuration changed
+        if (!running.build.container.baseSHA || running.build.container.baseSHA !== configuration.build.container.baseSHA) {
+          forceUpdate = true
+        }
+        // If the deployment is in error state, forceUpdate
+        const state = await execShellAsync(`docker stack ps ${running.build.container.name} --format '{{ json . }}'`)
+        const isError = state.split('\n').filter(n => n).map(s => JSON.parse(s)).filter(n => n.DesiredState !== 'Running' && n.Image.split(':')[1] === running.build.container.tag)
+        if (isError.length > 0) forceUpdate = true
+        foundService = true
+
+        const runningWithoutContainer = JSON.parse(JSON.stringify(running))
+        delete runningWithoutContainer.build.container
+
+        const configurationWithoutContainer = JSON.parse(JSON.stringify(configuration))
+        delete configurationWithoutContainer.build.container
+
+        // If only the configuration changed
+        if (JSON.stringify(runningWithoutContainer.build) !== JSON.stringify(configurationWithoutContainer.build) || JSON.stringify(runningWithoutContainer.publish) !== JSON.stringify(configurationWithoutContainer.publish)) configChanged = true
+        // If only the image changed
+        if (running.build.container.tag !== configuration.build.container.tag) imageChanged = true
+        // If build pack changed, forceUpdate the service
+        if (running.build.pack !== configuration.build.pack) forceUpdate = true
+      }
+    }
+  }
+  if (forceUpdate) {
+    imageChanged = false
+    configChanged = false
+  }
+  return {
+    foundService,
+    imageChanged,
+    configChanged,
+    forceUpdate
+  }
+}
+module.exports = { setDefaultConfiguration, updateServiceLabels, precheckDeployment }

api/libs/applications/deploy/copyFiles.js

@@ -1,52 +1,63 @@
 const fs = require('fs').promises
 module.exports = async function (configuration) {
   try {
-    // TODO: Do it better.
-    await fs.writeFile(`${configuration.general.workdir}/.dockerignore`, 'node_modules')
-    await fs.writeFile(
-      `${configuration.general.workdir}/nginx.conf`,
-      `user  nginx;
-        worker_processes  auto;
-        
-        error_log  /var/log/nginx/error.log warn;
-        pid        /var/run/nginx.pid;
-        
-        events {
-            worker_connections  1024;
-        }
-        
-        http {
-            include       /etc/nginx/mime.types;
-        
-            access_log      off;
-            sendfile        on;
-            #tcp_nopush     on;
-            keepalive_timeout  65;
-
-            server {
-                listen       80;
-                server_name  localhost;
-                
-                location / {
-                    root   /usr/share/nginx/html;
-                    index  index.html;
-                    try_files $uri $uri/index.html $uri/ /index.html =404;
-                }
-        
-                error_page  404              /50x.html;
-        
-                # redirect server error pages to the static page /50x.html
-                #
-                error_page   500 502 503 504  /50x.html;
-                location = /50x.html {
-                    root   /usr/share/nginx/html;
-                }  
-        
-            }
-        
-        }
-        `
-    )
+    // TODO: Write full .dockerignore for all deployments!!
+    if (configuration.build.pack === 'php') {
+      await fs.writeFile(`${configuration.general.workdir}/.htaccess`, `
+      RewriteEngine On
+      RewriteBase /
+      RewriteCond %{REQUEST_FILENAME} !-d
+      RewriteCond %{REQUEST_FILENAME} !-f
+      RewriteRule ^(.+)$ index.php [QSA,L]
+      `)
+    }
+    // await fs.writeFile(`${configuration.general.workdir}/.dockerignore`, 'node_modules')
+    if (configuration.build.pack === 'static') {
+      await fs.writeFile(
+        `${configuration.general.workdir}/nginx.conf`,
+        `user  nginx;
+          worker_processes  auto;
+          
+          error_log  /var/log/nginx/error.log warn;
+          pid        /var/run/nginx.pid;
+          
+          events {
+              worker_connections  1024;
+          }
+          
+          http {
+              include       /etc/nginx/mime.types;
+          
+              access_log      off;
+              sendfile        on;
+              #tcp_nopush     on;
+              keepalive_timeout  65;
+  
+              server {
+                  listen       80;
+                  server_name  localhost;
+                  
+                  location / {
+                      root   /usr/share/nginx/html;
+                      index  index.html;
+                      try_files $uri $uri/index.html $uri/ /index.html =404;
+                  }
+          
+                  error_page  404              /50x.html;
+          
+                  # redirect server error pages to the static page /50x.html
+                  #
+                  error_page   500 502 503 504  /50x.html;
+                  location = /50x.html {
+                      root   /usr/share/nginx/html;
+                  }  
+          
+              }
+          
+          }
+          `
+      )
+    }
   } catch (error) {
     throw { error, type: 'server' }
   }

api/libs/applications/deploy/deploy.js

@@ -1,17 +1,22 @@
 const yaml = require('js-yaml')
+const fs = require('fs').promises
 const { execShellAsync } = require('../../common')
 const { docker } = require('../../docker')
 const { saveAppLog } = require('../../logging')
 const { deleteSameDeployments } = require('../cleanup')
-const fs = require('fs').promises
 
-module.exports = async function (configuration, configChanged, imageChanged) {
+module.exports = async function (configuration, imageChanged) {
   try {
     const generateEnvs = {}
     for (const secret of configuration.publish.secrets) {
       generateEnvs[secret.name] = secret.value
     }
     const containerName = configuration.build.container.name
+
+    // Only save SHA256 of it in the configuration label
+    const baseServiceConfiguration = configuration.baseServiceConfiguration
+    delete configuration.baseServiceConfiguration
+
     const stack = {
       version: '3.8',
       services: {
@@ -20,23 +25,7 @@ module.exports = async function (configuration, configChanged, imageChanged) {
           networks: [`${docker.network}`],
           environment: generateEnvs,
           deploy: {
-            replicas: 1,
-            restart_policy: {
-              condition: 'on-failure',
-              delay: '5s',
-              max_attempts: 1,
-              window: '120s'
-            },
-            update_config: {
-              parallelism: 1,
-              delay: '10s',
-              order: 'start-first'
-            },
-            rollback_config: {
-              parallelism: 1,
-              delay: '10s',
-              order: 'start-first'
-            },
+            ...baseServiceConfiguration,
             labels: [
               'managedBy=coolify',
               'type=application',
@@ -73,16 +62,11 @@ module.exports = async function (configuration, configChanged, imageChanged) {
     }
     await saveAppLog('### Publishing.', configuration)
     await fs.writeFile(`${configuration.general.workdir}/stack.yml`, yaml.dump(stack))
-    if (configChanged) {
-      // console.log('configuration changed')
-      await execShellAsync(
-        `cat ${configuration.general.workdir}/stack.yml | docker stack deploy --prune -c - ${containerName}`
-      )
-    } else if (imageChanged) {
+    if (imageChanged) {
       // console.log('image changed')
       await execShellAsync(`docker service update --image ${configuration.build.container.name}:${configuration.build.container.tag} ${configuration.build.container.name}_${configuration.build.container.name}`)
     } else {
-      // console.log('new deployment or force deployment')
+      // console.log('new deployment or force deployment or config changed')
       await deleteSameDeployments(configuration)
       await execShellAsync(
         `cat ${configuration.general.workdir}/stack.yml | docker stack deploy --prune -c - ${containerName}`
@@ -91,6 +75,7 @@ module.exports = async function (configuration, configChanged, imageChanged) {
 
     await saveAppLog('### Published done!', configuration)
   } catch (error) {
+    console.log(error)
     await saveAppLog(`Error occured during deployment: ${error.message}`, configuration)
     throw { error, type: 'server' }
   }

api/libs/applications/index.js

@@ -8,10 +8,10 @@ const copyFiles = require('./deploy/copyFiles')
 const buildContainer = require('./build/container')
 const deploy = require('./deploy/deploy')
 const Deployment = require('../../models/Deployment')
-const { cleanup, purgeOldThings } = require('./cleanup')
+const { cleanupStuckedDeploymentsInDB, purgeImagesContainers } = require('./cleanup')
 const { updateServiceLabels } = require('./configuration')
 
-async function queueAndBuild (configuration, services, configChanged, imageChanged) {
+async function queueAndBuild (configuration, imageChanged) {
   const { id, organization, name, branch } = configuration.repository
   const { domain } = configuration.publish
   const { deployId, nickname, workdir } = configuration.general
@@ -22,15 +22,15 @@ async function queueAndBuild (configuration, services, configChanged, imageChang
     await saveAppLog(`${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} Queued.`, configuration)
     await copyFiles(configuration)
     await buildContainer(configuration)
-    await deploy(configuration, configChanged, imageChanged)
+    await deploy(configuration, imageChanged)
     await Deployment.findOneAndUpdate(
       { repoId: id, branch, deployId, organization, name, domain },
       { repoId: id, branch, deployId, organization, name, domain, progress: 'done' })
-    await updateServiceLabels(configuration, services)
+    await updateServiceLabels(configuration)
     cleanupTmp(workdir)
-    await purgeOldThings()
+    await purgeImagesContainers()
   } catch (error) {
-    await cleanup(configuration)
+    await cleanupStuckedDeploymentsInDB(configuration)
     cleanupTmp(workdir)
     const { type } = error.error
     if (type === 'app') {

api/libs/common.js

@@ -15,12 +15,16 @@ function delay (t) {
 }
 
 async function verifyUserId (authorization) {
-  const token = authorization.split(' ')[1]
-  const verify = jsonwebtoken.verify(token, process.env.JWT_SIGN_KEY)
-  const found = await User.findOne({ uid: verify.jti })
-  if (found) {
-    return true
-  } else {
+  try {
+    const token = authorization.split(' ')[1]
+    const verify = jsonwebtoken.verify(token, process.env.JWT_SIGN_KEY)
+    const found = await User.findOne({ uid: verify.jti })
+    if (found) {
+      return true
+    } else {
+      return false
+    }
+  } catch (error) {
     return false
   }
 }

api/libs/logging.js

@@ -40,13 +40,17 @@ async function saveAppLog (event, configuration, isError) {
 }
 
 async function saveServerLog ({ event, configuration, type }) {
-  if (configuration) {
-    const deployId = configuration.general.deployId
-    const repoId = configuration.repository.id
-    const branch = configuration.repository.branch
-    await new ApplicationLog({ repoId, branch, deployId, event: `[SERVER ERROR 😖]: ${event}` }).save()
+  try {
+    if (configuration) {
+      const deployId = configuration.general.deployId
+      const repoId = configuration.repository.id
+      const branch = configuration.repository.branch
+      await new ApplicationLog({ repoId, branch, deployId, event: `[SERVER ERROR 😖]: ${event}` }).save()
+    }
+    await new ServerLog({ event, type }).save()
+  } catch (error) {
+    // Hmm.
   }
-  await new ServerLog({ event, type }).save()
 }
 
 module.exports = {

api/packs/helpers.js

@@ -1,28 +0,0 @@
-const fs = require('fs').promises
-const { streamEvents, docker } = require('../libs/docker')
-
-async function buildImage (configuration) {
-  let dockerFile = `
-                # build
-                FROM node:lts
-                WORKDIR /usr/src/app
-                COPY package*.json .
-                `
-  if (configuration.build.command.installation) {
-    dockerFile += `RUN ${configuration.build.command.installation}
-                `
-  }
-  dockerFile += `COPY . .
-            RUN ${configuration.build.command.build}`
-
-  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, dockerFile)
-  const stream = await docker.engine.buildImage(
-    { src: ['.'], context: configuration.general.workdir },
-    { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
-  )
-  await streamEvents(stream, configuration)
-}
-
-module.exports = {
-  buildImage
-}

api/packs/index.js

@@ -1,4 +0,0 @@
-const static = require('./static')
-const nodejs = require('./nodejs')
-
-module.exports = { static, nodejs }

api/packs/nodejs/index.js

@@ -1,32 +0,0 @@
-const fs = require('fs').promises
-const { buildImage } = require('../helpers')
-const { streamEvents, docker } = require('../../libs/docker')
-
-module.exports = async function (configuration) {
-  if (configuration.build.command.build) await buildImage(configuration)
-
-  let dockerFile = `# production stage
-      FROM node:lts
-      WORKDIR /usr/src/app
-      `
-  if (configuration.build.command.build) {
-    dockerFile += `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.build.directory} /usr/src/app`
-  } else {
-    dockerFile += 'COPY . ./'
-  }
-  if (configuration.build.command.installation) {
-    dockerFile += `
-      RUN ${configuration.build.command.installation}
-      `
-  }
-  dockerFile += `
-        EXPOSE ${configuration.publish.port}
-        CMD [ "yarn", "start" ]`
-
-  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, dockerFile)
-  const stream = await docker.engine.buildImage(
-    { src: ['.'], context: configuration.general.workdir },
-    { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
-  )
-  await streamEvents(stream, configuration)
-}

api/packs/static/index.js

@@ -1,28 +0,0 @@
-const fs = require('fs').promises
-const { buildImage } = require('../helpers')
-const { streamEvents, docker } = require('../../libs/docker')
-
-module.exports = async function (configuration) {
-  if (configuration.build.command.build) await buildImage(configuration)
-
-  let dockerFile = `# production stage
-    FROM nginx:stable-alpine
-    COPY nginx.conf /etc/nginx/nginx.conf
-    `
-  if (configuration.build.command.build) {
-    dockerFile += `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.build.directory} /usr/share/nginx/html`
-  } else {
-    dockerFile += 'COPY . /usr/share/nginx/html'
-  }
-
-  dockerFile += `
-      EXPOSE 80
-      CMD ["nginx", "-g", "daemon off;"]`
-  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, dockerFile)
-
-  const stream = await docker.engine.buildImage(
-    { src: ['.'], context: configuration.general.workdir },
-    { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
-  )
-  await streamEvents(stream, configuration)
-}

api/routes/v1/application/check.js

@@ -5,31 +5,36 @@ const { docker } = require('../../../libs/docker')
 
 module.exports = async function (fastify) {
   fastify.post('/', async (request, reply) => {
-    if (!await verifyUserId(request.headers.authorization)) {
-      reply.code(500).send({ error: 'Invalid request' })
-      return
-    }
-    const configuration = setDefaultConfiguration(request.body)
+    try {
+      if (!await verifyUserId(request.headers.authorization)) {
+        reply.code(500).send({ error: 'Invalid request' })
+        return
+      }
+      const configuration = setDefaultConfiguration(request.body)
 
-    const services = (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application')
-    let foundDomain = false
+      const services = (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application')
+      let foundDomain = false
 
-    for (const service of services) {
-      const running = JSON.parse(service.Spec.Labels.configuration)
-      if (running) {
-        if (
-          running.publish.domain === configuration.publish.domain &&
-          running.repository.id !== configuration.repository.id
-        ) {
-          foundDomain = true
+      for (const service of services) {
+        const running = JSON.parse(service.Spec.Labels.configuration)
+        if (running) {
+          if (
+            running.publish.domain === configuration.publish.domain &&
+            running.repository.id !== configuration.repository.id &&
+            running.publish.path === configuration.publish.path
+          ) {
+            foundDomain = true
+          }
         }
       }
+      if (fastify.config.DOMAIN === configuration.publish.domain) foundDomain = true
+      if (foundDomain) {
+        reply.code(500).send({ message: 'Domain already in use.' })
+        return
+      }
+      return { message: 'OK' }
+    } catch (error) {
+      throw { error, type: 'server' }
     }
-    if (fastify.config.DOMAIN === configuration.publish.domain) foundDomain = true
-    if (foundDomain) {
-      reply.code(500).send({ message: 'Domain already in use.' })
-      return
-    }
-    return { message: 'OK' }
   })
 }

api/routes/v1/application/deploy/index.js

@@ -1,8 +1,8 @@
 
-const { verifyUserId, cleanupTmp, execShellAsync } = require('../../../../libs/common')
+const { verifyUserId, cleanupTmp } = require('../../../../libs/common')
 const Deployment = require('../../../../models/Deployment')
 const { queueAndBuild } = require('../../../../libs/applications')
-const { setDefaultConfiguration } = require('../../../../libs/applications/configuration')
+const { setDefaultConfiguration, precheckDeployment } = require('../../../../libs/applications/configuration')
 const { docker } = require('../../../../libs/docker')
 const cloneRepository = require('../../../../libs/applications/github/cloneRepository')
 
@@ -32,86 +32,43 @@ module.exports = async function (fastify) {
   //     },
   // };
   fastify.post('/', async (request, reply) => {
-    if (!await verifyUserId(request.headers.authorization)) {
+    try {
+      await verifyUserId(request.headers.authorization)
+    } catch (error) {
       reply.code(500).send({ error: 'Invalid request' })
       return
     }
+    try {
+      const services = (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application')
+      const configuration = setDefaultConfiguration(request.body)
+      await cloneRepository(configuration)
+      const { foundService, imageChanged, configChanged, forceUpdate } = await precheckDeployment({ services, configuration })
 
-    const configuration = setDefaultConfiguration(request.body)
-
-    const services = (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application')
-
-    await cloneRepository(configuration)
-
-    let foundService = false
-    let foundDomain = false
-    let configChanged = false
-    let imageChanged = false
-
-    let forceUpdate = false
-
-    for (const service of services) {
-      const running = JSON.parse(service.Spec.Labels.configuration)
-      if (running) {
-        if (
-          running.publish.domain === configuration.publish.domain &&
-          running.repository.id !== configuration.repository.id
-        ) {
-          foundDomain = true
-        }
-        if (running.repository.id === configuration.repository.id && running.repository.branch === configuration.repository.branch) {
-          const state = await execShellAsync(`docker stack ps ${running.build.container.name} --format '{{ json . }}'`)
-          const isError = state.split('\n').filter(n => n).map(s => JSON.parse(s)).filter(n => n.DesiredState !== 'Running')
-          if (isError.length > 0) forceUpdate = true
-
-          foundService = true
-          const runningWithoutContainer = JSON.parse(JSON.stringify(running))
-          delete runningWithoutContainer.build.container
-
-          const configurationWithoutContainer = JSON.parse(JSON.stringify(configuration))
-          delete configurationWithoutContainer.build.container
-
-          // If only the configuration changed
-          if (JSON.stringify(runningWithoutContainer.build) !== JSON.stringify(configurationWithoutContainer.build) || JSON.stringify(runningWithoutContainer.publish) !== JSON.stringify(configurationWithoutContainer.publish)) configChanged = true
-          // If only the image changed
-          if (running.build.container.tag !== configuration.build.container.tag) imageChanged = true
-          // If build pack changed, forceUpdate the service
-          if (running.build.pack !== configuration.build.pack) forceUpdate = true
-        }
-      }
-    }
-    if (foundDomain) {
-      cleanupTmp(configuration.general.workdir)
-      reply.code(500).send({ message: 'Domain already in use.' })
-      return
-    }
-    if (forceUpdate) {
-      imageChanged = false
-      configChanged = false
-    } else {
-      if (foundService && !imageChanged && !configChanged) {
+      if (foundService && !forceUpdate && !imageChanged && !configChanged) {
         cleanupTmp(configuration.general.workdir)
         reply.code(500).send({ message: 'Nothing changed, no need to redeploy.' })
         return
       }
+
+      const alreadyQueued = await Deployment.find({
+        repoId: configuration.repository.id,
+        branch: configuration.repository.branch,
+        organization: configuration.repository.organization,
+        name: configuration.repository.name,
+        domain: configuration.publish.domain,
+        progress: { $in: ['queued', 'inprogress'] }
+      })
+
+      if (alreadyQueued.length > 0) {
+        reply.code(200).send({ message: 'Already in the queue.' })
+        return
+      }
+
+      queueAndBuild(configuration, imageChanged)
+
+      reply.code(201).send({ message: 'Deployment queued.', nickname: configuration.general.nickname, name: configuration.build.container.name })
+    } catch (error) {
+      throw { error, type: 'server' }
     }
-
-    const alreadyQueued = await Deployment.find({
-      repoId: configuration.repository.id,
-      branch: configuration.repository.branch,
-      organization: configuration.repository.organization,
-      name: configuration.repository.name,
-      domain: configuration.publish.domain,
-      progress: { $in: ['queued', 'inprogress'] }
-    })
-
-    if (alreadyQueued.length > 0) {
-      reply.code(200).send({ message: 'Already in the queue.' })
-      return
-    }
-
-    queueAndBuild(configuration, services, configChanged, imageChanged)
-
-    reply.code(201).send({ message: 'Deployment queued.', nickname: configuration.general.nickname, name: configuration.build.container.name })
   })
 }

api/routes/v1/application/deploy/logs.js

@@ -18,25 +18,29 @@ module.exports = async function (fastify) {
     }
   }
   fastify.get('/', { schema: getLogSchema }, async (request, reply) => {
-    const { repoId, branch, page } = request.query
-    const onePage = 5
-    const show = Number(page) * onePage || 5
-    const deploy = await Deployment.find({ repoId, branch })
-      .select('-_id -__v -repoId')
-      .sort({ createdAt: 'desc' })
-      .limit(show)
+    try {
+      const { repoId, branch, page } = request.query
+      const onePage = 5
+      const show = Number(page) * onePage || 5
+      const deploy = await Deployment.find({ repoId, branch })
+        .select('-_id -__v -repoId')
+        .sort({ createdAt: 'desc' })
+        .limit(show)
 
-    const finalLogs = deploy.map(d => {
-      const finalLogs = { ...d._doc }
+      const finalLogs = deploy.map(d => {
+        const finalLogs = { ...d._doc }
 
-      const updatedAt = dayjs(d.updatedAt).utc()
+        const updatedAt = dayjs(d.updatedAt).utc()
 
-      finalLogs.took = updatedAt.diff(dayjs(d.createdAt)) / 1000
-      finalLogs.since = updatedAt.fromNow()
+        finalLogs.took = updatedAt.diff(dayjs(d.createdAt)) / 1000
+        finalLogs.since = updatedAt.fromNow()
 
+        return finalLogs
+      })
       return finalLogs
-    })
-    return finalLogs
+    } catch (error) {
+      throw { error, type: 'server' }
+    }
   })
 
   fastify.get('/:deployId', async (request, reply) => {

api/routes/v1/application/logs.js

@@ -2,9 +2,13 @@ const { docker } = require('../../../libs/docker')
 
 module.exports = async function (fastify) {
   fastify.get('/', async (request, reply) => {
-    const { name } = request.query
-    const service = await docker.engine.getService(`${name}_${name}`)
-    const logs = (await service.logs({ stdout: true, stderr: true, timestamps: true })).toString().split('\n').map(l => l.slice(8)).filter((a) => a)
-    return { logs }
+    try {
+      const { name } = request.query
+      const service = await docker.engine.getService(`${name}_${name}`)
+      const logs = (await service.logs({ stdout: true, stderr: true, timestamps: true })).toString().split('\n').map(l => l.slice(8)).filter((a) => a)
+      return { logs }
+    } catch (error) {
+      throw { error, type: 'server' }
+    }
   })
 }

api/routes/v1/config.js

@@ -1,60 +1,6 @@
 const { docker } = require('../../libs/docker')
 
 module.exports = async function (fastify) {
-  // const getConfig = {
-  //   querystring: {
-  //     type: 'object',
-  //     properties: {
-  //       repoId: { type: 'number' },
-  //       branch: { type: 'string' }
-  //     },
-  //     required: ['repoId', 'branch']
-  //   }
-  // }
-
-  // const saveConfig = {
-  //   body: {
-  //     type: 'object',
-  //     properties: {
-  //       build: {
-  //         type: 'object',
-  //         properties: {
-  //           baseDir: { type: 'string' },
-  //           installCmd: { type: 'string' },
-  //           buildCmd: { type: 'string' }
-  //         },
-  //         required: ['baseDir', 'installCmd', 'buildCmd']
-  //       },
-  //       publish: {
-  //         type: 'object',
-  //         properties: {
-  //           publishDir: { type: 'string' },
-  //           domain: { type: 'string' },
-  //           pathPrefix: { type: 'string' },
-  //           port: { type: 'number' }
-  //         },
-  //         required: ['publishDir', 'domain', 'pathPrefix', 'port']
-  //       },
-  //       previewDeploy: { type: 'boolean' },
-  //       branch: { type: 'string' },
-  //       repoId: { type: 'number' },
-  //       buildPack: { type: 'string' },
-  //       fullName: { type: 'string' },
-  //       installationId: { type: 'number' }
-  //     },
-  //     required: ['build', 'publish', 'previewDeploy', 'branch', 'repoId', 'buildPack', 'fullName', 'installationId']
-  //   }
-  // }
-
-  // fastify.get("/all", async (request, reply) => {
-  //   return await Config.find().select("-_id -__v");
-  // });
-
-  // fastify.get("/", { schema: getConfig }, async (request, reply) => {
-  //   const { repoId, branch } = request.query;
-  //   return await Config.findOne({ repoId, branch }).select("-_id -__v");
-  // });
-
   fastify.post('/', async (request, reply) => {
     const { name, organization, branch } = request.body
     const services = await docker.engine.listServices()
@@ -79,25 +25,4 @@ module.exports = async function (fastify) {
       reply.code(500).send({ message: 'No configuration found.' })
     }
   })
-
-  // fastify.delete("/", async (request, reply) => {
-  //   const { repoId, branch } = request.body;
-
-  //   const deploys = await Deployment.find({ repoId, branch })
-  //   const found = deploys.filter(d => d.progress !== 'done' && d.progress !== 'failed')
-  //   if (found.length > 0) {
-  //     throw new Error('Deployment inprogress, cannot delete now.');
-  //   }
-
-  //   const config = await Config.findOneAndDelete({ repoId, branch })
-  //   for (const deploy of deploys) {
-  //     await ApplicationLog.findOneAndRemove({ deployId: deploy.deployId });
-  //   }
-  //   const secrets = await Secret.find({ repoId, branch });
-  //   for (const secret of secrets) {
-  //     await Secret.findByIdAndRemove(secret._id);
-  //   }
-  //   await execShellAsync(`docker stack rm ${config.containerName}`);
-  //   return { message: 'Deleted application and related configurations.' };
-  // });
 }

api/routes/v1/dashboard/index.js

@@ -4,51 +4,59 @@ const ServerLog = require('../../../models/Logs/Server')
 
 module.exports = async function (fastify) {
   fastify.get('/', async (request, reply) => {
-    const latestDeployments = await Deployment.aggregate([
-      {
-        $sort: { createdAt: -1 }
-      },
-      {
-        $group:
+    try {
+      const latestDeployments = await Deployment.aggregate([
         {
-          _id: {
-            repoId: '$repoId',
-            branch: '$branch'
-          },
-          createdAt: { $last: '$createdAt' },
-          progress: { $first: '$progress' }
+          $sort: { createdAt: -1 }
+        },
+        {
+          $group:
+          {
+            _id: {
+              repoId: '$repoId',
+              branch: '$branch'
+            },
+            createdAt: { $last: '$createdAt' },
+            progress: { $first: '$progress' }
+          }
         }
-      }
-    ])
+      ])
 
-    const serverLogs = await ServerLog.find()
-    const services = await docker.engine.listServices()
+      const serverLogs = await ServerLog.find()
+      const services = await docker.engine.listServices()
 
-    let applications = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application' && r.Spec.Labels.configuration)
-    let databases = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'database' && r.Spec.Labels.configuration)
-    applications = applications.map(r => {
-      if (JSON.parse(r.Spec.Labels.configuration)) {
-        const configuration = JSON.parse(r.Spec.Labels.configuration)
-        const status = latestDeployments.find(l => configuration.repository.id === l._id.repoId && configuration.repository.branch === l._id.branch)
-        if (status && status.progress) r.progress = status.progress
+      let applications = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application' && r.Spec.Labels.configuration)
+      let databases = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'database' && r.Spec.Labels.configuration)
+      applications = applications.map(r => {
+        if (JSON.parse(r.Spec.Labels.configuration)) {
+          const configuration = JSON.parse(r.Spec.Labels.configuration)
+          const status = latestDeployments.find(l => configuration.repository.id === l._id.repoId && configuration.repository.branch === l._id.branch)
+          if (status && status.progress) r.progress = status.progress
+          r.Spec.Labels.configuration = configuration
+          return r
+        }
+        return {}
+      })
+      databases = databases.map(r => {
+        const configuration = r.Spec.Labels.configuration ? JSON.parse(r.Spec.Labels.configuration) : null
         r.Spec.Labels.configuration = configuration
         return r
+      })
+      applications = [...new Map(applications.map(item => [item.Spec.Labels.configuration.publish.domain + item.Spec.Labels.configuration.publish.path, item])).values()]
+      return {
+        serverLogs,
+        applications: {
+          deployed: applications
+        },
+        databases: {
+          deployed: databases
+        }
       }
-      return {}
-    })
-    databases = databases.map(r => {
-      const configuration = r.Spec.Labels.configuration ? JSON.parse(r.Spec.Labels.configuration) : null
-      r.Spec.Labels.configuration = configuration
-      return r
-    })
-    applications = [...new Map(applications.map(item => [item.Spec.Labels.configuration.publish.domain, item])).values()]
-    return {
-      serverLogs,
-      applications: {
-        deployed: applications
-      },
-      databases: {
-        deployed: databases
+    } catch (error) {
+      if (error.code === 'ENOENT' && error.errno === -2) {
+        throw new Error(`Docker service unavailable at ${error.address}.`)
+      } else {
+        throw { error, type: 'server' }
       }
     }
   })

api/routes/v1/databases/index.js

@@ -45,124 +45,128 @@ module.exports = async function (fastify) {
   }
 
   fastify.post('/deploy', { schema: postSchema }, async (request, reply) => {
-    let { type, defaultDatabaseName } = request.body
-    const passwords = generator.generateMultiple(2, {
-      length: 24,
-      numbers: true,
-      strict: true
-    })
-    const usernames = generator.generateMultiple(2, {
-      length: 10,
-      numbers: true,
-      strict: true
-    })
-    // TODO: Query for existing db with the same name
-    const nickname = getUniq()
+    try {
+      let { type, defaultDatabaseName } = request.body
+      const passwords = generator.generateMultiple(2, {
+        length: 24,
+        numbers: true,
+        strict: true
+      })
+      const usernames = generator.generateMultiple(2, {
+        length: 10,
+        numbers: true,
+        strict: true
+      })
+      // TODO: Query for existing db with the same name
+      const nickname = getUniq()
 
-    if (!defaultDatabaseName) defaultDatabaseName = nickname
+      if (!defaultDatabaseName) defaultDatabaseName = nickname
 
-    reply.code(201).send({ message: 'Deploying.' })
-    // TODO: Persistent volume, custom inputs
-    const deployId = cuid()
-    const configuration = {
-      general: {
-        workdir: `/tmp/${deployId}`,
-        deployId,
-        nickname,
-        type
-      },
-      database: {
-        usernames,
-        passwords,
-        defaultDatabaseName
-      },
-      deploy: {
-        name: nickname
+      reply.code(201).send({ message: 'Deploying.' })
+      // TODO: Persistent volume, custom inputs
+      const deployId = cuid()
+      const configuration = {
+        general: {
+          workdir: `/tmp/${deployId}`,
+          deployId,
+          nickname,
+          type
+        },
+        database: {
+          usernames,
+          passwords,
+          defaultDatabaseName
+        },
+        deploy: {
+          name: nickname
+        }
       }
-    }
-    let generateEnvs = {}
-    let image = null
-    let volume = null
-    if (type === 'mongodb') {
-      generateEnvs = {
-        MONGODB_ROOT_PASSWORD: passwords[0],
-        MONGODB_USERNAME: usernames[0],
-        MONGODB_PASSWORD: passwords[1],
-        MONGODB_DATABASE: defaultDatabaseName
+      let generateEnvs = {}
+      let image = null
+      let volume = null
+      if (type === 'mongodb') {
+        generateEnvs = {
+          MONGODB_ROOT_PASSWORD: passwords[0],
+          MONGODB_USERNAME: usernames[0],
+          MONGODB_PASSWORD: passwords[1],
+          MONGODB_DATABASE: defaultDatabaseName
+        }
+        image = 'bitnami/mongodb:4.4'
+        volume = `${configuration.general.deployId}-${type}-data:/bitnami/mongodb`
+      } else if (type === 'postgresql') {
+        generateEnvs = {
+          POSTGRESQL_PASSWORD: passwords[0],
+          POSTGRESQL_USERNAME: usernames[0],
+          POSTGRESQL_DATABASE: defaultDatabaseName
+        }
+        image = 'bitnami/postgresql:13.2.0'
+        volume = `${configuration.general.deployId}-${type}-data:/bitnami/postgresql`
+      } else if (type === 'couchdb') {
+        generateEnvs = {
+          COUCHDB_PASSWORD: passwords[0],
+          COUCHDB_USER: usernames[0]
+        }
+        image = 'bitnami/couchdb:3'
+        volume = `${configuration.general.deployId}-${type}-data:/bitnami/couchdb`
+      } else if (type === 'mysql') {
+        generateEnvs = {
+          MYSQL_ROOT_PASSWORD: passwords[0],
+          MYSQL_ROOT_USER: usernames[0],
+          MYSQL_USER: usernames[1],
+          MYSQL_PASSWORD: passwords[1],
+          MYSQL_DATABASE: defaultDatabaseName
+        }
+        image = 'bitnami/mysql:8.0'
+        volume = `${configuration.general.deployId}-${type}-data:/bitnami/mysql/data`
       }
-      image = 'bitnami/mongodb:4.4'
-      volume = `${configuration.general.deployId}-${type}-data:/bitnami/mongodb`
-    } else if (type === 'postgresql') {
-      generateEnvs = {
-        POSTGRESQL_PASSWORD: passwords[0],
-        POSTGRESQL_USERNAME: usernames[0],
-        POSTGRESQL_DATABASE: defaultDatabaseName
-      }
-      image = 'bitnami/postgresql:13.2.0'
-      volume = `${configuration.general.deployId}-${type}-data:/bitnami/postgresql`
-    } else if (type === 'couchdb') {
-      generateEnvs = {
-        COUCHDB_PASSWORD: passwords[0],
-        COUCHDB_USER: usernames[0]
-      }
-      image = 'bitnami/couchdb:3'
-      volume = `${configuration.general.deployId}-${type}-data:/bitnami/couchdb`
-    } else if (type === 'mysql') {
-      generateEnvs = {
-        MYSQL_ROOT_PASSWORD: passwords[0],
-        MYSQL_ROOT_USER: usernames[0],
-        MYSQL_USER: usernames[1],
-        MYSQL_PASSWORD: passwords[1],
-        MYSQL_DATABASE: defaultDatabaseName
-      }
-      image = 'bitnami/mysql:8.0'
-      volume = `${configuration.general.deployId}-${type}-data:/bitnami/mysql/data`
-    }
 
-    const stack = {
-      version: '3.8',
-      services: {
-        [configuration.general.deployId]: {
-          image,
-          networks: [`${docker.network}`],
-          environment: generateEnvs,
-          volumes: [volume],
-          deploy: {
-            replicas: 1,
-            update_config: {
-              parallelism: 0,
-              delay: '10s',
-              order: 'start-first'
-            },
-            rollback_config: {
-              parallelism: 0,
-              delay: '10s',
-              order: 'start-first'
-            },
-            labels: [
-              'managedBy=coolify',
-              'type=database',
-              'configuration=' + JSON.stringify(configuration)
-            ]
+      const stack = {
+        version: '3.8',
+        services: {
+          [configuration.general.deployId]: {
+            image,
+            networks: [`${docker.network}`],
+            environment: generateEnvs,
+            volumes: [volume],
+            deploy: {
+              replicas: 1,
+              update_config: {
+                parallelism: 0,
+                delay: '10s',
+                order: 'start-first'
+              },
+              rollback_config: {
+                parallelism: 0,
+                delay: '10s',
+                order: 'start-first'
+              },
+              labels: [
+                'managedBy=coolify',
+                'type=database',
+                'configuration=' + JSON.stringify(configuration)
+              ]
+            }
+          }
+        },
+        networks: {
+          [`${docker.network}`]: {
+            external: true
+          }
+        },
+        volumes: {
+          [`${configuration.general.deployId}-${type}-data`]: {
+            external: true
           }
         }
-      },
-      networks: {
-        [`${docker.network}`]: {
-          external: true
-        }
-      },
-      volumes: {
-        [`${configuration.general.deployId}-${type}-data`]: {
-          external: true
-        }
       }
+      await execShellAsync(`mkdir -p ${configuration.general.workdir}`)
+      await fs.writeFile(`${configuration.general.workdir}/stack.yml`, yaml.dump(stack))
+      await execShellAsync(
+              `cat ${configuration.general.workdir}/stack.yml | docker stack deploy -c - ${configuration.general.deployId}`
+      )
+    } catch (error) {
+      throw { error, type: 'server' }
     }
-    await execShellAsync(`mkdir -p ${configuration.general.workdir}`)
-    await fs.writeFile(`${configuration.general.workdir}/stack.yml`, yaml.dump(stack))
-    await execShellAsync(
-            `cat ${configuration.general.workdir}/stack.yml | docker stack deploy -c - ${configuration.general.deployId}`
-    )
   })
 
   fastify.delete('/:dbName', async (request, reply) => {

api/routes/v1/server/index.js

@@ -0,0 +1,14 @@
+const Server = require('../../../models/Logs/Server')
+module.exports = async function (fastify) {
+  fastify.get('/', async (request, reply) => {
+    try {
+      const serverLogs = await Server.find().select('-_id -__v')
+      // TODO: Should do better
+      return {
+        serverLogs
+      }
+    } catch (error) {
+      throw { error, type: 'server' }
+    }
+  })
+}

api/routes/v1/settings/index.js

@@ -25,7 +25,7 @@ module.exports = async function (fastify) {
         settings
       }
     } catch (error) {
-      throw new Error(error)
+      throw { error, type: 'server' }
     }
   })
 
@@ -38,7 +38,7 @@ module.exports = async function (fastify) {
       ).select('-_id -__v')
       reply.code(201).send({ settings })
     } catch (error) {
-      throw new Error(error)
+      throw { error, type: 'server' }
     }
   })
 }

api/routes/v1/upgrade/index.js

@@ -3,10 +3,10 @@ const { saveServerLog } = require('../../../libs/logging')
 
 module.exports = async function (fastify) {
   fastify.get('/', async (request, reply) => {
-    const upgradeP1 = await execShellAsync('bash ./install.sh upgrade-phase-1')
+    const upgradeP1 = await execShellAsync('bash -c "$(curl -fsSL https://get.coollabs.io/coolify/upgrade-p1.sh)"')
     await saveServerLog({ event: upgradeP1, type: 'UPGRADE-P-1' })
     reply.code(200).send('I\'m trying, okay?')
-    const upgradeP2 = await execShellAsync('bash ./install.sh upgrade-phase-2')
+    const upgradeP2 = await execShellAsync('docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -u root coolify bash -c "$(curl -fsSL https://get.coollabs.io/coolify/upgrade-p2.sh)"')
     await saveServerLog({ event: upgradeP2, type: 'UPGRADE-P-2' })
   })
 }

api/routes/v1/verify.js

@@ -3,14 +3,18 @@ const jwt = require('jsonwebtoken')
 
 module.exports = async function (fastify) {
   fastify.get('/', async (request, reply) => {
-    const { authorization } = request.headers
-    if (!authorization) {
+    try {
+      const { authorization } = request.headers
+      if (!authorization) {
+        reply.code(401).send({})
+        return
+      }
+      const token = authorization.split(' ')[1]
+      const verify = jwt.verify(token, fastify.config.JWT_SIGN_KEY)
+      const found = await User.findOne({ uid: verify.jti })
+      found ? reply.code(200).send({}) : reply.code(401).send({})
+    } catch (error) {
       reply.code(401).send({})
-      return
     }
-    const token = authorization.split(' ')[1]
-    const verify = jwt.verify(token, fastify.config.JWT_SIGN_KEY)
-    const found = await User.findOne({ uid: verify.jti })
-    found ? reply.code(200).send({}) : reply.code(401).send({})
   })
 }

api/routes/v1/webhooks/deploy.js

@@ -1,8 +1,8 @@
 const crypto = require('crypto')
-const { cleanupTmp, execShellAsync } = require('../../../libs/common')
+const { cleanupTmp } = require('../../../libs/common')
 const Deployment = require('../../../models/Deployment')
 const { queueAndBuild } = require('../../../libs/applications')
-const { setDefaultConfiguration } = require('../../../libs/applications/configuration')
+const { setDefaultConfiguration, precheckDeployment } = require('../../../libs/applications/configuration')
 const { docker } = require('../../../libs/docker')
 const cloneRepository = require('../../../libs/applications/github/cloneRepository')
 
@@ -45,98 +45,55 @@ module.exports = async function (fastify) {
       reply.code(500).send({ error: 'Not a push event.' })
       return
     }
+    try {
+      const services = (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application')
 
-    const services = (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application')
-
-    let configuration = services.find(r => {
-      if (request.body.ref.startsWith('refs')) {
-        const branch = request.body.ref.split('/')[2]
-        if (
-          JSON.parse(r.Spec.Labels.configuration).repository.id === request.body.repository.id &&
-          JSON.parse(r.Spec.Labels.configuration).repository.branch === branch
-        ) {
-          return r
+      let configuration = services.find(r => {
+        if (request.body.ref.startsWith('refs')) {
+          const branch = request.body.ref.split('/')[2]
+          if (
+            JSON.parse(r.Spec.Labels.configuration).repository.id === request.body.repository.id &&
+            JSON.parse(r.Spec.Labels.configuration).repository.branch === branch
+          ) {
+            return r
+          }
         }
+
+        return null
+      })
+      if (!configuration) {
+        reply.code(500).send({ error: 'No configuration found.' })
+        return
       }
 
-      return null
-    })
+      configuration = setDefaultConfiguration(JSON.parse(configuration.Spec.Labels.configuration))
+      await cloneRepository(configuration)
+      const { foundService, imageChanged, configChanged, forceUpdate } = await precheckDeployment({ services, configuration })
 
-    if (!configuration) {
-      reply.code(500).send({ error: 'No configuration found.' })
-      return
-    }
-
-    configuration = setDefaultConfiguration(JSON.parse(configuration.Spec.Labels.configuration))
-
-    await cloneRepository(configuration)
-
-    let foundService = false
-    let foundDomain = false
-    let configChanged = false
-    let imageChanged = false
-
-    let forceUpdate = false
-
-    for (const service of services) {
-      const running = JSON.parse(service.Spec.Labels.configuration)
-      if (running) {
-        if (
-          running.publish.domain === configuration.publish.domain &&
-          running.repository.id !== configuration.repository.id &&
-          running.repository.branch !== configuration.repository.branch
-        ) {
-          foundDomain = true
-        }
-        if (running.repository.id === configuration.repository.id && running.repository.branch === configuration.repository.branch) {
-          const state = await execShellAsync(`docker stack ps ${running.build.container.name} --format '{{ json . }}'`)
-          const isError = state.split('\n').filter(n => n).map(s => JSON.parse(s)).filter(n => n.DesiredState !== 'Running')
-          if (isError.length > 0) forceUpdate = true
-          foundService = true
-
-          const runningWithoutContainer = JSON.parse(JSON.stringify(running))
-          delete runningWithoutContainer.build.container
-
-          const configurationWithoutContainer = JSON.parse(JSON.stringify(configuration))
-          delete configurationWithoutContainer.build.container
-
-          if (JSON.stringify(runningWithoutContainer.build) !== JSON.stringify(configurationWithoutContainer.build) || JSON.stringify(runningWithoutContainer.publish) !== JSON.stringify(configurationWithoutContainer.publish)) configChanged = true
-          if (running.build.container.tag !== configuration.build.container.tag) imageChanged = true
-        }
-      }
-    }
-    if (foundDomain) {
-      cleanupTmp(configuration.general.workdir)
-      reply.code(500).send({ message: 'Domain already used.' })
-      return
-    }
-    if (forceUpdate) {
-      imageChanged = false
-      configChanged = false
-    } else {
-      if (foundService && !imageChanged && !configChanged) {
+      if (foundService && !forceUpdate && !imageChanged && !configChanged) {
         cleanupTmp(configuration.general.workdir)
         reply.code(500).send({ message: 'Nothing changed, no need to redeploy.' })
         return
       }
+      const alreadyQueued = await Deployment.find({
+        repoId: configuration.repository.id,
+        branch: configuration.repository.branch,
+        organization: configuration.repository.organization,
+        name: configuration.repository.name,
+        domain: configuration.publish.domain,
+        progress: { $in: ['queued', 'inprogress'] }
+      })
+
+      if (alreadyQueued.length > 0) {
+        reply.code(200).send({ message: 'Already in the queue.' })
+        return
+      }
+
+      queueAndBuild(configuration, imageChanged)
+
+      reply.code(201).send({ message: 'Deployment queued.', nickname: configuration.general.nickname, name: configuration.build.container.name })
+    } catch (error) {
+      throw { error, type: 'server' }
     }
-
-    const alreadyQueued = await Deployment.find({
-      repoId: configuration.repository.id,
-      branch: configuration.repository.branch,
-      organization: configuration.repository.organization,
-      name: configuration.repository.name,
-      domain: configuration.publish.domain,
-      progress: { $in: ['queued', 'inprogress'] }
-    })
-
-    if (alreadyQueued.length > 0) {
-      reply.code(200).send({ message: 'Already in the queue.' })
-      return
-    }
-
-    queueAndBuild(configuration, services, configChanged, imageChanged)
-
-    reply.code(201).send({ message: 'Deployment queued.' })
   })
 }

api/server.js

@@ -2,6 +2,8 @@ require('dotenv').config()
 const fs = require('fs')
 const util = require('util')
 const { saveServerLog } = require('./libs/logging')
+const { execShellAsync } = require('./libs/common')
+const { purgeImagesContainers, cleanupStuckedDeploymentsInDB } = require('./libs/applications/cleanup')
 const Deployment = require('./models/Deployment')
 const fastify = require('fastify')({
   logger: { level: 'error' }
@@ -10,6 +12,10 @@ const mongoose = require('mongoose')
 const path = require('path')
 const { schema } = require('./schema')
 
+process.on('unhandledRejection', (reason, p) => {
+  console.log(reason)
+  console.log(p)
+})
 fastify.register(require('fastify-env'), {
   schema,
   dotenv: true
@@ -31,13 +37,16 @@ if (process.env.NODE_ENV === 'production') {
 
 fastify.register(require('./app'), { prefix: '/api/v1' })
 fastify.setErrorHandler(async (error, request, reply) => {
-  console.log(error)
   if (error.statusCode) {
     reply.status(error.statusCode).send({ message: error.message } || { message: 'Something is NOT okay. Are you okay?' })
   } else {
     reply.status(500).send({ message: error.message } || { message: 'Something is NOT okay. Are you okay?' })
   }
-  await saveServerLog({ event: error })
+  try {
+    await saveServerLog({ event: error })
+  } catch (error) {
+    //
+  }
 })
 
 if (process.env.NODE_ENV === 'production') {
@@ -83,8 +92,25 @@ mongoose.connection.once('open', async function () {
     console.log('Coolify API is up and running in development.')
   }
   // On start cleanup inprogress/queued deployments.
-  const deployments = await Deployment.find({ progress: { $in: ['queued', 'inprogress'] } })
-  for (const deployment of deployments) {
-    await Deployment.findByIdAndUpdate(deployment._id, { $set: { progress: 'failed' } })
+  try {
+    await cleanupStuckedDeploymentsInDB()
+  } catch (error) {
+    // Could not cleanup DB 🤔
+  }
+  try {
+    // Doing because I do not want to prune these images. Prune skip coolify-reserve labeled images.
+    const basicImages = ['nginx:stable-alpine', 'node:lts', 'ubuntu:20.04']
+    for (const image of basicImages) {
+      await execShellAsync(`echo "FROM ${image}" | docker build --label coolify-reserve=true -t ${image} -`)
+    }
+  } catch (error) {
+    console.log('Could not pull some basic images from Docker Hub.')
+    console.log(error)
+  }
+  try {
+    await purgeImagesContainers()
+  } catch (error) {
+    console.log('Could not purge containers/images.')
+    console.log(error)
   }
 })

index.html

@@ -10,6 +10,7 @@
   <link rel="dns-prefetch" href="https://cdn.coollabs.io/" />
   <link rel="preconnect" href="https://cdn.coollabs.io/" crossorigin="" />
   <link rel="stylesheet" href="https://cdn.coollabs.io/fonts/montserrat/montserrat.css" />
+  <link rel="stylesheet" href="https://cdn.coollabs.io/css/microtip-0.2.2.min.css" />
 </head>
 
 <body>

install.sh

@@ -1,43 +1,88 @@
 #!/bin/bash
+
+preTasks() {
+echo '
+##############################
+#### Pulling Git Updates #####
+##############################'
 GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git pull
-echo "#### Building base image."
-docker build -t coolify-base -f install/Dockerfile-base .
+
 if [ $? -ne 0 ]; then
-    echo '#### Ooops something not okay!'
+    echo '
+####################################
+#### Ooops something not okay! #####
+####################################'
     exit 1
 fi
 
-echo "#### Checking configuration."
+echo '
+##############################
+#### Building Base Image #####
+##############################'
+docker build --label coolify-reserve=true -t coolify-base -f install/Dockerfile-base .
+
+if [ $? -ne 0 ]; then
+    echo '
+####################################
+#### Ooops something not okay! #####
+####################################'
+    exit 1
+fi
+
+echo '
+##################################
+#### Checking configuration. #####
+##################################'
 docker run --rm -w /usr/src/app coolify-base node install/install.js --check
 if [ $? -ne 0 ]; then
-    echo '#### Missing configuration.'
+   echo '
+##################################
+#### Missing configuration ! #####
+##################################'
     exit 1
 fi
-
+}
 case "$1" in
     "all")
-        echo "#### Rebuild everything."
+       preTasks
+       echo '
+#################################
+#### Rebuilding everything. #####
+#################################'
         docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify:/data/coolify -u root -w /usr/src/app coolify-base node install/install.js --type all
     ;;
     "coolify")
-        echo "#### Rebuild coolify."
+       preTasks
+       echo '
+##############################
+#### Rebuilding Coolify. #####
+##############################'
         docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify:/data/coolify -u root -w /usr/src/app coolify-base node install/install.js --type coolify
     ;;
     "proxy")
-        echo "#### Rebuild proxy."
+       preTasks
+       echo '
+############################
+#### Rebuilding Proxy. #####
+############################'
         docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify:/data/coolify -u root -w /usr/src/app coolify-base node install/install.js --type proxy
     ;;
     "upgrade-phase-1")
-        echo "#### Rebuild coolify from frontend request phase 1."
+        preTasks
+        echo '
+################################
+#### Upgrading Coolify P1. #####
+################################'
         docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify:/data/coolify -u root -w /usr/src/app coolify-base node install/install.js --type upgrade
     ;;
     "upgrade-phase-2")
-        echo "#### Rebuild coolify from frontend request phase 2."
+        echo '
+################################
+#### Upgrading Coolify P2. #####
+################################'
         docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /data/coolify:/data/coolify -u root -w /usr/src/app coolify-base node install/update.js --type upgrade
     ;;
-
     *)
-        echo "Use 'all' to build & deploy proxy+coolify, 'coolify' to build & deploy only coolify, 'proxy' to build & deploy only proxy."
         exit 1
      ;;
-esac
+esac

install/Dockerfile

@@ -1,5 +1,5 @@
 FROM coolify-base
 WORKDIR /usr/src/app
-RUN yarn build
-CMD ["yarn", "start"]
+RUN pnpm build
+CMD ["pnpm", "start"]
 EXPOSE 3000

install/Dockerfile-base

@@ -9,9 +9,10 @@ RUN apt update && apt install -y docker-ce-cli && apt clean all
 FROM node:14 as modules
 COPY --from=binaries /usr/bin/docker /usr/bin/docker
 COPY --from=binaries /usr/bin/envsubst /usr/bin/envsubst
+RUN curl -L https://pnpm.js.org/pnpm.js | node - add --global pnpm
 WORKDIR /usr/src/app
 COPY ./package*.json .
-RUN yarn install
+RUN pnpm install
 
 FROM modules
 WORKDIR /usr/src/app

install/Dockerfile-new

@@ -0,0 +1,24 @@
+FROM ubuntu:20.04 as binaries
+LABEL coolify-preserve=true
+RUN apt update && apt install -y curl gnupg2 ca-certificates
+RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
+RUN echo 'deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable' >> /etc/apt/sources.list
+RUN curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o /usr/bin/envsubst
+RUN curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -o /usr/bin/jq
+RUN chmod +x /usr/bin/envsubst /usr/bin/jq
+RUN apt update && apt install -y docker-ce-cli && apt clean all
+
+FROM node:lts
+WORKDIR /usr/src/app
+LABEL coolify-preserve=true
+COPY --from=binaries /usr/bin/docker /usr/bin/docker
+COPY --from=binaries /usr/bin/envsubst /usr/bin/envsubst
+COPY --from=binaries /usr/bin/jq /usr/bin/jq
+COPY . .
+RUN curl -f https://get.pnpm.io/v6.js | node - add --global pnpm@6
+RUN pnpm install
+RUN pnpm build
+RUN rm -fr node_modules .pnpm-store
+RUN pnpm install -P
+CMD ["pnpm", "start"]
+EXPOSE 3000

install/README.md

@@ -0,0 +1,10 @@
+Some of the files are here for backwards compatibility.
+
+I will do things after 2 months: 
+
+- rm ./install.js and ./update.js
+- rm ../install.sh
+- rm ./Dockerfile-base
+- rm ./obs
+- rm ./check.js "No need to check env file. During installation, it is checked by the installer. If you change it between to upgrades: 🤷‍♂️"
+- Rename Dockerfile-new to Dockerfile

install/check.js

@@ -0,0 +1,24 @@
+require('dotenv').config()
+const fastify = require('fastify')()
+const { schema } = require('../api/schema')
+
+checkConfig().then(() => {
+  console.log('Config: OK')
+}).catch((err) => {
+  console.log('Config: NOT OK')
+  console.error(err)
+  process.exit(1)
+})
+
+function checkConfig () {
+  return new Promise((resolve, reject) => {
+    fastify.register(require('fastify-env'), {
+      schema,
+      dotenv: true
+    })
+      .ready((err) => {
+        if (err) reject(err)
+        resolve()
+      })
+  })
+}

install/coolify-template.yml

@@ -22,6 +22,7 @@ services:
       - --providers.docker.swarmMode=true
       - --providers.docker.exposedbydefault=false
       - --providers.docker.network=${DOCKER_NETWORK}
+      - --providers.docker.swarmModeRefreshSeconds=1s
       - --entrypoints.web.address=:80
       - --entrypoints.websecure.address=:443
       - --certificatesresolvers.letsencrypt.acme.httpchallenge=true

install/install.js

@@ -13,7 +13,8 @@ program
 
 program.parse(process.argv)
 
-if (program.check) {
+const options = program.opts()
+if (options.check) {
   checkConfig().then(() => {
     console.log('Config: OK')
   }).catch((err) => {
@@ -26,16 +27,18 @@ if (program.check) {
     console.error(`Please run as root! Current user: ${user}`)
     process.exit(1)
   }
-  shell.exec(`docker network create ${process.env.DOCKER_NETWORK} --driver overlay`, { silent: !program.debug })
+  shell.exec(`docker network create ${process.env.DOCKER_NETWORK} --driver overlay`, { silent: !options.debug })
   shell.exec('docker build -t coolify -f install/Dockerfile .')
-  if (program.type === 'all') {
-    shell.exec('docker stack rm coollabs-coolify', { silent: !program.debug })
-  } else if (program.type === 'coolify') {
+  if (options.type === 'all') {
+    shell.exec('docker stack rm coollabs-coolify', { silent: !options.debug })
+  } else if (options.type === 'coolify') {
     shell.exec('docker service rm coollabs-coolify_coolify')
-  } else if (program.type === 'proxy') {
+  } else if (options.type === 'proxy') {
     shell.exec('docker service rm coollabs-coolify_proxy')
   }
-  if (program.type !== 'upgrade') shell.exec('set -a && source .env && set +a && envsubst < install/coolify-template.yml | docker stack deploy -c - coollabs-coolify', { silent: !program.debug, shell: '/bin/bash' })
+  if (options.type !== 'upgrade') {
+    shell.exec('set -a && source .env && set +a && envsubst < install/coolify-template.yml | docker stack deploy -c - coollabs-coolify', { silent: !options.debug, shell: '/bin/bash' })
+  }
 }
 
 function checkConfig () {

install/obs/Dockerfile-base-new

@@ -0,0 +1,4 @@
+FROM coolify-base-nodejs
+WORKDIR /usr/src/app
+COPY . .
+RUN pnpm install

install/obs/Dockerfile-base-nodejs

@@ -0,0 +1,6 @@
+FROM node:lts
+LABEL coolify-preserve=true
+COPY --from=coolify-binaries /usr/bin/docker /usr/bin/docker
+COPY --from=coolify-binaries /usr/bin/envsubst /usr/bin/envsubst
+COPY --from=coolify-binaries /usr/bin/jq /usr/bin/jq
+RUN curl -f https://get.pnpm.io/v6.js | node - add --global pnpm@6

install/obs/Dockerfile-binaries

@@ -0,0 +1,9 @@
+FROM ubuntu:20.04
+LABEL coolify-preserve=true
+RUN apt update && apt install -y curl gnupg2 ca-certificates
+RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
+RUN echo 'deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable' >> /etc/apt/sources.list
+RUN curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o /usr/bin/envsubst
+RUN curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -o /usr/bin/jq
+RUN chmod +x /usr/bin/envsubst /usr/bin/jq
+RUN apt update && apt install -y docker-ce-cli && apt clean all

install/update.js

@@ -2,7 +2,6 @@ require('dotenv').config()
 const { program } = require('commander')
 const shell = require('shelljs')
 const user = shell.exec('whoami', { silent: true }).stdout.replace('\n', '')
-
 program.version('0.0.1')
 program
   .option('-d, --debug', 'Debug outputs.')
@@ -10,12 +9,13 @@ program
   .option('-t, --type <type>', 'Deploy type.')
 
 program.parse(process.argv)
-
+const options = program.opts()
 if (user !== 'root') {
   console.error(`Please run as root! Current user: ${user}`)
   process.exit(1)
 }
-if (program.type === 'upgrade') {
+
+if (options.type === 'upgrade') {
   shell.exec('docker service rm coollabs-coolify_coolify')
-  shell.exec('set -a && source .env && set +a && envsubst < install/coolify-template.yml | docker stack deploy -c - coollabs-coolify', { silent: !program.debug, shell: '/bin/bash' })
+  shell.exec('set -a && source .env && set +a && envsubst < install/coolify-template.yml | docker stack deploy -c - coollabs-coolify', { silent: !options.debug, shell: '/bin/bash' })
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source, hassle-free, self-hostable Heroku & Netlify alternative.",
-  "version": "1.0.1",
+  "version": "1.0.6",
   "license": "AGPL-3.0",
   "scripts": {
     "lint": "standard",
@@ -16,43 +16,46 @@
     "build:svite": "svite build"
   },
   "dependencies": {
-    "@roxi/routify": "^2.7.3",
-    "@zerodevx/svelte-toast": "^0.1.4",
-    "axios": "^0.21.0",
-    "commander": "^6.2.1",
+    "@iarna/toml": "^2.2.5",
+    "@roxi/routify": "^2.15.1",
+    "@zerodevx/svelte-toast": "^0.2.1",
+    "axios": "^0.21.1",
+    "commander": "^7.2.0",
+    "compare-versions": "^3.6.0",
     "cuid": "^2.1.8",
     "dayjs": "^1.10.4",
     "deepmerge": "^4.2.2",
     "dockerode": "^3.2.1",
     "dotenv": "^8.2.0",
-    "fastify": "^3.9.1",
+    "fastify": "^3.14.2",
     "fastify-env": "^2.1.0",
-    "fastify-jwt": "^2.1.3",
+    "fastify-jwt": "^2.4.0",
     "fastify-plugin": "^3.0.0",
-    "fastify-static": "^3.3.0",
+    "fastify-static": "^4.0.1",
     "generate-password": "^1.6.0",
     "js-yaml": "^4.0.0",
     "jsonwebtoken": "^8.5.1",
-    "mongoose": "^5.11.4",
+    "mongoose": "^5.12.3",
     "shelljs": "^0.8.4",
+    "svelte-select": "^3.17.0",
     "unique-names-generator": "^4.4.0"
   },
   "devDependencies": {
-    "mongodb-memory-server-core": "^6.9.3",
-    "nodemon": "^2.0.6",
+    "mongodb-memory-server-core": "^6.9.6",
+    "nodemon": "^2.0.7",
     "npm-run-all": "^4.1.5",
-    "postcss": "^7.0.35",
-    "postcss-import": "^12.0.1",
-    "postcss-load-config": "^3.0.0",
+    "postcss": "^8.2.9",
+    "postcss-import": "^14.0.1",
+    "postcss-load-config": "^3.0.1",
     "postcss-preset-env": "^6.7.0",
-    "prettier": "1.19",
-    "prettier-plugin-svelte": "^2.1.6",
+    "prettier": "2.2.1",
+    "prettier-plugin-svelte": "^2.2.0",
     "standard": "^16.0.3",
-    "svelte": "^3.29.7",
-    "svelte-hmr": "^0.12.2",
-    "svelte-preprocess": "^4.6.1",
+    "svelte": "^3.37.0",
+    "svelte-hmr": "^0.14.0",
+    "svelte-preprocess": "^4.7.0",
     "svite": "0.8.1",
-    "tailwindcss": "compat"
+    "tailwindcss": "2.1.1"
   },
   "keywords": [
     "svelte",

src/App.svelte

@@ -3,12 +3,15 @@
   import { Router } from "@roxi/routify";
   import { routes } from "../.routify/routes";
   const options = {
-    duration: 2000,
-    dismissable: false
+    duration: 2000
   };
 </script>
 
 <style lang="postcss">
+  :global(.main) {
+    width: calc(100% - 4rem);
+    margin-left: 4rem;
+  }
   :global(._toastMsg) {
     @apply text-sm font-bold !important;
   }
@@ -57,6 +60,22 @@
   :global(.h-271) {
     min-height: 271px !important;
   }
+  :global(.repository-select-search .listItem .item),
+  :global(.repository-select-search .empty) {
+    @apply text-sm py-3 font-bold bg-warmGray-800 text-white cursor-pointer border-none hover:bg-warmGray-700 !important;
+  }
+
+  :global(.repository-select-search .listContainer) {
+    @apply bg-transparent !important;
+  }
+
+  :global(.repository-select-search .clearSelect) {
+    @apply text-white cursor-pointer !important;
+  }
+
+  :global(.repository-select-search .selectedItem) {
+    @apply text-white relative cursor-pointer font-bold text-sm flex items-center !important;
+  }
 </style>
 
 <SvelteToast options="{options}" />

src/components/Application/Configuration/ActiveTab/BuildStep.svelte

@@ -1,22 +1,24 @@
 <script>
-  import { application} from "@store";
+  import { application } from "@store";
+import Tooltip from "../../../Tooltip/TooltipInfo.svelte";
 </script>
 
-<div class="grid grid-cols-1 space-y-2 max-w-2xl md:mx-auto mx-6 text-center">
-  <label for="buildCommand">Build Command</label>
-  <input
-    id="buildCommand"
-    bind:value="{$application.build.command.build}"
-    placeholder="eg: yarn build"
-  />
+<div class="grid grid-cols-1 max-w-2xl md:mx-auto mx-6 text-center">
+  <label for="installCommand"
+    >Install Command <Tooltip label="Command to run for installing dependencies. eg: yarn install." />
+  </label>
 
-  <label for="installCommand">Install Command</label>
   <input
+    class="mb-6"
     id="installCommand"
     bind:value="{$application.build.command.installation}"
     placeholder="eg: yarn install"
   />
-
-  <label for="baseDir">Base Directory</label>
-  <input id="baseDir" bind:value="{$application.build.directory}" placeholder="/" />
+  <label for="buildCommand">Build Command <Tooltip label="Command to run for building your application. If empty, no build phase initiated in the deploy process." /></label>
+  <input
+    class="mb-6"
+    id="buildCommand"
+    bind:value="{$application.build.command.build}"
+    placeholder="eg: yarn build"
+  />
 </div>

src/components/Application/Configuration/ActiveTab/General.svelte

@@ -1,106 +1,112 @@
 <script>
-  import { application } from "@store";
+  import { application} from "@store";
+  import TooltipInfo from "../../../Tooltip/TooltipInfo.svelte";
+  const showPorts = ['nodejs','custom','rust']
 </script>
 
 <div>
-    <div
-      class="grid grid-cols-1 text-sm space-y-2 max-w-2xl md:mx-auto mx-6 pb-6 auto-cols-max"
-    >
-      <label for="buildPack">Build Pack</label>
-      <select id="buildPack" bind:value="{$application.build.pack}">
-        <option selected class="font-medium">static</option>
-        <option class="font-medium">nodejs</option>
-      </select>
-    </div>
-    <div
-      class="grid grid-cols-2 space-y-2 max-w-2xl md:mx-auto mx-6 justify-center items-center"
-    >
-      <label for="Domain">Domain</label>
-      <input
-        class:placeholder-red-500="{$application.publish.domain == null || $application.publish.domain == ''}"
-        class:border-red-500="{$application.publish.domain == null || $application.publish.domain == ''}"
-        id="Domain"
-        bind:value="{$application.publish.domain}"
-        placeholder="eg: coollabs.io (without www)"
+  <div
+    class="grid grid-cols-1 text-sm max-w-2xl md:mx-auto mx-6 pb-6 auto-cols-max "
+  >
+    <label for="buildPack"
+      >Build Pack
+      {#if $application.build.pack === 'custom'}
+      <TooltipInfo
+        label="Your custom Dockerfile will be used from the root directory (or from 'Base Directory' specified below) of your repository. "
       />
-      <label for="Path">Path Prefix</label>
-      <input
-        id="Path"
-        bind:value="{$application.publish.path}"
-        placeholder="/"
+      {:else if $application.build.pack === 'static'}
+      <TooltipInfo
+        label="Published as a static site (for build phase see 'Build Step' tab)."
       />
-      <label for="publishDir">Publish Directory</label>
-      <input
-        id="publishDir"
-        bind:value="{$application.publish.directory}"
-        placeholder="/"
+      {:else if $application.build.pack === 'nodejs'}
+      <TooltipInfo
+        label="Published as a Node.js application (for build phase see 'Build Step' tab)."
+      />
+      {:else if $application.build.pack === 'php'}
+      <TooltipInfo
+      size="large"
+        label="Published as a PHP application."
+      />
+      {:else if $application.build.pack === 'rust'}
+      <TooltipInfo
+      size="large"
+        label="Published as a Rust application."
       />
-      {#if $application.build.pack !== "static"}
-        <label for="Port">Port</label>
-        <input
-          id="Port"
-          bind:value="{$application.publish.port}"
-          placeholder="{$application.build.pack === 'static'
-            ? '80'
-            : '3000'}"
-        />
       {/if}
-      <!-- {#if config.buildPack === "static"}
-        <div class="text-base font-bold text-white pt-2">
-          Preview Deploys
-        </div>
-        <button
-          type="button"
-          on:click="{() =>
-            (config.previewDeploy = !config.previewDeploy)}"
-          aria-pressed="false"
-          class="relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-black"
-          class:bg-green-600="{config.previewDeploy}"
-          class:bg-coolgray-300="{!config.previewDeploy}"
+
+</label
+    >
+    <select id="buildPack" bind:value="{$application.build.pack}">
+      <option selected class="font-bold">static</option>
+      <option class="font-bold">nodejs</option>
+      <option class="font-bold">php</option>
+      <option class="font-bold">custom</option>
+      <option class="font-bold">rust</option>
+    </select>
+  </div>
+  <div
+    class="grid grid-cols-1 max-w-2xl md:mx-auto mx-6 justify-center items-center"
+  >
+    <div class="grid grid-flow-col gap-2 items-center pb-6">
+      <div class="grid grid-flow-row">
+        <label for="Domain" class="">Domain</label>
+        <input
+          class:placeholder-red-500="{$application.publish.domain == null ||
+            $application.publish.domain == ''}"
+          class:border-red-500="{$application.publish.domain == null ||
+            $application.publish.domain == ''}"
+          id="Domain"
+          bind:value="{$application.publish.domain}"
+          placeholder="eg: coollabs.io (without www)"
+        />
+      </div>
+      <div class="grid grid-flow-row">
+        <label for="Path"
+          >Path <TooltipInfo
+            label="{`Path to deploy your application on your domain. eg: /api means it will be deployed to -> https://${$application.publish.domain}/api`}"
+          /></label
         >
-          <span class="sr-only">Use setting</span>
-          <span
-            class="pointer-events-none relative inline-block h-5 w-5 rounded-full bg-white shadow transform ring-0 transition ease-in-out duration-200"
-            class:translate-x-5="{config.previewDeploy}"
-            class:translate-x-0="{!config.previewDeploy}"
-          >
-            <span
-              class="ease-in duration-200 absolute inset-0 h-full w-full flex items-center justify-center transition-opacity"
-              class:opacity-0="{config.previewDeploy}"
-              class:opacity-100="{!config.previewDeploy}"
-              aria-hidden="true"
-            >
-              <svg
-                class="bg-white h-3 w-3 text-red-600"
-                fill="none"
-                viewBox="0 0 12 12"
-              >
-                <path
-                  d="M4 8l2-2m0 0l2-2M6 6L4 4m2 2l2 2"
-                  stroke="currentColor"
-                  stroke-width="2"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"></path>
-              </svg>
-            </span>
-            <span
-              class="ease-out duration-100 absolute inset-0 h-full w-full flex items-center justify-center transition-opacity"
-              aria-hidden="true"
-              class:opacity-100="{config.previewDeploy}"
-              class:opacity-0="{!config.previewDeploy}"
-            >
-              <svg
-                class="bg-white h-3 w-3 text-green-600"
-                fill="currentColor"
-                viewBox="0 0 12 12"
-              >
-                <path
-                  d="M3.707 5.293a1 1 0 00-1.414 1.414l1.414-1.414zM5 8l-.707.707a1 1 0 001.414 0L5 8zm4.707-3.293a1 1 0 00-1.414-1.414l1.414 1.414zm-7.414 2l2 2 1.414-1.414-2-2-1.414 1.414zm3.414 2l4-4-1.414-1.414-4 4 1.414 1.414z"
-                ></path>
-              </svg>
-            </span>
-          </span>
-        </button>
-      {/if} -->
+        <input
+          id="Path"
+          bind:value="{$application.publish.path}"
+          placeholder="/"
+        />
+      </div>
     </div>
-  </div>
+    {#if showPorts.includes($application.build.pack)}
+    <label for="Port" >Port</label>
+    <input
+      id="Port"
+      class="mb-6"
+      bind:value="{$application.publish.port}"
+      placeholder="{$application.build.pack === 'static' ? '80' : '3000'}"
+    />
+  {/if}
+    <div class="grid grid-flow-col gap-2 items-center pt-12">
+      <div class="grid grid-flow-row">
+        <label for="baseDir"
+          >Base Directory <TooltipInfo
+            label="The directory to use as base for every command (could be useful if you have a monorepo)."
+          /></label
+        >
+        <input
+          id="baseDir"
+          bind:value="{$application.build.directory}"
+          placeholder="/"
+        />
+      </div>
+      <div class="grid grid-flow-row">
+        <label for="publishDir"
+          >Publish Directory <TooltipInfo
+            label="The directory to deploy after running the build command.  eg: dist, _site, public."
+          /></label
+        >
+        <input
+          id="publishDir"
+          bind:value="{$application.publish.directory}"
+          placeholder="/"
+        />
+      </div>
+    </div>
+  </div>
+</div>

src/components/Application/Configuration/ActiveTab/Secrets.svelte

@@ -9,35 +9,38 @@
   async function saveSecret() {
     if (secret.name && secret.value) {
       const found = $application.publish.secrets.find(
-      s => s.name === secret.name,
-    );
-    if (!found) {
-      $application.publish.secrets = [
-        ...$application.publish.secrets,
-        {
-          name: secret.name,
-          value: secret.value,
-        },
-      ];
-      secret = {
-        name: null,
-        value: null
+        s => s.name === secret.name,
+      );
+      if (!found) {
+        $application.publish.secrets = [
+          ...$application.publish.secrets,
+          {
+            name: secret.name,
+            value: secret.value,
+          },
+        ];
+        secret = {
+          name: null,
+          value: null,
+        };
+      } else {
+        foundSecret = found;
       }
-    } else {
-      foundSecret = found;
     }
-    }
-
   }
 
   async function removeSecret(name) {
-    $application.publish.secrets = [...$application.publish.secrets.filter(s => s.name !== name)]
-   
+    foundSecret = null
+    $application.publish.secrets = [
+      ...$application.publish.secrets.filter(s => s.name !== name),
+    ];
   }
 </script>
 
-<div class="space-y-2 max-w-2xl md:mx-auto mx-6 text-center">
-  <div class="text-left text-base font-bold tracking-tight text-warmGray-400">New Secret</div>
+<div class="max-w-2xl md:mx-auto mx-6 text-center">
+  <div class="text-left text-base font-bold tracking-tight text-warmGray-400">
+    New Secret
+  </div>
   <div class="grid md:grid-flow-col grid-flow-row gap-2">
     <input id="secretName" bind:value="{secret.name}" placeholder="Name" />
     <input id="secretValue" bind:value="{secret.value}" placeholder="Value" />
@@ -47,26 +50,28 @@
     >
   </div>
   {#if $application.publish.secrets.length > 0}
-    {#each $application.publish.secrets as s}
-      <div class="grid md:grid-flow-col grid-flow-row gap-2">
-        <input
-          id="{s.name}"
-          value="{s.name}"
-          disabled
-          class="bg-transparent border-transparent"
-          class:border-red-600="{foundSecret && foundSecret.name === s.name}"
-        />
-        <input
-          id="{s.createdAt}"
-          value="ENCRYPTED"
-          disabled
-          class="bg-transparent border-transparent"
-        />
-        <button
-          class="button w-20 bg-red-600 hover:bg-red-500 text-white"
-          on:click="{() => removeSecret(s.name)}">Delete</button
-        >
-      </div>
-    {/each}
+    <div class="py-4">
+      {#each $application.publish.secrets as s}
+        <div class="grid md:grid-flow-col grid-flow-row gap-2">
+          <input
+            id="{s.name}"
+            value="{s.name}"
+            disabled
+            class="border-2 bg-transparent border-transparent"
+            class:border-red-600="{foundSecret && foundSecret.name === s.name}"
+          />
+          <input
+            id="{s.createdAt}"
+            value="SAVED"
+            disabled
+            class="bg-transparent border-transparent"
+          />
+          <button
+            class="button w-20 bg-red-600 hover:bg-red-500 text-white"
+            on:click="{() => removeSecret(s.name)}">Delete</button
+          >
+        </div>
+      {/each}
+    </div>
   {/if}
 </div>

src/components/Application/Configuration/Branches.svelte

@@ -1,24 +1,46 @@
 <script>
   export let loading, branches;
+  import { isActive } from "@roxi/routify";
   import { application } from "@store";
+  import Select from "svelte-select";
+
+  const selectedValue =
+    !$isActive("/application/new") && $application.repository.branch
+
+  function handleSelect(event) {
+    $application.repository.branch = null;
+    setTimeout(() => {
+      $application.repository.branch = event.detail.value;
+    }, 1);
+  }
 </script>
 
 {#if loading}
   <div class="grid grid-cols-1">
     <label for="branch">Branch</label>
-    <select disabled>
-      <option selected>Loading branches</option>
-    </select>
+    <div class="repository-select-search col-span-2">
+      <Select
+        containerClasses="w-full border-none bg-transparent"
+        placeholder="Loading branches..."
+        isDisabled
+      />
+    </div>
   </div>
 {:else}
   <div class="grid grid-cols-1">
     <label for="branch">Branch</label>
-    <!-- svelte-ignore a11y-no-onchange -->
-    <select id="branch" bind:value="{$application.repository.branch}">
-      <option disabled selected>Select a branch</option>
-      {#each branches as branch}
-        <option value="{branch.name}" class="font-medium">{branch.name}</option>
-      {/each}
-    </select>
+    <div class="repository-select-search col-span-2">
+      <Select
+        containerClasses="w-full border-none bg-transparent"
+        on:select="{handleSelect}"
+        selectedValue="{selectedValue}"
+        isClearable="{false}"
+        items="{branches.map(b => ({ label: b.name, value: b.name }))}"
+        showIndicator="{$isActive('/application/new')}"
+        noOptionsMessage="No branches found"
+        placeholder="Select a branch"
+        isDisabled="{!$isActive('/application/new')}"
+      />
+    </div>
   </div>
 {/if}

src/components/Application/Configuration/Configuration.svelte

@@ -18,7 +18,7 @@
   let repositories = [];
 
   function dashify(str, options) {
-    if (typeof str !== "string") return str
+    if (typeof str !== "string") return str;
     return str
       .trim()
       .replace(/\W/g, m => (/[À-ž]/.test(m) ? m : "-"))
@@ -29,6 +29,7 @@
 
   async function loadBranches() {
     loading.branches = true;
+    if ($isActive("/application/new")) $application.repository.branch = null;
     const selectedRepository = repositories.find(
       r => r.id === $application.repository.id,
     );
@@ -44,7 +45,16 @@
     loading.branches = false;
   }
 
+  async function getGithubRepos(id, page) {
+    const data = await $fetch(
+      `https://api.github.com/user/installations/${id}/repositories?per_page=100&page=${page}`,
+    );
+
+    return data;
+  }
+
   async function loadGithub() {
+    loading.github = true;
     try {
       const { installations } = await $fetch(
         "https://api.github.com/user/installations",
@@ -55,12 +65,28 @@
       $application.github.installation.id = installations[0].id;
       $application.github.app.id = installations[0].app_id;
 
-      const data = await $fetch(
-        `https://api.github.com/user/installations/${$application.github.installation.id}/repositories?per_page=10000`,
+      let page = 1;
+      let userRepos = 0;
+      const data = await getGithubRepos(
+        $application.github.installation.id,
+        page,
       );
 
-      repositories = data.repositories;
-      const foundRepositoryOnGithub = data.repositories.find(
+      repositories = repositories.concat(data.repositories);
+      userRepos = data.total_count;
+
+      if (userRepos > repositories.length) {
+        while (userRepos > repositories.length) {
+          page = page + 1;
+          const repos = await getGithubRepos(
+            $application.github.installation.id,
+            page,
+          );
+          repositories = repositories.concat(repos.repositories);
+        }
+      }
+
+      const foundRepositoryOnGithub = repositories.find(
         r =>
           r.full_name ===
           `${$application.repository.organization}/${$application.repository.name}`,
@@ -72,8 +98,9 @@
       }
     } catch (error) {
       return false;
+    } finally {
+      loading.github = false;
     }
-    loading.github = false;
   }
   function modifyGithubAppConfig() {
     const left = screen.width / 2 - 1020 / 2;
@@ -117,18 +144,64 @@
   }
 </script>
 
+{#if !$isActive("/application/new")}
+  <div class="min-h-full text-white">
+    <div
+      class="py-5 text-left px-6 text-3xl tracking-tight font-bold flex items-center"
+    >
+      <a
+        target="_blank"
+        class="text-green-500 hover:underline cursor-pointer px-2"
+        href="{'https://' +
+          $application.publish.domain +
+          $application.publish.path}"
+        >{$application.publish.domain
+          ? `${$application.publish.domain}${$application.publish.path !== '/' ? $application.publish.path : ''}`
+          : "Loading..."}</a
+      >
+      <a
+        target="_blank"
+        class="icon"
+        href="{`https://github.com/${$application.repository.organization}/${$application.repository.name}`}"
+      >
+        <svg
+          class="w-6"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          stroke-width="2"
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          ><path
+            d="M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37 0 0 0-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44 0 0 0 20 4.77 5.07 5.07 0 0 0 19.91 1S18.73.65 16 2.48a13.38 13.38 0 0 0-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07 0 0 0 5 4.77a5.44 5.44 0 0 0-1.5 3.78c0 5.42 3.3 6.61 6.44 7A3.37 3.37 0 0 0 9 18.13V22"
+          ></path></svg
+        ></a
+      >
+    </div>
+  </div>
+{:else if $isActive("/application/new")}
+  <div class="min-h-full text-white">
+    <div
+      class="py-5 text-left px-6 text-3xl tracking-tight font-bold flex items-center"
+    >
+      New Application
+    </div>
+  </div>
+{/if}
+
 <div in:fade="{{ duration: 100 }}">
   {#if !$session.githubAppToken}
     <Login />
   {:else}
     {#await loadGithub()}
-      <Loading />
+      <Loading github githubLoadingText="Loading repositories..." />
     {:then}
       {#if loading.github}
-        <Loading />
+        <Loading github githubLoadingText="Loading repositories..." />
       {:else}
         <div
-          class="text-center space-y-2 max-w-4xl mx-auto px-6"
+          class="space-y-2 max-w-4xl mx-auto px-6"
           in:fade="{{ duration: 100 }}"
         >
           <Repositories

src/components/Application/Configuration/Repositories.svelte

@@ -2,35 +2,44 @@
   import { createEventDispatcher } from "svelte";
   import { isActive } from "@roxi/routify";
   import { application } from "@store";
+  import Select from "svelte-select";
+
+  function handleSelect(event) {
+    $application.repository.id = parseInt(event.detail.value, 10);
+    dispatch("loadBranches");
+  }
+
   export let repositories;
+  let items = repositories.map(repo => ({
+    label: `${repo.owner.login}/${repo.name}`,
+    value: repo.id.toString(),
+  }));
+
+  const selectedValue =
+    !$isActive("/application/new") &&
+    `${$application.repository.organization}/${$application.repository.name}`;
+
   const dispatch = createEventDispatcher();
-  const loadBranches = () => dispatch("loadBranches");
   const modifyGithubAppConfig = () => dispatch("modifyGithubAppConfig");
 </script>
 
 <div class="grid grid-cols-1">
   {#if repositories.length !== 0}
     <label for="repository">Organization / Repository</label>
-    <div class="grid grid-cols-3">
-      <!-- svelte-ignore a11y-no-onchange -->
-      <select
-        id="repository"
-        class:cursor-not-allowed="{!$isActive('/application/new')}"
-        class="col-span-2"
-        bind:value="{$application.repository.id}"
-        on:change="{loadBranches}"
-        disabled="{!$isActive('/application/new')}"
-      >
-        <option selected disabled>Select a repository</option>
-        {#each repositories as repo}
-          <option value="{repo.id}" class="font-medium">
-            {repo.owner.login}
-            /
-            {repo.name}
-          </option>
-        {/each}
-      </select>
-
+    <div class="grid grid-cols-3 ">
+      <div class="repository-select-search col-span-2">
+        <Select
+          containerClasses="w-full border-none bg-transparent"
+          on:select="{handleSelect}"
+          selectedValue="{selectedValue}"
+          isClearable="{false}"
+          items="{items}"
+          showIndicator="{$isActive('/application/new')}"
+          noOptionsMessage="No Repositories found"
+          placeholder="Select a Repository"
+          isDisabled="{!$isActive('/application/new')}"
+        />
+      </div>
       <button
         class="button col-span-1 ml-2 bg-warmGray-800 hover:bg-warmGray-700 text-white"
         on:click="{modifyGithubAppConfig}">Configure on Github</button

src/components/Application/Configuration/Tabs.svelte

@@ -1,11 +1,15 @@
 <script>
   import { redirect, isActive } from "@roxi/routify";
+  import { onMount } from "svelte";
+  import { toast } from "@zerodevx/svelte-toast";
+  import templates from "../../../utils/templates";
   import { application, fetch, deployments } from "@store";
   import General from "./ActiveTab/General.svelte";
   import BuildStep from "./ActiveTab/BuildStep.svelte";
   import Secrets from "./ActiveTab/Secrets.svelte";
-  import { onMount } from "svelte";
-
+  import Loading from "../../Loading.svelte";
+  const buildPhaseActive = ["nodejs", "static"];
+  let loading = false;
   onMount(async () => {
     if (!$isActive("/application/new")) {
       const config = await $fetch(`/api/v1/config`, {
@@ -22,22 +26,83 @@
         branch: $application.repository.branch,
       });
     } else {
-      $deployments.applications.deployed.filter(d => {
-        const conf = d?.Spec?.Labels.application;
+      loading = true;
+      $deployments?.applications?.deployed.find(d => {
+        const conf = d?.Spec?.Labels.configuration;
         if (
-          conf.repository.organization ===
+          conf?.repository?.organization ===
             $application.repository.organization &&
-          conf.repository.name === $application.repository.name &&
-          conf.repository.branch === $application.repository.branch
+          conf?.repository?.name === $application.repository.name &&
+          conf?.repository?.branch === $application.repository.branch
         ) {
           $redirect(`/application/:organization/:name/:branch/configuration`, {
             name: $application.repository.name,
             organization: $application.repository.organization,
             branch: $application.repository.branch,
           });
+          toast.push("This repository & branch is already defined. Redirecting...");
         }
       });
+      try {
+        const dir = await $fetch(
+          `https://api.github.com/repos/${$application.repository.organization}/${$application.repository.name}/contents/?ref=${$application.repository.branch}`,
+        );
+        const packageJson = dir.find(
+          f => f.type === "file" && f.name === "package.json",
+        );
+        const Dockerfile = dir.find(
+          f => f.type === "file" && f.name === "Dockerfile",
+        );
+        const CargoToml = dir.find(
+          f => f.type === "file" && f.name === "Cargo.toml",
+        );
+
+        if (Dockerfile) {
+          $application.build.pack = "custom";
+          toast.push("Custom Dockerfile found. Build pack set to custom.");
+        } else if (packageJson) {
+          const { content } = await $fetch(packageJson.git_url);
+          const packageJsonContent = JSON.parse(atob(content));
+          const checkPackageJSONContents = dep => {
+            return (
+              packageJsonContent?.dependencies?.hasOwnProperty(dep) ||
+              packageJsonContent?.devDependencies?.hasOwnProperty(dep)
+            );
+          };
+          Object.keys(templates).map(dep => {
+            if (checkPackageJSONContents(dep)) {
+              const config = templates[dep];
+              $application.build.pack = config.pack;
+              if (config.installation) {
+                $application.build.command.installation = config.installation;
+              }
+
+              if (config.port) {
+                $application.publish.port = config.port;
+              }
+
+              if (config.directory) {
+                $application.publish.directory = config.directory;
+              }
+
+              if (
+                packageJsonContent.scripts.hasOwnProperty("build") &&
+                config.build
+              ) {
+                $application.build.command.build = config.build;
+              }
+              toast.push(`${config.name} App detected. Default values set.`);
+            }
+          });
+        } else if (CargoToml) {
+          $application.build.pack = "rust";
+          toast.push(`Rust language detected. Default values set.`);
+        }
+      } catch (error) {
+        // Nothing detected
+      }
     }
+    loading = false;
   });
   let activeTab = {
     general: true,
@@ -56,42 +121,58 @@
   }
 </script>
 
-<div class="block text-center py-4">
-  <nav
-    class="flex space-x-4 justify-center font-bold text-md text-white"
-    aria-label="Tabs"
-  >
-    <div
-      on:click="{() => activateTab('general')}"
-      class:text-green-500="{activeTab.general}"
-      class="px-3 py-2 cursor-pointer hover:text-green-500"
+{#if loading}
+  <Loading github githubLoadingText="Scanning repository..." />
+{:else}
+  <div class="block text-center py-4">
+    <nav
+      class="flex space-x-4 justify-center font-bold text-md text-white"
+      aria-label="Tabs"
     >
-      General
-    </div>
-    <div
-      on:click="{() => activateTab('buildStep')}"
-      class:text-green-500="{activeTab.buildStep}"
-      class="px-3 py-2 cursor-pointer hover:text-green-500"
-    >
-      Build Step
-    </div>
-    <div
-      on:click="{() => activateTab('secrets')}"
-      class:text-green-500="{activeTab.secrets}"
-      class="px-3 py-2 cursor-pointer hover:text-green-500"
-    >
-      Secrets
-    </div>
-  </nav>
-</div>
-<div class="max-w-4xl mx-auto">
-  <div class="h-full">
-    {#if activeTab.general}
-      <General />
-    {:else if activeTab.buildStep}
-      <BuildStep />
-    {:else if activeTab.secrets}
-      <Secrets />
-    {/if}
+      <div
+        on:click="{() => activateTab('general')}"
+        class:text-green-500="{activeTab.general}"
+        class="px-3 py-2 cursor-pointer hover:text-green-500"
+      >
+        General
+      </div>
+      {#if !buildPhaseActive.includes($application.build.pack)}
+        <div disabled class="px-3 py-2 text-warmGray-700 cursor-not-allowed">
+          Build Step
+        </div>
+      {:else}
+        <div
+          on:click="{() => activateTab('buildStep')}"
+          class:text-green-500="{activeTab.buildStep}"
+          class="px-3 py-2 cursor-pointer hover:text-green-500"
+        >
+          Build Step
+        </div>
+      {/if}
+      {#if $application.build.pack === "custom"}
+        <div disabled class="px-3 py-2 text-warmGray-700 cursor-not-allowed">
+          Secrets
+        </div>
+      {:else}
+        <div
+          on:click="{() => activateTab('secrets')}"
+          class:text-green-500="{activeTab.secrets}"
+          class="px-3 py-2 cursor-pointer hover:text-green-500"
+        >
+          Secrets
+        </div>
+      {/if}
+    </nav>
   </div>
-</div>
+  <div class="max-w-4xl mx-auto">
+    <div class="h-full">
+      {#if activeTab.general}
+        <General />
+      {:else if activeTab.buildStep}
+        <BuildStep />
+      {:else if activeTab.secrets}
+        <Secrets />
+      {/if}
+    </div>
+  </div>
+{/if}

src/components/Loading.svelte

@@ -42,11 +42,38 @@
 </style>
 
 <script>
+  export let github = false;
+  export let githubLoadingText = "Loading GitHub...";
   export let fullscreen = true;
 </script>
 
 {#if fullscreen}
-  <div class="fixed top-0 flex flex-wrap content-center h-full w-full">
-    <span class="loader"></span>
-  </div>
+  {#if github}
+    <div class="fixed left-0 top-0 flex flex-wrap content-center h-full w-full">
+      <div class="main flex justify-center items-center">
+        <div class="w-64">
+          <svg
+            class=" w-28 animate-bounce mx-auto"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            ><path
+              d="M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37 0 0 0-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44 0 0 0 20 4.77 5.07 5.07 0 0 0 19.91 1S18.73.65 16 2.48a13.38 13.38 0 0 0-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07 0 0 0 5 4.77a5.44 5.44 0 0 0-1.5 3.78c0 5.42 3.3 6.61 6.44 7A3.37 3.37 0 0 0 9 18.13V22"
+            ></path></svg
+          >
+          <div class="text-xl font-bold text-center">
+            {githubLoadingText}
+          </div>
+        </div>
+      </div>
+    </div>
+  {:else}
+    <div class="main fixed left-0 top-0 flex flex-wrap content-center h-full">
+      <span class=" loader"></span>
+    </div>
+  {/if}
 {/if}

src/components/Tooltip/Tooltip.svelte

@@ -0,0 +1,14 @@
+<script>
+  export let position = "bottom";
+  export let label;
+  export let size = "fit";
+</script>
+
+<span
+  aria-label="{label}"
+  data-microtip-position="{position}"
+  data-microtip-size="{size}"
+  role="tooltip"
+>
+<slot></slot>
+</span>

src/components/Tooltip/TooltipInfo.svelte

@@ -0,0 +1,25 @@
+<script>
+  export let position = "top";
+  export let label;
+  export let size = "large";
+</script>
+
+<span
+  class="absolute px-1 py-1"
+  aria-label="{label}"
+  data-microtip-position="{position}"
+  data-microtip-size="{size}"
+  role="tooltip"
+>
+  <svg
+    class="w-4 text-warmGray-600 hover:text-white"
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 20 20"
+    fill="currentColor"
+  >
+    <path
+      fill-rule="evenodd"
+      d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z"
+      clip-rule="evenodd"></path>
+  </svg>
+</span>

src/index.css

@@ -15,4 +15,34 @@ body {
   --toastBackground: rgba(41, 37, 36, 0.8);
   --toastProgressBackground: transparent;
   --toastFont: 'Inter';
+}
+
+.border-gradient {
+    border-bottom: 2px solid transparent;
+    border-image: linear-gradient(0.25turn, rgba(255, 249, 34), rgba(255, 0, 128), rgba(56, 2, 155, 0));
+    border-image-slice: 1;
+}
+
+[aria-label][role~="tooltip"]::after {
+  background: rgba(41, 37, 36, 0.9);
+  color: white;
+  font-family: 'Inter';
+  font-size: 16px;
+  font-weight: 600;
+   white-space: normal;
+}
+
+[role~="tooltip"][data-microtip-position|="bottom"]::before {
+  background: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2236px%22%20height%3D%2212px%22%3E%3Cpath%20fill%3D%22rgba%2841,%2037,%2036,%200.9%29%22%20transform%3D%22rotate%28180%2018%206%29%22%20d%3D%22M2.658,0.000%20C-13.615,0.000%2050.938,0.000%2034.662,0.000%20C28.662,0.000%2023.035,12.002%2018.660,12.002%20C14.285,12.002%208.594,0.000%202.658,0.000%20Z%22/%3E%3C/svg%3E") no-repeat;
+}
+
+[role~="tooltip"][data-microtip-position|="top"]::before {
+  background: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2236px%22%20height%3D%2212px%22%3E%3Cpath%20fill%3D%22rgba%2841,%2037,%2036,%200.9%29%22%20transform%3D%22rotate%280%29%22%20d%3D%22M2.658,0.000%20C-13.615,0.000%2050.938,0.000%2034.662,0.000%20C28.662,0.000%2023.035,12.002%2018.660,12.002%20C14.285,12.002%208.594,0.000%202.658,0.000%20Z%22/%3E%3C/svg%3E") no-repeat;
+}
+[role~="tooltip"][data-microtip-position="right"]::before {
+  background: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2212px%22%20height%3D%2236px%22%3E%3Cpath%20fill%3D%22rgba%2841,%2037,%2036,%200.9%29%22%20transform%3D%22rotate%2890%206%206%29%22%20d%3D%22M2.658,0.000%20C-13.615,0.000%2050.938,0.000%2034.662,0.000%20C28.662,0.000%2023.035,12.002%2018.660,12.002%20C14.285,12.002%208.594,0.000%202.658,0.000%20Z%22/%3E%3C/svg%3E") no-repeat;
+}
+
+[role~="tooltip"][data-microtip-position="left"]::before {
+  background: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2212px%22%20height%3D%2236px%22%3E%3Cpath%20fill%3D%22rgba%2841,%2037,%2036,%200.9%29%22%20transform%3D%22rotate%28-90%2018%2018%29%22%20d%3D%22M2.658,0.000%20C-13.615,0.000%2050.938,0.000%2034.662,0.000%20C28.662,0.000%2023.035,12.002%2018.660,12.002%20C14.285,12.002%208.594,0.000%202.658,0.000%20Z%22/%3E%3C/svg%3E") no-repeat;
 }

src/pages/_layout.svelte

@@ -2,32 +2,23 @@
   .min-w-4rem {
     min-width: 4rem;
   }
-  .main {
-    width: calc(100% - 4rem);
-    margin-left: 4rem;
-  }
 </style>
 
 <script>
-  import { url, goto, route, isActive, redirect } from "@roxi/routify/runtime";
-  import {
-    loggedIn,
-    session,
-    fetch,
-    deployments,
-    application,
-    initConf,
-  } from "@store";
+  import { goto, route, isActive } from "@roxi/routify/runtime";
+  import { loggedIn, session, fetch, deployments } from "@store";
   import { toast } from "@zerodevx/svelte-toast";
-  import packageJson from "../../package.json";
   import { onMount } from "svelte";
+  import compareVersions from "compare-versions";
+  import packageJson from "../../package.json";
+  import Tooltip from "../components/Tooltip/Tooltip.svelte";
 
   let upgradeAvailable = false;
   let upgradeDisabled = false;
   let upgradeDone = false;
   let latest = {};
   onMount(async () => {
-    upgradeAvailable = await checkUpgrade();
+    if ($session.token) upgradeAvailable = await checkUpgrade();
   });
   async function verifyToken() {
     if ($session.token) {
@@ -74,17 +65,22 @@
   }
   async function checkUpgrade() {
     latest = await window
-      .fetch(
-        "https://raw.githubusercontent.com/coollabsio/coolify/main/package.json",
-        { cache: "no-cache" },
-      )
+      .fetch(`https://get.coollabs.io/version.json`, {
+        cache: "no-cache",
+      })
       .then(r => r.json());
-    if (
-      latest.version.split(".").join("") >
-      packageJson.version.split(".").join("")
-    ) {
-      return true;
-    }
+    const branch =
+      process.env.NODE_ENV === "production" &&
+      window.location.hostname !== "test.andrasbacsai.dev"
+        ? "main"
+        : "next";
+
+    return compareVersions(
+      latest.coolify[branch].version,
+      packageJson.version,
+    ) === 1
+      ? true
+      : false;
   }
 </script>
 
@@ -94,164 +90,169 @@
       class="w-16 bg-warmGray-800 text-white top-0 left-0 fixed min-w-4rem min-h-screen"
     >
       <div
-        class="flex flex-col w-full h-screen items-center space-y-4 transition-all duration-100"
+        class="flex flex-col w-full h-screen items-center transition-all duration-100"
         class:border-green-500="{$isActive('/dashboard/applications')}"
         class:border-purple-500="{$isActive('/dashboard/databases')}"
       >
         <img class="w-10 pt-4 pb-4" src="/favicon.png" alt="coolLabs logo" />
-        <div
-          class="p-2 hover:bg-warmGray-700 rounded hover:text-green-500 my-4 transition-all duration-100 cursor-pointer"
-          on:click="{() => $goto('/dashboard/applications')}"
-          class:text-green-500="{$isActive('/dashboard/applications') ||
-            $isActive('/application')}"
-          class:bg-warmGray-700="{$isActive('/dashboard/applications') ||
-            $isActive('/application')}"
-        >
-          <svg
-            class="w-8"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            fill="none"
-            stroke="currentColor"
-            stroke-width="2"
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            ><rect x="4" y="4" width="16" height="16" rx="2" ry="2"></rect><rect
-              x="9"
-              y="9"
-              width="6"
-              height="6"></rect><line x1="9" y1="1" x2="9" y2="4"></line><line
-              x1="15"
-              y1="1"
-              x2="15"
-              y2="4"></line><line x1="9" y1="20" x2="9" y2="23"></line><line
-              x1="15"
-              y1="20"
-              x2="15"
-              y2="23"></line><line x1="20" y1="9" x2="23" y2="9"></line><line
-              x1="20"
-              y1="14"
-              x2="23"
-              y2="14"></line><line x1="1" y1="9" x2="4" y2="9"></line><line
-              x1="1"
-              y1="14"
-              x2="4"
-              y2="14"></line></svg
+        <Tooltip position="right" label="Applications">
+          <div
+            class="p-2 hover:bg-warmGray-700 rounded hover:text-green-500 my-4 transition-all duration-100 cursor-pointer"
+            on:click="{() => $goto('/dashboard/applications')}"
+            class:text-green-500="{$isActive('/dashboard/applications') ||
+              $isActive('/application')}"
+            class:bg-warmGray-700="{$isActive('/dashboard/applications') ||
+              $isActive('/application')}"
           >
-        </div>
-        <div
-          class="p-2 hover:bg-warmGray-700 rounded hover:text-purple-500 my-4 transition-all duration-100 cursor-pointer"
-          on:click="{() => $goto('/dashboard/databases')}"
-          class:text-purple-500="{$isActive('/dashboard/databases') ||
-            $isActive('/database')}"
-          class:bg-warmGray-700="{$isActive('/dashboard/databases') ||
-            $isActive('/database')}"
-        >
-          <svg
-            class="w-8"
-            xmlns="http://www.w3.org/2000/svg"
-            fill="none"
-            viewBox="0 0 24 24"
-            stroke="currentColor"
-          >
-            <path
+            <svg
+              class="w-8"
+              xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              stroke-width="2"
               stroke-linecap="round"
               stroke-linejoin="round"
-              stroke-width="2"
-              d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4"
-            ></path>
-          </svg>
-        </div>
+              ><rect x="4" y="4" width="16" height="16" rx="2" ry="2"
+              ></rect><rect x="9" y="9" width="6" height="6"></rect><line
+                x1="9"
+                y1="1"
+                x2="9"
+                y2="4"></line><line x1="15" y1="1" x2="15" y2="4"></line><line
+                x1="9"
+                y1="20"
+                x2="9"
+                y2="23"></line><line x1="15" y1="20" x2="15" y2="23"
+              ></line><line x1="20" y1="9" x2="23" y2="9"></line><line
+                x1="20"
+                y1="14"
+                x2="23"
+                y2="14"></line><line x1="1" y1="9" x2="4" y2="9"></line><line
+                x1="1"
+                y1="14"
+                x2="4"
+                y2="14"></line></svg
+            >
+          </div>
+        </Tooltip>
+        <Tooltip position="right" label="Databases">
+          <div
+            class="p-2 hover:bg-warmGray-700 rounded hover:text-purple-500 transition-all duration-100 cursor-pointer"
+            on:click="{() => $goto('/dashboard/databases')}"
+            class:text-purple-500="{$isActive('/dashboard/databases') ||
+              $isActive('/database')}"
+            class:bg-warmGray-700="{$isActive('/dashboard/databases') ||
+              $isActive('/database')}"
+          >
+            <svg
+              class="w-8"
+              xmlns="http://www.w3.org/2000/svg"
+              fill="none"
+              viewBox="0 0 24 24"
+              stroke="currentColor"
+            >
+              <path
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                stroke-width="2"
+                d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4"
+              ></path>
+            </svg>
+          </div>
+        </Tooltip>
         <div class="flex-1"></div>
-        <button
-          title="Settings"
-          class="p-2 hover:bg-warmGray-700 rounded hover:text-yellow-500 my-4 transition-all duration-100 cursor-pointer"
-          class:text-yellow-500="{$isActive('/settings')}"
-          class:bg-warmGray-700="{$isActive('/settings')}"
-          on:click="{() => $goto('/settings')}"
-        >
-          <svg
-            class="w-8"
-            xmlns="http://www.w3.org/2000/svg"
-            fill="none"
-            viewBox="0 0 24 24"
-            stroke="currentColor"
+        <Tooltip position="right" label="Settings">
+          <button
+            class="p-2 hover:bg-warmGray-700 rounded hover:text-yellow-500 transition-all duration-100 cursor-pointer"
+            class:text-yellow-500="{$isActive('/settings')}"
+            class:bg-warmGray-700="{$isActive('/settings')}"
+            on:click="{() => $goto('/settings')}"
           >
-            <path
+            <svg
+              class="w-8"
+              xmlns="http://www.w3.org/2000/svg"
+              fill="none"
+              viewBox="0 0 24 24"
+              stroke="currentColor"
+            >
+              <path
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                stroke-width="2"
+                d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"
+              ></path>
+              <path
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                stroke-width="2"
+                d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"></path>
+            </svg>
+          </button>
+        </Tooltip>
+        <Tooltip position="right" label="Logout">
+          <button
+            class="p-2 hover:bg-warmGray-700 rounded hover:text-red-500 my-4 transition-all duration-100 cursor-pointer"
+            on:click="{logout}"
+          >
+            <svg
+              class="w-7"
+              xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              stroke-width="2"
               stroke-linecap="round"
               stroke-linejoin="round"
-              stroke-width="2"
-              d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"
-            ></path>
-            <path
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              stroke-width="2"
-              d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"></path>
-          </svg>
-        </button>
-        <button
-          class="p-2 hover:bg-warmGray-700 rounded hover:text-red-500 my-4 transition-all duration-100 cursor-pointer"
-          on:click="{logout}"
-        >
-          <svg
-            class="w-7"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            fill="none"
-            stroke="currentColor"
-            stroke-width="2"
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            ><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path><polyline
-              points="16 17 21 12 16 7"></polyline><line
-              x1="21"
-              y1="12"
-              x2="9"
-              y2="12"></line></svg
-          >
-        </button>
+              ><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"
+              ></path><polyline points="16 17 21 12 16 7"></polyline><line
+                x1="21"
+                y1="12"
+                x2="9"
+                y2="12"></line></svg
+            >
+          </button>
+        </Tooltip>
         <div
           class="cursor-pointer text-xs font-bold text-warmGray-400 py-2 hover:bg-warmGray-700 w-full text-center"
         >
-          v{packageJson.version}
+          {packageJson.version}
         </div>
       </div>
     </nav>
   {/if}
   {#if upgradeAvailable}
     <footer
-      class="absolute top-0 right-0 p-2 w-auto rounded-tl text-white "
+      class="absolute bottom-0 right-0 p-4 px-6 w-auto rounded-tl text-white "
     >
       <div class="flex items-center">
         <div></div>
         <div class="flex-1"></div>
-          {#if !upgradeDisabled}
-            <button
-              class="bg-gradient-to-r from-purple-500 via-pink-500 to-red-500 font-bold text-xs rounded px-2 py-2"
-              disabled="{upgradeDisabled}"
-              on:click="{upgrade}"
-              >New version available. <br>Click here to upgrade!</button
-            >
-          {:else if upgradeDone}
-            <button
-              use:reloadInAMin
-              class="font-bold text-xs rounded px-2 cursor-not-allowed"
-              disabled="{upgradeDisabled}"
-              >Upgrade done. 🎉 Automatically reloading in 30s.</button
-            >
-          {:else}
-            <button
-              class="opacity-50 tracking-tight font-bold text-xs rounded px-2  cursor-not-allowed"
-              disabled="{upgradeDisabled}">Upgrading. It could take a while, please wait...</button
-            >
-          {/if}
-    
+        {#if !upgradeDisabled}
+          <button
+            class="bg-gradient-to-r from-purple-500 via-pink-500 to-red-500 text-xs font-bold rounded px-2 py-2"
+            disabled="{upgradeDisabled}"
+            on:click="{upgrade}"
+            >New version available, <br />click here to upgrade!</button
+          >
+        {:else if upgradeDone}
+          <button
+            use:reloadInAMin
+            class="font-bold text-xs rounded px-2 cursor-not-allowed"
+            disabled="{upgradeDisabled}"
+            >Upgrade done. 🎉 Automatically reloading in 30s.</button
+          >
+        {:else}
+          <button
+            class="opacity-50 tracking-tight font-bold text-xs rounded px-2  cursor-not-allowed"
+            disabled="{upgradeDisabled}"
+            >Upgrading. It could take a while, please wait...</button
+          >
+        {/if}
       </div>
     </footer>
-    {/if}
-  <main class:main={$route.path !== "/index"}>
-      <slot />
+  {/if}
+  <main class:main="{$route.path !== '/index'}">
+    <slot />
   </main>
 {:catch test}
   {$goto("/index")}

src/pages/application/[organization]/[name]/[branch]/configuration.svelte

@@ -1,62 +1,5 @@
 <script>
-  import { redirect, isActive } from "@roxi/routify";
-  import { application, fetch, initialApplication, initConf } from "@store";
-  import { toast } from "@zerodevx/svelte-toast";
   import Configuration from "../../../../../components/Application/Configuration/Configuration.svelte";
-  import Loading from "../../../../../components/Loading.svelte";
-
-  async function loadConfiguration() {
-    if (!$isActive("/application/new")) {
-      try {
-        const config = await $fetch(`/api/v1/config`, {
-          body: {
-            name: $application.repository.name,
-            organization: $application.repository.organization,
-            branch: $application.repository.branch,
-          },
-        });
-        $application = { ...config };
-        $initConf = JSON.parse(JSON.stringify($application));
-      } catch (error) {
-        toast.push("Configuration not found.");
-        $redirect("/dashboard/applications");
-      }
-    } else {
-      $application = JSON.parse(JSON.stringify(initialApplication));
-    }
-  }
 </script>
 
-<div class="min-h-full text-white">
-  <div
-    class="py-5 text-left px-6 text-3xl tracking-tight font-bold flex items-center"
-  >
-    <a
-      target="_blank"
-      class="text-green-500 hover:underline cursor-pointer px-2"
-      href="{'https://' +
-        $application.publish.domain +
-        $application.publish.path}">{$application.publish.domain}</a
-    >
-    <a
-      target="_blank"
-      class="icon"
-      href="{`https://github.com/${$application.repository.organization}/${$application.repository.name}`}"
-    >
-      <svg
-        class="w-6"
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        fill="none"
-        stroke="currentColor"
-        stroke-width="2"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        ><path
-          d="M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37 0 0 0-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44 0 0 0 20 4.77 5.07 5.07 0 0 0 19.91 1S18.73.65 16 2.48a13.38 13.38 0 0 0-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07 0 0 0 5 4.77a5.44 5.44 0 0 0-1.5 3.78c0 5.42 3.3 6.61 6.44 7A3.37 3.37 0 0 0 9 18.13V22"
-        ></path></svg
-      ></a
-    >
-  </div>
-</div>
 <Configuration />

src/pages/application/[organization]/[name]/[branch]/logs/[deployId].svelte

@@ -38,12 +38,12 @@
   <Loading />
 {:then}
   <div
-    class="text-center space-y-2 max-w-7xl mx-auto px-6"
+    class="text-center px-6"
     in:fade="{{ duration: 100 }}"
   >
-    <div class="max-w-4xl mx-auto" in:fade="{{ duration: 100 }}">
+    <div in:fade="{{ duration: 100 }}">
       <pre
-        class="text-left font-mono text-xs font-medium tracking-tighter rounded-lg bg-warmGray-800  p-4 whitespace-pre-wrap">
+        class="leading-4 text-left text-sm font-semibold tracking-tighter rounded-lg bg-black p-6 whitespace-pre-wrap">
       {#if logs.length > 0}
         {#each logs as log}
           {log + '\n'}

src/pages/application/[organization]/[name]/[branch]/logs/index.svelte

@@ -59,17 +59,17 @@
   <Loading />
 {:then}
   <div
-    class="text-center space-y-2 max-w-7xl mx-auto px-6"
+    class="text-center px-6"
     in:fade="{{ duration: 100 }}"
   >
     <div class="flex pt-2 space-x-4 w-full">
       <div class="w-full">
         <div class="font-bold text-left pb-2 text-xl">Application logs</div>
         {#if logs.length === 0}
-          <div class="text-xs">Waiting for the logs...</div>
+          <div class="text-xs font-semibold tracking-tighter">Waiting for the logs...</div>
         {:else}
-          <pre
-            class="text-left font-mono text-xs font-medium rounded bg-warmGray-800 text-white p-4 whitespace-pre-wrap w-full">
+        <pre
+        class="leading-4 text-left text-sm font-semibold tracking-tighter rounded-lg bg-black p-6 whitespace-pre-wrap w-full">
             {#each logs as log}
               {log + '\n'}
             {/each}

src/pages/application/[organization]/[name]/[branch]/overview.svelte

@@ -1,5 +1,4 @@
 <script>
-  import { fade } from "svelte/transition";
   import { application } from "@store";
   import Configuration from "../../../../../components/Application/Configuration/Configuration.svelte";
 </script>

src/pages/application/_layout.svelte

@@ -5,6 +5,7 @@
   import { fade } from "svelte/transition";
   import Loading from "../../components/Loading.svelte";
   import { toast } from "@zerodevx/svelte-toast";
+import Tooltip from "../../components/Tooltip/Tooltip.svelte";
 
   $application.repository.organization = $params.organization;
   $application.repository.name = $params.name;
@@ -49,6 +50,7 @@
 
   async function deploy() {
     try {
+      $application.build.pack =  $application.build.pack.replace('.','').toLowerCase()
       toast.push("Checking inputs.");
       await $fetch(`/api/v1/application/check`, {
         body: $application,
@@ -76,8 +78,8 @@
 <nav
   class="flex text-white justify-end items-center m-4 fixed right-0 top-0 space-x-4"
 >
+<Tooltip position="bottom" label="Deploy" >
   <button
-    title="Deploy"
     disabled="{$application.publish.domain === '' ||
       $application.publish.domain === null}"
     class:cursor-not-allowed="{$application.publish.domain === '' ||
@@ -90,6 +92,7 @@
     class="icon"
     on:click="{deploy}"
   >
+ 
     <svg
       class="w-6"
       xmlns="http://www.w3.org/2000/svg"
@@ -107,9 +110,11 @@
         d="M20.39 18.39A5 5 0 0 0 18 9h-1.26A8 8 0 1 0 3 16.3"></path><polyline
         points="16 16 12 12 8 16"></polyline></svg
     >
+
   </button>
+</Tooltip>
+<Tooltip position="bottom" label="Delete" >
   <button
-    title="Delete"
     disabled="{$application.publish.domain === '' ||
       $application.publish.domain === null ||
       $isActive('/application/new')}"
@@ -142,9 +147,10 @@
       ></path>
     </svg>
   </button>
+</Tooltip>
   <div class="border border-warmGray-700 h-8"></div>
+  <Tooltip position="bottom" label="Logs" >
   <button
-    title="Logs"
     class="icon"
     class:text-warmGray-700="{$isActive('/application/new')}"
     disabled="{$isActive('/application/new')}"
@@ -177,8 +183,9 @@
       ></path>
     </svg>
   </button>
+</Tooltip>
+<Tooltip position="bottom-left" label="Configuration" >
   <button
-    title="Configuration"
     class="icon hover:text-yellow-400"
     disabled="{$isActive(`/application/new`)}"
     class:text-yellow-400="{$isActive(
@@ -207,6 +214,7 @@
       ></path>
     </svg>
   </button>
+</Tooltip>
 </nav>
 
 <div class="text-white">

src/pages/application/new.svelte

@@ -2,12 +2,4 @@
   import Configuration from "../../components/Application/Configuration/Configuration.svelte";
 </script>
 
-<div class="min-h-full text-white">
-  <div
-    class="py-5 text-left px-6 text-3xl tracking-tight font-bold flex items-center"
-  >
-    New Application
-  </div>
-</div>
-
 <Configuration />

src/pages/index.svelte

@@ -43,7 +43,7 @@
       <p
         class="mt-1 pb-8 font-extrabold text-white text-5xl sm:tracking-tight lg:text-6xl text-center"
       >
-        Coolify
+        <span class="border-gradient">Coolify</span>
       </p>
       <h2 class="text-2xl md:text-3xl font-extrabold text-white">
         An open-source, hassle-free, self-hostable<br />

src/store.js

@@ -125,7 +125,8 @@ export const application = writable({
     },
     container: {
       name: null,
-      tag: null
+      tag: null,
+      baseSHA: null
     }
   },
   publish: {

src/utils/templates.js

@@ -0,0 +1,51 @@
+const defaultBuildAndDeploy = {
+  installation: 'yarn install',
+  build: 'yarn build'
+}
+
+const templates = {
+  next: {
+    pack: 'nodejs',
+    ...defaultBuildAndDeploy,
+    port: 3000,
+    name: 'Next.js'
+  },
+  nuxt: {
+    pack: 'nodejs',
+    ...defaultBuildAndDeploy,
+    port: 8080,
+    name: 'Nuxt'
+  },
+  'react-scripts': {
+    pack: 'static',
+    ...defaultBuildAndDeploy,
+    directory: 'build',
+    name: 'Create React'
+  },
+  'parcel-bundler': {
+    pack: 'static',
+    ...defaultBuildAndDeploy,
+    directory: 'dist',
+    name: 'Parcel'
+  },
+  'vue-cli-service': {
+    pack: 'static',
+    ...defaultBuildAndDeploy,
+    directory: 'dist',
+    name: 'Vue CLI'
+  },
+  gatsby: {
+    pack: 'static',
+    ...defaultBuildAndDeploy,
+    directory: 'public',
+    name: 'Gatsby'
+  },
+  'preact-cli': {
+    pack: 'static',
+    ...defaultBuildAndDeploy,
+    directory: 'build',
+    name: 'Preact CLI'
+  }
+}
+
+export default templates

tailwind.config.js

@@ -16,7 +16,7 @@ module.exports = {
     ],
     preserveHtmlElements: true,
     options: {
-      safelist: [/svelte-/, 'border-green-500', 'border-yellow-300', 'border-red-500'],
+      safelist: [/svelte-/, 'border-green-500', 'border-yellow-300', 'border-red-500', 'hover:border-green-500', 'hover:border-red-200', 'hover:bg-red-200'],
       defaultExtractor: (content) => {
         // WARNING: tailwindExtractor is internal tailwind api
         // if this breaks after a tailwind update, report to svite repo
@@ -32,6 +32,15 @@ module.exports = {
   important: true,
   theme: {
     extend: {
+      keyframes: {
+        wiggle: {
+          '0%, 100%': { transform: 'rotate(-3deg)' },
+          '50%': { transform: 'rotate(3deg)' }
+        }
+      },
+      animation: {
+        wiggle: 'wiggle 0.5s ease-in-out infinite'
+      },
       fontFamily: {
         sans: ['Montserrat', ...defaultTheme.fontFamily.sans]
       },

vite.config.js

@@ -26,7 +26,8 @@ module.exports = {
       '@zerodevx/svelte-toast',
       'mongodb-memory-server-core',
       'unique-names-generator',
-      'generate-password'
+      'generate-password',
+      '@iarna/toml'
     ]
   },
   proxy: {