v1.0.10 (#39)

Fixes: 
- Default Nuxt port changed to 3000 (thanks to @yurgeman).
- Cleanup old images effectively.
- More attempts on container startups (3->6).
- Always clean up server logs on restart/redeploy.

.dockerignore

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

.gitignore

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

README.md

@@ -22,21 +22,21 @@ A: It defines your application's final form.
 
 # Screenshots
 
-[Login](https://coollabs.io/coolify/login.jpg)
+[Login](https://coolify.io/login.jpg)
 
-[Applications](https://coollabs.io/coolify/applications.jpg)
+[Applications](https://coolify.io/applications.jpg)
 
-[Databases](https://coollabs.io/coolify/databases.jpg)
+[Databases](https://coolify.io/databases.jpg)
 
-[Configuration](https://coollabs.io/coolify/configuration.jpg)
+[Configuration](https://coolify.io/configuration.jpg)
 
-[Settings](https://coollabs.io/coolify/settings.jpg)
+[Settings](https://coolify.io/settings.jpg)
 
-[Logs](https://coollabs.io/coolify/logs.jpg)
+[Logs](https://coolify.io/logs.jpg)
 
 # 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

@@ -1,7 +1,7 @@
 module.exports = async function (fastify, opts) {
   // Private routes
   fastify.register(async function (server) {
-    if (process.env.NODE_ENV === 'production') server.register(require('./plugins/authentication'))
+    server.register(require('./plugins/authentication'))
     server.register(require('./routes/v1/upgrade'), { prefix: '/upgrade' })
     server.register(require('./routes/v1/settings'), { prefix: '/settings' })
     server.register(require('./routes/v1/dashboard'), { prefix: '/dashboard' })
@@ -12,6 +12,9 @@ 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/services'), { prefix: '/services' })
+    server.register(require('./routes/v1/services/deploy'), { prefix: '/services/deploy' })
+    server.register(require('./routes/v1/server'), { prefix: '/server' })
   })
   // Public routes
   fastify.register(require('./routes/v1/verify'), { prefix: '/verify' })

api/buildPacks/custom/index.js

@@ -10,6 +10,6 @@ module.exports = async function (configuration) {
     )
     await streamEvents(stream, configuration)
   } else {
-    throw { error: 'No custom dockerfile found.', type: 'app' }
+    throw new Error('No custom dockerfile found.')
   }
 }

api/buildPacks/helpers.js

@@ -4,8 +4,9 @@ const buildImageNodeDocker = (configuration) => {
   return [
     'FROM node:lts',
     'WORKDIR /usr/src/app',
-    `COPY ${configuration.build.directory} ./`,
+    `COPY ${configuration.build.directory}/package*.json ./`,
     configuration.build.command.installation && `RUN ${configuration.build.command.installation}`,
+    `COPY ./${configuration.build.directory} ./`,
     `RUN ${configuration.build.command.build}`
   ].join('\n')
 }

api/buildPacks/index.js

@@ -2,5 +2,6 @@ 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 }
+module.exports = { static, nodejs, php, custom, rust }

api/buildPacks/nodejs/index.js

@@ -1,15 +1,17 @@
 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}`,
+      COPY ${configuration.build.directory}/package*.json ./
+      RUN ${configuration.build.command.installation}
+      COPY ./${configuration.build.directory} ./`,
     `EXPOSE ${configuration.publish.port}`,
     'CMD [ "yarn", "start" ]'
   ].join('\n')

api/buildPacks/php/index.js

@@ -1,11 +1,12 @@
 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`,
+    `COPY ./${configuration.build.directory} /var/www/html`,
     'EXPOSE 80',
     ' CMD ["apache2-foreground"]'
   ].join('\n')

api/buildPacks/rust/index.js

@@ -0,0 +1,60 @@
+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) {
+  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)
+}

api/buildPacks/static/index.js

@@ -2,6 +2,7 @@ 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',
@@ -9,7 +10,7 @@ const publishStaticDocker = (configuration) => {
     '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} ./`,
+      : `COPY ./${configuration.build.directory} ./`,
     'EXPOSE 80',
     'CMD ["nginx", "-g", "daemon off;"]'
   ].join('\n')

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')
 
@@ -9,26 +9,20 @@ module.exports = async function (configuration) {
 
   const execute = packs[configuration.build.pack]
   if (execute) {
+    await Deployment.findOneAndUpdate(
+      { repoId: id, branch, deployId, organization, name, domain },
+      { repoId: id, branch, deployId, organization, name, domain, progress: 'inprogress' })
+    await saveAppLog('### Building application.', configuration)
+    await execute(configuration)
+    await saveAppLog('### Building done.', configuration)
+  } else {
     try {
-      await Deployment.findOneAndUpdate(
-        { repoId: id, branch, deployId, organization, name, domain },
-        { repoId: id, branch, deployId, organization, name, domain, progress: 'inprogress' })
-      await saveAppLog('### Building application.', configuration)
-
-      await execute(configuration)
-
-      await saveAppLog('### Building done.', configuration)
-    } catch (error) {
       await Deployment.findOneAndUpdate(
         { repoId: id, branch, deployId, organization, name, domain },
         { repoId: id, branch, deployId, organization, name, domain, progress: 'failed' })
-      if (error.stack) throw { error: error.stack, type: 'server' }
+    } catch (error) {
-      throw { error, type: 'app' }
+      // Hmm.
     }
-  } else {
+    throw new Error('No buildpack found.')
-    await Deployment.findOneAndUpdate(
-      { repoId: id, branch, deployId, organization, name, domain },
-      { repoId: id, branch, deployId, organization, name, domain, progress: 'failed' })
-    throw { error: 'No buildpack found.', type: 'app' }
   }
 }

api/libs/applications/cleanup/index.js

@@ -2,41 +2,29 @@ const { docker } = require('../../docker')
 const { execShellAsync } = require('../../common')
 const Deployment = require('../../../models/Deployment')
 
-async function purgeOldThings () {
+async function purgeImagesContainers (configuration) {
-  try {
+  const { name, tag } = configuration.build.container
-    // TODO: Tweak this, because it deletes coolify-base, so the upgrade will be slow
+  await execShellAsync('docker container prune -f')
-    await docker.engine.pruneImages()
+  const IDsToDelete = (await execShellAsync(`docker images ls --filter=reference='${name}' --filter=before='${name}:${tag}' --format '{{json .ID }}'`)).trim().replace(/"/g, '').split('\n')
-    await docker.engine.pruneContainers()
+  if (IDsToDelete.length !== 0) for (const id of IDsToDelete) await execShellAsync(`docker rmi -f ${id}`)
-  } catch (error) {
+  await execShellAsync('docker image prune -f')
-    throw { error, type: 'server' }
-  }
 }
 
-async function cleanup (configuration) {
+async function cleanupStuckedDeploymentsInDB () {
-  const { id } = configuration.repository
+  // Cleanup stucked deployments.
-  const deployId = configuration.general.deployId
+  await Deployment.updateMany(
-  try {
+    { progress: { $in: ['queued', 'inprogress'] } },
-    // Cleanup stucked deployments.
+    { progress: 'failed' }
-    const deployments = await Deployment.find({ repoId: id, deployId: { $ne: deployId }, progress: { $in: ['queued', 'inprogress'] } })
+  )
-    for (const deployment of deployments) {
-      await Deployment.findByIdAndUpdate(deployment._id, { $set: { progress: 'failed' } })
-    }
-  } catch (error) {
-    throw { error, type: 'server' }
-  }
 }
 
 async function deleteSameDeployments (configuration) {
-  try {
+  await (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application').map(async s => {
-    await (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application').map(async s => {
+    const running = JSON.parse(s.Spec.Labels.configuration)
-      const running = JSON.parse(s.Spec.Labels.configuration)
+    if (running.repository.id === configuration.repository.id && running.repository.branch === configuration.repository.branch) {
-      if (running.repository.id === configuration.repository.id && running.repository.branch === configuration.repository.branch) {
+      await execShellAsync(`docker stack rm ${s.Spec.Labels['com.docker.stack.namespace']}`)
-        await execShellAsync(`docker stack rm ${s.Spec.Labels['com.docker.stack.namespace']}`)
+    }
-      }
+  })
-    })
-  } catch (error) {
-    throw { error, type: 'server' }
-  }
 }
 
-module.exports = { cleanup, deleteSameDeployments, purgeOldThings }
+module.exports = { cleanupStuckedDeploymentsInDB, deleteSameDeployments, purgeImagesContainers }

api/libs/applications/configuration.js

@@ -1,73 +1,58 @@
 const { uniqueNamesGenerator, adjectives, colors, animals } = require('unique-names-generator')
 const cuid = require('cuid')
 const crypto = require('crypto')
-
+const { docker } = require('../docker')
-const { execShellAsync } = require('../common')
+const { execShellAsync, baseServiceConfiguration } = require('../common')
 
 function getUniq () {
   return uniqueNamesGenerator({ dictionaries: [adjectives, animals, colors], length: 2 })
 }
 
 function setDefaultConfiguration (configuration) {
-  try {
+  const nickname = getUniq()
-    const nickname = getUniq()
+  const deployId = cuid()
-    const deployId = cuid()
 
-    const shaBase = JSON.stringify({ repository: configuration.repository })
+  const shaBase = JSON.stringify({ repository: configuration.repository })
-    const sha256 = crypto.createHash('sha256').update(shaBase).digest('hex')
+  const sha256 = crypto.createHash('sha256').update(shaBase).digest('hex')
 
-    const baseServiceConfiguration = {
+  configuration.build.container.name = sha256.slice(0, 15)
-      replicas: 1,
+
-      restart_policy: {
+  configuration.general.nickname = nickname
-        condition: 'any',
+  configuration.general.deployId = deployId
-        max_attempts: 3
+  configuration.general.workdir = `/tmp/${deployId}`
-      },
+
-      update_config: {
+  if (!configuration.publish.path) configuration.publish.path = '/'
-        parallelism: 1,
+  if (!configuration.publish.port) {
-        delay: '10s',
+    if (configuration.build.pack === 'php') {
-        order: 'start-first'
+      configuration.publish.port = 80
-      },
+    } else if (configuration.build.pack === 'static') {
-      rollback_config: {
+      configuration.publish.port = 80
-        parallelism: 1,
+    } else if (configuration.build.pack === 'nodejs') {
-        delay: '10s',
+      configuration.publish.port = 3000
-        order: 'start-first'
+    } else if (configuration.build.pack === 'rust') {
-      }
+      configuration.publish.port = 3000
     }
-
-    configuration.build.container.name = sha256.slice(0, 15)
-
-    configuration.general.nickname = nickname
-    configuration.general.deployId = deployId
-    configuration.general.workdir = `/tmp/${deployId}`
-
-    if (!configuration.publish.path) configuration.publish.path = '/'
-    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
-      }
-    }
-    if (!configuration.build.directory) {
-      configuration.build.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) {
-    throw { error, type: 'server' }
   }
+
+  if (!configuration.build.directory) configuration.build.directory = ''
+  if (configuration.build.directory.startsWith('/')) configuration.build.directory = configuration.build.directory.replace('/', '')
+
+  if (!configuration.publish.directory) configuration.publish.directory = ''
+  if (configuration.publish.directory.startsWith('/')) configuration.publish.directory = configuration.publish.directory.replace('/', '')
+
+  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
 }
 
-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) {
@@ -77,12 +62,56 @@ async function updateServiceLabels (configuration, services) {
   })
   if (found) {
     const { ID } = found
-    try {
+    const Labels = { ...JSON.parse(found.Spec.Labels.configuration), ...configuration }
-      const Labels = { ...JSON.parse(found.Spec.Labels.configuration), ...configuration }
+    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}`)
-      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, baseServiceConfiguration }

api/libs/applications/deploy/copyFiles.js

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

api/libs/applications/deploy/deploy.js

@@ -5,79 +5,72 @@ const { docker } = require('../../docker')
 const { saveAppLog } = require('../../logging')
 const { deleteSameDeployments } = require('../cleanup')
 
-module.exports = async function (configuration, configChanged, imageChanged) {
+module.exports = async function (configuration, imageChanged) {
-  try {
+  const generateEnvs = {}
-    const generateEnvs = {}
+  for (const secret of configuration.publish.secrets) {
-    for (const secret of configuration.publish.secrets) {
+    generateEnvs[secret.name] = secret.value
-      generateEnvs[secret.name] = secret.value
+  }
-    }
+  const containerName = configuration.build.container.name
-    const containerName = configuration.build.container.name
 
-    // Only save SHA256 of it in the configuration label
+  // Only save SHA256 of it in the configuration label
-    const baseServiceConfiguration = configuration.baseServiceConfiguration
+  const baseServiceConfiguration = configuration.baseServiceConfiguration
-    delete configuration.baseServiceConfiguration
+  delete configuration.baseServiceConfiguration
 
-    const stack = {
+  const stack = {
-      version: '3.8',
+    version: '3.8',
-      services: {
+    services: {
-        [containerName]: {
+      [containerName]: {
-          image: `${configuration.build.container.name}:${configuration.build.container.tag}`,
+        image: `${configuration.build.container.name}:${configuration.build.container.tag}`,
-          networks: [`${docker.network}`],
+        networks: [`${docker.network}`],
-          environment: generateEnvs,
+        environment: generateEnvs,
-          deploy: {
+        deploy: {
-            ...baseServiceConfiguration,
+          ...baseServiceConfiguration,
-            labels: [
+          labels: [
-              'managedBy=coolify',
+            'managedBy=coolify',
-              'type=application',
+            'type=application',
-              'configuration=' + JSON.stringify(configuration),
+            'configuration=' + JSON.stringify(configuration),
-              'traefik.enable=true',
+            'traefik.enable=true',
-              'traefik.http.services.' +
+            'traefik.http.services.' +
               configuration.build.container.name +
               `.loadbalancer.server.port=${configuration.publish.port}`,
-              'traefik.http.routers.' +
+            'traefik.http.routers.' +
               configuration.build.container.name +
               '.entrypoints=websecure',
-              'traefik.http.routers.' +
+            'traefik.http.routers.' +
               configuration.build.container.name +
               '.rule=Host(`' +
               configuration.publish.domain +
               '`) && PathPrefix(`' +
               configuration.publish.path +
               '`)',
-              'traefik.http.routers.' +
+            'traefik.http.routers.' +
               configuration.build.container.name +
               '.tls.certresolver=letsencrypt',
-              'traefik.http.routers.' +
+            'traefik.http.routers.' +
               configuration.build.container.name +
               '.middlewares=global-compress'
-            ]
+          ]
-          }
-        }
-      },
-      networks: {
-        [`${docker.network}`]: {
-          external: true
         }
       }
+    },
+    networks: {
+      [`${docker.network}`]: {
+        external: true
+      }
     }
-    await saveAppLog('### Publishing.', configuration)
-    await fs.writeFile(`${configuration.general.workdir}/stack.yml`, yaml.dump(stack))
-    // TODO: Compare stack.yml with the currently running one to upgrade if something changes, like restart_policy
-    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 or config changed')
-      await deleteSameDeployments(configuration)
-      await execShellAsync(
-        `cat ${configuration.general.workdir}/stack.yml | docker stack deploy --prune -c - ${containerName}`
-      )
-    }
-
-    await saveAppLog('### Published done!', configuration)
-  } catch (error) {
-    console.log(error)
-    await saveAppLog(`Error occured during deployment: ${error.message}`, configuration)
-    throw { error, type: 'server' }
   }
+  await saveAppLog('### Publishing.', configuration)
+  await fs.writeFile(`${configuration.general.workdir}/stack.yml`, yaml.dump(stack))
+  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 or config changed')
+    await deleteSameDeployments(configuration)
+    await execShellAsync(
+        `cat ${configuration.general.workdir}/stack.yml | docker stack deploy --prune -c - ${containerName}`
+    )
+  }
+
+  await saveAppLog('### Published done!', configuration)
 }

api/libs/applications/github/cloneRepository.js

@@ -15,30 +15,24 @@ module.exports = async function (configuration) {
     iss: parseInt(github.app.id)
   }
 
