Merge pull request buildkite-plugins#211 from pecigonzalo/feature/rm-…

…option

Add --rm option as default for runs

README.md

@@ -421,6 +421,12 @@ Sets `docker-compose` to run with `--verbose`
 
 The default is `false`.
 
+### `rm` (optional, run only)
+
+If set to true, docker compose will remove the primary container after run. Equivalent to `--rm` in docker-compose.
+
+The default is `true`.
+
 ## Developing
 
 To run the tests:

commands/run.sh

@@ -131,6 +131,11 @@ if [[ "$(plugin_read_config USE_ALIASES "false")" == "true" ]] ; then
   run_params+=(--use-aliases)
 fi
 
+# Optionally remove containers after run
+if [[ "$(plugin_read_config RM "true")" == "true" ]]; then
+  run_params+=(--rm)
+fi
+
 run_params+=("$run_service")
 
 if [[ "${BUILDKITE_PLUGIN_DOCKER_COMPOSE_REQUIRE_PREBUILD:-}" =~ ^(true|on|1)$ ]] && [[ ! -f "$override_file" ]] ; then

lib/run.bash

@@ -28,8 +28,13 @@ check_linked_containers_and_save_logs() {
   mkdir -p "$logdir"
 
   while read -r line ; do
-    service_name="$(cut -d$'\t' -f2 <<< "$line")"
-    service_container_id="$(cut -d$'\t' -f1 <<< "$line")"
+    if [[ -z "${line}" ]]; then
+      # Skip empty lines
+      continue
+    fi
+
+    service_name="$(cut -d$'\t' -f2 <<<"$line")"
+    service_container_id="$(cut -d$'\t' -f1 <<<"$line")"
 
     if [[ "$service_name" == "$service" ]] ; then
       continue

plugin.yml

@@ -66,6 +66,8 @@ configuration:
       type: boolean
     workdir:
       type: string
+    rm:
+      type: boolean
   oneOf:
     - required:
       - run