v1.0.4 (#21)

- Search in repositories (thanks to @SaraVieira).
- Custom Dockerfile - you be able to deploy ANY applications! 🎉 
- Basic repository scanner for Nextjs and React. It will setup the default commands and buildpack if it detects some defined parameters.
- UI/UX fixes:
  - Github loading screen instead of standard loading screen. 
  - Info tooltips which provide some explanations of the input fields.

api/libs/applications/configuration.js

@@ -50,15 +50,11 @@ function setDefaultConfiguration (configuration) {
         configuration.publish.port = 3000
       }
     }
-
-    if (configuration.build.pack === 'static') {
-      if (!configuration.build.command.installation) configuration.build.command.installation = 'yarn install'
-      if (!configuration.build.directory) configuration.build.directory = '/'
+    if (!configuration.build.directory) {
+      configuration.build.directory = '/'
     }
-
-    if (configuration.build.pack === 'nodejs') {
+    if (configuration.build.pack === 'static' || configuration.build.pack === 'nodejs') {
       if (!configuration.build.command.installation) configuration.build.command.installation = 'yarn install'
-      if (!configuration.build.directory) configuration.build.directory = '/'
     }
 
     configuration.build.container.baseSHA = crypto.createHash('sha256').update(JSON.stringify(baseServiceConfiguration)).digest('hex')

api/libs/applications/deploy/deploy.js

@@ -60,7 +60,6 @@ module.exports = async function (configuration, configChanged, imageChanged) {
         }
       }
     }
-    console.log(stack)
     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

api/packs/custom/index.js

@@ -0,0 +1,15 @@
+const fs = require('fs').promises
+const { streamEvents, docker } = require('../../libs/docker')
+
+module.exports = async function (configuration) {
+  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' }
+  }
+}

api/packs/helpers.js

@@ -1,21 +1,16 @@
 const fs = require('fs').promises
 const { streamEvents, docker } = require('../libs/docker')
-
+const buildImageNodeDocker = (configuration) => {
+  return [
+    'FROM node:lts',
+    'WORKDIR /usr/src/app',
+    `COPY ${configuration.build.directory} ./`,
+    configuration.build.command.installation && `RUN ${configuration.build.command.installation}`,
+    `RUN ${configuration.build.command.build}`
+  ].join('\n')
+}
 async function buildImage (configuration) {
-  let dockerFile = `
-                # build
-                FROM node:lts
-                WORKDIR /usr/src/app
-                COPY package*.json .
-                `
-  if (configuration.build.command.installation) {
-    dockerFile += `RUN ${configuration.build.command.installation}
-                `
-  }
-  dockerFile += `COPY . .
-            RUN ${configuration.build.command.build}`
-
-  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, dockerFile)
+  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}` }

api/packs/index.js

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

api/packs/nodejs/index.js

@@ -2,32 +2,22 @@ const fs = require('fs').promises
 const { buildImage } = require('../helpers')
 const { streamEvents, docker } = require('../../libs/docker')
 
+const publishNodejsDocker = (configuration) => {
+  return [
+    'FROM node:lts',
+    'WORKDIR /usr/src/app',
+    configuration.build.command.build
+      ? `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} ./`
+      : `COPY ${configuration.build.directory} ./`,
+    configuration.build.command.installation && `RUN ${configuration.build.command.installation}`,
+    `EXPOSE ${configuration.publish.port}`,
+    'CMD [ "yarn", "start" ]'
+  ].join('\n')
+}
+
 module.exports = async function (configuration) {
   if (configuration.build.command.build) await buildImage(configuration)
-
-  let dockerFile = `# production stage
-      FROM node:lts
-      WORKDIR /usr/src/app
-      `
-  if (configuration.build.command.build) {
-    dockerFile += `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} /usr/src/app`
-  } else {
-    if (configuration.publish.directory) {
-      dockerFile += `COPY .${configuration.publish.directory} ./`
-    } else {
-      dockerFile += 'COPY ./'
-    }
-  }
-  if (configuration.build.command.installation) {
-    dockerFile += `
-      RUN ${configuration.build.command.installation}
-      `
-  }
-  dockerFile += `
-        EXPOSE ${configuration.publish.port}
-        CMD [ "yarn", "start" ]`
-
-  await fs.writeFile(`${configuration.general.workdir}/Dockerfile`, dockerFile)
+  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}` }

api/packs/php/index.js

@@ -1,21 +1,18 @@
 const fs = require('fs').promises
 const { streamEvents, docker } = require('../../libs/docker')
 
+const publishPHPDocker = (configuration) => {
+  return [
+    'FROM php:apache',
+    'WORKDIR /usr/src/app',
+    `COPY .${configuration.build.directory} /var/www/html`,
+    'EXPOSE 80',
+    ' CMD ["apache2-foreground"]'
+  ].join('\n')
+}
+
 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)
-
+  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}` }

api/packs/static/index.js

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