-  try {
+  const jwtToken = jwt.sign(payload, githubPrivateKey, {
-    const jwtToken = jwt.sign(payload, githubPrivateKey, {
+    algorithm: 'RS256'
-      algorithm: 'RS256'
+  })
-    })
+  const accessToken = await axios({
-    const accessToken = await axios({
+    method: 'POST',
-      method: 'POST',
+    url: `https://api.github.com/app/installations/${github.installation.id}/access_tokens`,
-      url: `https://api.github.com/app/installations/${github.installation.id}/access_tokens`,
+    data: {},
-      data: {},
+    headers: {
-      headers: {
+      Authorization: 'Bearer ' + jwtToken,
-        Authorization: 'Bearer ' + jwtToken,
+      Accept: 'application/vnd.github.machine-man-preview+json'
-        Accept: 'application/vnd.github.machine-man-preview+json'
+    }
-      }
+  })
-    })
+  await execShellAsync(
-    await execShellAsync(
       `mkdir -p ${workdir} && git clone -q -b ${branch} https://x-access-token:${accessToken.data.token}@github.com/${organization}/${name}.git ${workdir}/`
-    )
+  )
-    configuration.build.container.tag = (
+  configuration.build.container.tag = (
-      await execShellAsync(`cd ${configuration.general.workdir}/ && git rev-parse HEAD`)
+    await execShellAsync(`cd ${configuration.general.workdir}/ && git rev-parse HEAD`)
-    )
+  )
-      .replace('\n', '')
+    .replace('\n', '')
-      .slice(0, 7)
+    .slice(0, 7)
-  } catch (error) {
-    cleanupTmp(workdir)
-    if (error.stack) console.log(error.stack)
-    throw { error, type: 'server' }
-  }
 }

api/libs/applications/index.js

@@ -1,44 +1,27 @@
 const dayjs = require('dayjs')
 
-const { saveServerLog } = require('../logging')
-const { cleanupTmp } = require('../common')
-
 const { saveAppLog } = require('../logging')
 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 { 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
+  const { deployId, nickname } = configuration.general
-  try {
+  await new Deployment({
-    await new Deployment({
+    repoId: id, branch, deployId, domain, organization, name, nickname
-      repoId: id, branch, deployId, domain, organization, name, nickname
+  }).save()
-    }).save()
+  await saveAppLog(`${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} Queued.`, configuration)
-    await saveAppLog(`${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} Queued.`, configuration)
+  await copyFiles(configuration)
-    await copyFiles(configuration)
+  await buildContainer(configuration)
-    await buildContainer(configuration)
+  await deploy(configuration, imageChanged)
-    await deploy(configuration, configChanged, imageChanged)
+  await Deployment.findOneAndUpdate(
-    await Deployment.findOneAndUpdate(
+    { repoId: id, branch, deployId, organization, name, domain },
-      { repoId: id, branch, deployId, organization, name, domain },
+    { repoId: id, branch, deployId, organization, name, domain, progress: 'done' })
-      { repoId: id, branch, deployId, organization, name, domain, progress: 'done' })
+  await updateServiceLabels(configuration)
-    await updateServiceLabels(configuration, services)
-    cleanupTmp(workdir)
-    await purgeOldThings()
-  } catch (error) {
-    await cleanup(configuration)
-    cleanupTmp(workdir)
-    const { type } = error.error
-    if (type === 'app') {
-      await saveAppLog(error.error, configuration, true)
-    } else {
-      await saveServerLog({ event: error.error, configuration })
-    }
-  }
 }
 
 module.exports = { queueAndBuild }

api/libs/common.js

@@ -6,6 +6,24 @@ const User = require('../models/User')
 const algorithm = 'aes-256-cbc'
 const key = process.env.SECRETS_ENCRYPTION_KEY
 
