diff --git a/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java b/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java index cf7968e573d14..0fab6badba53e 100644 --- a/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java +++ b/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java @@ -141,7 +141,11 @@ public DockerSessionFactory( this.predicate = Require.nonNull("Accepted capabilities predicate", predicate); this.hostConfig = Require.nonNull("Container host config", hostConfig); this.hostConfigKeys = Require.nonNull("Browser container host config keys", hostConfigKeys); - this.composeLabels = Require.nonNull("Docker Compose labels", composeLabels); + // Merge compose labels with oneoff=False to prevent triggering --exit-code-from dynamic grid + Map allLabels = + new HashMap<>(Require.nonNull("Docker Compose labels", composeLabels)); + allLabels.put("com.docker.compose.oneoff", "False"); + this.composeLabels = Collections.unmodifiableMap(allLabels); } @Override