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

Merge branch '3.4.x' 

Closes gh-46021
This commit is contained in:
Andy Wilkinson 2025-06-18 17:39:07 +01:00
parent d1ebe43805 95a569987f
commit e525837c88
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging-oci-image.adoc
View File

@ -254,7 +254,7 @@ Application contents will also be in this location in the generated image.
| `securityOptions` | `securityOptions`
| `--securityOptions` | `--securityOptions`
| https://docs.docker.com/engine/reference/run/#security-configuration[Security options] that will be applied to the builder container, provided as an array of string values | https://docs.docker.com/reference/cli/docker/container/run/#security-opt[Security options] that will be applied to the builder container, provided as an array of string values
| `["label=disable"]` on Linux and macOS, `[]` on Windows | `["label=disable"]` on Linux and macOS, `[]` on Windows
|=== |===

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/build-image.adoc
View File

@ -260,7 +260,7 @@ Application contents will also be in this location in the generated image.
| `/workspace` | `/workspace`
| `securityOptions` | `securityOptions`
| https://docs.docker.com/engine/reference/run/#security-configuration[Security options] that will be applied to the builder container, provided as an array of string values | https://docs.docker.com/reference/cli/docker/container/run/#security-opt[Security options] that will be applied to the builder container, provided as an array of string values
| `["label=disable"]` on Linux and macOS, `[]` on Windows | `["label=disable"]` on Linux and macOS, `[]` on Windows
|=== |===