Merge branch 'develop', prepare 4.1.2

Author: yamalight

Dockerfile

@@ -1,7 +1,7 @@
-FROM alpine
+FROM docker/compose:1.24.0
 
-# install required libs, docker-compose and yarn
-RUN apk update && apk add --no-cache libstdc++ libgcc py-pip yarn && pip install docker-compose
+# install required libs and yarn
+RUN apk update && apk add --no-cache libstdc++ libgcc yarn
 
 # copy binary
 COPY exoframe-server /

package.json

@@ -1,6 +1,6 @@
 {
   "name": "exoframe-server",
-  "version": "4.1.1",
+  "version": "4.1.2-dev",
   "description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
   "main": "bin/server-core.js",
   "bin": "bin/exoframe-server.js",

src/docker/templates/compose.js

@@ -140,8 +140,10 @@ exports.executeTemplate = async ({
 
   // generate host
   const host = getHost({serverConfig, name: baseName, config});
-  const env = getEnv({username, config, name: baseName, host})
-    .reduce((merged, [key, value]) => ({...merged, [key]: value}), {});
+  const env = getEnv({username, config, name: baseName, host}).reduce(
+    (merged, [key, value]) => ({...merged, [key]: value}),
+    {}
+  );
 
   // re-build images if needed
   const {code: buildExitCode, log: buildLog} = await executeCompose({
@@ -154,6 +156,16 @@ exports.executeTemplate = async ({
   });
   util.logger.debug('Compose build executed, exit code:', buildExitCode);
 
+  if (buildExitCode !== '0') {
+    util.writeStatus(resultStream, {
+      message: `Deployment failed! Docker-compose build exited with code: ${buildExitCode}.`,
+      log: buildLog,
+      level: 'error',
+    });
+    resultStream.end('');
+    return;
+  }
+
   // run compose via plugins if available
   const plugins = util.getPlugins();
   for (const plugin of plugins) {
@@ -184,7 +196,7 @@ exports.executeTemplate = async ({
   }
 
   // execute compose 'up -d'
-  const exitCode = await executeCompose({
+  const {code: exitCode, log: execLog} = await executeCompose({
     cmd: ['--project-name', baseName, 'up', '-d'],
     env,
     resultStream,
@@ -194,6 +206,16 @@ exports.executeTemplate = async ({
   });
   util.logger.debug('Compose up executed, exit code:', exitCode);
 
+  if (exitCode !== '0') {
+    util.writeStatus(resultStream, {
+      message: `Deployment failed! Docker-compose up exited with code: ${exitCode}.`,
+      log: execLog,
+      level: 'error',
+    });
+    resultStream.end('');
+    return;
+  }
+
   // get container infos
   const allContainers = await docker.daemon.listContainers({all: true});
   const deployments = await Promise.all(

src/routes/deploy.js

@@ -69,6 +69,18 @@ const deploy = async ({username, folder, existing, resultStream}) => {
       }
     }
   }
+
+  // if template not found - throw an error
+  if (!template) {
+    logger.debug(`Build failed! Couldn't find template: ${config.template}`);
+    util.writeStatus(resultStream, {
+      message: `Build failed! Couldn't find template: ${config.template}!`,
+      level: 'error',
+    });
+    resultStream.end('');
+    return;
+  }
+
   logger.debug('Using template:', template);
   // execute fitting template
   await template.executeTemplate(templateProps);

src/routes/update.js

@@ -55,7 +55,7 @@ module.exports = fastify => {
             await traefikContainer.remove();
           }
           // re-init traefik
-          initDocker({restart: true});
+          initDocker();
           // reply
           reply.code(200).send({updated: true});
           return;

src/routes/version.js

@@ -27,7 +27,8 @@ module.exports = fastify => {
         const allImages = await docker.listImages();
         const traefik = allImages.find(img => img.RepoTags && img.RepoTags.find(t => t.includes('traefik')));
         if (traefik) {
-          traefikVersion = traefik.Labels['org.label-schema.version'];
+          traefikVersion =
+            traefik.Labels['org.label-schema.version'] || traefik.Labels['org.opencontainers.image.version'];
         }
         // get latest versions
         const lastServerTag = await getLatestVersion(exoServerUrl);

test/deploy.test.js

@@ -15,7 +15,7 @@ const authToken = require('./fixtures/authToken');
 const {startServer} = require('../src');
 const docker = require('../src/docker/docker');
 const {initNetwork} = require('../src/docker/network');
-const {getSecretsCollection, secretsInited} = require('../src/db/secrets')
+const {getSecretsCollection, secretsInited} = require('../src/db/secrets');
 
 // create tar streams
 const streamDockerImage = tar.pack(path.join(__dirname, 'fixtures', 'docker-image-project'));
@@ -29,6 +29,9 @@ const streamCompose = tar.pack(path.join(__dirname, 'fixtures', 'compose-project
 const streamComposeUpdate = tar.pack(path.join(__dirname, 'fixtures', 'compose-project'));
 const streamBrokenDocker = tar.pack(path.join(__dirname, 'fixtures', 'broken-docker-project'));
 const streamBrokenNode = tar.pack(path.join(__dirname, 'fixtures', 'broken-node-project'));
+const streamBrokenTemplate = tar.pack(path.join(__dirname, 'fixtures', 'broken-template-project'));
+const streamBrokenCompose = tar.pack(path.join(__dirname, 'fixtures', 'broken-compose-project'));
+const streamBrokenComposeStart = tar.pack(path.join(__dirname, 'fixtures', 'broken-compose-project-start'));
 const streamAdditionalLabels = tar.pack(path.join(__dirname, 'fixtures', 'additional-labels'));
 const streamTemplate = tar.pack(path.join(__dirname, 'fixtures', 'template-project'));
 
@@ -612,6 +615,78 @@ test('Should display error log for broken Node.js project', async done => {
   done();
 });
 
+test('Should display error log for project with broken template', async done => {
+  const options = Object.assign(optionsBase, {
+    payload: streamBrokenTemplate,
+  });
+
+  const response = await fastify.inject(options);
+  // parse result into lines
+  const result = response.payload
+    .split('\n')
+    .filter(l => l && l.length)
+    .map(line => JSON.parse(line));
+
+  // get last error
+  const error = result.pop();
+
+  // check response
+  expect(response.statusCode).toEqual(200);
+  expect(error.level).toEqual('error');
+  expect(error.message).toEqual(`Build failed! Couldn't find template: do-not-exist!`);
+
+  // clean all exited containers
+  const allContainers = await docker.listContainers({all: true});
+  const exitedWithError = allContainers.filter(c => c.Status.includes('Exited (1)'));
+  await Promise.all(exitedWithError.map(c => docker.getContainer(c.Id)).map(c => c.remove()));
+
+  done();
+});
+
+test('Should display error log for broken compose project build', async done => {
+  const options = Object.assign(optionsBase, {
+    payload: streamBrokenCompose,
+  });
+
+  const response = await fastify.inject(options);
+  // parse result into lines
+  const result = response.payload
+    .split('\n')
+    .filter(l => l && l.length)
+    .map(line => JSON.parse(line));
+
+  // get last error
+  const error = result.pop();
+
+  // check response
+  expect(response.statusCode).toEqual(200);
+  expect(error.message).toEqual(`Deployment failed! Docker-compose build exited with code: 1.`);
+
+  done();
+});
+
+test('Should display error log for broken compose project start', async done => {
+  const options = Object.assign(optionsBase, {
+    payload: streamBrokenComposeStart,
+  });
+
+  const response = await fastify.inject(options);
+  // parse result into lines
+  const result = response.payload
+    .split('\n')
+    .filter(l => l && l.length)
+    .map(line => JSON.parse(line));
+
+  // get last error
+  const error = result.pop();
+
+  // check response
+  expect(response.statusCode).toEqual(200);
+  expect(error.message).toEqual(`Deployment failed! Docker-compose up exited with code: 1.`);
+
+  done();
+});
+
 test('Should have additional labels', async done => {
   const options = Object.assign(optionsBase, {
     payload: streamAdditionalLabels,

test/fixtures/broken-compose-project-start/Dockerfile

@@ -0,0 +1,3 @@
+FROM busybox
+
+CMD ["exit", "1"]

test/fixtures/broken-compose-project-start/docker-compose.yml

@@ -0,0 +1,4 @@
+version: '2'
+services:
+  web:
+    build: .

test/fixtures/broken-compose-project-start/exoframe.json

@@ -0,0 +1,4 @@
+{
+  "name": "test-broken-compose-deploy",
+  "restart": "no"
+}