Merge branch '3.1.x'

Closes gh-36910

Author: mhalbritter

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliCommand.java

@@ -184,7 +184,7 @@ static final class ComposeDown extends DockerCliCommand<Void> {
 	static final class ComposeStart extends DockerCliCommand<Void> {
 
 		ComposeStart(LogLevel logLevel) {
-			super(Type.DOCKER_COMPOSE, logLevel, Void.class, false, "start", "--no-color", "--detach", "--wait");
+			super(Type.DOCKER_COMPOSE, logLevel, Void.class, false, "start", "--detach", "--wait");
 		}
 
 	}

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/core/DockerCliCommandTests.java

@@ -88,7 +88,7 @@ void composeStart() {
 		DockerCliCommand<?> command = new DockerCliCommand.ComposeStart(LogLevel.INFO);
 		assertThat(command.getType()).isEqualTo(DockerCliCommand.Type.DOCKER_COMPOSE);
 		assertThat(command.getLogLevel()).isEqualTo(LogLevel.INFO);
-		assertThat(command.getCommand()).containsExactly("start", "--no-color", "--detach", "--wait");
+		assertThat(command.getCommand()).containsExactly("start", "--detach", "--wait");
 		assertThat(command.deserialize("[]")).isNull();
 	}