+const baseServiceConfiguration = {
+  replicas: 1,
+  restart_policy: {
+    condition: 'any',
+    max_attempts: 6
+  },
+  update_config: {
+    parallelism: 1,
+    delay: '10s',
+    order: 'start-first'
+  },
+  rollback_config: {
+    parallelism: 1,
+    delay: '10s',
+    order: 'start-first',
+    failure_action: 'rollback'
+  }
+}
 function delay (t) {
   return new Promise(function (resolve) {
     setTimeout(function () {
@@ -15,12 +33,16 @@ function delay (t) {
 }
 
 async function verifyUserId (authorization) {
-  const token = authorization.split(' ')[1]
+  try {
-  const verify = jsonwebtoken.verify(token, process.env.JWT_SIGN_KEY)
+    const token = authorization.split(' ')[1]
-  const found = await User.findOne({ uid: verify.jti })
+    const verify = jsonwebtoken.verify(token, process.env.JWT_SIGN_KEY)
-  if (found) {
+    const found = await User.findOne({ uid: verify.jti })
-    return true
+    if (found) {
-  } else {
+      return true
+    } else {
+      return false
+    }
+  } catch (error) {
     return false
   }
 }
@@ -90,5 +112,6 @@ module.exports = {
   checkImageAvailable,
   encryptData,
   decryptData,
-  verifyUserId
+  verifyUserId,
+  baseServiceConfiguration
 }

api/libs/docker.js

@@ -8,24 +8,21 @@ const docker = {
   network: process.env.DOCKER_NETWORK
 }
 async function streamEvents (stream, configuration) {
-  try {
+  await new Promise((resolve, reject) => {
-    await new Promise((resolve, reject) => {
+    docker.engine.modem.followProgress(stream, onFinished, onProgress)
-      docker.engine.modem.followProgress(stream, onFinished, onProgress)
+    function onFinished (err, res) {
-      function onFinished (err, res) {
+      if (err) reject(err)
-        if (err) reject(err)
+      resolve(res)
-        resolve(res)
+    }
-      }
+    function onProgress (event) {
-      function onProgress (event) {
+      if (event.error) {
-        if (event.error) {
+        saveAppLog(event.error, configuration, true)
-          reject(event.error)
+        reject(event.error)
-          return
+      } else if (event.stream) {
-        }
         saveAppLog(event.stream, configuration)
       }
-    })
+    }
-  } catch (error) {
+  })
-    throw { error, type: 'app' }
-  }
 }
 
 module.exports = { streamEvents, docker }

api/libs/http-error/handlers.js

@@ -0,0 +1,75 @@
+/* eslint-disable */
+"use strict";   
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleErrors = exports.handleValidationError = exports.handleNotFoundError = void 0;
+const http_errors_enhanced_1 = require("http-errors-enhanced");
+const interfaces_1 = require("./interfaces");
+const utils_1 = require("./utils");
+const validation_1 = require("./validation");
+function handleNotFoundError(request, reply) {
+    handleErrors(new http_errors_enhanced_1.NotFoundError('Not found.'), request, reply);
+}
+exports.handleNotFoundError = handleNotFoundError;
+function handleValidationError(error, request) {
+    /*
+      As seen in https://github.com/fastify/fastify/blob/master/lib/validation.js
+      the error.message will  always start with the relative section (params, querystring, headers, body)
+      and fastify throws on first failing section.
+    */
+    const section = error.message.match(/^\w+/)[0];
+    return new http_errors_enhanced_1.BadRequestError('One or more validations failed trying to process your request.', {
+        failedValidations: validation_1.convertValidationErrors(section, Reflect.get(request, section), error.validation)
+    });
+}
+exports.handleValidationError = handleValidationError;
+function handleErrors(error, request, reply) {
+    var _a, _b;
+    // It is a generic error, handle it
+    const code = error.code;
+    if (!('statusCode' in error)) {
+        if ('validation' in error && ((_a = request[interfaces_1.kHttpErrorsEnhancedConfiguration]) === null || _a === void 0 ? void 0 : _a.convertValidationErrors)) {
+            // If it is a validation error, convert errors to human friendly format
+            error = handleValidationError(error, request);
+        }
+        else if ((_b = request[interfaces_1.kHttpErrorsEnhancedConfiguration]) === null || _b === void 0 ? void 0 : _b.hideUnhandledErrors) {
+            // It is requested to hide the error, just log it and then create a generic one
+            request.log.error({ error: http_errors_enhanced_1.serializeError(error) });
+            error = new http_errors_enhanced_1.InternalServerError('An error occurred trying to process your request.');
+        }
+        else {
+            // Wrap in a HttpError, making the stack explicitily available
+            error = new http_errors_enhanced_1.InternalServerError(http_errors_enhanced_1.serializeError(error));
+            Object.defineProperty(error, 'stack', { enumerable: true });
+        }
+    }
+    else if (code === 'INVALID_CONTENT_TYPE' || code === 'FST_ERR_CTP_INVALID_MEDIA_TYPE') {
+        error = new http_errors_enhanced_1.UnsupportedMediaTypeError(utils_1.upperFirst(validation_1.validationMessagesFormatters.contentType()));
+    }
+    else if (code === 'FST_ERR_CTP_EMPTY_JSON_BODY') {
+        error = new http_errors_enhanced_1.BadRequestError(utils_1.upperFirst(validation_1.validationMessagesFormatters.jsonEmpty()));
+    }
+    else if (code === 'MALFORMED_JSON' || error.message === 'Invalid JSON' || error.stack.includes('at JSON.parse')) {
+        error = new http_errors_enhanced_1.BadRequestError(utils_1.upperFirst(validation_1.validationMessagesFormatters.json()));
+    }
+    // Get the status code
+    let { statusCode, headers } = error;
+    // Code outside HTTP range
+    if (statusCode < 100 || statusCode > 599) {
+        statusCode = http_errors_enhanced_1.INTERNAL_SERVER_ERROR;
+    }
+    // Create the body
+    const body = {
+        statusCode,
+        error: http_errors_enhanced_1.messagesByCodes[statusCode],
+        message: error.message
+    };
+    http_errors_enhanced_1.addAdditionalProperties(body, error);
+    // Send the error back
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    reply
+        .code(statusCode)
+        .headers(headers !== null && headers !== void 0 ? headers : {})
+        .type('application/json')
+        .send(body);
+}
+exports.handleErrors = handleErrors;

api/libs/http-error/index.js

@@ -0,0 +1,58 @@
+/* eslint-disable */
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.plugin = exports.validationMessagesFormatters = exports.niceJoin = exports.convertValidationErrors = void 0;
+const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
+const handlers_1 = require("./handlers");
+const interfaces_1 = require("./interfaces");
+const validation_1 = require("./validation");
+__exportStar(require("./handlers"), exports);
+__exportStar(require("./interfaces"), exports);
+var validation_2 = require("./validation");
+Object.defineProperty(exports, "convertValidationErrors", { enumerable: true, get: function () { return validation_2.convertValidationErrors; } });
+Object.defineProperty(exports, "niceJoin", { enumerable: true, get: function () { return validation_2.niceJoin; } });
+Object.defineProperty(exports, "validationMessagesFormatters", { enumerable: true, get: function () { return validation_2.validationMessagesFormatters; } });
+exports.plugin = fastify_plugin_1.default(function (instance, options, done) {
+    var _a, _b, _c, _d;
+    const isProduction = process.env.NODE_ENV === 'production';
+    const convertResponsesValidationErrors = (_a = options.convertResponsesValidationErrors) !== null && _a !== void 0 ? _a : !isProduction;
+    const configuration = {
+        hideUnhandledErrors: (_b = options.hideUnhandledErrors) !== null && _b !== void 0 ? _b : isProduction,
+        convertValidationErrors: (_c = options.convertValidationErrors) !== null && _c !== void 0 ? _c : true,
+        responseValidatorCustomizer: options.responseValidatorCustomizer,
+        allowUndeclaredResponses: (_d = options.allowUndeclaredResponses) !== null && _d !== void 0 ? _d : false
+    };
+    instance.decorate(interfaces_1.kHttpErrorsEnhancedConfiguration, null);
+    instance.decorateRequest(interfaces_1.kHttpErrorsEnhancedConfiguration, null);
+    instance.addHook('onRequest', async (request) => {
+        request[interfaces_1.kHttpErrorsEnhancedConfiguration] = configuration;
+    });
+    instance.setErrorHandler(handlers_1.handleErrors);
+    // instance.setNotFoundHandler(handlers_1.handleNotFoundError);
+    if (convertResponsesValidationErrors) {
+        instance.decorate(interfaces_1.kHttpErrorsEnhancedResponseValidations, []);
+        instance.addHook('onRoute', validation_1.addResponseValidation);
+        instance.addHook('onReady', validation_1.compileResponseValidationSchema.bind(instance, configuration));
+    }
+    done();
+}, { name: 'fastify-http-errors-enhanced' });
+exports.default = exports.plugin;
+// Fix CommonJS exporting
+/* istanbul ignore else */
+if (typeof module !== 'undefined') {
+    module.exports = exports.plugin;
+    Object.assign(module.exports, exports);
+}

api/libs/http-error/interfaces.js

@@ -0,0 +1,6 @@
+/* eslint-disable */
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.kHttpErrorsEnhancedResponseValidations = exports.kHttpErrorsEnhancedConfiguration = void 0;
+exports.kHttpErrorsEnhancedConfiguration = Symbol('fastify-http-errors-enhanced-configuration');
+exports.kHttpErrorsEnhancedResponseValidations = Symbol('fastify-http-errors-enhanced-response-validation');

api/libs/http-error/utils.js

@@ -0,0 +1,31 @@
+/* eslint-disable */
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get = exports.upperFirst = void 0;
+function upperFirst(source) {
+    if (typeof source !== 'string' || !source.length) {
+        return source;
+    }
+    return source[0].toUpperCase() + source.substring(1);
+}
+exports.upperFirst = upperFirst;
+function get(target, path) {
+    var _a;
+    const tokens = path.split('.').map((t) => t.trim());
+    for (const token of tokens) {
+        if (typeof target === 'undefined' || target === null) {
+            // We're supposed to be still iterating, but the chain is over - Return undefined
+            target = undefined;
+            break;
+        }
+        const index = token.match(/^(\d+)|(?:\[(\d+)\])$/);
+        if (index) {
+            target = target[parseInt((_a = index[1]) !== null && _a !== void 0 ? _a : index[2], 10)];
+        }
+        else {
+            target = target[token];
+        }
+    }
+    return target;
+}
+exports.get = get;

api/libs/http-error/validation.js

@@ -0,0 +1,239 @@
+/* eslint-disable */
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compileResponseValidationSchema = exports.addResponseValidation = exports.convertValidationErrors = exports.validationMessagesFormatters = exports.niceJoin = void 0;
+const ajv_1 = __importDefault(require("ajv"));
+const http_errors_enhanced_1 = require("http-errors-enhanced");
+const interfaces_1 = require("./interfaces");
+const utils_1 = require("./utils");
+function niceJoin(array, lastSeparator = ' and ', separator = ', ') {
+    switch (array.length) {
+        case 0:
+            return '';
+        case 1:
+            return array[0];
+        case 2:
+            return array.join(lastSeparator);
+        default:
+            return array.slice(0, array.length - 1).join(separator) + lastSeparator + array[array.length - 1];
+    }
+}
+exports.niceJoin = niceJoin;
+exports.validationMessagesFormatters = {
+    contentType: () => 'only JSON payloads are accepted. Please set the "Content-Type" header to start with "application/json"',
+    json: () => 'the body payload is not a valid JSON',
+    jsonEmpty: () => 'the JSON body payload cannot be empty if the "Content-Type" header is set',
+    missing: () => 'must be present',
+    unknown: () => 'is not a valid property',
+    uuid: () => 'must be a valid GUID (UUID v4)',
+    timestamp: () => 'must be a valid ISO 8601 / RFC 3339 timestamp (example: 2018-07-06T12:34:56Z)',
+    date: () => 'must be a valid ISO 8601 / RFC 3339 date (example: 2018-07-06)',
+    time: () => 'must be a valid ISO 8601 / RFC 3339 time (example: 12:34:56)',
+    uri: () => 'must be a valid URI',
+    hostname: () => 'must be a valid hostname',
+    ipv4: () => 'must be a valid IPv4',
+    ipv6: () => 'must be a valid IPv6',
+    paramType: (type) => {
+        switch (type) {
+            case 'integer':
+                return 'must be a valid integer number';
+            case 'number':
+                return 'must be a valid number';
+            case 'boolean':
+                return 'must be a valid boolean (true or false)';
+            case 'object':
+                return 'must be a object';
+            case 'array':
+                return 'must be an array';
+            default:
+                return 'must be a string';
+        }
+    },
+    presentString: () => 'must be a non empty string',
+    minimum: (min) => `must be a number greater than or equal to ${min}`,
+    maximum: (max) => `must be a number less than or equal to ${max}`,
+    minimumProperties(min) {
+        return min === 1 ? 'cannot be a empty object' : `must be a object with at least ${min} properties`;
+    },
+    maximumProperties(max) {
+        return max === 0 ? 'must be a empty object' : `must be a object with at most ${max} properties`;
+    },
+    minimumItems(min) {
+        return min === 1 ? 'cannot be a empty array' : `must be an array with at least ${min} items`;
+    },
+    maximumItems(max) {
+        return max === 0 ? 'must be a empty array' : `must be an array with at most ${max} items`;
+    },
+    enum: (values) => `must be one of the following values: ${niceJoin(values.map((f) => `"${f}"`), ' or ')}`,
+    pattern: (pattern) => `must match pattern "${pattern.replace(/\(\?:/g, '(')}"`,
+    invalidResponseCode: (code) => `This endpoint cannot respond with HTTP status ${code}.`,
+    invalidResponse: (code) => `The response returned from the endpoint violates its specification for the HTTP status ${code}.`,
+    invalidFormat: (format) => `must match format "${format}" (format)`
+};
+function convertValidationErrors(section, data, validationErrors) {
+    const errors = {};
+    if (section === 'querystring') {
+        section = 'query';
+    }
+    // For each error
+    for (const e of validationErrors) {
+        let message = '';
+        let pattern;
+        let value;
+        let reason;
+        // Normalize the key
+        let key = e.dataPath;
+        if (key.startsWith('.')) {
+            key = key.substring(1);
+        }
+        // Remove useless quotes
+        /* istanbul ignore next */
+        if (key.startsWith('[') && key.endsWith(']')) {
+            key = key.substring(1, key.length - 1);
+        }
+        // Depending on the type
+        switch (e.keyword) {
+            case 'required':
+            case 'dependencies':
+                key = e.params.missingProperty;
+                message = exports.validationMessagesFormatters.missing();
+                break;
+            case 'additionalProperties':
+                key = e.params.additionalProperty;
+                message = exports.validationMessagesFormatters.unknown();
+                break;
+            case 'type':
+                message = exports.validationMessagesFormatters.paramType(e.params.type);
+                break;
+            case 'minProperties':
+                message = exports.validationMessagesFormatters.minimumProperties(e.params.limit);
+                break;
+            case 'maxProperties':
+                message = exports.validationMessagesFormatters.maximumProperties(e.params.limit);
+                break;
+            case 'minItems':
+                message = exports.validationMessagesFormatters.minimumItems(e.params.limit);
+                break;
+            case 'maxItems':
+                message = exports.validationMessagesFormatters.maximumItems(e.params.limit);
+                break;
+            case 'minimum':
+                message = exports.validationMessagesFormatters.minimum(e.params.limit);
+                break;
+            case 'maximum':
+                message = exports.validationMessagesFormatters.maximum(e.params.limit);
+                break;
+            case 'enum':
+                message = exports.validationMessagesFormatters.enum(e.params.allowedValues);
+                break;
+            case 'pattern':
+                pattern = e.params.pattern;
+                value = utils_1.get(data, key);
+                if (pattern === '.+' && !value) {
+                    message = exports.validationMessagesFormatters.presentString();
+                }
+                else {
+                    message = exports.validationMessagesFormatters.pattern(e.params.pattern);
+                }
+                break;
+            case 'format':
+                reason = e.params.format;
+                // Normalize the key
+                if (reason === 'date-time') {
+                    reason = 'timestamp';
+                }
+                message = (exports.validationMessagesFormatters[reason] || exports.validationMessagesFormatters.invalidFormat)(reason);
+                break;
+        }
+        // No custom message was found, default to input one replacing the starting verb and adding some path info
+        if (!message.length) {
+            message = `${e.message.replace(/^should/, 'must')} (${e.keyword})`;
+        }
+        // Remove useless quotes
+        /* istanbul ignore next */
+        if (key.match(/(?:^['"])(?:[^.]+)(?:['"]$)/)) {
+            key = key.substring(1, key.length - 1);
+        }
+        // Fix empty properties
+        if (!key) {
+            key = '$root';
+        }
+        key = key.replace(/^\//, '');
+        errors[key] = message;
+    }
+    return { [section]: errors };
+}
+exports.convertValidationErrors = convertValidationErrors;
+function addResponseValidation(route) {
+    var _a;
+    if (!((_a = route.schema) === null || _a === void 0 ? void 0 : _a.response)) {
+        return;
+    }
+    const validators = {};
+    /*
+      Add these validators to the list of the one to compile once the server is started.
+      This makes possible to handle shared schemas.
+    */
+    this[interfaces_1.kHttpErrorsEnhancedResponseValidations].push([
+        this,
+        validators,
+        Object.entries(route.schema.response)
+    ]);
+    // Note that this hook is not called for non JSON payloads therefore validation is not possible in such cases
+    route.preSerialization = async function (request, reply, payload) {
+        const statusCode = reply.raw.statusCode;
+        // Never validate error 500
+        if (statusCode === http_errors_enhanced_1.INTERNAL_SERVER_ERROR) {
+            return payload;
+        }
+        // No validator, it means the HTTP status is not allowed
+        const validator = validators[statusCode];
+        if (!validator) {
+            if (request[interfaces_1.kHttpErrorsEnhancedConfiguration].allowUndeclaredResponses) {
+                return payload;
+            }
+            throw new http_errors_enhanced_1.InternalServerError(exports.validationMessagesFormatters.invalidResponseCode(statusCode));
+        }
+        // Now validate the payload
+        const valid = validator(payload);
+        if (!valid) {
+            throw new http_errors_enhanced_1.InternalServerError(exports.validationMessagesFormatters.invalidResponse(statusCode), {
+                failedValidations: convertValidationErrors('response', payload, validator.errors)
+            });
+        }
+        return payload;
+    };
+}
+exports.addResponseValidation = addResponseValidation;
+function compileResponseValidationSchema(configuration) {
+    // Fix CJS/ESM interoperability
+    // @ts-expect-error
+    let AjvConstructor = ajv_1.default;
+    /* istanbul ignore next */
+    if (AjvConstructor.default) {
+        AjvConstructor = AjvConstructor.default;
+    }
+    const hasCustomizer = typeof configuration.responseValidatorCustomizer === 'function';
+    for (const [instance, validators, schemas] of this[interfaces_1.kHttpErrorsEnhancedResponseValidations]) {
+        // @ts-expect-error
+        const compiler = new AjvConstructor({
+            // The fastify defaults, with the exception of removeAdditional and coerceTypes, which have been reversed
+            removeAdditional: false,
+            useDefaults: true,
+            coerceTypes: false,
+            allErrors: true
+        });
+        compiler.addSchema(Object.values(instance.getSchemas()));
+        compiler.addKeyword('example');
+        if (hasCustomizer) {
+            configuration.responseValidatorCustomizer(compiler);
+        }
+        for (const [code, schema] of schemas) {
+            validators[code] = compiler.compile(schema);
+        }
+    }
+}
+exports.compileResponseValidationSchema = compileResponseValidationSchema;

api/libs/logging.js

@@ -1,10 +1,18 @@
+const dayjs = require('dayjs')
+const axios = require('axios')
+
 const ApplicationLog = require('../models/Logs/Application')
 const ServerLog = require('../models/Logs/Server')
-const dayjs = require('dayjs')
+const Settings = require('../models/Settings')
+const { version } = require('../../package.json')
 
 function generateTimestamp () {
   return `${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} `
 }
+const patterns = [
+  '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
+  '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'
+].join('|')
 
 async function saveAppLog (event, configuration, isError) {
   try {
@@ -12,25 +20,12 @@ async function saveAppLog (event, configuration, isError) {
     const repoId = configuration.repository.id
     const branch = configuration.repository.branch
     if (isError) {
-      // console.log(event, config, isError)
+      const clearedEvent = '[ERROR 😱] ' + generateTimestamp() + event.replace(new RegExp(patterns, 'g'), '').replace(/(\r\n|\n|\r)/gm, '')
-      let clearedEvent = null
+      await new ApplicationLog({ repoId, branch, deployId, event: clearedEvent }).save()
-
-      if (event.error) clearedEvent = '[ERROR] ' + generateTimestamp() + event.error.replace(/(\r\n|\n|\r)/gm, '')
-      else if (event) clearedEvent = '[ERROR] ' + generateTimestamp() + event.replace(/(\r\n|\n|\r)/gm, '')
-
-      try {
-        await new ApplicationLog({ repoId, branch, deployId, event: clearedEvent }).save()
-      } catch (error) {
-        console.log(error)
-      }
     } else {
       if (event && event !== '\n') {
-        const clearedEvent = '[INFO] ' + generateTimestamp() + event.replace(/(\r\n|\n|\r)/gm, '')
+        const clearedEvent = '[INFO] ' + generateTimestamp() + event.replace(new RegExp(patterns, 'g'), '').replace(/(\r\n|\n|\r)/gm, '')
-        try {
+        await new ApplicationLog({ repoId, branch, deployId, event: clearedEvent }).save()
-          await new ApplicationLog({ repoId, branch, deployId, event: clearedEvent }).save()
-        } catch (error) {
-          console.log(error)
-        }
       }
     }
   } catch (error) {
@@ -39,16 +34,14 @@ async function saveAppLog (event, configuration, isError) {
   }
 }
 
-async function saveServerLog ({ event, configuration, type }) {
+async function saveServerLog (error) {
-  if (configuration) {
+  const settings = await Settings.findOne({ applicationName: 'coolify' })
-    const deployId = configuration.general.deployId
+  const payload = { message: error.message, stack: error.stack, type: error.type || 'spaghetticode', version }
-    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()
-}
 
+  const found = await ServerLog.find(payload)
+  if (found.length === 0 && error.message) await new ServerLog(payload).save()
+  if (settings && settings.sendErrors && process.env.NODE_ENV === 'production') await axios.post('https://errors.coollabs.io/api/error', payload)
+}
 module.exports = {
   saveAppLog,
   saveServerLog

api/libs/services/plausible/index.js

@@ -0,0 +1,185 @@
+const { execShellAsync, cleanupTmp, baseServiceConfiguration } = require('../../common')
+const yaml = require('js-yaml')
+const fs = require('fs').promises
+const generator = require('generate-password')
+const { docker } = require('../../docker')
+
+async function plausible ({ email, userName, userPassword, baseURL, traefikURL }) {
+  const deployId = 'plausible'
+  const workdir = '/tmp/plausible'
+  const secretKey = generator.generate({ length: 64, numbers: true, strict: true })
+  const generateEnvsPostgres = {
+    POSTGRESQL_PASSWORD: generator.generate({ length: 24, numbers: true, strict: true }),
+    POSTGRESQL_USERNAME: generator.generate({ length: 10, numbers: true, strict: true }),
+    POSTGRESQL_DATABASE: 'plausible'
+  }
+
+  const secrets = [
+    { name: 'ADMIN_USER_EMAIL', value: email },
+    { name: 'ADMIN_USER_NAME', value: userName },
+    { name: 'ADMIN_USER_PWD', value: userPassword },
+    { name: 'BASE_URL', value: baseURL },
+    { name: 'SECRET_KEY_BASE', value: secretKey },
+    { name: 'DISABLE_AUTH', value: 'false' },
+    { name: 'DISABLE_REGISTRATION', value: 'true' },
+    { name: 'DATABASE_URL', value: `postgresql://${generateEnvsPostgres.POSTGRESQL_USERNAME}:${generateEnvsPostgres.POSTGRESQL_PASSWORD}@plausible_db:5432/${generateEnvsPostgres.POSTGRESQL_DATABASE}` },
+    { name: 'CLICKHOUSE_DATABASE_URL', value: 'http://plausible_events_db:8123/plausible' }
+  ]
+
+  const generateEnvsClickhouse = {}
+  for (const secret of secrets) generateEnvsClickhouse[secret.name] = secret.value
+
+  const clickhouseConfigXml = `
+    <yandex>
+      <logger>
+          <level>warning</level>
+          <console>true</console>
+      </logger>
+
+      <!-- Stop all the unnecessary logging -->
+      <query_thread_log remove="remove"/>
+      <query_log remove="remove"/>
+      <text_log remove="remove"/>
+      <trace_log remove="remove"/>
+      <metric_log remove="remove"/>
+      <asynchronous_metric_log remove="remove"/>
+  </yandex>`
+  const clickhouseUserConfigXml = `
+    <yandex>
+      <profiles>
+          <default>
+              <log_queries>0</log_queries>
+              <log_query_threads>0</log_query_threads>
+          </default>
+      </profiles>
+  </yandex>`
+
+  const clickhouseConfigs = [
+    { source: 'plausible-clickhouse-user-config.xml', target: '/etc/clickhouse-server/users.d/logging.xml' },
+    { source: 'plausible-clickhouse-config.xml', target: '/etc/clickhouse-server/config.d/logging.xml' },
+    { source: 'plausible-init.query', target: '/docker-entrypoint-initdb.d/init.query' },
+    { source: 'plausible-init-db.sh', target: '/docker-entrypoint-initdb.d/init-db.sh' }
+  ]
+
+  const initQuery = 'CREATE DATABASE IF NOT EXISTS plausible;'
+  const initScript = 'clickhouse client --queries-file /docker-entrypoint-initdb.d/init.query'
+  await execShellAsync(`mkdir -p ${workdir}`)
+  await fs.writeFile(`${workdir}/clickhouse-config.xml`, clickhouseConfigXml)
+  await fs.writeFile(`${workdir}/clickhouse-user-config.xml`, clickhouseUserConfigXml)
+  await fs.writeFile(`${workdir}/init.query`, initQuery)
+  await fs.writeFile(`${workdir}/init-db.sh`, initScript)
+  const stack = {
+    version: '3.8',
+    services: {
+      [deployId]: {
+        image: 'plausible/analytics:latest',
+        command: 'sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh db init-admin && /entrypoint.sh run"',
+        networks: [`${docker.network}`],
+        volumes: [`${deployId}-postgres-data:/var/lib/postgresql/data`],
+        environment: generateEnvsClickhouse,
+        deploy: {
+          ...baseServiceConfiguration,
+          labels: [
+            'managedBy=coolify',
+            'type=service',
+            'serviceName=plausible',
+            'configuration=' + JSON.stringify({ email, userName, userPassword, baseURL, secretKey, generateEnvsPostgres, generateEnvsClickhouse }),
+            'traefik.enable=true',
+            'traefik.http.services.' +
+            deployId +
+            '.loadbalancer.server.port=8000',
+            'traefik.http.routers.' +
+            deployId +
+            '.entrypoints=websecure',
+            'traefik.http.routers.' +
+            deployId +
+            '.rule=Host(`' +
+            traefikURL +
+            '`) && PathPrefix(`/`)',
+            'traefik.http.routers.' +
+            deployId +
+            '.tls.certresolver=letsencrypt',
+            'traefik.http.routers.' +
+            deployId +
+            '.middlewares=global-compress'
+          ]
+        }
+      },
+      plausible_db: {
+        image: 'bitnami/postgresql:13.2.0',
+        networks: [`${docker.network}`],
+        environment: generateEnvsPostgres,
+        deploy: {
+          ...baseServiceConfiguration,
+          labels: [
+            'managedBy=coolify',
+            'type=service',
+            'serviceName=plausible'
+          ]
+        }
+      },
+      plausible_events_db: {
+        image: 'yandex/clickhouse-server:21.3.2.5',
+        networks: [`${docker.network}`],
+        volumes: [`${deployId}-clickhouse-data:/var/lib/clickhouse`],
+        ulimits: {
+          nofile: {
+            soft: 262144,
+            hard: 262144
+          }
+        },
+        configs: [...clickhouseConfigs],
+        deploy: {
+          ...baseServiceConfiguration,
+          labels: [
+            'managedBy=coolify',
+            'type=service',
+            'serviceName=plausible'
+          ]
+        }
+      }
+    },
+    networks: {
+      [`${docker.network}`]: {
+        external: true
+      }
+    },
+    volumes: {
+      [`${deployId}-clickhouse-data`]: {
+        external: true
+      },
+      [`${deployId}-postgres-data`]: {
+        external: true
+      }
+    },
+    configs: {
+      'plausible-clickhouse-user-config.xml': {
+        file: `${workdir}/clickhouse-user-config.xml`
+      },
+      'plausible-clickhouse-config.xml': {
+        file: `${workdir}/clickhouse-config.xml`
+      },
+      'plausible-init.query': {
+        file: `${workdir}/init.query`
+      },
+      'plausible-init-db.sh': {
+        file: `${workdir}/init-db.sh`
+      }
+    }
+  }
+  await fs.writeFile(`${workdir}/stack.yml`, yaml.dump(stack))
+  await execShellAsync('docker stack rm plausible')
+  await execShellAsync(
+    `cat ${workdir}/stack.yml | docker stack deploy --prune -c - ${deployId}`
+  )
+  cleanupTmp(workdir)
+}
+
+async function activateAdminUser () {
+  const { POSTGRESQL_USERNAME, POSTGRESQL_PASSWORD, POSTGRESQL_DATABASE } = JSON.parse(JSON.parse((await execShellAsync('docker service inspect plausible_plausible --format=\'{{json .Spec.Labels.configuration}}\'')))).generateEnvsPostgres
+  const containers = (await execShellAsync('docker ps -a --format=\'{{json .Names}}\'')).replace(/"/g, '').trim().split('\n')
+  const postgresDB = containers.find(container => container.startsWith('plausible_plausible_db'))
+  await execShellAsync(`docker exec ${postgresDB} psql -H postgresql://${POSTGRESQL_USERNAME}:${POSTGRESQL_PASSWORD}@localhost:5432/${POSTGRESQL_DATABASE} -c "UPDATE users SET email_verified = true;"`)
+}
+
+module.exports = { plausible, activateAdminUser }

api/models/Logs/Server.js

@@ -2,10 +2,11 @@ const mongoose = require('mongoose')
 const { version } = require('../../../package.json')
 const logSchema = mongoose.Schema(
   {
-    version: { type: String, required: true, default: version },
+    version: { type: String, default: version },
-    type: { type: String, required: true, enum: ['API', 'UPGRADE-P-1', 'UPGRADE-P-2'], default: 'API' },
+    type: { type: String, required: true },
-    event: { type: String, required: true },
+    message: { type: String, required: true },
-    seen: { type: Boolean, required: true, default: false }
+    stack: { type: String },
+    seen: { type: Boolean, default: false }
   },
   { timestamps: { createdAt: 'createdAt', updatedAt: false } }
 )

api/models/Settings.js

@@ -3,7 +3,8 @@ const mongoose = require('mongoose')
 const settingsSchema = mongoose.Schema(
   {
     applicationName: { type: String, required: true, default: 'coolify' },
-    allowRegistration: { type: Boolean, required: true, default: false }
+    allowRegistration: { type: Boolean, required: true, default: false },
+    sendErrors: { type: Boolean, required: true, default: true }
   },
   { timestamps: true }
 )

api/routes/v1/application/check.js

@@ -1,35 +1,37 @@
 
-const { verifyUserId } = require('../../../libs/common')
 const { setDefaultConfiguration } = require('../../../libs/applications/configuration')
 const { docker } = require('../../../libs/docker')
+const { saveServerLog } = require('../../../libs/logging')
 
 module.exports = async function (fastify) {
   fastify.post('/', async (request, reply) => {
-    if (!await verifyUserId(request.headers.authorization)) {
+    try {
-      reply.code(500).send({ error: 'Invalid request' })
+      const configuration = setDefaultConfiguration(request.body)
-      return
-    }
-    const configuration = setDefaultConfiguration(request.body)
 
-    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 foundDomain = false
+      let foundDomain = false
 
-    for (const service of services) {
+      for (const service of services) {
-      const running = JSON.parse(service.Spec.Labels.configuration)
+        const running = JSON.parse(service.Spec.Labels.configuration)
-      if (running) {
+        if (running) {
-        if (
+          if (
-          running.publish.domain === configuration.publish.domain &&
+            running.publish.domain === configuration.publish.domain &&
-          running.repository.id !== configuration.repository.id
+            running.repository.id !== configuration.repository.id &&
-        ) {
+            running.publish.path === configuration.publish.path
-          foundDomain = true
+          ) {
+            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) {
+      await saveServerLog(error)
+      throw new Error(error)
     }
-    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,121 +1,69 @@
 
-const { verifyUserId, cleanupTmp, execShellAsync } = require('../../../../libs/common')
 const Deployment = require('../../../../models/Deployment')
+const ApplicationLog = require('../../../../models/Logs/Application')
+const { verifyUserId, cleanupTmp } = require('../../../../libs/common')
+const { purgeImagesContainers } = require('../../../../libs/applications/cleanup')
 const { queueAndBuild } = require('../../../../libs/applications')
-const { setDefaultConfiguration } = require('../../../../libs/applications/configuration')
+const { setDefaultConfiguration, precheckDeployment } = require('../../../../libs/applications/configuration')
 const { docker } = require('../../../../libs/docker')
+const { saveServerLog } = require('../../../../libs/logging')
 const cloneRepository = require('../../../../libs/applications/github/cloneRepository')
 
 module.exports = async function (fastify) {
-  // const postSchema = {
-  //     body: {
-  //         type: "object",
-  //         properties: {
-  //             ref: { type: "string" },
-  //             repository: {
-  //                 type: "object",
-  //                 properties: {
-  //                     id: { type: "number" },
-  //                     full_name: { type: "string" },
-  //                 },
-  //                 required: ["id", "full_name"],
-  //             },
-  //             installation: {
-  //                 type: "object",
-  //                 properties: {
-  //                     id: { type: "number" },
-  //                 },
-  //                 required: ["id"],
-  //             },
-  //         },
-  //         required: ["ref", "repository", "installation"],
-  //     },
-  // };
   fastify.post('/', async (request, reply) => {
-    if (!await verifyUserId(request.headers.authorization)) {
+    let configuration
+    try {
+      await verifyUserId(request.headers.authorization)
+    } catch (error) {
       reply.code(500).send({ error: 'Invalid request' })
       return
     }
-
+    try {
-    const configuration = setDefaultConfiguration(request.body)
+      const services = (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application')
-
+      configuration = setDefaultConfiguration(request.body)
-    const services = (await docker.engine.listServices()).filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application')
+      if (!configuration) {
-
+        throw new Error('Whaat?')
-    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) {
-          // Base service configuration changed
-          if (!running.build.container.baseSHA || running.build.container.baseSHA !== configuration.build.container.baseSHA) {
-            configChanged = true
-          }
-          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
-        }
       }
-    }
+      await cloneRepository(configuration)
-    if (foundDomain) {
+      const { foundService, imageChanged, configChanged, forceUpdate } = await precheckDeployment({ services, configuration })
-      cleanupTmp(configuration.general.workdir)
+
-      reply.code(500).send({ message: 'Domain already in use.' })
+      if (foundService && !forceUpdate && !imageChanged && !configChanged) {
-      return
-    }
-    if (forceUpdate) {
-      imageChanged = false
-      configChanged = false
-    } else {
-      if (foundService && !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
+      }
+
+      reply.code(201).send({ message: 'Deployment queued.', nickname: configuration.general.nickname, name: configuration.build.container.name, deployId: configuration.general.deployId })
+      await queueAndBuild(configuration, imageChanged)
+    } catch (error) {
+      const { id, organization, name, branch } = configuration.repository
+      const { domain } = configuration.publish
+      const { deployId } = configuration.general
+      await Deployment.findOneAndUpdate(
+        { repoId: id, branch, deployId, organization, name, domain },
+        { repoId: id, branch, deployId, organization, name, domain, progress: 'failed' })
+      if (error.name) {
+        if (error.message && error.stack) await saveServerLog(error)
+        if (reply.sent) await new ApplicationLog({ repoId: id, branch, deployId, event: `[ERROR 😖]: ${error.stack}` }).save()
+      }
+      throw new Error(error)
+    } finally {
+      cleanupTmp(configuration.general.workdir)
+      await purgeImagesContainers(configuration)
     }
-
-    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
+    try {
-    const onePage = 5
+      const { repoId, branch, page } = request.query
-    const show = Number(page) * onePage || 5
+      const onePage = 5
-    const deploy = await Deployment.find({ repoId, branch })
+      const show = Number(page) * onePage || 5
-      .select('-_id -__v -repoId')
+      const deploy = await Deployment.find({ repoId, branch })
-      .sort({ createdAt: 'desc' })
+        .select('-_id -__v -repoId')
-      .limit(show)
+        .sort({ createdAt: 'desc' })
+        .limit(show)
 
-    const finalLogs = deploy.map(d => {
+      const finalLogs = deploy.map(d => {
-      const finalLogs = { ...d._doc }
+        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.took = updatedAt.diff(dayjs(d.createdAt)) / 1000
-      finalLogs.since = updatedAt.fromNow()
+        finalLogs.since = updatedAt.fromNow()
 
+        return finalLogs
+      })
       return finalLogs
-    })
+    } catch (error) {
-    return finalLogs
+      throw new Error(error)
+    }
   })
 
   fastify.get('/:deployId', async (request, reply) => {

api/routes/v1/application/logs.js

@@ -1,10 +1,16 @@
 const { docker } = require('../../../libs/docker')
+const { saveServerLog } = require('../../../libs/logging')
 
 module.exports = async function (fastify) {
   fastify.get('/', async (request, reply) => {
-    const { name } = request.query
+    try {
-    const service = await docker.engine.getService(`${name}_${name}`)
+      const { name } = request.query
-    const logs = (await service.logs({ stdout: true, stderr: true, timestamps: true })).toString().split('\n').map(l => l.slice(8)).filter((a) => a)
+      const service = await docker.engine.getService(`${name}_${name}`)
-    return { logs }
+      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) {
+      await saveServerLog(error)
+      throw new Error(error)
+    }
   })
 }

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

@@ -1,6 +1,7 @@
 const { docker } = require('../../../libs/docker')
 const Deployment = require('../../../models/Deployment')
 const ServerLog = require('../../../models/Logs/Server')
+const { saveServerLog } = require('../../../libs/logging')
 
 module.exports = async function (fastify) {
   fastify.get('/', async (request, reply) => {
@@ -21,12 +22,11 @@ module.exports = async function (fastify) {
           }
         }
       ])
-
       const serverLogs = await ServerLog.find()
-      const services = await docker.engine.listServices()
+      const dockerServices = await docker.engine.listServices()
-
+      let applications = dockerServices.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application' && r.Spec.Labels.configuration)
-      let applications = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application' && r.Spec.Labels.configuration)
+      let databases = dockerServices.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'database' && r.Spec.Labels.configuration)
-      let databases = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'database' && r.Spec.Labels.configuration)
+      let services = dockerServices.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'service' && r.Spec.Labels.configuration)
       applications = applications.map(r => {
         if (JSON.parse(r.Spec.Labels.configuration)) {
           const configuration = JSON.parse(r.Spec.Labels.configuration)
@@ -42,7 +42,12 @@ module.exports = async function (fastify) {
         r.Spec.Labels.configuration = configuration
         return r
       })
-      applications = [...new Map(applications.map(item => [item.Spec.Labels.configuration.publish.domain, item])).values()]
+      services = services.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: {
@@ -50,11 +55,17 @@ module.exports = async function (fastify) {
         },
         databases: {
           deployed: databases
+        },
+        services: {
+          deployed: services
         }
       }
     } catch (error) {
       if (error.code === 'ENOENT' && error.errno === -2) {
         throw new Error(`Docker service unavailable at ${error.address}.`)
+      } else {
+        await saveServerLog(error)
+        throw new Error(error)
       }
     }
   })

api/routes/v1/databases/index.js

@@ -3,6 +3,7 @@ const fs = require('fs').promises
 const cuid = require('cuid')
 const { docker } = require('../../../libs/docker')
 const { execShellAsync } = require('../../../libs/common')
+const { saveServerLog } = require('../../../libs/logging')
 
 const { uniqueNamesGenerator, adjectives, colors, animals } = require('unique-names-generator')
 const generator = require('generate-password')
@@ -17,13 +18,15 @@ module.exports = async function (fastify) {
       const database = (await docker.engine.listServices()).find(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'database' && JSON.parse(r.Spec.Labels.configuration).general.deployId === deployId)
       if (database) {
         const jsonEnvs = {}
-        for (const d of database.Spec.TaskTemplate.ContainerSpec.Env) {
+        if (database.Spec.TaskTemplate.ContainerSpec.Env) {
-          const s = d.split('=')
+          for (const d of database.Spec.TaskTemplate.ContainerSpec.Env) {
-          jsonEnvs[s[0]] = s[1]
+            const s = d.split('=')
+            jsonEnvs[s[0]] = s[1]
+          }
         }
         const payload = {
           config: JSON.parse(database.Spec.Labels.configuration),
-          envs: jsonEnvs
+          envs: jsonEnvs || null
         }
         reply.code(200).send(payload)
       } else {
@@ -38,131 +41,148 @@ module.exports = async function (fastify) {
     body: {
       type: 'object',
       properties: {
-        type: { type: 'string', enum: ['mongodb', 'postgresql', 'mysql', 'couchdb'] }
+        type: { type: 'string', enum: ['mongodb', 'postgresql', 'mysql', 'couchdb', 'clickhouse'] }
       },
       required: ['type']
     }
   }
 
   fastify.post('/deploy', { schema: postSchema }, async (request, reply) => {
-    let { type, defaultDatabaseName } = request.body
+    try {
-    const passwords = generator.generateMultiple(2, {
+      let { type, defaultDatabaseName } = request.body
-      length: 24,
+      const passwords = generator.generateMultiple(2, {
-      numbers: true,
+        length: 24,
-      strict: true
+        numbers: true,
-    })
+        strict: true
-    const usernames = generator.generateMultiple(2, {
+      })
-      length: 10,
+      const usernames = generator.generateMultiple(2, {
-      numbers: true,
+        length: 10,
-      strict: true
+        numbers: true,
-    })
+        strict: true
-    // TODO: Query for existing db with the same name
+      })
-    const nickname = getUniq()
+      // 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.' })
+      reply.code(201).send({ message: 'Deploying.' })
-    // TODO: Persistent volume, custom inputs
+      // TODO: Persistent volume, custom inputs
-    const deployId = cuid()
+      const deployId = cuid()
-    const configuration = {
+      const configuration = {
-      general: {
+        general: {
-        workdir: `/tmp/${deployId}`,
+          workdir: `/tmp/${deployId}`,
-        deployId,
+          deployId,
-        nickname,
+          nickname,
-        type
+          type
-      },
+        },
-      database: {
+        database: {
-        usernames,
+          usernames,
-        passwords,
+          passwords,
-        defaultDatabaseName
+          defaultDatabaseName
-      },
+        },
-      deploy: {
+        deploy: {
-        name: nickname
+          name: nickname
+        }
       }
-    }
+      await execShellAsync(`mkdir -p ${configuration.general.workdir}`)
-    let generateEnvs = {}
+      let generateEnvs = {}
-    let image = null
+      let image = null
-    let volume = null
+      let volume = null
-    if (type === 'mongodb') {
+      let ulimits = {}
-      generateEnvs = {
+      if (type === 'mongodb') {
-        MONGODB_ROOT_PASSWORD: passwords[0],
+        generateEnvs = {
-        MONGODB_USERNAME: usernames[0],
+          MONGODB_ROOT_PASSWORD: passwords[0],
-        MONGODB_PASSWORD: passwords[1],
+          MONGODB_USERNAME: usernames[0],
-        MONGODB_DATABASE: defaultDatabaseName
+          MONGODB_PASSWORD: passwords[1],
-      }
+          MONGODB_DATABASE: defaultDatabaseName
-      image = 'bitnami/mongodb:4.4'
+        }
-      volume = `${configuration.general.deployId}-${type}-data:/bitnami/mongodb`
+        image = 'bitnami/mongodb:4.4'
-    } else if (type === 'postgresql') {
+        volume = `${configuration.general.deployId}-${type}-data:/bitnami/mongodb`
-      generateEnvs = {
+      } else if (type === 'postgresql') {
-        POSTGRESQL_PASSWORD: passwords[0],
+        generateEnvs = {
-        POSTGRESQL_USERNAME: usernames[0],
+          POSTGRESQL_PASSWORD: passwords[0],
-        POSTGRESQL_DATABASE: defaultDatabaseName
+          POSTGRESQL_USERNAME: usernames[0],
-      }
+          POSTGRESQL_DATABASE: defaultDatabaseName
-      image = 'bitnami/postgresql:13.2.0'
+        }
-      volume = `${configuration.general.deployId}-${type}-data:/bitnami/postgresql`
+        image = 'bitnami/postgresql:13.2.0'
-    } else if (type === 'couchdb') {
+        volume = `${configuration.general.deployId}-${type}-data:/bitnami/postgresql`
-      generateEnvs = {
+      } else if (type === 'couchdb') {
-        COUCHDB_PASSWORD: passwords[0],
+        generateEnvs = {
-        COUCHDB_USER: usernames[0]
+          COUCHDB_PASSWORD: passwords[0],
-      }
+          COUCHDB_USER: usernames[0]
-      image = 'bitnami/couchdb:3'
+        }
-      volume = `${configuration.general.deployId}-${type}-data:/bitnami/couchdb`
+        image = 'bitnami/couchdb:3'
-    } else if (type === 'mysql') {
+        volume = `${configuration.general.deployId}-${type}-data:/bitnami/couchdb`
-      generateEnvs = {
+      } else if (type === 'mysql') {
-        MYSQL_ROOT_PASSWORD: passwords[0],
+        generateEnvs = {
-        MYSQL_ROOT_USER: usernames[0],
+          MYSQL_ROOT_PASSWORD: passwords[0],
-        MYSQL_USER: usernames[1],
+          MYSQL_ROOT_USER: usernames[0],
-        MYSQL_PASSWORD: passwords[1],
+          MYSQL_USER: usernames[1],
-        MYSQL_DATABASE: defaultDatabaseName
+          MYSQL_PASSWORD: passwords[1],
-      }
+          MYSQL_DATABASE: defaultDatabaseName
-      image = 'bitnami/mysql:8.0'
+        }
-      volume = `${configuration.general.deployId}-${type}-data:/bitnami/mysql/data`
+        image = 'bitnami/mysql:8.0'
-    }
+        volume = `${configuration.general.deployId}-${type}-data:/bitnami/mysql/data`
-
+      } else if (type === 'clickhouse') {
-    const stack = {
+        image = 'yandex/clickhouse-server'
-      version: '3.8',
+        volume = `${configuration.general.deployId}-${type}-data:/var/lib/clickhouse`
-      services: {
+        ulimits = {
-        [configuration.general.deployId]: {
+          nofile: {
-          image,
+            soft: 262144,
-          networks: [`${docker.network}`],
+            hard: 262144
-          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}`]: {
+      const stack = {
-          external: true
+        version: '3.8',
-        }
+        services: {
-      },
+          [configuration.general.deployId]: {
-      volumes: {
+            image,
-        [`${configuration.general.deployId}-${type}-data`]: {
+            networks: [`${docker.network}`],
-          external: true
+            environment: generateEnvs,
+            volumes: [volume],
+            ulimits,
+            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
+          }
         }
       }
+      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) {
+      console.log(error)
+      await saveServerLog(error)
+      throw new Error(error)
     }
-    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/login/github.js

@@ -4,6 +4,8 @@ const Settings = require('../../../models/Settings')
 const cuid = require('cuid')
 const mongoose = require('mongoose')
 const jwt = require('jsonwebtoken')
+const { saveServerLog } = require('../../../libs/logging')
+
 module.exports = async function (fastify) {
   const githubCodeSchema = {
     schema: {
@@ -59,8 +61,12 @@ module.exports = async function (fastify) {
               avatar: avatar_url,
               uid
             })
+            const defaultSettings = new Settings({
+              _id: new mongoose.Types.ObjectId()
+            })
             try {
               await newUser.save()
+              await defaultSettings.save()
             } catch (e) {
               console.log(e)
               reply.code(500).send({ success: false, error: e })
@@ -111,8 +117,8 @@ module.exports = async function (fastify) {
         return
       }
     } catch (error) {
-      console.log(error)
+      await saveServerLog(error)
-      reply.code(500).send({ success: false, error: error.message })
+      throw new Error(error)
     }
   })
   fastify.get('/success', 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 new Error(error)
+    }
+  })
+}

api/routes/v1/services/deploy.js

@@ -0,0 +1,15 @@
+const { plausible, activateAdminUser } = require('../../../libs/services/plausible')
+
+module.exports = async function (fastify) {
+  fastify.post('/plausible', async (request, reply) => {
+    let { email, userName, userPassword, baseURL } = request.body
+    const traefikURL = baseURL
+    baseURL = `https://${baseURL}`
+    await plausible({ email, userName, userPassword, baseURL, traefikURL })
+    return {}
+  })
+  fastify.patch('/plausible/activate', async (request, reply) => {
+    await activateAdminUser()
+    return 'OK'
+  })
+}

api/routes/v1/services/index.js

@@ -0,0 +1,27 @@
+const { execShellAsync } = require('../../../libs/common')
+const { docker } = require('../../../libs/docker')
+
+module.exports = async function (fastify) {
+  fastify.get('/:serviceName', async (request, reply) => {
+    const { serviceName } = request.params
+    try {
+      const service = (await docker.engine.listServices()).find(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'service' && r.Spec.Labels.serviceName === serviceName && r.Spec.Name === `${serviceName}_${serviceName}`)
+      if (service) {
+        const payload = {
+          config: JSON.parse(service.Spec.Labels.configuration)
+        }
+        reply.code(200).send(payload)
+      } else {
+        throw new Error()
+      }
+    } catch (error) {
+      console.log(error)
+      throw new Error('No service found?')
+    }
+  })
+  fastify.delete('/:serviceName', async (request, reply) => {
+    const { serviceName } = request.params
+    await execShellAsync(`docker stack rm ${serviceName}`)
+    reply.code(200).send({})
+  })
+}

api/routes/v1/settings/index.js

@@ -1,13 +1,16 @@
 const Settings = require('../../../models/Settings')
+const { saveServerLog } = require('../../../libs/logging')
+
 module.exports = async function (fastify) {
   const applicationName = 'coolify'
   const postSchema = {
     body: {
       type: 'object',
       properties: {
-        allowRegistration: { type: 'boolean' }
+        allowRegistration: { type: 'boolean' },
+        sendErrors: { type: 'boolean' }
       },
-      required: ['allowRegistration']
+      required: []
     }
   }
 
@@ -25,6 +28,7 @@ module.exports = async function (fastify) {
         settings
       }
     } catch (error) {
+      await saveServerLog(error)
       throw new Error(error)
     }
   })
@@ -38,6 +42,7 @@ module.exports = async function (fastify) {
       ).select('-_id -__v')
       reply.code(201).send({ settings })
     } catch (error) {
+      await saveServerLog(error)
       throw new Error(error)
     }
   })

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' })
+    await saveServerLog({ message: 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' })
+    await saveServerLog({ message: 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
+    try {
-    if (!authorization) {
+      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,10 +1,15 @@
 const crypto = require('crypto')
-const { cleanupTmp, execShellAsync } = require('../../../libs/common')
+const { cleanupTmp } = require('../../../libs/common')
+
 const Deployment = require('../../../models/Deployment')
+const ApplicationLog = require('../../../models/Logs/Application')
+const ServerLog = require('../../../models/Logs/Server')
+
 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')
+const { purgeImagesContainers } = require('../../../libs/applications/cleanup')
 
 module.exports = async function (fastify) {
   // TODO: Add this to fastify plugin
@@ -33,6 +38,7 @@ module.exports = async function (fastify) {
     }
   }
   fastify.post('/', { schema: postSchema }, async (request, reply) => {
+    let configuration
     const hmac = crypto.createHmac('sha256', fastify.config.GITHUP_APP_WEBHOOK_SECRET)
     const digest = Buffer.from('sha256=' + hmac.update(JSON.stringify(request.body)).digest('hex'), 'utf8')
     const checksum = Buffer.from(request.headers['x-hub-signature-256'], 'utf8')
@@ -45,98 +51,72 @@ 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')
+      configuration = services.find(r => {
-
+        if (request.body.ref.startsWith('refs')) {
-    let configuration = services.find(r => {
+          const branch = request.body.ref.split('/')[2]
-      if (request.body.ref.startsWith('refs')) {
+          if (
-        const branch = request.body.ref.split('/')[2]
+            JSON.parse(r.Spec.Labels.configuration).repository.id === request.body.repository.id &&
-        if (
+            JSON.parse(r.Spec.Labels.configuration).repository.branch === branch
-          JSON.parse(r.Spec.Labels.configuration).repository.id === request.body.repository.id &&
+          ) {
-          JSON.parse(r.Spec.Labels.configuration).repository.branch === branch
+            return r
-        ) {
+          }
-          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) {
+      if (foundService && !forceUpdate && !imageChanged && !configChanged) {
-      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) {
         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
+      }
+
+      reply.code(201).send({ message: 'Deployment queued.', nickname: configuration.general.nickname, name: configuration.build.container.name })
+      await queueAndBuild(configuration, imageChanged)
+    } catch (error) {
+      const { id, organization, name, branch } = configuration.repository
+      const { domain } = configuration.publish
+      const { deployId } = configuration.general
+      await Deployment.findOneAndUpdate(
+        { repoId: id, branch, deployId, organization, name, domain },
+        { repoId: id, branch, deployId, organization, name, domain, progress: 'failed' })
+      if (error.name === 'Error') {
+        // Error during runtime
+        await new ApplicationLog({ repoId: id, branch, deployId, event: `[ERROR 😖]: ${error.stack}` }).save()
+      } else {
+        // Error in my code
+        const payload = { message: error.message, stack: error.stack, type: 'spaghetticode' }
+        if (error.message && error.stack) await new ServerLog(payload).save()
+        if (reply.sent) await new ApplicationLog({ repoId: id, branch, deployId, event: `[ERROR 😖]: ${error.stack}` }).save()
+      }
+      throw new Error(error)
+    } finally {
+      cleanupTmp(configuration.general.workdir)
+      await purgeImagesContainers(configuration)
     }
-
-    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

@@ -1,15 +1,26 @@
 require('dotenv').config()
 const fs = require('fs')
 const util = require('util')
-const { saveServerLog } = require('./libs/logging')
+const axios = require('axios')
-const Deployment = require('./models/Deployment')
-const fastify = require('fastify')({
-  logger: { level: 'error' }
-})
 const mongoose = require('mongoose')
 const path = require('path')
+const { saveServerLog } = require('./libs/logging')
+const { execShellAsync } = require('./libs/common')
+const { purgeImagesContainers, cleanupStuckedDeploymentsInDB } = require('./libs/applications/cleanup')
+const fastify = require('fastify')({
+  trustProxy: true,
+  logger: {
+    level: 'error'
+  }
+})
+fastify.register(require('../api/libs/http-error'))
+
 const { schema } = require('./schema')
 
+process.on('unhandledRejection', async (reason, p) => {
+  await saveServerLog({ message: reason.message, type: 'unhandledRejection' })
+})
+
 fastify.register(require('fastify-env'), {
   schema,
   dotenv: true
@@ -30,15 +41,6 @@ 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 })
-})
 
 if (process.env.NODE_ENV === 'production') {
   mongoose.connect(
@@ -82,9 +84,27 @@ mongoose.connection.once('open', async function () {
     fastify.listen(3001)
     console.log('Coolify API is up and running in development.')
   }
+  try {
+    // Always cleanup server logs
+    await mongoose.connection.db.dropCollection('logs-servers')
+  } catch (error) {
+    // Could not cleanup logs-servers collection
+  }
   // On start cleanup inprogress/queued deployments.
-  const deployments = await Deployment.find({ progress: { $in: ['queued', 'inprogress'] } })
+  try {
-  for (const deployment of deployments) {
+    await cleanupStuckedDeploymentsInDB()
-    await Deployment.findByIdAndUpdate(deployment._id, { $set: { progress: 'failed' } })
+  } catch (error) {
+    // Could not cleanup DB 🤔
+  }
+  try {
+    // Doing because I do not want to prune these images. Prune skips coolify-reserve labeled images.
+    const basicImages = ['nginx:stable-alpine', 'node:lts', 'ubuntu:20.04', 'php:apache', 'rust:latest']
+    for (const image of basicImages) {
+      // await execShellAsync(`echo "FROM ${image}" | docker build --label coolify-reserve=true -t ${image} -`)
+      await execShellAsync(`docker pull ${image}`)
+    }
+  } catch (error) {
+    console.log('Could not pull some basic images from Docker Hub.')
+    console.log(error)
   }
 })

install/Dockerfile-new

@@ -0,0 +1,15 @@
+FROM node:lts
+LABEL coolify-preserve=true
+WORKDIR /usr/src/app
+RUN curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.6.tgz | tar -xzvf - docker/docker -C . --strip-components 1
+RUN mv /usr/src/app/docker /usr/bin/docker
+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 /usr/bin/docker
+RUN curl -f https://get.pnpm.io/v6.js | node - add --global pnpm
+COPY ./*package.json .
+RUN pnpm install
+COPY . .
+RUN pnpm build
+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-dev.yml

@@ -0,0 +1,73 @@
+version: '3.8'
+
+services:
+  proxy:
+    image: traefik:v2.4
+    hostname: coollabs-proxy
+    ports:
+      - target: 80
+        published: 80
+        protocol: tcp
+        mode: host
+      - target: 443
+        published: 443
+        protocol: tcp
+        mode: host
+      - target: 8080
+        published: 8080
+        protocol: tcp
+        mode: host
+    command:
+      - --api.insecure=true
+      - --api.dashboard=true
+      - --api.debug=true
+      - --log.level=ERROR
+      - --providers.docker=true
+      - --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
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - ${DOCKER_NETWORK}
+    deploy:
+      update_config:
+        parallelism: 1
+        delay: 10s
+        order: start-first
+      replicas: 1
+      placement:
+        constraints:
+          - node.role == manager
+      labels:
+        - "traefik.enable=true"
+        - "traefik.http.routers.api.entrypoints=websecure"
+        - "traefik.http.routers.api.service=api@internal"
+        - "traefik.http.routers.api.middlewares=auth"
+        - "traefik.http.services.traefik.loadbalancer.server.port=80"
+        - "traefik.http.services.traefik.loadbalancer.server.port=443"
+
+        # Global redirect www to non-www
+        - "traefik.http.routers.www-catchall.rule=hostregexp(`{host:www.(.+)}`)"
+        - "traefik.http.routers.www-catchall.entrypoints=web"
+        - "traefik.http.routers.www-catchall.middlewares=redirect-www-to-nonwww"
+        - "traefik.http.middlewares.redirect-www-to-nonwww.redirectregex.regex=^http://(?:www\\.)?(.+)"
+        - "traefik.http.middlewares.redirect-www-to-nonwww.redirectregex.replacement=http://$$$${1}"
+
+        # Global redirect http to https
+        - "traefik.http.routers.http-catchall.rule=hostregexp(`{host:.+}`)"
+        - "traefik.http.routers.http-catchall.entrypoints=web"
+        - "traefik.http.routers.http-catchall.middlewares=redirect-to-https"
+
+        - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+        - "traefik.http.middlewares.global-compress.compress=true"
+
+networks:
+  ${DOCKER_NETWORK}:
+    driver: overlay
+    name: ${DOCKER_NETWORK}
+    external: true
+

install/coolify-template.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   proxy:
-    image: traefik:v2.3
+    image: traefik:v2.4
     hostname: coollabs-proxy
     ports:
       - target: 80
@@ -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/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.')

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source, hassle-free, self-hostable Heroku & Netlify alternative.",
-  "version": "1.0.5",
+  "version": "1.0.10",
   "license": "AGPL-3.0",
   "scripts": {
     "lint": "standard",
@@ -16,8 +16,10 @@
     "build:svite": "svite build"
   },
   "dependencies": {
+    "@iarna/toml": "^2.2.5",
     "@roxi/routify": "^2.15.1",
-    "@zerodevx/svelte-toast": "^0.2.0",
+    "@zerodevx/svelte-toast": "^0.2.2",
+    "ajv": "^8.1.0",
     "axios": "^0.21.1",
     "commander": "^7.2.0",
     "compare-versions": "^3.6.0",
@@ -26,12 +28,13 @@
     "deepmerge": "^4.2.2",
     "dockerode": "^3.2.1",
     "dotenv": "^8.2.0",
-    "fastify": "^3.14.1",
+    "fastify": "^3.14.2",
     "fastify-env": "^2.1.0",
     "fastify-jwt": "^2.4.0",
     "fastify-plugin": "^3.0.0",
     "fastify-static": "^4.0.1",
     "generate-password": "^1.6.0",
+    "http-errors-enhanced": "^0.7.0",
     "js-yaml": "^4.0.0",
     "jsonwebtoken": "^8.5.1",
     "mongoose": "^5.12.3",
@@ -52,7 +55,7 @@
     "standard": "^16.0.3",
     "svelte": "^3.37.0",
     "svelte-hmr": "^0.14.0",
-    "svelte-preprocess": "^4.6.1",
+    "svelte-preprocess": "^4.7.0",
     "svite": "0.8.1",
     "tailwindcss": "2.1.1"
   },

src/App.svelte

@@ -3,8 +3,7 @@
   import { Router } from "@roxi/routify";
   import { routes } from "../.routify/routes";
   const options = {
-    duration: 5000,
+    duration: 2000
-    dismissable: true
   };
 </script>
 
@@ -32,7 +31,7 @@
     @apply bg-warmGray-700 !important;
   }
   :global(input) {
-    @apply text-sm rounded py-2 px-6 font-bold bg-warmGray-800 text-white transition duration-150 outline-none !important;
+    @apply text-sm rounded py-2 px-6 font-bold bg-warmGray-800 text-white transition duration-150 outline-none border border-transparent !important;
   }
   :global(input:hover) {
     @apply bg-warmGray-700 !important;

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

@@ -1,6 +1,7 @@
 <script>
   import { application} from "@store";
   import TooltipInfo from "../../../Tooltip/TooltipInfo.svelte";
+  const showPorts = ['nodejs','custom','rust']
 </script>
 
 <div>
@@ -26,6 +27,11 @@
       size="large"
         label="Published as a PHP application."
       />
+      {:else if $application.build.pack === 'rust'}
+      <TooltipInfo
+      size="large"
+        label="Published as a Rust application."
+      />
       {/if}
 
 </label
@@ -35,6 +41,7 @@
       <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
@@ -56,7 +63,7 @@
       <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="{`Path to deploy your application on your domain. eg: /api means it will be deployed to -> https://${$application.publish.domain || '<yourdomain>'}/api`}"
           /></label
         >
         <input
@@ -66,7 +73,7 @@
         />
       </div>
     </div>
-    {#if $application.build.pack === "nodejs" || $application.build.pack === "custom"}
+    {#if showPorts.includes($application.build.pack)}
     <label for="Port" >Port</label>
     <input
       id="Port"
@@ -85,7 +92,7 @@
         <input
           id="baseDir"
           bind:value="{$application.build.directory}"
-          placeholder="/"
+          placeholder="eg: sourcedir"
         />
       </div>
       <div class="grid grid-flow-row">
@@ -97,7 +104,7 @@
         <input
           id="publishDir"
           bind:value="{$application.publish.directory}"
-          placeholder="/"
+          placeholder="eg: dist, _site, public"
         />
       </div>
     </div>

src/components/Application/Configuration/Configuration.svelte

@@ -29,7 +29,7 @@
 
   async function loadBranches() {
     loading.branches = true;
-    if ($isActive("/application/new")) $application.repository.branch = null
+    if ($isActive("/application/new")) $application.repository.branch = null;
     const selectedRepository = repositories.find(
       r => r.id === $application.repository.id,
     );
@@ -54,6 +54,7 @@
   }
 
   async function loadGithub() {
+    loading.github = true;
     try {
       const { installations } = await $fetch(
         "https://api.github.com/user/installations",
@@ -100,7 +101,6 @@
     } finally {
       loading.github = false;
     }
- 
   }
   function modifyGithubAppConfig() {
     const left = screen.width / 2 - 1020 / 2;
@@ -144,6 +144,52 @@
   }
 </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 : ''}`
+          : "<yourdomain>"}</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 />

src/components/Application/Configuration/Tabs.svelte

@@ -8,7 +8,7 @@
   import BuildStep from "./ActiveTab/BuildStep.svelte";
   import Secrets from "./ActiveTab/Secrets.svelte";
   import Loading from "../../Loading.svelte";
-
+  const buildPhaseActive = ["nodejs", "static"];
   let loading = false;
   onMount(async () => {
     if (!$isActive("/application/new")) {
@@ -27,8 +27,8 @@
       });
     } else {
       loading = true;
-      $deployments?.applications?.deployed.filter(d => {
+      $deployments?.applications?.deployed.find(d => {
-        const conf = d?.Spec?.Labels.application;
+        const conf = d?.Spec?.Labels.configuration;
         if (
           conf?.repository?.organization ===
             $application.repository.organization &&
@@ -40,6 +40,7 @@
             organization: $application.repository.organization,
             branch: $application.repository.branch,
           });
+          toast.push("This repository & branch is already defined. Redirecting...");
         }
       });
       try {
@@ -52,15 +53,15 @@
         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) {
+        if (packageJson) {
-          $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(
+            return (
               packageJsonContent?.dependencies?.hasOwnProperty(dep) ||
               packageJsonContent?.devDependencies?.hasOwnProperty(dep)
             );
@@ -69,17 +70,9 @@
             if (checkPackageJSONContents(dep)) {
               const config = templates[dep];
               $application.build.pack = config.pack;
-              if (config.installation) {
+              if (config.installation) $application.build.command.installation = 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 (config.port) {
-                $application.publish.port = config.port;
-              }
-
-              if (config.directory) {
-                $application.publish.directory = config.directory;
-              }
 
               if (
                 packageJsonContent.scripts.hasOwnProperty("build") &&
@@ -87,13 +80,15 @@
               ) {
                 $application.build.command.build = config.build;
               }
-              toast.push(
+              toast.push(`${config.name} App detected. Default values set.`);
-                `${config.name} App detected. Default values set.`,
-              );
             }
- 
           });
-
+        } else if (CargoToml) {
+          $application.build.pack = "rust";
+          toast.push(`Rust language detected. Default values set.`);
+        } else if (Dockerfile) {
+          $application.build.pack = "custom";
+          toast.push("Custom Dockerfile found. Build pack set to custom.");
         }
       } catch (error) {
         // Nothing detected
@@ -133,7 +128,7 @@
       >
         General
       </div>
-      {#if $application.build.pack === "php"}
+      {#if !buildPhaseActive.includes($application.build.pack)}
         <div disabled class="px-3 py-2 text-warmGray-700 cursor-not-allowed">
           Build Step
         </div>
@@ -146,14 +141,19 @@
           Build Step
         </div>
       {/if}
-
+      {#if $application.build.pack === "custom"}
-      <div
+        <div disabled class="px-3 py-2 text-warmGray-700 cursor-not-allowed">
-        on:click="{() => activateTab('secrets')}"
+          Secrets
-        class:text-green-500="{activeTab.secrets}"
+        </div>
-        class="px-3 py-2 cursor-pointer hover:text-green-500"
+      {:else}
-      >
+        <div
-        Secrets
+          on:click="{() => activateTab('secrets')}"
-      </div>
+          class:text-green-500="{activeTab.secrets}"
+          class="px-3 py-2 cursor-pointer hover:text-green-500"
+        >
+          Secrets
+        </div>
+      {/if}
     </nav>
   </div>
   <div class="max-w-4xl mx-auto">

src/components/Databases/Configuration/Configuration.svelte

@@ -58,6 +58,13 @@
       >
         Couchdb
       </button>
+      <!-- <button
+      class="button bg-gray-500 p-2 text-white hover:bg-yellow-500 cursor-pointer w-32"
+      on:click="{() => (type = 'clickhouse')}"
+      class:bg-yellow-500="{type === 'clickhouse'}"
+    >
+      Clickhouse
+    </button> -->
     </div>
     {#if type}
       <div>
@@ -81,6 +88,8 @@
           class:hover:bg-orange-500="{type === 'mysql'}"
           class:bg-red-600="{type === 'couchdb'}"
           class:hover:bg-red-500="{type === 'couchdb'}"
+          class:bg-yellow-500="{type === 'clickhouse'}"
+          class:hover:bg-yellow-400="{type === 'clickhouse'}"
           class="button p-2 w-32 text-white"
           on:click="{deploy}">Deploy</button
         >

src/components/Databases/SVGs/Clickhouse.svelte

@@ -0,0 +1,9 @@
+<script>
+  export let customClass;
+</script>
+
+<svg class="{customClass}" viewBox="0 0 9 8" xmlns="http://www.w3.org/2000/svg"
+  ><path d="m0 7h1v1h-1z" fill="#f00"></path><path
+    d="m0 0h1v7h-1zm2 0h1v8h-1zm2 0h1v8h-1zm2 0h1v8h-1zm2 3.25h1v1.5h-1z"
+    fill="#fc0"></path></svg
+>

src/components/PasswordField.svelte

@@ -0,0 +1,54 @@
+<script>
+  export let value;
+  let showPassword = false;
+</script>
+
+<div class="relative w-full">
+  <input
+    type="{showPassword ? 'text' : 'password'}"
+    class="w-full "
+    {value}
+    disabled
+  />
+  <div
+    class="absolute top-0 my-2 mx-2 right-0 cursor-pointer text-warmGray-600 hover:text-white"
+    on:click="{() => showPassword = !showPassword}"
+  >
+    {#if showPassword}
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        class="h-6 w-6"
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke="currentColor"
+      >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21"
+        ></path>
+      </svg>
+    {:else}
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        class="h-6 w-6"
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke="currentColor"
+      >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"></path>
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"
+        ></path>
+      </svg>
+    {/if}
+  </div>
+</div>

src/components/Services/Plausible.svelte

@@ -0,0 +1,82 @@
+<script>
+  import { fetch } from "@store";
+  import { params } from "@roxi/routify/runtime";
+  import { fade } from "svelte/transition";
+  import { toast } from "@zerodevx/svelte-toast";
+  import Loading from "../Loading.svelte";
+  import TooltipInfo from "../Tooltip/TooltipInfo.svelte";
+  import PasswordField from "../PasswordField.svelte";
+  import Tooltip from "../Tooltip/Tooltip.svelte";
+  export let service;
+
+  $: name = $params.name;
+  let loading = false;
+  async function activate() {
+    try {
+      loading = true;
+      await $fetch(`/api/v1/services/deploy/${name}/activate`, {
+        method: "PATCH",
+        body: {},
+      });
+      toast.push(`All users are activated for Plausible.`);
+    } catch (error) {
+      console.log(error);
+      toast.push(`Ooops, there was an error activating users for Plausible?!`);
+    } finally {
+      loading = false;
+    }
+  }
+</script>
+
+{#if loading}
+  <Loading />
+{:else}
+  <div class="text-left max-w-5xl mx-auto px-6" in:fade="{{ duration: 100 }}">
+    <div class="pb-2 pt-5 space-y-4">
+      <div class="flex space-x-5 items-center">
+        <div class="text-2xl font-bold py-4 border-gradient">General</div>
+        <div class="flex-1"></div>
+        <Tooltip
+          position="bottom"
+          size="large"
+          label="Activate all users in Plausible database, so you can login without the email verification."
+        >
+          <button
+            class="button bg-blue-500 hover:bg-blue-400 px-2"
+            on:click="{activate}">Activate All Users</button
+          >
+        </Tooltip>
+      </div>
+
+      <div class="flex items-center">
+        <div class="font-bold w-64 text-warmGray-400">Domain</div>
+        <input class="w-full" value="{service.config.baseURL}" disabled />
+      </div>
+      <div class="flex items-center">
+        <div class="font-bold w-64 text-warmGray-400">Email address</div>
+        <input class="w-full" value="{service.config.email}" disabled />
+      </div>
+      <div class="flex items-center">
+        <div class="font-bold w-64 text-warmGray-400">Username</div>
+        <input class="w-full" value="{service.config.userName}" disabled />
+      </div>
+      <div class="flex items-center">
+        <div class="font-bold w-64 text-warmGray-400">Password</div>
+        <PasswordField value="{service.config.userPassword}" />
+      </div>
+      <div class="text-2xl font-bold py-4 border-gradient w-32">PostgreSQL</div>
+      <div class="flex items-center">
+        <div class="font-bold w-64 text-warmGray-400">Username</div>
+        <input class="w-full" value="{service.config.generateEnvsPostgres.POSTGRESQL_USERNAME}" disabled />
+      </div>
+      <div class="flex items-center">
+        <div class="font-bold w-64 text-warmGray-400">Password</div>
+        <PasswordField value="{service.config.generateEnvsPostgres.POSTGRESQL_PASSWORD}" />
+      </div>
+      <div class="flex items-center">
+        <div class="font-bold w-64 text-warmGray-400">Database</div>
+        <input class="w-full" value="{service.config.generateEnvsPostgres.POSTGRESQL_DATABASE}" disabled />
+      </div>
+    </div>
+  </div>
+{/if}

src/index.css

@@ -22,6 +22,11 @@ body {
     border-image: linear-gradient(0.25turn, rgba(255, 249, 34), rgba(255, 0, 128), rgba(56, 2, 155, 0));
     border-image-slice: 1;
 }
+.border-gradient-full {
+    border: 4px 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);
@@ -29,7 +34,7 @@ body {
   font-family: 'Inter';
   font-size: 16px;
   font-weight: 600;
-   white-space: normal;
+  white-space: normal;
 }
 
 [role~="tooltip"][data-microtip-position|="bottom"]::before {

src/pages/_layout.svelte

@@ -17,9 +17,37 @@
   let upgradeDisabled = false;
   let upgradeDone = false;
   let latest = {};
+  let showAck = false;
+  const branch =
+    process.env.NODE_ENV === "production" &&
+    window.location.hostname !== "test.andrasbacsai.dev"
+      ? "main"
+      : "next";
   onMount(async () => {
-    if ($session.token) upgradeAvailable = await checkUpgrade();
+    if ($session.token) {
+      upgradeAvailable = await checkUpgrade();
+      if (!localStorage.getItem("automaticErrorReportsAck")) {
+        showAck = true;
+        if (latest?.coolify[branch]?.settings?.sendErrors) {
+          const settings = {
+            sendErrors: true,
+          };
+          await $fetch("/api/v1/settings", {
+            body: {
+              ...settings,
+            },
+            headers: {
+              Authorization: `Bearer ${$session.token}`,
+            },
+          });
+        }
+      }
+    }
   });
+  function ackError() {
+    localStorage.setItem("automaticErrorReportsAck", "true");
+    showAck = false;
+  }
   async function verifyToken() {
     if ($session.token) {
       try {
@@ -64,24 +92,47 @@
     }
   }
   async function checkUpgrade() {
-    const branch =
-      process.env.NODE_ENV === "production" &&
-      window.location.hostname !== "test.andrasbacsai.dev"
-        ? "main"
-        : "next";
     latest = await window
-      .fetch(
+      .fetch(`https://get.coollabs.io/version.json`, {
-        `https://raw.githubusercontent.com/coollabsio/coolify/${branch}/package.json`,
+        cache: "no-cache",
-        { cache: "no-cache" },
+      })
-      )
       .then(r => r.json());
-    return compareVersions(latest.version, packageJson.version) === 1
+
+    return compareVersions(
+      latest.coolify[branch].version,
+      packageJson.version,
+    ) === 1
       ? true
       : false;
   }
 </script>
 
 {#await verifyToken() then notUsed}
+  {#if showAck}
+    <div
+      class="p-2 fixed top-0 right-0 z-50 w-64 m-2 rounded border-gradient-full bg-black"
+    >
+      <div class="text-white text-xs space-y-2 text-justify font-medium">
+        <div>
+          We implemented an automatic error reporting feature, which is enabled
+          by default.
+        </div>
+        <div>
+          Why? Because we would like to hunt down bugs faster and easier.
+        </div>
+        <div class="py-5">
+          If you do not like it, you can turn it off in the <button
+            class="underline font-bold"
+            on:click="{$goto('/settings')}">Settings menu</button
+          >.
+        </div>
+        <button
+          class="button p-2 bg-warmGray-800 w-full text-center hover:bg-warmGray-700"
+          on:click="{ackError}">OK</button
+        >
+      </div>
+    </div>
+  {/if}
   {#if $route.path !== "/index"}
     <nav
       class="w-16 bg-warmGray-800 text-white top-0 left-0 fixed min-w-4rem min-h-screen"
@@ -94,7 +145,7 @@
         <img class="w-10 pt-4 pb-4" src="/favicon.png" alt="coolLabs logo" />
         <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"
+            class="p-2 hover:bg-warmGray-700 rounded hover:text-green-500 mt-4 transition-all duration-100 cursor-pointer"
             on:click="{() => $goto('/dashboard/applications')}"
             class:text-green-500="{$isActive('/dashboard/applications') ||
               $isActive('/application')}"
@@ -134,7 +185,7 @@
         </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"
+            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')}"
@@ -157,6 +208,20 @@
             </svg>
           </div>
         </Tooltip>
+        <Tooltip position="right" label="Services">
+          <div
+            class="p-2 hover:bg-warmGray-700 rounded hover:text-blue-500 transition-all duration-100 cursor-pointer"
+            on:click="{() => $goto('/dashboard/services')}"
+            class:text-blue-500="{$isActive('/dashboard/services') ||
+              $isActive('/service')}"
+            class:bg-warmGray-700="{$isActive('/dashboard/services') ||
+              $isActive('/service')}"
+          >
+          <svg xmlns="http://www.w3.org/2000/svg" class="w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 15a4 4 0 004 4h9a5 5 0 10-.1-9.999 5.002 5.002 0 10-9.78 2.096A4.001 4.001 0 003 15z" />
+          </svg>
+          </div>
+        </Tooltip>
         <div class="flex-1"></div>
         <Tooltip position="right" label="Settings">
           <button

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

@@ -1,38 +1,5 @@
 <script>
-  import { application } from "@store";
   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"
-  >
-    <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

@@ -1,5 +1,5 @@
 <script>
-  import { params } from "@roxi/routify";
+  import { params, redirect } from "@roxi/routify";
   import { onDestroy, onMount } from "svelte";
   import { fade } from "svelte/transition";
   import { fetch } from "@store";
@@ -15,13 +15,18 @@
   });
 
   async function loadLogs() {
-    const { events, progress } = await $fetch(
+    try {
+      const { events, progress } = await $fetch(
       `/api/v1/application/deploy/logs/${$params.deployId}`,
     );
     logs = [...events];
     if (progress === "done" || progress === "failed") {
       clearInterval(loadLogsInterval);
     }
+    } catch(error) {
+      $redirect('/dashboard')
+    }
+
   }
   onDestroy(() => {
     clearInterval(loadLogsInterval);
@@ -38,12 +43,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
+        <pre
-            class="text-left font-mono text-xs font-medium rounded bg-warmGray-800 text-white p-4 whitespace-pre-wrap w-full">
+        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

@@ -10,7 +10,7 @@
     Overview of
     <a
       target="_blank"
-      class="text-green-500 hover:underline cursor-pointer px-2"
+      class="hover:underline cursor-pointer px-2"
       href="{'https://' +
         $application.publish.domain +
         $application.publish.path}">{$application.publish.domain}</a

src/pages/application/_layout.svelte

@@ -50,24 +50,25 @@ import Tooltip from "../../components/Tooltip/Tooltip.svelte";
 
   async function deploy() {
     try {
-      $application.build.pack =  $application.build.pack.replace('.','').toLowerCase()
+      $application.build.pack = $application.build.pack.replace('.','').toLowerCase()
       toast.push("Checking inputs.");
       await $fetch(`/api/v1/application/check`, {
         body: $application,
       });
-      const { nickname, name } = await $fetch(`/api/v1/application/deploy`, {
+      const { nickname, name, deployId } = await $fetch(`/api/v1/application/deploy`, {
         body: $application,
       });
       $application.general.nickname = nickname;
       $application.build.container.name = name;
+      $application.general.deployId = deployId;
       $initConf = JSON.parse(JSON.stringify($application));
       toast.push("Application deployment queued.");
-      $redirect(
+      $goto(
-        `/application/${$application.repository.organization}/${$application.repository.name}/${$application.repository.branch}/logs`,
+        `/application/${$application.repository.organization}/${$application.repository.name}/${$application.repository.branch}/logs/${$application.general.deployId}`,
       );
     } catch (error) {
       console.log(error);
-      toast.push(error.error ? error.error : "Ooops something went wrong.");
+      toast.push(error.error || error || "Ooops something went wrong.");
     }
   }
 </script>

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/dashboard/databases.svelte

@@ -49,6 +49,7 @@
   import Postgresql from "../../components/Databases/SVGs/Postgresql.svelte";
   import Mysql from "../../components/Databases/SVGs/Mysql.svelte";
   import CouchDb from "../../components/Databases/SVGs/CouchDb.svelte";
+  import Clickhouse from "../../components/Databases/SVGs/Clickhouse.svelte";
   const initialNumberOfDBs = $deployments.databases?.deployed.length;
   $: if ($deployments.databases?.deployed.length) {
     if (initialNumberOfDBs !== $deployments.databases?.deployed.length) {
@@ -86,15 +87,15 @@
       <div class="flex items-center justify-center flex-wrap">
         {#each $deployments.databases.deployed as database}
           <div
-          in:fade="{{ duration: 200 }}"
+            in:fade="{{ duration: 200 }}"
             class="px-4 pb-4"
             on:click="{() =>
               $goto(
-                `/database/${database.Spec.Labels.configuration.general.deployId}/overview`,
+                `/database/${database.Spec.Labels.configuration.general.deployId}/configuration`,
               )}"
           >
             <div
-              class="relative rounded-xl p-6 w-52 h-32 bg-warmGray-800 hover:bg-purple-500 text-white shadow-md cursor-pointer ease-in-out transform hover:scale-105 duration-200 hover:rotate-1 group"
+              class="relative rounded-xl p-6 bg-warmGray-800 border-2 border-dashed border-transparent hover:border-purple-500 text-white shadow-md cursor-pointer ease-in-out transform hover:scale-105 duration-100 group"
             >
               <div class="flex items-center">
                 {#if database.Spec.Labels.configuration.general.type == "mongodb"}
@@ -109,11 +110,20 @@
                   <CouchDb
                     customClass="w-10 h-10 fill-current text-red-600 absolute top-0 left-0 -m-4"
                   />
+                {:else if database.Spec.Labels.configuration.general.type == "clickhouse"}
+                  <Clickhouse
+                    customClass="w-10 h-10 fill-current text-red-600 absolute top-0 left-0 -m-4"
+                  />
                 {/if}
-                <div
+                <div class="text-center w-full">
-                  class="text-xs font-bold text-center w-full text-warmGray-300  group-hover:text-white"
+                  <div
-                >
+                    class="text-base font-bold text-white group-hover:text-white"
-                  {database.Spec.Labels.configuration.general.nickname}
+                  >
+                    {database.Spec.Labels.configuration.general.nickname}
+                  </div>
+                  <div class="text-xs font-bold text-warmGray-300 ">
+                    ({database.Spec.Labels.configuration.general.type})
+                  </div>
                 </div>
               </div>
             </div>
@@ -121,27 +131,26 @@
         {/each}
         {#if $dbInprogress}
           <div class=" px-4 pb-4">
-            <div class="gradient-border text-xs font-bold text-warmGray-300 pt-6">
+            <div
+              class="gradient-border text-xs font-bold text-warmGray-300 pt-6"
+            >
               Working...
             </div>
           </div>
         {/if}
       </div>
     </div>
-  {:else}
+  {:else if $dbInprogress}
-
-    {#if $dbInprogress}
     <div class="px-4 mx-auto py-5">
-    <div class="flex items-center justify-center flex-wrap">
+      <div class="flex items-center justify-center flex-wrap">
-    <div class=" px-4 pb-4">
+        <div class=" px-4 pb-4">
-      <div class="gradient-border text-xs font-bold text-warmGray-300 pt-6">
+          <div class="gradient-border text-xs font-bold text-warmGray-300 pt-6">
-        Working...
+            Working...
+          </div>
+        </div>
       </div>
     </div>
-    </div>
+  {:else}
-  </div>
-    {:else}
     <div class="text-2xl font-bold text-center">No databases found</div>
   {/if}
-  {/if}
 </div>

src/pages/dashboard/services.svelte

@@ -0,0 +1,74 @@
+<script>
+  import { deployments, dateOptions } from "@store";
+  import { fade } from "svelte/transition";
+  import { goto } from "@roxi/routify/runtime";
+
+  function switchTo(application) {
+    const { branch, name, organization } = application;
+    $goto(`/application/:organization/:name/:branch`, {
+      name,
+      organization,
+      branch,
+    });
+  }
+</script>
+
+<div
+  in:fade="{{ duration: 100 }}"
+  class="py-5 text-left px-6 text-3xl tracking-tight font-bold flex items-center"
+>
+  <div>Services</div>
+  <button
+    class="icon p-1 ml-4 bg-blue-500 hover:bg-blue-400"
+    on:click="{() => $goto('/service/new')}"
+  >
+    <svg
+      class="w-6"
+      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="M12 6v6m0 0v6m0-6h6m-6 0H6"></path>
+    </svg>
+  </button>
+</div>
+<div in:fade="{{ duration: 100 }}">
+  {#if $deployments.services?.deployed.length > 0}
+    <div class="px-4 mx-auto py-5">
+      <div class="flex items-center justify-center flex-wrap">
+        {#each $deployments.services.deployed as service}
+          <div
+            in:fade="{{ duration: 200 }}"
+            class="px-4 pb-4"
+            on:click="{() =>
+              $goto(`/service/${service.Spec.Labels.serviceName}/configuration`)}"
+          >
+            <div
+              class="relative rounded-xl p-6 bg-warmGray-800 border-2 border-dashed border-transparent hover:border-blue-500 text-white shadow-md cursor-pointer ease-in-out transform hover:scale-105 duration-100 group"
+            >
+              <div class="flex items-center">
+                {#if service.Spec.Labels.serviceName == "plausible"}
+                  <div>
+                    <img
+                      alt="plausible logo"
+                      class="w-10 absolute top-0 left-0 -m-6"
+                      src="https://cdn.coollabs.io/assets/coolify/services/plausible/logo_sm.png"
+                    />
+                    <div class="text-white font-bold">Plausible Analytics</div>
+                  </div>
+                {/if}
+              </div>
+            </div>
+          </div>
+        {/each}
+      </div>
+    </div>
+  {:else}
+    <div class="text-2xl font-bold text-center">No services found</div>
+  {/if}
+</div>

src/pages/database/[name]/configuration.svelte

@@ -1,12 +1,15 @@
 <script>
   import { fetch, database } from "@store";
   import { redirect, params } from "@roxi/routify/runtime";
+  import { toast } from "@zerodevx/svelte-toast";
   import { fade } from "svelte/transition";
+
   import CouchDb from "../../../components/Databases/SVGs/CouchDb.svelte";
   import MongoDb from "../../../components/Databases/SVGs/MongoDb.svelte";
   import Mysql from "../../../components/Databases/SVGs/Mysql.svelte";
   import Postgresql from "../../../components/Databases/SVGs/Postgresql.svelte";
-import Loading from "../../../components/Loading.svelte";
+  import Loading from "../../../components/Loading.svelte";
+  import PasswordField from "../../../components/PasswordField.svelte";
 
   $: name = $params.name;
 
@@ -14,6 +17,7 @@ import Loading from "../../../components/Loading.svelte";
     if (name) {
       try {
         $database = await $fetch(`/api/v1/databases/${name}`);
+        console.log($database);
       } catch (error) {
         toast.push(`Cannot find database ${name}`);
         $redirect(`/dashboard/databases`);
@@ -23,7 +27,7 @@ import Loading from "../../../components/Loading.svelte";
 </script>
 
 {#await loadDatabaseConfig()}
-<Loading/>
+  <Loading />
 {:then}
   <div class="min-h-full text-white">
     <div
@@ -43,37 +47,34 @@ import Loading from "../../../components/Loading.svelte";
       </div>
     </div>
   </div>
-  <div
+  <div class="text-left max-w-6xl mx-auto px-6" in:fade="{{ duration: 100 }}">
-    class="text-left max-w-5xl mx-auto px-6"
+    <div class="pb-2 pt-5 space-y-4">
-    in:fade="{{ duration: 100 }}"
+      <div class="text-2xl font-bold py-4 border-gradient w-32">Database</div>
-  >
-    <div class="pb-2 pt-5">
       <div class="flex items-center">
-        <div class="font-bold w-48 text-warmGray-400">Connection string</div>
+        <div class="font-bold w-64 text-warmGray-400">Connection string</div>
         {#if $database.config.general.type === "mongodb"}
-          <textarea
+          <PasswordField
-            disabled
-            class="w-full"
             value="{`mongodb://${$database.envs.MONGODB_USERNAME}:${$database.envs.MONGODB_PASSWORD}@${$database.config.general.deployId}:27017/${$database.envs.MONGODB_DATABASE}`}"
           />
         {:else if $database.config.general.type === "postgresql"}
-          <textarea
+          <PasswordField
-            disabled
-            class="w-full"
             value="{`postgresql://${$database.envs.POSTGRESQL_USERNAME}:${$database.envs.POSTGRESQL_PASSWORD}@${$database.config.general.deployId}:5432/${$database.envs.POSTGRESQL_DATABASE}`}"
           />
         {:else if $database.config.general.type === "mysql"}
-          <textarea
+          <PasswordField
-            disabled
-            class="w-full"
             value="{`mysql://${$database.envs.MYSQL_USER}:${$database.envs.MYSQL_PASSWORD}@${$database.config.general.deployId}:3306/${$database.envs.MYSQL_DATABASE}`}"
           />
         {:else if $database.config.general.type === "couchdb"}
-          <textarea
+          <PasswordField
-            disabled
-            class="w-full"
             value="{`http://${$database.envs.COUCHDB_USER}:${$database.envs.COUCHDB_PASSWORD}@${$database.config.general.deployId}:5984`}"
           />
+        {:else if $database.config.general.type === "clickhouse"}
+          <!-- {JSON.stringify($database)} -->
+          <!-- <textarea
+          disabled
+          class="w-full"
+          value="{`postgresql://${$database.envs.POSTGRESQL_USERNAME}:${$database.envs.POSTGRESQL_PASSWORD}@${$database.config.general.deployId}:5432/${$database.envs.POSTGRESQL_DATABASE}`}"
+        ></textarea> -->
         {/if}
       </div>
     </div>
@@ -83,8 +84,7 @@ import Loading from "../../../components/Loading.svelte";
         <textarea
           disabled
           class="w-full"
-          value="{$database.envs.MONGODB_ROOT_PASSWORD}"
+          value="{$database.envs.MONGODB_ROOT_PASSWORD}"></textarea>
-        ></textarea>
       </div>
     {/if}
   </div>

src/pages/database/_layout.svelte

@@ -3,6 +3,7 @@
   import { fetch, database, initialDatabase } from "@store";
   import { toast } from "@zerodevx/svelte-toast";
   import { onDestroy } from "svelte";
+import Tooltip from "../../components/Tooltip/Tooltip.svelte";
 
   $: name = $params.name
 
@@ -23,6 +24,7 @@
   <nav
     class="flex text-white justify-end items-center m-4 fixed right-0 top-0 space-x-4"
   >
+  <Tooltip position="bottom" label="Delete" >
     <button
       title="Delete"
       class="icon hover:text-red-500"
@@ -43,27 +45,39 @@
         ></path>
       </svg>
     </button>
+  </Tooltip>
     <div class="border border-warmGray-700 h-8"></div>
-    <button
+    <Tooltip position="bottom-left" label="Configuration" >
-      title="Configuration"
+      <button
-      disabled
+        class="icon hover:text-yellow-400"
-      class="icon text-warmGray-700 hover:bg-transparent cursor-not-allowed"
+        disabled="{$isActive(`/database/new`)}"
-    >
+        class:text-yellow-400="{$isActive(
-      <svg
+          `/database/${name}/configuration`,
-        class="w-6"
+        ) || $isActive(`/application/new`)}"
-        xmlns="http://www.w3.org/2000/svg"
+        class:bg-warmGray-700="{$isActive(
-        fill="none"
+          `/database/${name}/configuration`,
-        viewBox="0 0 24 24"
+        ) || $isActive(`/database/new`)}"
-        stroke="currentColor"
+        on:click="{() =>
+          $goto(
+            `/database/${name}/configuration`,
+          )}"
       >
-        <path
+        <svg
-          stroke-linecap="round"
+          class="w-6"
-          stroke-linejoin="round"
+          xmlns="http://www.w3.org/2000/svg"
-          stroke-width="2"
+          fill="none"
-          d="M12 6V4m0 2a2 2 0 100 4m0-4a2 2 0 110 4m-6 8a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4m6 6v10m6-2a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4"
+          viewBox="0 0 24 24"
-        ></path>
+          stroke="currentColor"
-      </svg>
+        >
-    </button>
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M12 6V4m0 2a2 2 0 100 4m0-4a2 2 0 110 4m-6 8a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4m6 6v10m6-2a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4"
+          ></path>
+        </svg>
+      </button>
+    </Tooltip>
   </nav>
 {/if}
 <div class="text-white">

src/pages/service/[name]/_layout.svelte

@@ -0,0 +1,81 @@
+<script>
+    import { params, goto, isActive, redirect, url } from "@roxi/routify";
+    import { fetch } from "@store";
+    import { toast } from "@zerodevx/svelte-toast";
+import Tooltip from "../../../components/Tooltip/Tooltip.svelte";
+  
+    $: name = $params.name
+  
+    async function removeService() {
+      await $fetch(`/api/v1/services/${name}`, {
+        method: "DELETE",
+      });
+      toast.push("Service removed.");
+      $redirect(`/dashboard/services`);
+    }
+  </script>
+  
+
+    <nav
+      class="flex text-white justify-end items-center m-4 fixed right-0 top-0 space-x-4"
+    >
+    <Tooltip position="bottom" label="Delete" >
+      <button
+        title="Delete"
+        class="icon hover:text-red-500"
+        on:click="{removeService}"
+      >
+        <svg
+          class="w-6"
+          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="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
+          ></path>
+        </svg>
+      </button>
+    </Tooltip>
+      <div class="border border-warmGray-700 h-8"></div>
+      <Tooltip position="bottom-left" label="Configuration" >
+        <button
+          class="icon hover:text-yellow-400"
+          disabled="{$isActive(`/application/new`)}"
+          class:text-yellow-400="{$isActive(
+            `/service/${name}/configuration`,
+          ) || $isActive(`/application/new`)}"
+          class:bg-warmGray-700="{$isActive(
+            `/service/${name}/configuration`,
+          ) || $isActive(`/application/new`)}"
+          on:click="{() =>
+            $goto(
+              `/service/${name}/configuration`,
+            )}"
+        >
+          <svg
+            class="w-6"
+            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="M12 6V4m0 2a2 2 0 100 4m0-4a2 2 0 110 4m-6 8a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4m6 6v10m6-2a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4"
+            ></path>
+          </svg>
+        </button>
+      </Tooltip>
+    </nav>
+
+  <div class="text-white">
+    <slot />
+  </div>
+  

src/pages/service/[name]/configuration.svelte

@@ -0,0 +1,68 @@
+<script>
+  import { fetch } from "@store";
+  import { redirect, params } from "@roxi/routify/runtime";
+  import { fade } from "svelte/transition";
+  import { toast } from "@zerodevx/svelte-toast";
+
+  import Loading from "../../../components/Loading.svelte";
+  import Plausible from "../../../components/Services/Plausible.svelte";
+
+  $: name = $params.name;
+  let service = {};
+  async function loadServiceConfig() {
+    if (name) {
+      try {
+        service = await $fetch(`/api/v1/services/${name}`);
+      } catch (error) {
+        toast.push(`Cannot find service ${name}?!`);
+        $redirect(`/dashboard/services`);
+      }
+    }
+  }
+  async function activate() {
+    try {
+      await $fetch(`/api/v1/services/deploy/${name}/activate`, {
+        method: "PATCH",
+        body: {},
+      });
+      toast.push(`All users are activated for Plausible.`);
+    } catch (error) {
+      console.log(error);
+      toast.push(`Ooops, there was an error activating users for Plausible?!`);
+    }
+  }
+</script>
+
+{#await loadServiceConfig()}
+  <Loading />
+{:then}
+  <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
+        href="{service.config.baseURL}"
+        target="_blank"
+        class="inline-flex hover:underline cursor-pointer px-2"
+      >
+        <div>{name === "plausible" ? "Plausible Analytics" : name}</div>
+        <div class="px-4">
+          {#if name === "plausible"}
+            <img
+              alt="plausible logo"
+              class="w-6 mx-auto"
+              src="https://cdn.coollabs.io/assets/coolify/services/plausible/logo_sm.png"
+            />
+          {/if}
+        </div>
+      </a>
+    </div>
+  </div>
+  <div class="space-y-2 max-w-4xl mx-auto px-6" in:fade="{{ duration: 100 }}">
+    <div class="block text-center py-4">
+      {#if name === "plausible"}
+        <Plausible {service}/>
+      {/if}
+    </div>
+  </div>
+{/await}

src/pages/service/[name]/index.svelte

@@ -0,0 +1,5 @@
+<script>
+    import { redirect } from "@roxi/routify";
+    $redirect("/dashboard/services");
+  </script>
+  

src/pages/service/new/[type]/_layout.svelte

@@ -0,0 +1,33 @@
+<script>
+  import { params, goto, isActive, redirect, url } from "@roxi/routify";
+  import { fetch, newService, initialNewService } from "@store";
+  import { toast } from "@zerodevx/svelte-toast";
+  import Tooltip from "../../../../components/Tooltip/Tooltip.svelte";
+  import { onDestroy } from "svelte";
+  import Loading from "../../../../components/Loading.svelte";
+  $: type = $params.type;
+  async function checkService() {
+    try {
+      await $fetch(`/api/v1/services/${type}`);
+      $redirect(`/dashboard/services`);
+      toast.push(
+        `${
+          type === "plausible" ? "Plausible Analytics" : type
+        } already deployed.`,
+      );
+    } catch (error) {
+      //
+    }
+  }
+  onDestroy(() => {
+    $newService = JSON.parse(JSON.stringify(initialNewService));
+  });
+</script>
+
+{#await checkService()}
+  <Loading />
+{:then}
+  <div class="text-white">
+    <slot />
+  </div>
+{/await}

src/pages/service/new/[type]/index.svelte

@@ -0,0 +1,136 @@
+<script>
+  import { redirect, params, isActive } from "@roxi/routify/runtime";
+  import { newService, fetch } from "@store";
+  import { fade } from "svelte/transition";
+  import Loading from "../../../../components/Loading.svelte";
+  import TooltipInfo from "../../../../components/Tooltip/TooltipInfo.svelte";
+  import { toast } from "@zerodevx/svelte-toast";
+
+  $: type = $params.type;
+  $: deployable =
+    $newService.baseURL === "" ||
+    $newService.baseURL === null ||
+    $newService.email === "" ||
+    $newService.email === null ||
+    $newService.userName === "" ||
+    $newService.userName === null ||
+    $newService.userPassword === "" ||
+    $newService.userPassword === null ||
+    $newService.userPassword.length <= 6 ||
+    $newService.userPassword !== $newService.userPasswordAgain;
+  let loading = false;
+  async function deploy() {
+    try {
+      loading = true;
+      const payload = $newService;
+      delete payload.userPasswordAgain;
+      await $fetch(`/api/v1/services/deploy/${type}`, {
+        body: payload,
+      });
+      toast.push(
+        "Service deployment queued.<br><br><br>It could take 2-5 minutes to be ready, be patient and grab a coffee/tea!",
+        { duration: 4000 },
+      );
+      $redirect(`/dashboard/services`);
+    } catch (error) {
+      console.log(error);
+      toast.push("Oops something went wrong. See console.log.");
+    } finally {
+      loading = false;
+    }
+  }
+</script>
+
+<div class="min-h-full text-white">
+  <div class="py-5 text-left px-6 text-3xl tracking-tight font-bold">
+    Deploy new
+    {#if type === "plausible"}
+      <span class="text-blue-500 px-2 capitalize">Plausible Analytics</span>
+    {/if}
+  </div>
+</div>
+{#if loading}
+  <Loading />
+{:else}
+  <div
+    class="space-y-2 max-w-4xl mx-auto px-6 flex-col text-center"
+    in:fade="{{ duration: 100 }}"
+  >
+    <div class="grid grid-flow-row">
+      <label for="Domain"
+        >Domain <TooltipInfo
+          position="right"
+          label="{`You will have your Plausible instance at here.`}"
+        /></label
+      >
+      <input
+        id="Domain"
+        class:border-red-500="{$newService.baseURL == null ||
+          $newService.baseURL == ''}"
+        bind:value="{$newService.baseURL}"
+        placeholder="analytics.coollabs.io"
+      />
+    </div>
+    <div class="grid grid-flow-row">
+      <label for="Email">Email</label>
+      <input
+        id="Email"
+        class:border-red-500="{$newService.email == null ||
+          $newService.email == ''}"
+        bind:value="{$newService.email}"
+        placeholder="hi@coollabs.io"
+      />
+    </div>
+    <div class="grid grid-flow-row">
+      <label for="Username">Username </label>
+      <input
+        id="Username"
+        class:border-red-500="{$newService.userName == null ||
+          $newService.userName == ''}"
+        bind:value="{$newService.userName}"
+        placeholder="admin"
+      />
+    </div>
+    <div class="grid grid-flow-row">
+      <label for="Password"
+        >Password <TooltipInfo
+          position="right"
+          label="{`Must be at least 7 characters.`}"
+        /></label
+      >
+      <input
+        id="Password"
+        type="password"
+        class:border-red-500="{$newService.userPassword == null ||
+          $newService.userPassword == '' ||
+          $newService.userPassword.length <= 6}"
+        bind:value="{$newService.userPassword}"
+      />
+    </div>
+    <div class="grid grid-flow-row pb-5">
+      <label for="PasswordAgain">Password again </label>
+      <input
+        id="PasswordAgain"
+        type="password"
+        class:placeholder-red-500="{$newService.userPassword !==
+          $newService.userPasswordAgain}"
+        class:border-red-500="{$newService.userPassword !==
+          $newService.userPasswordAgain}"
+        bind:value="{$newService.userPasswordAgain}"
+      />
+    </div>
+    <button
+      disabled="{deployable}"
+      class:cursor-not-allowed="{deployable}"
+      class:bg-blue-500="{!deployable}"
+      class:hover:bg-blue-400="{!deployable}"
+      class:hover:bg-transparent="{deployable}"
+      class:text-warmGray-700="{deployable}"
+      class:text-white="{!deployable}"
+      class="button p-2"
+      on:click="{deploy}"
+    >
+      Deploy
+    </button>
+  </div>
+{/if}

src/pages/service/new/index.svelte

@@ -0,0 +1,32 @@
+<script>
+  import { isActive, redirect, goto } from "@roxi/routify/runtime";
+  import { fade } from "svelte/transition";
+</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"
+  >
+    Select a service
+  </div>
+</div>
+<div
+  class="text-center space-y-2 max-w-4xl mx-auto px-6"
+  in:fade="{{ duration: 100 }}"
+>
+  {#if $isActive("/service/new")}
+    <div class="flex justify-center space-x-4 font-bold pb-6">
+      <div
+        class="text-center flex-col items-center cursor-pointer ease-in-out transform hover:scale-105 duration-100 border-2 border-dashed border-transparent hover:border-blue-500 p-2 rounded bg-warmGray-800"
+        on:click="{$goto('/service/new/plausible')}"
+      >
+        <img
+          alt="plausible logo"
+          class="w-12 mx-auto"
+          src="https://cdn.coollabs.io/assets/coolify/services/plausible/logo_sm.png"
+        />
+        <div class="text-white">Plausible Analytics</div>
+      </div>
+    </div>
+  {/if}
+</div>

src/pages/settings/index.svelte

@@ -6,11 +6,13 @@
 
   let settings = {
     allowRegistration: false,
+    sendErrors: true
   };
 
   async function loadSettings() {
     const response = await $fetch(`/api/v1/settings`);
     settings.allowRegistration = response.settings.allowRegistration;
+    settings.sendErrors = response.settings.sendErrors;
   }
   async function changeSettings(value) {
     settings[value] = !settings[value];
@@ -23,7 +25,7 @@
   }
 </script>
 
-  <div class="min-h-full text-white"  in:fade="{{ duration: 100 }}">
+  <div class="min-h-full text-white" in:fade="{{ duration: 100 }}">
     <div
       class="py-5 text-left px-6 text-3xl tracking-tight font-bold flex items-center"
     >
@@ -35,7 +37,8 @@
 {:then}
 <div in:fade="{{ duration: 100 }}">
   <div class="max-w-4xl mx-auto px-6 pb-4">
-    <div class="">
+    <div>
+      <div class="text-2xl font-bold py-4 border-gradient w-32 text-white">General</div>
       <div class="divide-y divide-gray-200">
         <div class="px-4 sm:px-6">
           <ul class="mt-2 divide-y divide-gray-200">
@@ -101,6 +104,67 @@
                 </span>
               </button>
             </li>
+            <li class="py-4 flex items-center justify-between">
+              <div class="flex flex-col">
+                <p class="text-base font-bold text-warmGray-100">
+                  Send errors automatically?
+                </p>
+                <p class="text-sm font-medium text-warmGray-400">
+                  Allow to send errors automatically to developer(s) at coolLabs (<a href="https://twitter.com/andrasbacsai" target="_blank" class="underline text-white font-bold hover:text-blue-400">Andras Bacsai</a>). This will help to fix bugs quicker. 🙏
+                </p>
+              </div>
+              <button
+                type="button"
+                on:click="{() => changeSettings('sendErrors')}"
+                aria-pressed="true"
+                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"
+                class:bg-green-600="{settings.sendErrors}"
+                class:bg-warmGray-700="{!settings.sendErrors}"
+              >
+                <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 transition ease-in-out duration-200"
+                  class:translate-x-5="{settings.sendErrors}"
+                  class:translate-x-0="{!settings.sendErrors}"
+                >
+                  <span
+                    class=" ease-in duration-200 absolute inset-0 h-full w-full flex items-center justify-center transition-opacity"
+                    class:opacity-0="{settings.sendErrors}"
+                    class:opacity-100="{!settings.sendErrors}"
+                    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="{settings.sendErrors}"
+                    class:opacity-0="{!settings.sendErrors}"
+                  >
+                    <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>
+            </li>
           </ul>
         </div>
       </div>

src/store.js

@@ -219,3 +219,18 @@ export const database = writable({
 })
 
 export const dbInprogress = writable(false)
+
+export const newService = writable({
+  email: null,
+  userName: 'admin',
+  userPassword: null,
+  userPasswordAgain: null,
+  baseURL: null
+})
+export const initialNewService = {
+  email: null,
+  userName: 'admin',
+  userPassword: null,
+  userPasswordAgain: null,
+  baseURL: null
+}

src/utils/templates.js

@@ -13,7 +13,7 @@ const templates = {
   nuxt: {
     pack: 'nodejs',
     ...defaultBuildAndDeploy,
-    port: 8080,
+    port: 3000,
     name: 'Nuxt'
   },
   'react-scripts': {
@@ -28,7 +28,7 @@ const templates = {
     directory: 'dist',
     name: 'Parcel'
   },
-  'vue-cli-service': {
+  '@vue/cli-service': {
     pack: 'static',
     ...defaultBuildAndDeploy,
     directory: 'dist',

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

vite.config.js

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