Merge branch '3.3.x' into 3.4.x

philwebb · philwebb · commit ef9ad41b0a31 · 2025-04-11T09:19:32.000-07:00
Closes gh-45166
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java
@@ -98,7 +98,7 @@ public List<LayerId> getLayers() {
 	 * @return the image OS
 	 */
 	public String getOs() {
-		return (!StringUtils.hasText(this.os)) ? "linux" : this.os;
+		return (StringUtils.hasText(this.os)) ? this.os : "linux";
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public List<LayerId> getLayers() {`
`98`	`98`	`* @return the image OS`
`99`	`99`	`*/`
`100`	`100`	`public String getOs() {`
`101`		`- return (!StringUtils.hasText(this.os)) ? "linux" : this.os;`
	`101`	`+ return (StringUtils.hasText(this.os)) ? this.os : "linux";`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/**`