Merge pull request #39 from uw-ipd/master

Add docker runtime support.

README.md

@@ -113,6 +113,12 @@ Outputs the command to be run, and enables xtrace in the plugin
 
 Example: `true`
 
+### `runtime` (optional)
+
+Specify an explicit docker runtime. See https://docs.docker.com/engine/reference/commandline/run/#options for more details.
+
+Example: `nvidia`
+
 ## License
 
 MIT (see [LICENSE](LICENSE))

hooks/command

@@ -74,6 +74,11 @@ if [[ -n "${BUILDKITE_PLUGIN_DOCKER_NETWORK:-}" ]] ; then
   args+=("--network" "${BUILDKITE_PLUGIN_DOCKER_NETWORK:-}")
 fi
 
+# Support docker run --runtime
+if [[ -n "${BUILDKITE_PLUGIN_DOCKER_RUNTIME:-}" ]] ; then
+  args+=("--runtime" "${BUILDKITE_PLUGIN_DOCKER_RUNTIME:-}")
+fi
+
 echo "--- :docker: Running ${BUILDKITE_COMMAND} in ${BUILDKITE_PLUGIN_DOCKER_IMAGE}"
 
 if [[ "${debug_mode:-off}" =~ (on) ]] ; then

plugin.yml

@@ -25,6 +25,8 @@ configuration:
       type: string
     debug:
       type: boolean
+    runtime:
+      type: string
   required:
     - image
-  additionalProperties: false
+  additionalProperties: false

tests/command.bats

@@ -235,3 +235,26 @@ load '/usr/local/lib/bats/load.bash'
   unset BUILDKITE_PLUGIN_DOCKER_DEBUG
   unset BUILDKITE_COMMAND
 }
+
+@test "Runs with custom runtime" {
+  export BUILDKITE_PLUGIN_DOCKER_WORKDIR=/app
+  export BUILDKITE_PLUGIN_DOCKER_IMAGE=image:tag
+  export BUILDKITE_PLUGIN_DOCKER_MOUNT_BUILDKITE_AGENT=false
+  export BUILDKITE_PLUGIN_DOCKER_RUNTIME=custom_runtime
+  export BUILDKITE_COMMAND="echo hello world"
+
+  stub docker \
+    "run -it --rm --volume $PWD:/app --workdir /app --runtime custom_runtime image:tag bash -c 'echo hello world' : echo ran command in docker"
+
+  run $PWD/hooks/command
+
+  assert_success
+  assert_output --partial "ran command in docker"
+
+  unstub docker
+  unset BUILDKITE_PLUGIN_DOCKER_WORKDIR
+  unset BUILDKITE_PLUGIN_DOCKER_IMAGE
+  unset BUILDKITE_PLUGIN_DOCKER_MOUNT_BUILDKITE_AGENT
+  unset BUILDKITE_PLUGIN_DOCKER_RUNTIME
+  unset BUILDKITE_COMMAND
+}