add run option

Signed-off-by: Jared Quick <jared.quick@salesforce.com>

Author: jquick

README.md

@@ -64,9 +64,9 @@ Important: this only works when building a single service, an error will be gene
 
 A list of KEY=VALUE that are passed through as build arguments when image is being built.
 
-#### `labels` (build only, string or array)
+#### `labels` (build and run only, string or array)
 
-A list of KEY=VALUE that are passed through as service labels when image is being built. These will be merged with any service labels defined in the compose file.
+A list of KEY=VALUE that are passed through as service labels when image is being built or ran. These will be merged with any service labels defined in the compose file.
 
 #### `env` or `environment` (run only, string or array)
 

commands/run.sh

@@ -92,6 +92,10 @@ if [[ "$(plugin_read_config RUN_LABELS "true")" =~ ^(true|on|1)$ ]]; then
   )
 fi
 
+while read -r label ; do
+  [[ -n "${label:-}" ]] && run_params+=("--label" "${label}")
+done <<< "$(plugin_read_list LABELS)"
+
 # append env vars provided in ENV or ENVIRONMENT, these are newline delimited
 while IFS=$'\n' read -r env ; do
   [[ -n "${env:-}" ]] && run_params+=("-e" "${env}")

plugin.yml

@@ -153,7 +153,7 @@ configuration:
     environment: [ run ]
     expand-volume-vars: [ volumes ]
     graceful-shutdown: [ run ]
-    labels: [ build ]
+    labels: [ build, run ]
     leave-volumes: [ run ]
     mount-buildkite-agent: [ run ]
     mount-checkout: [ run ]

tests/run.bats

@@ -1280,3 +1280,28 @@ cmd3"
   assert_output --partial "env-propagation-list desired, but LIST_OF_VARS is not defined!"
   unstub buildkite-agent
 }
+
+@test "Run with a list of propagated labels" {
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_LABELS_0="com.buildkite.test=test"
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_LABELS_1="com.buildkite.test2=test2"
+  export BUILDKITE_COMMAND="echo hello world"
+
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_RUN=myservice
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CHECK_LINKED_CONTAINERS=false
+
+  stub docker \
+    "compose -f docker-compose.yml -p buildkite1111 up -d --scale myservice=0 myservice : echo ran myservice dependencies" \
+    "compose -f docker-compose.yml -p buildkite1111 run --name buildkite1111_myservice_build_1 --label com.buildkite.test=test --label com.buildkite.test2=test2 -T --rm myservice /bin/sh -e -c 'echo hello world' : echo ran myservice"
+
+  stub buildkite-agent \
+    "meta-data exists docker-compose-plugin-built-image-tag-myservice : exit 1"
+
+  run "$PWD"/hooks/command
+
+  assert_success
+  refute_output --partial "Pulling"
+  assert_output --partial "ran myservice"
+
+  unstub docker
+  unstub buildkite-agent
+}