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

Merge branch '2.3.x'

Browse Source 
Closes gh-22923
This commit is contained in:
Scott Frederick
2020-08-12 17:04:54 -05:00
parent 8e1768262c 005ed8b8db
commit 092bbd198e
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc
View File

@@ -121,7 +121,8 @@ The builder and run image can be specified on the command line as well, as shown
==== Builder Configuration ==== Builder Configuration
If the builder exposes configuration options, those can be set using the `environment` property. If the builder exposes configuration options, those can be set using the `environment` property.
The following example assumes that the default builder defines a `BP_JVM_VERSION` property (typically used to customize the JDK version the image should use): The following example assumes that the default builder recognizes a `BP_JVM_VERSION` property.
This property is typically used to customize the JDK version the image should use by specifying the major version and a wildcard for the rest of the version:
[source,groovy,indent=0,subs="verbatim,attributes",role="primary"] [source,groovy,indent=0,subs="verbatim,attributes",role="primary"]
.Groovy .Groovy

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

@@ -9,12 +9,12 @@ bootJar {
// tag::env[] // tag::env[]
bootBuildImage { bootBuildImage {
environment = ["BP_JVM_VERSION" : "13.0.1"] environment = ["BP_JVM_VERSION" : "8.*"]
} }
// end::env[] // end::env[]
task bootBuildImageEnvironment { task bootBuildImageEnvironment {
doFirst { doFirst {
bootBuildImage.environment.each { name, value -> println "$name=$value" } bootBuildImage.environment.each { name, value -> println "$name=$value" }
} }
} }

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.getByName<BootBuildImage>("bootBuildImage") { tasks.getByName<BootBuildImage>("bootBuildImage") {
environment = mapOf("BP_JVM_VERSION" to "13.0.1") environment = mapOf("BP_JVM_VERSION" to "8.*")
} }
// end::env[] // end::env[]

5
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc
View File

@@ -158,7 +158,8 @@ The builder and run image can be specified on the command line as well, as shown
==== Builder Configuration ==== Builder Configuration
If the builder exposes configuration options using environment variables, those can be set using the `env` attributes. If the builder exposes configuration options using environment variables, those can be set using the `env` attributes.
The following example assumes that the default builder defines a `BP_JVM_VERSION` property (typically used to customize the JDK version the image should use): The following example assumes that the default builder recognizes a `BP_JVM_VERSION` property.
This property is typically used to customize the JDK version the image should use by specifying the major version and a wildcard for the rest of the version:
[source,xml,indent=0,subs="verbatim,attributes"] [source,xml,indent=0,subs="verbatim,attributes"]
---- ----
@@ -172,7 +173,7 @@ The following example assumes that the default builder defines a `BP_JVM_VERSION
<configuration> <configuration>
<image> <image>
<env> <env>
<BP_JVM_VERSION>13.0.1</BP_JVM_VERSION> <BP_JVM_VERSION>8.*</BP_JVM_VERSION>
</env> </env>
</image> </image>
</configuration> </configuration>