Merge pull request #478 from Gusto/add-builder-use-once-parameter

Change behavior of `builder.use` to only use builder once

Author: pzeballos

commands/build.sh

@@ -115,6 +115,10 @@ if [[ ! "$(plugin_read_config SKIP_PULL "false")" == "true" ]] ; then
   build_params+=(--pull)
 fi
 
+if [[ -n "$(plugin_read_config BUILDER_NAME "")" ]] && [[ "$(plugin_read_config BUILDER_USE "false")" == "true" ]]; then
+  build_params+=("--builder" "$(plugin_read_config BUILDER_NAME "")")
+fi
+
 if [[ "$(plugin_read_config NO_CACHE "false")" == "true" ]] ; then
   build_params+=(--no-cache)
 fi

hooks/pre-command

@@ -73,7 +73,6 @@ fi
 if [[ "${builder_use}" == "true" ]]; then
     if builder_instance_exists "${builder_name}"; then
         echo "~~~ :docker: Using Builder Instance '${builder_name}'"
-        docker buildx use "${builder_name}"
     else
         echo "+++ 🚨 Builder Instance '${builder_name}' does not exist"
         exit 1

tests/build.bats

@@ -31,6 +31,22 @@ setup_file() {
   unstub docker
 }
 
+@test "Build with builder" {
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_BUILD=myservice
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_BUILDER_NAME=mybuilder
+  export BUILDKITE_PLUGIN_DOCKER_COMPOSE_BUILDER_USE=true
+
+  stub docker \
+    "compose -f docker-compose.yml -p buildkite1111 build --pull --builder mybuilder myservice : echo built myservice"
+
+  run "$PWD"/hooks/command
+
+  assert_success
+  assert_output --partial "built myservice"
+
+  unstub docker
+}
+
 @test "Build with no-cache" {
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_BUILD=myservice
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_NO_CACHE=true

tests/builder-instances.bats

@@ -105,7 +105,7 @@ load '../lib/shared'
     assert_success
     assert_output --partial "~~~ :docker: Creating Builder Instance 'builder-name' with Driver 'docker-container'"
     assert_output --partial "~~~ :warning: Builder Instance 'builder-name' created but will not be used as 'use: true' parameter not specified"
-    
+
     assert_output --partial "~~~ :docker: Using Default Builder 'test' with Driver 'driver'"
 
     unstub docker
@@ -131,8 +131,7 @@ load '../lib/shared'
     export BUILDKITE_PLUGIN_DOCKER_COMPOSE_BUILDER_NAME=builder-name
 
     stub docker \
-        "buildx inspect builder-name : exit 0" \
-        "buildx use builder-name : exit 0"
+        "buildx inspect builder-name : exit 0"
 
     run "$PWD"/hooks/pre-command
 
@@ -198,7 +197,7 @@ load '../lib/shared'
 
     assert_success
     assert_output "~~~ :docker: Cleaning up Builder Instance 'builder-name'"
-    
+
     unstub docker
 }