From 962d5c7d0832942da31a27df2c85811fde12680b Mon Sep 17 00:00:00 2001
From: Eugene <eugene@eugenecog.local>
Date: Thu, 12 Oct 2023 10:09:42 -0700
Subject: [PATCH] Add --skip-pull support to v2 run command

The `docker-compose` plugin currently seems to ignore the `skip-pull`
option. For example, this configuration:

```
steps:
  - command: bundle exec rubocop
    plugins:
      - docker-compose#v4.14.0:
          run: ruby
          skip-pull: true
          config: docker-compose.yml
          cli-version: 2
```

Results in a command that includes the `--pull` flag, something like
this:

```
docker compose -f docker-compose.yml -p buildkite0123456789 build --pull ruby
```

This PR updates run.sh to fully support the `skip-pull` option. The
same configuration as above now results in the `--pull` flag being
omitted from the generated command:

```
docker compose -f docker-compose.yml -p buildkite0123456789 build ruby
```
---
 commands/run.sh   |  7 ++++++-
 tests/v2/run.bats | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/commands/run.sh b/commands/run.sh
index 8a2f2e0e..3782b307 100755
--- a/commands/run.sh
+++ b/commands/run.sh
@@ -271,7 +271,12 @@ fi
 
 run_params+=("$run_service")
 
-build_params=(--pull)
+build_params=()
+
+# Only pull if SKIP_PULL is not true
+if [[ ! "$(plugin_read_config SKIP_PULL "false")" == "true" ]] ; then
+  build_params+=(--pull)
+fi
 
 if [[ "$(plugin_read_config NO_CACHE "false")" == "true" ]] ; then
   build_params+=(--no-cache)
diff --git a/tests/v2/run.bats b/tests/v2/run.bats
index e34f6718..d8dcf64e 100644
--- a/tests/v2/run.bats
+++ b/tests/v2/run.bats
@@ -259,6 +259,33 @@ cmd3"
   unstub buildkite-agent
 }
 
+@test "Run without a prebuilt image without pulling" {
+  export BUILDKITE_JOB_ID=1111
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_RUN=myservice
+  export BUILDKITE_PIPELINE_SLUG=test
+  export BUILDKITE_BUILD_NUMBER=1
+  export BUILDKITE_COMMAND="echo hello world"
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CHECK_LINKED_CONTAINERS=false
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CLEANUP=false
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_SKIP_PULL=true
+
+  stub docker \
+    "compose -f docker-compose.yml -p buildkite1111 build myservice : echo built myservice" \
+    "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 --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
+  assert_output --partial "built myservice"
+  assert_output --partial "ran myservice"
+  unstub docker
+  unstub buildkite-agent
+}
+
 @test "Run with a prebuilt image and propagate environment but no BUILDKITE_ENV_FILE" {
   export BUILDKITE_JOB_ID=1111
   export BUILDKITE_PIPELINE_SLUG=test