clean up docker command wrappers

etpinard · etpinard · commit 63ba88bd4c8e · 2017-10-12T16:19:00.000-04:00
diff --git a/tasks/docker.js b/tasks/docker.js
@@ -1,8 +1,8 @@
 var constants = require('./util/constants');
 var common = require('./util/common');
-var containerCommands = require('./util/container_commands');
 
 var arg = process.argv[2];
+var name = constants.testContainerName;
 var msg, cmd, cb, errorCb;
 
 switch(arg) {
@@ -12,29 +12,39 @@ switch(arg) {
         break;
 
     case 'run':
-        msg = 'Booting up ' + constants.testContainerName + ' docker container';
-        cmd = containerCommands.dockerRun;
+        msg = 'Booting up ' + name + ' docker container';
+
+        cmd = [
+            'docker run -di',
+            '--name', name,
+            '--volume', constants.pathToRoot + ':' + constants.testContainerHome,
+            // save files as local owner
+            '--user `id --user`',
+            // override container entry point
+            '--entrypoint /bin/bash',
+            constants.testContainerImage
+        ].join(' ');
 
         // if docker-run fails, try docker-start.
         errorCb = function(err) {
             if(err) {
-                common.execCmd('docker start ' + constants.testContainerName);
+                common.execCmd('docker start ' + name);
             }
         };
         break;
 
     case 'stop':
-        msg = 'Stopping ' + constants.testContainerName + ' docker container';
-        cmd = 'docker stop ' + constants.testContainerName;
+        msg = 'Stopping ' + name + ' docker container';
+        cmd = 'docker stop ' + name;
         break;
 
     case 'remove':
-        msg = 'Removing ' + constants.testContainerName + ' docker container';
-        cmd = 'docker rm ' + constants.testContainerName;
+        msg = 'Removing ' + name + ' docker container';
+        cmd = 'docker rm ' + name;
         break;
 
     default:
-        console.log('Usage: pull, run, setup, stop, remove');
+        console.log('Usage: pull, run, stop, remove');
         process.exit(0);
         break;
 }
diff --git a/tasks/util/common.js b/tasks/util/common.js
@@ -1,9 +1,7 @@
 var fs = require('fs');
 var path = require('path');
 var exec = require('child_process').exec;
-
 var constants = require('./constants');
-var containerCommands = require('./container_commands');
 
 exports.execCmd = function(cmd, cb, errorCb) {
     cb = cb ? cb : function() {};
@@ -110,15 +108,15 @@ exports.testImageWrapper = function(opts) {
 
         pathToScript = path.join('plotly.js', 'test', 'image', opts.script);
 
-        cmd = containerCommands.getExecCmd(
+        cmd = wrapDockerExecCmd(
             isCI,
             [pathToElectron, pathToScript, args].join(' ')
         );
 
         errorCb = function(err) {
             if(/Xvfb failed to start/.test(err)) {
                 // in case Xvfb port was not closed, kill Xvfb and run cmd again
-                var pKill = containerCommands.getExecCmd(isCI, 'pkill Xvfb');
+                var pKill = wrapDockerExecCmd(isCI, 'pkill Xvfb');
                 exports.execCmd(pKill, function() { exports.execCmd(cmd); });
             } else if(err) {
                 process.exit(err.code);
@@ -129,3 +127,31 @@ exports.testImageWrapper = function(opts) {
     console.log(msg);
     exports.execCmd(cmd, null, errorCb);
 };
+
+function wrapDockerExecCmd(isCI, commands) {
+    var _commands = Array.isArray(commands) ? commands.slice() : [commands];
+    var name = constants.testContainerName;
+
+    if(isCI) {
+        _commands = ['export CIRCLECI=1'].concat(_commands);
+
+        var id = '$(docker inspect --format \'{{.Id}}\' ' + name + ')';
+
+        return [
+            'sudo', 'lxc-attach',
+            '-n', id,
+            '-f', '/var/lib/docker/containers/' + id + '/config.lxc',
+            '-- bash -c', quoteJoin(_commands)
+        ].join(' ');
+    }
+    else {
+        return [
+            'docker exec -i', name,
+            '/bin/bash -c', quoteJoin(_commands)
+        ].join(' ');
+    }
+}
+
+function quoteJoin(arr) {
+    return '"' + arr.join(' && ') + '"';
+}
diff --git a/tasks/util/constants.js b/tasks/util/constants.js
@@ -78,7 +78,7 @@ module.exports = {
     mapboxAccessToken: 'pk.eyJ1IjoiZXRwaW5hcmQiLCJhIjoiY2luMHIzdHE0MGFxNXVubTRxczZ2YmUxaCJ9.hwWZful0U2CQxit4ItNsiQ',
     pathToCredentials: path.join(pathToBuild, 'credentials.json'),
 
-    testContainerImage: 'plotly/testbed:latest',
+    testContainerImage: 'plotly/testbed:image-exporter',
     testContainerName: process.env.PLOTLYJS_TEST_CONTAINER_NAME || 'image-exporter-container',
     testContainerHome: '/var/www/image-exporter/plotly.js',
 
diff --git a/tasks/util/container_commands.js b/tasks/util/container_commands.js
