Skip to content

Commit 774e3bf

Browse files
authored
Ensure all docker compose tasks are disabled when appropriate (#100355)
We mistakenly weren't skipping `DockerBuild` tasks when docker is unavailable on the host machine.
1 parent baad6f6 commit 774e3bf

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.avast.gradle.dockercompose.ComposeExtension;
1111
import com.avast.gradle.dockercompose.DockerComposePlugin;
1212
import com.avast.gradle.dockercompose.ServiceInfo;
13+
import com.avast.gradle.dockercompose.tasks.ComposeBuild;
1314
import com.avast.gradle.dockercompose.tasks.ComposeDown;
1415
import com.avast.gradle.dockercompose.tasks.ComposePull;
1516
import com.avast.gradle.dockercompose.tasks.ComposeUp;
@@ -146,6 +147,7 @@ public void execute(Task task) {
146147
maybeSkipTasks(tasks, dockerSupport, getTaskClass("org.elasticsearch.gradle.internal.test.RestIntegTestTask"));
147148
maybeSkipTasks(tasks, dockerSupport, getTaskClass("org.elasticsearch.gradle.internal.test.AntFixture"));
148149
maybeSkipTasks(tasks, dockerSupport, ComposeUp.class);
150+
maybeSkipTasks(tasks, dockerSupport, ComposeBuild.class);
149151
maybeSkipTasks(tasks, dockerSupport, ComposePull.class);
150152
maybeSkipTasks(tasks, dockerSupport, ComposeDown.class);
151153

0 commit comments

Comments
 (0)