Merge pull request #20 from peaksandpies/master

New DNS option to start the docker container with

Author: kfatehi

config/config.html

@@ -3,6 +3,7 @@ <h3>Docker Runner</h3>
   Jobs are run inside docker containers!
 </p>
 <input ng-model="config.image" placeholder="Docker image to use. Default: strider/strider-docker-slave" class="input-block-level input-xxlarge" type="text">
+<input ng-model="config.dns" placeholder="comma separated list of dns servers, default: 8.8.8.8" class="input-block-level input-xxlarge" type="text">
 <label class="checkbox">
   <input type="checkbox" ng-model="config.privileged">
   Should the image run in privileged mode? WARNING: Don't run insecure code in privileged mode.

lib/create-container.js

@@ -23,6 +23,7 @@ module.exports = function (createOptions, docker, config, done) {
       container.start({
         Privileged: config.privileged,
         PublishAllPorts: config.publishPorts,
+        Dns: config.dns,
       }, function(err, data) {
         if(err) return done(new Error(err))
         container.wait(function(err, data) {

lib/run.js

@@ -12,12 +12,15 @@ module.exports = function (docker, job, provider, plugins, config, next) {
     }
   })
   var slaveConfig = _.extend({
-    id: job._id, 
+    id: job._id,
     dataDir: config.dataDir,
     image: 'strider/strider-docker-slave',
     env: env,
   }, config.branchConfig.runner.config)
   slaveConfig.image = slaveConfig.image || "strider/strider-docker-slave"
+  if (slaveConfig.dns && slaveConfig.dns.length > 6) {
+    slaveConfig.dns   = slaveConfig.dns.split(",")
+  }
   config.io.emit('job.status.command.comment', job._id, {
     comment: 'Creating docker container from ' + slaveConfig.image,
     plugin: 'docker',