Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x' into 3.4.x

Browse Source
This commit is contained in:
Phillip Webb
2025-04-10 16:30:04 -07:00
parent 5a3fc4a48b 935d759754
commit 96899e08d4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 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.
@@ -98,7 +98,7 @@ public class Image extends MappedObject {
* @return the image OS
*/
public String getOs() {
return (!StringUtils.hasText(this.os)) ? this.os : "linux";
return (!StringUtils.hasText(this.os)) ? "linux" : this.os;
}
/**