Merge branch 'develop', prepare 1.1.0

yamalight · yamalight · commit b851c8de84e6 · 2017-12-11T18:51:49.000+01:00
diff --git a/package.json b/package.json
@@ -38,6 +38,6 @@
   "devDependencies": {
     "coveralls": "^3.0.0",
     "pkg": "^4.1.4",
-    "tap": "^10.7.1"
+    "tap": "^11.0.0"
   }
 }
diff --git a/src/docker/start.js b/src/docker/start.js
@@ -38,13 +38,15 @@ module.exports = async ({image, username, resultStream}) => {
     RestartPolicy.Name = 'on-failure';
     RestartPolicy.MaximumRetryCount = restartCount;
   }
+  const additionalLabels = config.labels || {};
 
   // create config
   const containerConfig = {
     Image: image,
     name,
     Env,
     Labels: {
+      ...additionalLabels,
       'exoframe.deployment': name,
       'exoframe.user': username,
       'exoframe.project': project,
diff --git a/test/deploy.js b/test/deploy.js
@@ -17,6 +17,7 @@ module.exports = (server, token) =>
     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 streamAdditionalLabels = tar.pack(path.join(__dirname, 'fixtures', 'additional-labels'));
 
     // options base
     const optionsBase = {
@@ -484,6 +485,39 @@ module.exports = (server, token) =>
       });
     });
 
+    tap.test('Should have additional labels', t => {
+      const options = Object.assign(optionsBase, {
+        payload: streamAdditionalLabels,
+      });
+
+      server.inject(options, async response => {
+        // parse result into lines
+        const result = response.result
+          .split('\n')
+          .filter(l => l && l.length)
+          .map(line => JSON.parse(line));
+
+        // find deployments
+        const deployments = result.find(it => it.deployments && it.deployments.length).deployments;
+
+        // check response
+        t.equal(response.statusCode, 200, 'Correct status code');
+
+        // check docker services
+        const allContainers = await docker.listContainers();
+        const containerInfo = allContainers.find(c => c.Names.includes(deployments[0].Name));
+        t.ok(containerInfo, 'Docker has container');
+        t.equal(containerInfo.Labels['custom.label'], "additional-label", 'Should have label `custom.label=additional-label`');
+
+        // cleanup
+        const instance = docker.getContainer(containerInfo.Id);
+        await instance.stop();
+        await instance.remove();
+        
+        t.end();
+      });
+    });
+
     tap.test('End', t => {
       resolve();
       t.end();
diff --git a/test/fixtures/additional-labels/exoframe.json b/test/fixtures/additional-labels/exoframe.json
@@ -0,0 +1,9 @@
+{
+  "name": "test-additional-labels",
+  "domain": false,
+  "project": "simple-html",
+  "restart": "no",
+  "labels": {
+    "custom.label" : "additional-label"
+  }
+}
diff --git a/test/fixtures/additional-labels/index.html b/test/fixtures/additional-labels/index.html
@@ -0,0 +1,8 @@
+<html lang="en">
+<head>
+    <title>hello world.</title>
+</head>
+<body>
+    <h1>Testing additional labels</h1>
+</body>
+</html>
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@`
`38`	`38`	`"devDependencies": {`
`39`	`39`	`"coveralls": "^3.0.0",`
`40`	`40`	`"pkg": "^4.1.4",`
`41`		`- "tap": "^10.7.1"`
	`41`	`+ "tap": "^11.0.0"`
`42`	`42`	`}`
`43`	`43`	`}`