v1.0.3 - Simple PHP support! 🎉 (#15)

- Basic PHP support. - Cosmetic things here and there. - Fix publish directory option.
2021-04-02 15:05:23 +02:00
parent 767c65ab10
commit 5573187d43
15 changed files with 6593 additions and 140 deletions
--- a/api/libs/applications/configuration.js
+++ b/api/libs/applications/configuration.js
@@ -41,7 +41,15 @@ function setDefaultConfiguration (configuration) {
    configuration.general.workdir = `/tmp/${deployId}`

    if (!configuration.publish.path) configuration.publish.path = '/'
-    if (!configuration.publish.port) configuration.publish.port = configuration.build.pack === 'static' ? 80 : 3000
+    if (!configuration.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.pack === 'static') {
      if (!configuration.build.command.installation) configuration.build.command.installation = 'yarn install'
--- a/api/libs/applications/deploy/deploy.js
+++ b/api/libs/applications/deploy/deploy.js
@@ -64,16 +64,11 @@ module.exports = async function (configuration, configChanged, imageChanged) {
    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 (configChanged) {
-      // console.log('configuration changed')
-      await execShellAsync(
-        `cat ${configuration.general.workdir}/stack.yml | docker stack deploy --prune -c - ${containerName}`
-      )
-    } else if (imageChanged) {
+    if (imageChanged) {
      // console.log('image changed')
      await execShellAsync(`docker service update --image ${configuration.build.container.name}:${configuration.build.container.tag} ${configuration.build.container.name}_${configuration.build.container.name}`)
    } else {
-      // console.log('new deployment or force deployment')
+      // console.log('new deployment or force deployment or config changed')
      await deleteSameDeployments(configuration)
      await execShellAsync(
        `cat ${configuration.general.workdir}/stack.yml | docker stack deploy --prune -c - ${containerName}`
--- a/api/packs/index.js
+++ b/api/packs/index.js
@@ -1,4 +1,5 @@
 const static = require('./static')
 const nodejs = require('./nodejs')
+const php = require('./php')

-module.exports = { static, nodejs }
+module.exports = { static, nodejs, php }
--- a/api/packs/nodejs/index.js
+++ b/api/packs/nodejs/index.js
@@ -10,9 +10,13 @@ module.exports = async function (configuration) {
      WORKDIR /usr/src/app
      `
  if (configuration.build.command.build) {
-    dockerFile += `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.build.directory} /usr/src/app`
+    dockerFile += `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} /usr/src/app`
  } else {
-    dockerFile += 'COPY . ./'
+    if (configuration.publish.directory) {
+      dockerFile += `COPY .${configuration.publish.directory} ./`
+    } else {
+      dockerFile += 'COPY ./'
+    }
  }
  if (configuration.build.command.installation) {
    dockerFile += `
--- a/api/packs/php/index.js
+++ b/api/packs/php/index.js
@@ -0,0 +1,24 @@
+const fs = require('fs').promises
+const { streamEvents, docker } = require('../../libs/docker')
+
+module.exports = async function (configuration) {
+  let dockerFile = `# production stage
+    FROM php:apache
+    `
+  if (configuration.publish.directory) {
+    dockerFile += `COPY ${configuration.publish.directory} /var/www/html`
+  } else {
+    dockerFile += 'COPY . /var/www/html'
+  }
+
+  dockerFile += `
+      EXPOSE 80
+      CMD ["apache2-foreground"]`
+  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, dockerFile)
+
+  const stream = await docker.engine.buildImage(
+    { src: ['.'], context: configuration.general.workdir },
+    { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+  )
+  await streamEvents(stream, configuration)
+}
--- a/api/packs/static/index.js
+++ b/api/packs/static/index.js
@@ -10,9 +10,13 @@ module.exports = async function (configuration) {
    COPY nginx.conf /etc/nginx/nginx.conf
    `
  if (configuration.build.command.build) {
-    dockerFile += `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.build.directory} /usr/share/nginx/html`
+    dockerFile += `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} /usr/share/nginx/html`
  } else {
-    dockerFile += 'COPY . /usr/share/nginx/html'
+    if (configuration.publish.directory) {
+      dockerFile += `COPY .${configuration.publish.directory} /usr/share/nginx/html`
+    } else {
+      dockerFile += 'COPY . /usr/share/nginx/html'
+    }
  }

  dockerFile += `
--- a/api/routes/v1/dashboard/index.js
+++ b/api/routes/v1/dashboard/index.js
@@ -4,51 +4,57 @@ const ServerLog = require('../../../models/Logs/Server')

 module.exports = async function (fastify) {
  fastify.get('/', async (request, reply) => {
-    const latestDeployments = await Deployment.aggregate([
-      {
-        $sort: { createdAt: -1 }
-      },
-      {
-        $group:
+    try {
+      const latestDeployments = await Deployment.aggregate([
        {
-          _id: {
-            repoId: '$repoId',
-            branch: '$branch'
-          },
-          createdAt: { $last: '$createdAt' },
-          progress: { $first: '$progress' }
+          $sort: { createdAt: -1 }
+        },
+        {
+          $group:
+          {
+            _id: {
+              repoId: '$repoId',
+              branch: '$branch'
+            },
+            createdAt: { $last: '$createdAt' },
+            progress: { $first: '$progress' }
+          }
        }
-      }
-    ])
+      ])

-    const serverLogs = await ServerLog.find()
-    const services = await docker.engine.listServices()
+      const serverLogs = await ServerLog.find()
+      const services = await docker.engine.listServices()

-    let applications = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application' && r.Spec.Labels.configuration)
-    let databases = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'database' && r.Spec.Labels.configuration)
-    applications = applications.map(r => {
-      if (JSON.parse(r.Spec.Labels.configuration)) {
-        const configuration = JSON.parse(r.Spec.Labels.configuration)
-        const status = latestDeployments.find(l => configuration.repository.id === l._id.repoId && configuration.repository.branch === l._id.branch)
-        if (status && status.progress) r.progress = status.progress
+      let applications = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'application' && r.Spec.Labels.configuration)
+      let databases = services.filter(r => r.Spec.Labels.managedBy === 'coolify' && r.Spec.Labels.type === 'database' && r.Spec.Labels.configuration)
+      applications = applications.map(r => {
+        if (JSON.parse(r.Spec.Labels.configuration)) {
+          const configuration = JSON.parse(r.Spec.Labels.configuration)
+          const status = latestDeployments.find(l => configuration.repository.id === l._id.repoId && configuration.repository.branch === l._id.branch)
+          if (status && status.progress) r.progress = status.progress
+          r.Spec.Labels.configuration = configuration
+          return r
+        }
+        return {}
+      })
+      databases = databases.map(r => {
+        const configuration = r.Spec.Labels.configuration ? JSON.parse(r.Spec.Labels.configuration) : null
        r.Spec.Labels.configuration = configuration
        return r
+      })
+      applications = [...new Map(applications.map(item => [item.Spec.Labels.configuration.publish.domain, item])).values()]
+      return {
+        serverLogs,
+        applications: {
+          deployed: applications
+        },
+        databases: {
+          deployed: databases
+        }
      }
-      return {}
-    })
-    databases = databases.map(r => {
-      const configuration = r.Spec.Labels.configuration ? JSON.parse(r.Spec.Labels.configuration) : null
-      r.Spec.Labels.configuration = configuration
-      return r
-    })
-    applications = [...new Map(applications.map(item => [item.Spec.Labels.configuration.publish.domain, item])).values()]
-    return {
-      serverLogs,
-      applications: {
-        deployed: applications
-      },
-      databases: {
-        deployed: databases
+    } catch (error) {
+      if (error.code === 'ENOENT' && error.errno === -2) {
+        throw new Error(`Docker service unavailable at ${error.address}.`)
      }
    }
  })
--- a/api/server.js
+++ b/api/server.js
@@ -31,7 +31,7 @@ if (process.env.NODE_ENV === 'production') {

 fastify.register(require('./app'), { prefix: '/api/v1' })
 fastify.setErrorHandler(async (error, request, reply) => {
-  console.log(error)
+  console.log({ error })
  if (error.statusCode) {
    reply.status(error.statusCode).send({ message: error.message } || { message: 'Something is NOT okay. Are you okay?' })
  } else {