Merge pull request #334 from donbobka/add-support-docker-compose-v2

Add support docker compose v2

.buildkite/pipeline.yml

@@ -22,6 +22,7 @@ steps:
     plugins:
       ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}#${BUILDKITE_COMMIT}:
         run: tests
+        command: ["bats", "tests", "tests/v2"]
 
   # The rest of the steps are integration tests
 

README.md

@@ -560,12 +560,16 @@ Select when to upload container logs.
 
 The default is `on-error`.
 
+### `cli-version` (optional)
+
+If set to `2`, plugin will use `docker compose` to execute commands; otherwise it will default to version `1` using `docker-compose` instead.
+
 ## Developing
 
 To run the tests:
 
 ```bash
-docker-compose run --rm tests
+docker-compose run --rm tests bats tests tests/v2
 ```
 
 ## License

lib/shared.bash

@@ -177,6 +177,9 @@ function build_image_override_file_with_version() {
 # Runs the docker-compose command, scoped to the project, with the given arguments
 function run_docker_compose() {
   local command=(docker-compose)
+  if [[ "$(plugin_read_config CLI_VERSION "1")" == "2" ]] ; then
+    command=(docker compose)
+  fi
 
   if [[ "$(plugin_read_config VERBOSE "false")" == "true" ]] ; then
     command+=(--verbose)

plugin.yml

@@ -78,6 +78,11 @@ configuration:
       type: boolean
     entrypoint:
       type: string
+    cli-version:
+      type: string
+      enum:
+        - 1
+        - 2
   anyOf:
     - required:
       - run

tests/build.bats

@@ -75,6 +75,23 @@ load '../lib/shared'
   unstub docker-compose
 }
 
+@test "Build with docker-compose and v1 is set explicitly " {
+  export BUILDKITE_JOB_ID=1111
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_BUILD=myservice
+  export BUILDKITE_PIPELINE_SLUG=test
+  export BUILDKITE_BUILD_NUMBER=1
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CLI_VERSION=1
+
+  stub docker-compose \
+    "-f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml build --pull myservice : echo built myservice"
+
+  run $PWD/hooks/command
+
+  assert_success
+  assert_output --partial "built myservice"
+  unstub docker-compose
+}
+
 @test "Build with a repository" {
   export BUILDKITE_JOB_ID=1111
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_BUILD=myservice