Merge pull request #480 from buildkite-plugins/toote_quiet_push

Quiet push

Author: pzeballos

README.md

@@ -273,9 +273,15 @@ Sets `docker-compose` to run with `--verbose`
 
 The default is `false`.
 
-#### `quiet-pull` (run only, boolean)
+#### `quiet-pull` (run/push only, boolean)
 
-Start up dependencies with `--quiet-pull` to prevent even more logs during that portion of the execution.
+During `run`, start up dependencies with `--quiet-pull` to prevent even more logs during that portion of the execution. Will also add `--quiet` if a `docker pull` is executed before a `push` step.
+
+The default is `false`.
+
+#### `quiet-push` (push only, boolean)
+
+Will add `--quiet` to the `docker push` command to prevent such verbose logs.
 
 The default is `false`.
 

commands/push.sh

@@ -21,6 +21,16 @@ fi
 
 pulled_services=("")
 build_services=("")
+push_command=(push)
+pull_command=(pull)
+
+if [ "$(plugin_read_config QUIET_PUSH 'false')" == "true" ]; then
+  push_command+=("--quiet")
+fi
+
+if [ "$(plugin_read_config QUIET_PULL "false")" == "true" ] ; then
+  pull_command+=("--quiet")
+fi
 
 if plugin_read_list_into_result BUILDKITE_PLUGIN_DOCKER_COMPOSE_BUILD; then
   build_services=("${result[@]}")
@@ -45,7 +55,7 @@ for line in $(plugin_read_list PUSH) ; do
     # Only pull it down once
     if ! in_array "${service_name}" "${pulled_services[@]}" ; then
       echo "~~~ :docker: Pulling pre-built service ${service_name}" >&2;
-      retry "$push_retries" plugin_prompt_and_run docker pull "$prebuilt_image"
+      retry "$push_retries" plugin_prompt_and_run docker "${pull_command[@]}" "$prebuilt_image"
       pulled_services+=("${service_name}")
     fi
 
@@ -64,15 +74,15 @@ for line in $(plugin_read_list PUSH) ; do
   # push: "service-name"
   if [[ ${#tokens[@]} -eq 1 ]] ; then
     echo "${group_type} :docker: Pushing images for ${service_name}" >&2;
-    retry "$push_retries" run_docker_compose push "${service_name}"
+    retry "$push_retries" run_docker_compose "${push_command[@]}" "${service_name}"
     set_prebuilt_image "${prebuilt_image_namespace}" "${service_name}" "${service_image}"
     target_image="${service_image}" # necessary for build-alias
   # push: "service-name:repo:tag"
   else
     target_image="$(IFS=:; echo "${tokens[*]:1}")"
     echo "${group_type} :docker: Pushing image $target_image" >&2;
     plugin_prompt_and_run docker tag "$service_image" "$target_image"
-    retry "$push_retries" plugin_prompt_and_run docker push "$target_image"
+    retry "$push_retries" plugin_prompt_and_run docker "${push_command[@]}" "$target_image"
     set_prebuilt_image "${prebuilt_image_namespace}" "${service_name}" "${target_image}"
   fi
 done

commands/run.sh

@@ -71,17 +71,21 @@ if [[ ${#prebuilt_services[@]} -gt 0 ]] ; then
   up_params+=(-f "$override_file")
 fi
 
+pull_params+=("pull")
+
 # If there are multiple services to pull, run it in parallel (although this is now the default)
 if [[ ${#pull_services[@]} -gt 1 ]] ; then
-  pull_params+=("pull" "--parallel" "${pull_services[@]}")
-elif [[ ${#pull_services[@]} -eq 1 ]] ; then
-  pull_params+=("pull" "${pull_services[0]}")
+  pull_params+=("--parallel")
+fi
+
+if [ "$(plugin_read_config QUIET_PULL "false")" == "true" ] ; then
+  pull_params+=("--quiet")
 fi
 
 # Pull down specified services
 if [[ ${#pull_services[@]} -gt 0 ]] && [[ "$(plugin_read_config SKIP_PULL "false")" != "true" ]]; then
   echo "~~~ :docker: Pulling services ${pull_services[0]}"
-  retry "$pull_retries" run_docker_compose "${pull_params[@]}"
+  retry "$pull_retries" run_docker_compose "${pull_params[@]}" "${pull_services[@]}"
 fi
 
 # We set a predictable container name so we can find it and inspect it later on

plugin.yml

@@ -132,6 +132,8 @@ configuration:
       type: integer
     quiet-pull:
       type: boolean
+    quiet-push:
+      type: boolean
     require-prebuild:
       type: boolean
     rm:
@@ -210,7 +212,8 @@ configuration:
     pull: [ run ]
     pull-retries: [ run ]
     push-retries: [ push ]
-    quiet-pull: [ run ]
+    quiet-pull: [ push, run]
+    quiet-push: [ push ]
     require-prebuild: [ run ]
     rm: [ run ]
     run-image: [ run ]