Construct unique deployments backend strings,

Use host urls or deployment names.
This prevents unique deployments from being loadbalanced when deploying same project.
Addresses: exoframejs/exoframe#113

Author: yamalight

src/docker/start.js

@@ -1,11 +1,10 @@
 // our modules
 const docker = require('./docker');
 const {initNetwork} = require('../docker/init');
-const {getProjectConfig, baseNameFromImage, nameFromImage, projectFromConfig, writeStatus} = require('../util');
+const {getProjectConfig, nameFromImage, projectFromConfig, writeStatus} = require('../util');
 const {getConfig} = require('../config');
 
 module.exports = async ({image, username, resultStream}) => {
-  const baseName = baseNameFromImage(image);
   const name = nameFromImage(image);
 
   // get server config
@@ -41,6 +40,9 @@ module.exports = async ({image, username, resultStream}) => {
   }
   const additionalLabels = config.labels || {};
 
+  // construct backend name from host (if available) or name
+  const backend = host && host.length ? host : name;
+
   // create config
   const containerConfig = {
     Image: image,
@@ -50,7 +52,7 @@ module.exports = async ({image, username, resultStream}) => {
       'exoframe.deployment': name,
       'exoframe.user': username,
       'exoframe.project': project,
-      'traefik.backend': baseName,
+      'traefik.backend': backend,
     }),
     HostConfig: {
       RestartPolicy,

src/util/index.js

@@ -43,8 +43,8 @@ exports.nameFromImage = image => {
 };
 
 exports.projectFromConfig = ({username, config}) => {
-  const tag = exports.tagFromConfig({username, config});
-  const baseName = tag.split(':').shift();
+  const image = exports.tagFromConfig({username, config});
+  const baseName = exports.baseNameFromImage(image);
   return config.project || baseName;
 };
 

test/deploy.test.js

@@ -75,16 +75,13 @@ test('Should deploy simple docker project', async done => {
   // check docker services
   const allContainers = await docker.listContainers();
   const containerInfo = allContainers.find(c => c.Names.includes(completeDeployments[0].Name));
-  const deployId = completeDeployments[0].Name.split('-')
-    .slice(-1)
-    .shift();
   const name = completeDeployments[0].Name.slice(1);
 
   expect(containerInfo).toBeDefined();
   expect(containerInfo.Labels['exoframe.deployment']).toEqual(name);
   expect(containerInfo.Labels['exoframe.user']).toEqual('admin');
   expect(containerInfo.Labels['exoframe.project']).toEqual('test-project');
-  expect(containerInfo.Labels['traefik.backend']).toEqual(name.replace(`-${deployId}`, ''));
+  expect(containerInfo.Labels['traefik.backend']).toEqual(`${name}.test`);
   expect(containerInfo.NetworkSettings.Networks.exoframe).toBeDefined();
 
   const containerData = docker.getContainer(containerInfo.Id);
@@ -133,7 +130,7 @@ test('Should deploy simple node project', async done => {
   expect(container.Labels['exoframe.deployment']).toEqual(name);
   expect(container.Labels['exoframe.user']).toEqual('admin');
   expect(container.Labels['exoframe.project']).toEqual(name.replace(`-${deployId}`, ''));
-  expect(container.Labels['traefik.backend']).toEqual(name.replace(`-${deployId}`, ''));
+  expect(container.Labels['traefik.backend']).toEqual('localhost');
   expect(container.Labels['traefik.frontend.rule']).toEqual('Host:localhost');
   expect(container.NetworkSettings.Networks.exoframe).toBeDefined();
 
@@ -177,7 +174,7 @@ test('Should deploy simple HTML project', async done => {
   expect(container.Labels['exoframe.deployment']).toEqual(name);
   expect(container.Labels['exoframe.user']).toEqual('admin');
   expect(container.Labels['exoframe.project']).toEqual('simple-html');
-  expect(container.Labels['traefik.backend']).toEqual(name.replace(`-${deployId}`, ''));
+  expect(container.Labels['traefik.backend']).toEqual(name);
   expect(container.Labels['traefik.frontend.rule']).toBeUndefined();
   expect(container.NetworkSettings.Networks.exoframe).toBeDefined();
 
@@ -221,7 +218,7 @@ test('Should update simple HTML project', async done => {
   expect(container.Labels['exoframe.deployment']).toEqual(name);
   expect(container.Labels['exoframe.user']).toEqual('admin');
   expect(container.Labels['exoframe.project']).toEqual('simple-html');
-  expect(container.Labels['traefik.backend']).toEqual(name.replace(`-${deployId}`, ''));
+  expect(container.Labels['traefik.backend']).toEqual(name);
   expect(container.Labels['traefik.frontend.rule']).toBeUndefined();
   expect(container.NetworkSettings.Networks.exoframe).toBeDefined();
 
@@ -498,7 +495,7 @@ test('Should deploy project with configured template', async done => {
   expect(container.Labels['exoframe.deployment']).toEqual(name);
   expect(container.Labels['exoframe.user']).toEqual('admin');
   expect(container.Labels['exoframe.project']).toEqual(name.replace(`-${deployId}`, ''));
-  expect(container.Labels['traefik.backend']).toEqual(name.replace(`-${deployId}`, ''));
+  expect(container.Labels['traefik.backend']).toEqual('localhost');
   expect(container.Labels['traefik.frontend.rule']).toEqual('Host:localhost');
   expect(container.NetworkSettings.Networks.exoframe).toBeDefined();