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
2021-04-19 09:46:05 +02:00
parent bad84289c4
commit 142b83cc13
51 changed files with 1300 additions and 837 deletions
--- 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.')
  }
 }
--- 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 }
--- a/api/libs/applications/configuration.js
+++ b/api/libs/applications/configuration.js
@@ -9,69 +9,64 @@ function getUniq () {
 }

 function setDefaultConfiguration (configuration) {
-  try {
-    const nickname = getUniq()
-    const deployId = cuid()
+  const nickname = getUniq()
+  const deployId = cuid()

-    const shaBase = JSON.stringify({ repository: configuration.repository })
-    const sha256 = crypto.createHash('sha256').update(shaBase).digest('hex')
+  const shaBase = JSON.stringify({ repository: configuration.repository })
+  const sha256 = crypto.createHash('sha256').update(shaBase).digest('hex')

-    const baseServiceConfiguration = {
-      replicas: 1,
-      restart_policy: {
-        condition: 'any',
-        max_attempts: 3
-      },
-      update_config: {
-        parallelism: 1,
-        delay: '10s',
-        order: 'start-first'
-      },
-      rollback_config: {
-        parallelism: 1,
-        delay: '10s',
-        order: 'start-first',
-        failure_action: 'rollback'
-      }
+  const baseServiceConfiguration = {
+    replicas: 1,
+    restart_policy: {
+      condition: 'any',
+      max_attempts: 3
+    },
+    update_config: {
+      parallelism: 1,
+      delay: '10s',
+      order: 'start-first'
+    },
+    rollback_config: {
+      parallelism: 1,
+      delay: '10s',
+      order: 'start-first',
+      failure_action: 'rollback'
    }
-
-    configuration.build.container.name = sha256.slice(0, 15)
-
-    configuration.general.nickname = nickname
-    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
-      } else if (configuration.build.pack === 'rust') {
-        configuration.publish.port = 3000
-      }
-    }
-
-    if (!configuration.build.directory) {
-      configuration.build.directory = '/'
-    }
-    if (!configuration.publish.directory) {
-      configuration.publish.directory = '/'
-    }
-
-    if (configuration.build.pack === 'static' || configuration.build.pack === 'nodejs') {
-      if (!configuration.build.command.installation) configuration.build.command.installation = 'yarn install'
-    }
-
-    configuration.build.container.baseSHA = crypto.createHash('sha256').update(JSON.stringify(baseServiceConfiguration)).digest('hex')
-    configuration.baseServiceConfiguration = baseServiceConfiguration
-
-    return configuration
-  } catch (error) {
-    throw { error, type: 'server' }
  }
+
+  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
+    } else if (configuration.build.pack === 'rust') {
+      configuration.publish.port = 3000
+    }
+  }
+
+  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) {
@@ -86,12 +81,8 @@ async function updateServiceLabels (configuration) {
  })
  if (found) {
    const { ID } = found
-    try {
-      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}`)
-    } catch (error) {
-      console.log(error)
-    }
+    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}`)
  }
 }

--- a/api/libs/applications/deploy/copyFiles.js
+++ b/api/libs/applications/deploy/copyFiles.js
@@ -59,6 +59,6 @@ module.exports = async function (configuration) {
      )
    }
  } catch (error) {
-    throw { error, type: 'server' }
+    throw new Error(error)
  }
 }
