address feedback

Signed-off-by: Jared Quick <jared.quick@salesforce.com>

Author: jquick

README.md

@@ -64,10 +64,6 @@ Important: this only works when building a single service, an error will be gene
 
 A list of KEY=VALUE that are passed through as build arguments when image is being built.
 
-#### `labels` (build and run only, string or array)
-
-A list of KEY=VALUE that are passed through as service labels when image is being built or ran. These will be merged with any service labels defined in the compose file.
-
 #### `env` or `environment` (run only, string or array)
 
 A list of either KEY or KEY=VALUE that are passed through as environment variables to the container.
@@ -272,6 +268,14 @@ If set to true, adds useful Docker labels to the primary container. See [Contain
 
 The default is `true`.
 
+#### `labels` (run only, string or array)
+
+A list of KEY=VALUE that are passed through as service labels when image is being ran. These will be merged with any service labels defined in the compose file.
+
+#### `build-labels` (build only, string or array)
+
+A list of KEY=VALUE that are passed through as service labels when image is being built. These will be merged with any service labels defined in the compose file.
+
 #### `compatibility` (boolean)
 
 If set to true, all docker compose commands will rum with compatibility mode. Equivalent to `--compatibility` in docker compose.

commands/build.sh

@@ -50,7 +50,7 @@ for service_name in $(plugin_read_list BUILD) ; do
   labels=()
   while read -r label ; do
     [[ -n "${label:-}" ]] && labels+=("${label}")
-  done <<< "$(plugin_read_list LABELS)"
+  done <<< "$(plugin_read_list BUILD_LABELS)"
 
   if [[ -n "${target}" ]] || [[ "${#labels[@]}" -gt 0 ]] || [[ "${#cache_from[@]}" -gt 0 ]]; then
     build_images+=("$service_name" "${image_name}" "${target}")

lib/shared.bash

@@ -167,26 +167,24 @@ function build_image_override_file_with_version() {
     shift 3
 
     # load cache_from array
-    cache_from=()
-    if (( $# > 0 )); then
-      cache_from_amt=$1
-      shift
-      while (( cache_from_amt-- > 0 )); do
+    cache_from_amt="${1:-0}"
+    [[ -n "${1:-}" ]] && shift; # remove the value if not empty
+    if [[ "${cache_from_amt}" -gt 0 ]]; then
+      for amt in $(seq 1 "$cache_from_amt"); do
         cache_from+=( "$1" ); shift
       done
     fi
 
     # load labels array
-    labels=()
-    if (( $# > 0 )); then
-      labels_amt=$1
-      shift
-      while (( labels_amt-- > 0 )); do
+    labels_amt="${1:-0}"
+    [[ -n "${1:-}" ]] && shift; # remove the value if not empty
+    if [[ "${labels_amt}" -gt 0 ]]; then
+      for amt in $(seq 1 "$labels_amt"); do
         labels+=( "$1" ); shift
       done
     fi
 
-    if [[ -z "$image_name" ]] && [[ -z "$target" ]] && [[ "${#cache_from[@]}" -eq 0 ]] && [[ "${#labels[@]}" -eq 0 ]]; then
+    if [[ -z "$image_name" ]] && [[ -z "$target" ]] && [[ "$cache_from_amt" -eq 0 ]] && [[ "$labels_amt" -eq 0 ]]; then
       # should not print out an empty service
       continue
     fi
@@ -197,15 +195,15 @@ function build_image_override_file_with_version() {
       printf "    image: %s\\n" "$image_name"
     fi
 
-    if [[ "${#cache_from[@]}" -gt 0 ]] || [[ -n "$target" ]] || [[ "${#labels[@]}" -gt 0 ]]; then
+    if [[ "$cache_from_amt" -gt 0 ]] || [[ -n "$target" ]] || [[ "$labels_amt" -gt 0 ]]; then
       printf "    build:\\n"
     fi
 
     if [[ -n "$target" ]]; then
       printf "      target: %s\\n" "$target"
     fi
 
-    if [[ "${#cache_from[@]}" -gt 0 ]] ; then
+    if [[ "$cache_from_amt" -gt 0 ]] ; then
       if ! docker_compose_supports_cache_from "$version" ; then
         echo "Unsupported Docker Compose config file version: $version"
         echo "The 'cache_from' option can only be used with Compose file versions 2.2 or 3.2 and above."
@@ -220,7 +218,7 @@ function build_image_override_file_with_version() {
       done
     fi
 
-    if [[ "${#labels[@]}" -gt 0 ]] ; then
+    if [[ "$labels_amt" -gt 0 ]] ; then
       printf "      labels:\\n"
       for label in "${labels[@]}"; do
         printf "        - %s\\n" "${label}"

plugin.yml

@@ -23,6 +23,9 @@ configuration:
     build-alias:
       type: [ string, array ]
       minimum: 1
+    build-labels:
+      type: [ string, array ]
+      minimum: 1
     build-parallel:
       type: boolean
     buildkit:
@@ -141,6 +144,7 @@ configuration:
     ansi: [ run ]
     args: [ build ]
     build-alias: [ push ]
+    build-labels: [ build ]
     build-parallel: [ build ]
     buildkit: [ build ]
     buildkit-inline-cache: [ build ]
@@ -153,7 +157,7 @@ configuration:
     environment: [ run ]
     expand-volume-vars: [ volumes ]
     graceful-shutdown: [ run ]
-    labels: [ build, run ]
+    labels: [ run ]
     leave-volumes: [ run ]
     mount-buildkite-agent: [ run ]
     mount-checkout: [ run ]

tests/image-override-file.bats

@@ -132,6 +132,28 @@ EOF
   assert_output "$myservice_override_file3"
 }
 
+@test "Build a docker-compose file with multiple cache-from and multiple labels and target" {
+  myservice_override_file3=$(cat <<-EOF
+version: '3.2'
+services:
+  myservice:
+    image: newimage:1.0.0
+    build:
+      target: build
+      cache_from:
+        - my.repository/myservice:latest
+        - my.repository/myservice:target
+      labels:
+        - com.buildkite.test=test
+        - com.buildkite.test2=test2
+EOF
+  )
+
+  run build_image_override_file_with_version "3.2" "myservice" "newimage:1.0.0" "build" 2 "my.repository/myservice:latest" "my.repository/myservice:target" 2 "com.buildkite.test=test" "com.buildkite.test2=test2"
+
+  assert_success
+  assert_output "$myservice_override_file3"
+}
 
 @test "Build a docker-compose file with cache-from and compose-file version 2" {
   run build_image_override_file_with_version "2" "myservice" "newimage:1.0.0" "" 1 "my.repository/myservice:latest"