CLI v2 as default

.buildkite/pipeline.yml

@@ -22,9 +22,9 @@ steps:
     plugins:
       ${BUILDKITE_PULL_REQUEST_REPO:-$BUILDKITE_REPO}#${BUILDKITE_COMMIT}:
         run: tests
-        command: ["bats", "tests", "tests/v2"]
         # for pretty colors
         tty: true
+        command: ["bats", "tests", "tests/v1"]
 
   # The rest of the steps are integration tests
 

README.md

@@ -606,11 +606,11 @@ The default is `on-error`.
 
 ### `cli-version` (optional, string or integer)
 
-If set to `2`, plugin will use `docker compose` to execute commands; otherwise it will default to version `1`, using `docker-compose` instead.
+If set to `1`, plugin will use `docker-compose` (that is deprecated and unsupported) to execute commands; otherwise it will default to version `2`, using `docker compose` instead.
 
 ### `buildkit` (optional, build only, boolean)
 
-Assuming you have a compatible docker installation and configuration in the agent, activating this option would setup the environment for the `docker-compose build` call to use BuildKit. Note that if you are using `cli-version` 2, you are already using buildkit by default.
+Assuming you have a compatible docker installation and configuration in the agent, activating this option would setup the environment for the `docker compose build` call to use BuildKit. Note that this should only be necessary if you are using `cli-version` 1 (version 2 already uses buildkit by default).
 
 You may want to also add `BUILDKIT_INLINE_CACHE=1` to your build arguments (`args` option in this plugin), but know that [there are known issues with it](https://github.com/moby/buildkit/issues/2274).
 

commands/build.sh

@@ -11,7 +11,7 @@ else
   group_type="+++"
 fi
 
-if [[ "$(plugin_read_config BUILDKIT "false")" == "true" ]]; then
+if [[ "$(plugin_read_config BUILDKIT "true")" == "true" ]]; then
   export DOCKER_BUILDKIT=1
   export COMPOSE_DOCKER_CLI_BUILD=1
   export BUILDKIT_PROGRESS=plain
@@ -95,7 +95,7 @@ while read -r line ; do
 done <<< "$(plugin_read_list SECRETS)"
 
 if [[ "$(plugin_read_config SSH "false")" != "false" ]] ; then
-  if [[ "${DOCKER_BUILDKIT:-}" != "1" && "${BUILDKITE_PLUGIN_DOCKER_COMPOSE_CLI_VERSION:-}" != "2" ]]; then
+  if [[ "${DOCKER_BUILDKIT:-}" != "1" && "${BUILDKITE_PLUGIN_DOCKER_COMPOSE_CLI_VERSION:-2}" != "2" ]]; then
     echo "🚨 You can not use the ssh option if you are not using buildkit"
     exit 1
   fi

lib/push.bash

@@ -21,9 +21,9 @@ compose_image_for_service() {
 default_compose_image_for_service() {
   local service="$1"
 
-  local separator="_"
-  if [[ "$(plugin_read_config CLI_VERSION "1")" == "2" ]] && [[ "$(plugin_read_config COMPATIBILITY "false")" != "true" ]] ; then
-    separator="-"
+  local separator="-"
+  if [[ "$(plugin_read_config CLI_VERSION "2")" == "1" ]] || [[ "$(plugin_read_config COMPATIBILITY "false")" == "true" ]] ; then
+    separator="_"
   fi
 
   printf '%s%s%s\n' "$(docker_compose_project_name)" "$separator" "$service"

lib/shared.bash

@@ -207,7 +207,7 @@ 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
+  if [[ "$(plugin_read_config CLI_VERSION "2")" == "2" ]] ; then
     command=(docker compose)
   fi