v1.0.7 (#32)

New features: - Automatic error reporting (enabled by default) - Increase build times by leveraging docker build caches - Fixes: - Fix error handling - Fix vue autodetect - Custom dockerfile is not the default Others: - Cleanup `logs-servers` collection, because old errors are not standardized - New Traefik proxy version - Standardized directory configurations
coollabsio · Apr 19, 2021 · 142b83c · 142b83c
1 parent bad8428
commit 142b83c
Show file tree

Hide file tree

Showing 51 changed files with 1,295 additions and 832 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,4 @@ dist-ssr
 yarn-error.log
 api/development/console.log
 .pnpm-debug.log
-yarn.lock
 .pnpm-store
diff --git a/api/app.js b/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' })

diff --git a/api/buildPacks/custom/index.js b/api/buildPacks/custom/index.js
@@ -2,18 +2,14 @@ const fs = require('fs').promises
 const { streamEvents, docker } = require('../../libs/docker')
 
 module.exports = async function (configuration) {
-  try {
-    const path = `${configuration.general.workdir}/${configuration.build.directory ? configuration.build.directory : ''}`
-    if (fs.stat(`${path}/Dockerfile`)) {
-      const stream = await docker.engine.buildImage(
-        { src: ['.'], context: path },
-        { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
-      )
-      await streamEvents(stream, configuration)
-    } else {
-      throw { error: 'No custom dockerfile found.', type: 'app' }
-    }
-  } catch (error) {
-    throw { error, type: 'server' }
+  const path = `${configuration.general.workdir}/${configuration.build.directory ? configuration.build.directory : ''}`
+  if (fs.stat(`${path}/Dockerfile`)) {
+    const stream = await docker.engine.buildImage(
+      { src: ['.'], context: path },
+      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+    )
+    await streamEvents(stream, configuration)
+  } else {
+    throw new Error('No custom dockerfile found.')
   }
 }
diff --git a/api/buildPacks/helpers.js b/api/buildPacks/helpers.js
@@ -4,22 +4,19 @@ 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')
 }
 async function buildImage (configuration) {
-  try {
-    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, buildImageNodeDocker(configuration))
-    const stream = await docker.engine.buildImage(
-      { src: ['.'], context: configuration.general.workdir },
-      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
-    )
-    await streamEvents(stream, configuration)
-  } catch (error) {
-    throw { error, type: 'server' }
-  }
+  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, buildImageNodeDocker(configuration))
+  const stream = await docker.engine.buildImage(
+    { src: ['.'], context: configuration.general.workdir },
+    { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+  )
+  await streamEvents(stream, configuration)
 }
 
 module.exports = {

diff --git a/api/buildPacks/nodejs/index.js b/api/buildPacks/nodejs/index.js
@@ -7,24 +7,22 @@ const publishNodejsDocker = (configuration) => {
     '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 --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} .`
+      : `
+      COPY ${configuration.build.directory}/package*.json .
+      RUN ${configuration.build.command.installation}
+      COPY ./${configuration.build.directory} .`,
     `EXPOSE ${configuration.publish.port}`,
     'CMD [ "yarn", "start" ]'
   ].join('\n')
 }
 
 module.exports = async function (configuration) {
-  try {
-    if (configuration.build.command.build) await buildImage(configuration)
-    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishNodejsDocker(configuration))
-    const stream = await docker.engine.buildImage(
-      { src: ['.'], context: configuration.general.workdir },
-      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
-    )
-    await streamEvents(stream, configuration)
-  } catch (error) {
-    throw { error, type: 'server' }
-  }
+  if (configuration.build.command.build) await buildImage(configuration)
+  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishNodejsDocker(configuration))
+  const stream = await docker.engine.buildImage(
+    { src: ['.'], context: configuration.general.workdir },
+    { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+  )
+  await streamEvents(stream, configuration)
 }
diff --git a/api/buildPacks/php/index.js b/api/buildPacks/php/index.js
@@ -6,21 +6,17 @@ const publishPHPDocker = (configuration) => {
     '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')
 }
 
 module.exports = async function (configuration) {
-  try {
-    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishPHPDocker(configuration))
-    const stream = await docker.engine.buildImage(
-      { src: ['.'], context: configuration.general.workdir },
-      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
-    )
-    await streamEvents(stream, configuration)
-  } catch (error) {
-    throw { error, type: 'server' }
-  }
+  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishPHPDocker(configuration))
+  const stream = await docker.engine.buildImage(
+    { src: ['.'], context: configuration.general.workdir },
+    { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+  )
+  await streamEvents(stream, configuration)
 }
