From aab4e66927a34b0d3591dfb29deb948ff3cf02cd Mon Sep 17 00:00:00 2001
From: Przemko Robakowski <przemko.robakowski@elastic.co>
Date: Thu, 12 Sep 2019 23:59:42 +0200
Subject: [PATCH] Assemble takes into account build.docker=false property

Closes #45034
---
 distribution/docker/build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle
index 7bf973e7edc92..ec3a3f5a383c9 100644
--- a/distribution/docker/build.gradle
+++ b/distribution/docker/build.gradle
@@ -175,8 +175,10 @@ for (final boolean oss : [false, true]) {
   addBuildDockerImage(oss)
 }
 
-assemble.dependsOn "buildOssDockerImage"
-assemble.dependsOn "buildDockerImage"
+if (System.getProperty("build.docker") != "false") {
+  assemble.dependsOn "buildOssDockerImage"
+  assemble.dependsOn "buildDockerImage"
+}
 
 // We build the images used in compose locally, but the pull command insists on using a repository
 // thus we must disable it to prevent it from doing so.