Merge branch '3.3.x' into 3.4.x

Closes gh-45166
2025-04-11 09:19:32 -07:00
parent bb759d81ce a6f54ec5ea
commit ef9ad41b0a
1 changed files with 1 additions and 1 deletions
--- 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 class Image extends MappedObject {
 	 * @return the image OS
 	 */
 	public String getOs() {
-		return (!StringUtils.hasText(this.os)) ? "linux" : this.os;
+		return (StringUtils.hasText(this.os)) ? this.os : "linux";
 	}

 	/**