Allow setting multiple passthrough variables at once

Improve Docker and Docker Compose DSLs when setting more than one variable to pass through from the pipeline.
Widen · Feb 28, 2020 · 363095f · 363095f
1 parent 1f4e2e4
commit 363095f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/.buildkite/pipeline.extra-steps.gradle b/.buildkite/pipeline.extra-steps.gradle
@@ -29,6 +29,12 @@ commandStep {
     // Common Buildkite plugins are also part of the DSL.
     dockerCompose {
         run 'unit'
+        // Passthrough variables
+        environment(
+            'FOO',
+            'BAR',
+            'BAZ',
+        )
     }
 }
 

diff --git a/buildSrc/src/main/groovy/com/widen/plugins/buildkite/BuildkitePipeline.groovy b/buildSrc/src/main/groovy/com/widen/plugins/buildkite/BuildkitePipeline.groovy
@@ -259,12 +259,12 @@ class BuildkitePipeline implements ConfigurableEnvironment {
             }
 
             /**
-             * Set an environment variable to pass into the Docker container.
+             * Set one or more environment variables to pass into the Docker container.
              *
-             * @param name The variable name.
+             * @param name The variable names.
              */
-            void environment(String name) {
-                model.get('environment', []) << name
+            void environment(String... names) {
+                model.get('environment', []).addAll(names)
             }
 
             /**
@@ -383,10 +383,12 @@ class BuildkitePipeline implements ConfigurableEnvironment {
             }
 
             /**
-             * Set an environment variable to pass into the container.
+             * Set one or more environment variables to pass into the Docker container.
+             *
+             * @param name The variable names.
              */
-            void environment(String name) {
-                model.get('env', []) << name
+            void environment(String... names) {
+                model.get('env', []).addAll(names)
             }
 
             /**