--- a/api/libs/applications/deploy/deploy.js
+++ b/api/libs/applications/deploy/deploy.js
@@ -6,77 +6,71 @@ const { saveAppLog } = require('../../logging')
 const { deleteSameDeployments } = require('../cleanup')

 module.exports = async function (configuration, imageChanged) {
-  try {
-    const generateEnvs = {}
-    for (const secret of configuration.publish.secrets) {
-      generateEnvs[secret.name] = secret.value
-    }
-    const containerName = configuration.build.container.name
+  const generateEnvs = {}
+  for (const secret of configuration.publish.secrets) {
+    generateEnvs[secret.name] = secret.value
+  }
+  const containerName = configuration.build.container.name

-    // Only save SHA256 of it in the configuration label
-    const baseServiceConfiguration = configuration.baseServiceConfiguration
-    delete configuration.baseServiceConfiguration
+  // Only save SHA256 of it in the configuration label
+  const baseServiceConfiguration = configuration.baseServiceConfiguration
+  delete configuration.baseServiceConfiguration

-    const stack = {
-      version: '3.8',
-      services: {
-        [containerName]: {
-          image: `${configuration.build.container.name}:${configuration.build.container.tag}`,
-          networks: [`${docker.network}`],
-          environment: generateEnvs,
-          deploy: {
-            ...baseServiceConfiguration,
-            labels: [
-              'managedBy=coolify',
-              'type=application',
-              'configuration=' + JSON.stringify(configuration),
-              'traefik.enable=true',
-              'traefik.http.services.' +
+  const stack = {
+    version: '3.8',
+    services: {
+      [containerName]: {
+        image: `${configuration.build.container.name}:${configuration.build.container.tag}`,
+        networks: [`${docker.network}`],
+        environment: generateEnvs,
+        deploy: {
+          ...baseServiceConfiguration,
+          labels: [
+            'managedBy=coolify',
+            'type=application',
+            'configuration=' + JSON.stringify(configuration),
+            'traefik.enable=true',
+            '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))
-    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)
 }
--- a/api/libs/applications/github/cloneRepository.js
+++ b/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, {
-      algorithm: 'RS256'
-    })
-    const accessToken = await axios({
-      method: 'POST',
-      url: `https://api.github.com/app/installations/${github.installation.id}/access_tokens`,
-      data: {},
-      headers: {
-        Authorization: 'Bearer ' + jwtToken,
-        Accept: 'application/vnd.github.machine-man-preview+json'
-      }
-    })
-    await execShellAsync(
+  const jwtToken = jwt.sign(payload, githubPrivateKey, {
+    algorithm: 'RS256'
+  })
+  const accessToken = await axios({
+    method: 'POST',
+    url: `https://api.github.com/app/installations/${github.installation.id}/access_tokens`,
+    data: {},
+    headers: {
+      Authorization: 'Bearer ' + jwtToken,
+      Accept: 'application/vnd.github.machine-man-preview+json'
+    }
+  })
+  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 = (
-      await execShellAsync(`cd ${configuration.general.workdir}/ && git rev-parse HEAD`)
-    )
-      .replace('\n', '')
-      .slice(0, 7)
-  } catch (error) {
-    cleanupTmp(workdir)
-    if (error.stack) console.log(error.stack)
-    throw { error, type: 'server' }
-  }
+  )
+  configuration.build.container.tag = (
+    await execShellAsync(`cd ${configuration.general.workdir}/ && git rev-parse HEAD`)
+  )
+    .replace('\n', '')
+    .slice(0, 7)
 }
--- a/api/libs/applications/index.js
+++ b/api/libs/applications/index.js
@@ -1,6 +1,5 @@
 const dayjs = require('dayjs')

-const { saveServerLog } = require('../logging')
 const { cleanupTmp } = require('../common')

 const { saveAppLog } = require('../logging')
@@ -8,37 +7,26 @@ const copyFiles = require('./deploy/copyFiles')
 const buildContainer = require('./build/container')
 const deploy = require('./deploy/deploy')
 const Deployment = require('../../models/Deployment')
-const { cleanupStuckedDeploymentsInDB, purgeImagesContainers } = require('./cleanup')
+const { purgeImagesContainers } = require('./cleanup')
 const { updateServiceLabels } = require('./configuration')

 async function queueAndBuild (configuration, imageChanged) {
  const { id, organization, name, branch } = configuration.repository
  const { domain } = configuration.publish
  const { deployId, nickname, workdir } = configuration.general
-  try {
-    await new Deployment({
-      repoId: id, branch, deployId, domain, organization, name, nickname
-    }).save()
-    await saveAppLog(`${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} Queued.`, configuration)
-    await copyFiles(configuration)
-    await buildContainer(configuration)
-    await deploy(configuration, imageChanged)
-    await Deployment.findOneAndUpdate(
-      { repoId: id, branch, deployId, organization, name, domain },
-      { repoId: id, branch, deployId, organization, name, domain, progress: 'done' })
-    await updateServiceLabels(configuration)
-    cleanupTmp(workdir)
-    await purgeImagesContainers()
-  } catch (error) {
-    await cleanupStuckedDeploymentsInDB(configuration)
-    cleanupTmp(workdir)
-    const { type } = error.error
-    if (type === 'app') {
-      await saveAppLog(error.error, configuration, true)
-    } else {
-      await saveServerLog({ event: error.error, configuration })
-    }
-  }
+  await new Deployment({
+    repoId: id, branch, deployId, domain, organization, name, nickname
+  }).save()
+  await saveAppLog(`${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} Queued.`, configuration)
+  await copyFiles(configuration)
+  await buildContainer(configuration)
+  await deploy(configuration, imageChanged)
+  await Deployment.findOneAndUpdate(
+    { repoId: id, branch, deployId, organization, name, domain },
+    { repoId: id, branch, deployId, organization, name, domain, progress: 'done' })
+  await updateServiceLabels(configuration)
+  cleanupTmp(workdir)
+  await purgeImagesContainers()
 }

 module.exports = { queueAndBuild }