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

Merge branch '2.4.x' 

See gh-26654
This commit is contained in:
Stephane Nicoll 2021-05-26 09:27:52 +02:00
parent 249c675fff 130261f0df
commit e5ee1eb86f
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/profiles.adoc
View File

@ -24,6 +24,16 @@ For example, you could include it in your `application.properties`, as shown in
You could also specify it on the command line by using the following switch: `--spring.profiles.active=dev,hsqldb`.
If no profile is active, a default profile is enabled.
The name of the default profile is `default` and it can be tuned using the configprop:spring.profiles.default[] `Environment` property, as shown in the following example:
[source,yaml,indent=0,subs="verbatim",configprops,configblocks]
----
spring:
profiles:
default: "none"
----
[[features.profiles.adding-active-profiles]]

18
spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/properties-and-configuration.adoc
View File

@ -239,6 +239,24 @@ See "`<<features#features.profiles>>`" in the "`Spring Boot features`" section f
[[howto.properties-and-configuration.set-default-spring-profile-name]]
=== Set the Default Profile Name
The default profile is a profile that is enabled if no profile is active.
By default, the name of the default profile is `default`, but it could be changed using a System property (configprop:spring.profiles.default[]) or an OS environment variable (configprop:spring.profiles.default[format=envvar]).
In Spring Boot, you can also set the default profile name in `application.properties`, as shown in the following example:
[source,yaml,indent=0,subs="verbatim",configprops,configblocks]
----
spring:
profiles:
default: "dev"
----
See "`<<features#features.profiles>>`" in the "`Spring Boot features`" section for more information.
[[howto.properties-and-configuration.change-configuration-depending-on-the-environment]]
=== Change Configuration Depending on the Environment
Spring Boot supports multi-document YAML and Properties files (see <<features#features.external-config.files.multi-document>> for details) which can be activated conditionally based on the active profiles.