From 1e8696f2b2d7ca2834dcb6165b4d846b708d345c Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Tue, 3 Oct 2023 12:40:00 -0700 Subject: [PATCH] Never support Docker build features on Windows (#100218) (#100225) --- .../gradle/internal/docker/DockerSupportService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportService.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportService.java index 2062d3cf29bae..b4770f9a7bd5d 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportService.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportService.java @@ -8,6 +8,7 @@ package org.elasticsearch.gradle.internal.docker; import org.elasticsearch.gradle.Architecture; +import org.elasticsearch.gradle.OS; import org.elasticsearch.gradle.Version; import org.elasticsearch.gradle.internal.info.BuildParams; import org.gradle.api.GradleException; @@ -200,6 +201,11 @@ private boolean isExcludedOs() { return false; } + // Even if for some reason Docker exists on Windows agents, flag it as unsupported + if (OS.current() == OS.WINDOWS) { + return true; + } + // Only some hosts in CI are configured with Docker. We attempt to work out the OS // and version, so that we know whether to expect to find Docker. We don't attempt // to probe for whether Docker is available, because that doesn't tell us whether