From 402110c55717728140f18196c7eb0b5a0f08a257 Mon Sep 17 00:00:00 2001
From: Mark Vieira <portugee@gmail.com>
Date: Wed, 1 Jul 2020 16:08:46 -0700
Subject: [PATCH] [7.x] Upgrade Gradle docker-compose plugin (#58873)

---
 buildSrc/build.gradle                                          | 2 +-
 .../org/elasticsearch/gradle/docker/DockerSupportService.java  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index d5cd0c93225..2f84369d07d 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -100,7 +100,7 @@ dependencies {
   api "org.elasticsearch:jna:5.5.0"
   api 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
   api 'de.thetaphi:forbiddenapis:3.0'
-  api 'com.avast.gradle:gradle-docker-compose-plugin:0.8.12'
+  api 'com.avast.gradle:gradle-docker-compose-plugin:0.12.1'
   api 'org.apache.maven:maven-model:3.6.2'
   api 'com.networknt:json-schema-validator:1.0.36'
 
diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java b/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java
index 9d49fe2e2f0..0230e772b97 100644
--- a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java
+++ b/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java
@@ -336,8 +336,7 @@ public abstract class DockerSupportService implements BuildService<DockerSupport
             Result lastCommand
         ) {
             this.isAvailable = isAvailable;
-            // TODO: This is temporary, and should be removed when https://github.com/elastic/elasticsearch/issues/58795 is resolved
-            this.isComposeAvailable = false; // isComposeAvailable;
+            this.isComposeAvailable = isComposeAvailable;
             this.isVersionHighEnough = isVersionHighEnough;
             this.path = path;
             this.version = version;