Merge pull request #242 from jpfielding/platform

Support for --platform arg

Author: toote

README.md

@@ -249,6 +249,12 @@ Join the container to the docker network specified. The network will be created
 
 Example: `test-network`
 
+### `platform` (optional, string)
+
+Platform defines the target platform containers for this service will run on, using the os[/arch[/variant]] syntax. The values of os, arch, and variant MUST conform to the convention used by the OCI Image Spec.
+
+Example: `linux/arm64`
+
 ### `pid` (optional, string)
 
 PID namespace provides separation of processes. The PID Namespace removes the view of the system processes, and allows process ids to be reused including pid 1. See https://docs.docker.com/engine/reference/run/#pid-settings---pid for more details. By default, all containers have the PID namespace enabled.

hooks/command

@@ -386,6 +386,11 @@ if [[ -n "${BUILDKITE_PLUGIN_DOCKER_NETWORK:-}" ]] ; then
   args+=("--network" "${BUILDKITE_PLUGIN_DOCKER_NETWORK:-}")
 fi
 
+# Support docker run --platform
+if [[ -n "${BUILDKITE_PLUGIN_DOCKER_PLATFORM:-}" ]] ; then
+  args+=("--platform" "${BUILDKITE_PLUGIN_DOCKER_PLATFORM:-}")
+fi
+
 # Support docker run --pid
 if [[ -n "${BUILDKITE_PLUGIN_DOCKER_PID:-}" ]] ; then
   args+=("--pid" "${BUILDKITE_PLUGIN_DOCKER_PID:-}")

plugin.yml

@@ -73,6 +73,8 @@ configuration:
       type: array
     workdir:
       type: string
+    platform:
+      type: string
     propagate-environment:
       type: boolean
     propagate-aws-auth-tokens:

tests/command.bats

@@ -708,6 +708,21 @@ EOF
   unstub docker
 }
 
+@test "Runs BUILDKITE_COMMAND with platform" {
+  export BUILDKITE_PLUGIN_DOCKER_PLATFORM=linux/amd64
+  export BUILDKITE_COMMAND="echo hello world"
+
+  stub docker \
+    "run -t -i --rm --init --volume $PWD:/workdir --workdir /workdir --platform linux/amd64 --label com.buildkite.job-id=1-2-3-4 image:tag /bin/sh -e -c 'echo hello world' : echo ran command in docker"
+
+  run "$PWD"/hooks/command
+
+  assert_success
+  assert_output --partial "ran command in docker"
+
+  unstub docker
+}
+
 @test "Runs with a command as a string" {
   export BUILDKITE_PLUGIN_DOCKER_COMMAND="echo hello world"
   export BUILDKITE_COMMAND=