root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch '3.3.x' into 3.4.x 

Closes gh-45166
This commit is contained in:
Phillip Webb 2025-04-11 09:19:32 -07:00
parent bb759d81ce a6f54ec5ea
commit ef9ad41b0a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/Image.java
View File

@ -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";
}
/**