diff --git a/api/buildPacks/rust/index.js b/api/buildPacks/rust/index.js
@@ -37,28 +37,24 @@ const cacheRustDocker = (configuration, custom) => {
 }
 
 module.exports = async function (configuration) {
-  try {
-    const cargoToml = await execShellAsync(`cat ${configuration.general.workdir}/Cargo.toml`)
-    const parsedToml = TOML.parse(cargoToml)
-    const custom = {
-      name: parsedToml.package.name
-    }
-    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, cacheRustDocker(configuration, custom))
+  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)
+  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))
+  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishRustDocker(configuration, custom))
 
-    stream = await docker.engine.buildImage(
-      { src: ['.'], context: configuration.general.workdir },
-      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
-    )
-    await streamEvents(stream, configuration)
-  } catch (error) {
-    throw { error, type: 'server' }
-  }
+  stream = await docker.engine.buildImage(
+    { src: ['.'], context: configuration.general.workdir },
+    { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+  )
+  await streamEvents(stream, configuration)
 }
diff --git a/api/buildPacks/static/index.js b/api/buildPacks/static/index.js
@@ -9,24 +9,20 @@ const publishStaticDocker = (configuration) => {
     'COPY nginx.conf /etc/nginx/nginx.conf',
     'WORKDIR /usr/share/nginx/html',
     configuration.build.command.build
-      ? `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} ./`
-      : `COPY ${configuration.build.directory} ./`,
+      ? `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} .`
+      : `COPY ./${configuration.build.directory} .`,
     'EXPOSE 80',
     'CMD ["nginx", "-g", "daemon off;"]'
   ].join('\n')
 }
 
 module.exports = async function (configuration) {
-  try {
-    if (configuration.build.command.build) await buildImage(configuration)
-    await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishStaticDocker(configuration))
+  if (configuration.build.command.build) await buildImage(configuration)
+  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, publishStaticDocker(configuration))
 
-    const stream = await docker.engine.buildImage(
-      { src: ['.'], context: configuration.general.workdir },
-      { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
-    )
-    await streamEvents(stream, configuration)
-  } catch (error) {
-    throw { error, type: 'server' }
-  }
+  const stream = await docker.engine.buildImage(
+    { src: ['.'], context: configuration.general.workdir },
+    { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+  )
+  await streamEvents(stream, configuration)
 }
diff --git a/api/libs/applications/build/container.js b/api/libs/applications/build/container.js
@@ -9,22 +9,12 @@ module.exports = async function (configuration) {
 
   const execute = packs[configuration.build.pack]
   if (execute) {
-    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' }
-      throw { error, type: 'app' }
-    }
+    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(
@@ -33,7 +23,6 @@ module.exports = async function (configuration) {
     } catch (error) {
       // Hmm.
     }
-
-    throw { error: 'No buildpack found.', type: 'app' }
+    throw new Error('No buildpack found.')
   }
 }
diff --git a/api/libs/applications/cleanup/index.js b/api/libs/applications/cleanup/index.js
@@ -3,39 +3,25 @@ const { execShellAsync } = require('../../common')
 const Deployment = require('../../../models/Deployment')
 
 async function purgeImagesContainers () {
-  try {
-    await execShellAsync('docker container prune -f')
-    await execShellAsync('docker image prune -f --filter=label!=coolify-reserve=true')
-  } catch (error) {
-    throw { error, type: 'server' }
-  }
+  await execShellAsync('docker container prune -f')
+  await execShellAsync('docker image prune -f --filter=label!=coolify-reserve=true')
 }
 
-async function cleanupStuckedDeploymentsInDB (configuration) {
-  const { id } = configuration.repository
-  const deployId = configuration.general.deployId
-  try {
-    // Cleanup stucked deployments.
-    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 cleanupStuckedDeploymentsInDB () {
+  // Cleanup stucked deployments.
+  await Deployment.updateMany(
+    { progress: { $in: ['queued', 'inprogress'] } },
+    { progress: 'failed' }
+  )
 }
 
 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 => {
-      const running = JSON.parse(s.Spec.Labels.configuration)
-      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']}`)
-      }
-    })
-  } catch (error) {
-    throw { error, type: 'server' }
-  }
+  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)
+    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']}`)
+    }
+  })
 }
 
 module.exports = { cleanupStuckedDeploymentsInDB, deleteSameDeployments, purgeImagesContainers }