Adding log-driver, log-opt

Adding log-driver and log-opt options

Author: JoeColeman95

commands/run.sh

@@ -397,6 +397,18 @@ if [[ -n "${BUILDKITE_PLUGIN_DOCKER_STORAGE_OPT:-}" ]] ; then
   args+=("--storage-opt" "${BUILDKITE_PLUGIN_DOCKER_STORAGE_OPT:-}")
 fi
 
+# Support docker run --log-driver
+if [[ -n "${BUILDKITE_PLUGIN_DOCKER_LOG_DRIVER:-}" ]] ; then
+  args+=("--log-driver" "${BUILDKITE_PLUGIN_DOCKER_LOG_DRIVER}")
+fi
+
+# Support docker run --log-opt
+if plugin_read_list_into_result BUILDKITE_PLUGIN_DOCKER_LOG_OPT; then
+  for arg in "${result[@]}"; do
+    args+=("--log-opt" "$arg")
+  done
+fi
+
 shell=()
 shell_disabled=1
 

plugin.yml

@@ -47,6 +47,10 @@ configuration:
       type: boolean
     load:
       type: string
+    log-driver:
+      type: string
+    log-opt:
+      type: array
     memory:
       type: string
     memory-swap:

tests/command.bats

@@ -1382,6 +1382,70 @@ EOF
   unstub docker
 }
 
+@test "Runs BUILDKITE_COMMAND with log-driver" {
+  export BUILDKITE_PLUGIN_DOCKER_LOG_DRIVER=json-file
+  export BUILDKITE_COMMAND="echo hello world"
+
+  stub docker \
+    "run -t -i --rm --init --volume $PWD:/workdir --workdir /workdir --log-driver json-file --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 BUILDKITE_COMMAND with log-opt" {
+  export BUILDKITE_PLUGIN_DOCKER_LOG_OPT_0=max-size=10m
+  export BUILDKITE_COMMAND="echo hello world"
+
+  stub docker \
+    "run -t -i --rm --init --volume $PWD:/workdir --workdir /workdir --log-opt max-size=10m --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 BUILDKITE_COMMAND with multiple log-opt" {
+  export BUILDKITE_PLUGIN_DOCKER_LOG_OPT_0=max-size=10m
+  export BUILDKITE_PLUGIN_DOCKER_LOG_OPT_1=max-file=3
+  export BUILDKITE_PLUGIN_DOCKER_LOG_OPT_2=labels=production
+  export BUILDKITE_COMMAND="echo hello world"
+
+  stub docker \
+    "run -t -i --rm --init --volume $PWD:/workdir --workdir /workdir --log-opt max-size=10m --log-opt max-file=3 --log-opt labels=production --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 BUILDKITE_COMMAND with log-driver and log-opt" {
+  export BUILDKITE_PLUGIN_DOCKER_LOG_DRIVER=syslog
+  export BUILDKITE_PLUGIN_DOCKER_LOG_OPT_0=syslog-address=tcp://192.168.1.3:514
+  export BUILDKITE_PLUGIN_DOCKER_LOG_OPT_1=tag=myapp
+  export BUILDKITE_COMMAND="echo hello world"
+
+  stub docker \
+    "run -t -i --rm --init --volume $PWD:/workdir --workdir /workdir --log-driver syslog --log-opt syslog-address=tcp://192.168.1.3:514 --log-opt tag=myapp --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 "Run with BUILDKITE_COMMAND that exits with a failure" {
   export BUILDKITE_COMMAND='pwd'