Merge branch 'develop', prepare 2.0.2

Author: yamalight

README.md

@@ -58,18 +58,43 @@ Exoframe stores its config in `~/.exoframe/server.config.yml`.
 Currently it contains the following settings:
 
 ```yaml
-debug: false # whether debug mode is enabled, default "false"
-letsencrypt: false # whether to enable letsencrypt, default "false"
-letsencryptEmail: your@email.com # email used for letsencrypt
-compress: true # whether to apply gzip compression, default "true"
-baseDomain: false # base domain to use for deployments without domains specified, default "false"
-cors: false # CORS support; can be "true" ("*" header) or object with "origin" property, default "false"
-traefikImage: 'traefik:latest' # Traefik image to be used; set to "false" to disable traefik management, default "traefik:latest"
-traefikName: 'exoframe-traefik' # Traefik container name, default "exoframe-traefik"
-traefikArgs: [] # Additional Traefik start args, default []
-exoframeNetwork: 'exoframe' # Network used by traefik to connect services to, default "exoframe"
-updateChannel: 'stable' # server image update channel; can be "stable" or "nightly", default "stable"
-publicKeysPath: '/path/to/your/public/keys' # path to folder with authorized_keys, default "~/.ssh"
+# whether debug mode is enabled, default "false"
+debug: false
+
+# whether to enable letsencrypt, default "false"
+letsencrypt: false
+
+# email used for letsencrypt
+letsencryptEmail: your@email.com
+
+# whether to apply gzip compression, default "true"
+compress: true
+
+# base top-level domain to use for deployments without domains specified, default "false"
+# used as postfix, e.g. if you specify ".example.com" (dot is auto-prepended if not present)
+# all your deployments will be autodeployed as "deployment-id.example.com"
+baseDomain: false
+
+# CORS support; can be "true" ("*" header) or object with "origin" property, default "false"
+cors: false
+
+# Traefik image to be used; set to "false" to disable traefik management, default "traefik:latest"
+traefikImage: 'traefik:latest'
+
+# Traefik container name, default "exoframe-traefik"
+traefikName: 'exoframe-traefik'
+
+# Additional Traefik start args, default []
+traefikArgs: []
+
+# Network used by traefik to connect services to, default "exoframe"
+exoframeNetwork: 'exoframe'
+
+# server image update channel; can be "stable" or "nightly", default "stable"
+updateChannel: 'stable'
+
+# path to folder with authorized_keys, default "~/.ssh"
+publicKeysPath: '/path/to/your/public/keys'
 ```
 
 _Warning:_ Most changes to config are applied immediately. With exception of Letsencrypt config. If you are enabling letsencrypt after Traefik instance has been started, you'll need to remove Traefik and then restart Exoframe server for changes to take effect.

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
@@ -15,7 +14,11 @@ module.exports = async ({image, username, resultStream}) => {
   const config = getProjectConfig();
 
   // generate host
-  const defaultDomain = serverConfig.baseDomain ? `${name}${serverConfig.baseDomain}` : undefined;
+  // construct base domain from config, prepend with "." if it's not there
+  const baseDomain = serverConfig.baseDomain ? serverConfig.baseDomain.replace(/^(\.?)/, '.') : undefined;
+  // construc default domain using given base domain
+  const defaultDomain = baseDomain ? `${name}${baseDomain}` : undefined;
+  // construct host
   const host = config.domain === undefined ? defaultDomain : config.domain;
 
   // generate env vars
@@ -41,6 +44,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 +56,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();
 

test/fixtures/server.config.yml

@@ -1,6 +1,6 @@
 debug: true
 letsencrypt: false
 letsencryptEmail: test@gmail.com
-baseDomain: '.test'
+baseDomain: 'test'
 cors:
   origin: 'http://test.com'