fixup: make container commands work on CI

Author: etpinard

tasks/util/constants.js

@@ -72,6 +72,7 @@ module.exports = {
     pathToSetPlotConfig: path.join(pathToBuild, 'set_plot_config.js'),
 
     testContainerName: process.env.PLOTLYJS_TEST_CONTAINER_NAME || 'imagetest',
+    testContainerPort: '9010',
     testContainerUrl: 'http://localhost:9010/',
     testContainerHome: '/var/www/streambed/image_server/plotly.js',
 

tasks/util/container_commands.js

@@ -23,11 +23,11 @@ containerCommands.dockerRun = [
     'docker run -d',
     '--name', constants.testContainerName,
     '-v', constants.pathToRoot + ':' + constants.testContainerHome,
-    '-p', constants.testContainerUrl,
+    '-p', constants.testContainerPort + ':' + constants.testContainerPort,
     'plotly/testbed:latest'
 ].join(' ');
 
-containerCommands.getRunCmd = function(commands, isCI) {
+containerCommands.getRunCmd = function(isCI, commands) {
     var _commands = Array.isArray(commands) ? commands.slice() : [commands];
 
     if(isCI) return getRunCI(_commands);
@@ -52,10 +52,11 @@ function getRunCI(commands) {
     commands = ['export CIRCLECI=1', containerCommands.cdHome].concat(commands);
 
     return [
+        'sudo',
         'lxc-attach -n',
-        '$(docker inspect --format \'{{.Id}}\'' + constants.testContainerName + ')',
+        '$(docker inspect --format \'{{.Id}}\' ' + constants.testContainerName + ')',
         '-- bash -c',
-        commands.join(' && ')
+        '"' + commands.join(' && ') + '"'
     ].join(' ');
 }