Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41173 from sdeleuze

Browse Source 
* pr/41173:
  Update Kotlin DSL examples of bootBuildImage to be additive

Closes gh-41173
This commit is contained in:
Moritz Halbritter 2024-06-28 13:47:50 +02:00
commit 86fa2296e2
3 changed files with 3 additions and 3 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/gradle/packaging/boot-build-image-env-proxy.gradle.kts
View File

@ -7,7 +7,7 @@ plugins {
// tag::env[] // tag::env[]
tasks.named<BootBuildImage>("bootBuildImage") { tasks.named<BootBuildImage>("bootBuildImage") {
environment.set(mapOf("HTTP_PROXY" to "http://proxy.example.com", environment.putAll(mapOf("HTTP_PROXY" to "http://proxy.example.com",
"HTTPS_PROXY" to "https://proxy.example.com")) "HTTPS_PROXY" to "https://proxy.example.com"))
} }
// end::env[] // end::env[]

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env-runtime.gradle.kts
View File

@ -7,7 +7,7 @@ plugins {
// tag::env-runtime[] // tag::env-runtime[]
tasks.named<BootBuildImage>("bootBuildImage") { tasks.named<BootBuildImage>("bootBuildImage") {
environment.set(mapOf( environment.putAll(mapOf(
"BPE_DELIM_JAVA_TOOL_OPTIONS" to " ", "BPE_DELIM_JAVA_TOOL_OPTIONS" to " ",
"BPE_APPEND_JAVA_TOOL_OPTIONS" to "-XX:+HeapDumpOnOutOfMemoryError" "BPE_APPEND_JAVA_TOOL_OPTIONS" to "-XX:+HeapDumpOnOutOfMemoryError"
)) ))

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-build-image-env.gradle.kts
View File

@ -7,7 +7,7 @@ plugins {
// tag::env[] // tag::env[]
tasks.named<BootBuildImage>("bootBuildImage") { tasks.named<BootBuildImage>("bootBuildImage") {
environment.set(environment.get() + mapOf("BP_JVM_VERSION" to "17")) environment.put("BP_JVM_VERSION", "17")
} }
// end::env[] // end::env[]