Merge branch 'develop', prepare 3.2.0

Author: yamalight

src/docker/start.js

@@ -250,6 +250,11 @@ exports.start = async ({image, username, resultStream, existing = []}) => {
     Labels['traefik.frontend.rateLimit.rateSet.exo.burst'] = String(config.rateLimit.burst);
   }
 
+  // if basic auth is set - add it to config
+  if (config.basicAuth && config.basicAuth.length) {
+    Labels['traefik.frontend.auth.basic.users'] = config.basicAuth
+  }
+
   // if running in swarm mode - run traefik as swarm service
   if (serverConfig.swarm) {
     // create service config

test/deploy.test.js

@@ -189,6 +189,7 @@ test('Should deploy simple HTML project', async done => {
   expect(container.Labels['traefik.frontend.rateLimit.rateSet.exo.average']).toEqual('1');
   expect(container.Labels['traefik.frontend.rateLimit.rateSet.exo.burst']).toEqual('5');
   expect(container.Labels['traefik.frontend.rule']).toBeUndefined();
+  expect(container.Labels['traefik.frontend.auth.basic.users']).toEqual('user:$apr1$$9Cv/OMGj$$ZomWQzuQbL.3TRCS81A1g/');
   expect(container.NetworkSettings.Networks.exoframe).toBeDefined();
 
   // store initial deploy id

test/fixtures/html-project/exoframe.json

@@ -7,5 +7,6 @@
     "period": "1s",
     "average": 1,
     "burst": 5
-  }
+  },
+  "basicAuth": "user:$apr1$$9Cv/OMGj$$ZomWQzuQbL.3TRCS81A1g/"
 }