Add forced start mode for Docker Compose

mhalbritter · Apr 4, 2024 · eed489b · eed489b
1 parent e9e2bc9
commit eed489b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/...java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java b/...java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,7 +119,10 @@ void start() {
 		Wait wait = this.properties.getReadiness().getWait();
 		List<RunningService> runningServices = dockerCompose.getRunningServices();
 		if (lifecycleManagement.shouldStart()) {
-			if (runningServices.isEmpty()) {
+			if (!runningServices.isEmpty() && !start.isForce()) {
+				logger.info("There are already Docker Compose services running, skipping startup");
+			}
+			else {
 				start.getCommand().applyTo(dockerCompose, start.getLogLevel());
 				runningServices = dockerCompose.getRunningServices();
 				if (wait == Wait.ONLY_IF_STARTED) {
@@ -129,9 +132,6 @@ void start() {
 					this.shutdownHandlers.add(() -> stop.getCommand().applyTo(dockerCompose, stop.getTimeout()));
 				}
 			}
-			else {
-				logger.info("There are already Docker Compose services running, skipping startup");
-			}
 		}
 		List<RunningService> relevantServices = new ArrayList<>(runningServices);
 		relevantServices.removeIf(this::isIgnored);

diff --git a/.../main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeProperties.java b/.../main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -148,6 +148,11 @@ public static class Start {
 		 */
 		private LogLevel logLevel = LogLevel.INFO;
 
+		/**
+		 * Whether to force the start, regardless of running services.
+		 */
+		private boolean force;
+
 		public StartCommand getCommand() {
 			return this.command;
 		}
@@ -164,6 +169,14 @@ public void setLogLevel(LogLevel logLevel) {
 			this.logLevel = logLevel;
 		}
 
+		public boolean isForce() {
+			return this.force;
+		}
+
+		public void setForce(boolean force) {
+			this.force = force;
+		}
+
 	}
 
 	/**