Phase.java (spring-boot-2.7.3) | : | Phase.java (spring-boot-2.7.4) | ||
---|---|---|---|---|
skipping to change at line 50 | skipping to change at line 50 | |||
private final boolean verboseLogging; | private final boolean verboseLogging; | |||
private boolean daemonAccess = false; | private boolean daemonAccess = false; | |||
private final List<String> args = new ArrayList<>(); | private final List<String> args = new ArrayList<>(); | |||
private final List<Binding> bindings = new ArrayList<>(); | private final List<Binding> bindings = new ArrayList<>(); | |||
private final Map<String, String> env = new LinkedHashMap<>(); | private final Map<String, String> env = new LinkedHashMap<>(); | |||
private final List<String> securityOptions = new ArrayList<>(); | ||||
private String networkMode; | private String networkMode; | |||
/** | /** | |||
* Create a new {@link Phase} instance. | * Create a new {@link Phase} instance. | |||
* @param name the name of the phase | * @param name the name of the phase | |||
* @param verboseLogging if verbose logging is requested | * @param verboseLogging if verbose logging is requested | |||
*/ | */ | |||
Phase(String name, boolean verboseLogging) { | Phase(String name, boolean verboseLogging) { | |||
this.name = name; | this.name = name; | |||
this.verboseLogging = verboseLogging; | this.verboseLogging = verboseLogging; | |||
skipping to change at line 114 | skipping to change at line 116 | |||
/** | /** | |||
* Update this phase with the network the build container will connect to . | * Update this phase with the network the build container will connect to . | |||
* @param networkMode the network | * @param networkMode the network | |||
*/ | */ | |||
void withNetworkMode(String networkMode) { | void withNetworkMode(String networkMode) { | |||
this.networkMode = networkMode; | this.networkMode = networkMode; | |||
} | } | |||
/** | /** | |||
* Update this phase with a security option. | ||||
* @param option the security option | ||||
*/ | ||||
void withSecurityOption(String option) { | ||||
this.securityOptions.add(option); | ||||
} | ||||
/** | ||||
* Return the name of the phase. | * Return the name of the phase. | |||
* @return the phase name | * @return the phase name | |||
*/ | */ | |||
String getName() { | String getName() { | |||
return this.name; | return this.name; | |||
} | } | |||
@Override | @Override | |||
public String toString() { | public String toString() { | |||
return this.name; | return this.name; | |||
skipping to change at line 141 | skipping to change at line 151 | |||
if (this.daemonAccess) { | if (this.daemonAccess) { | |||
update.withUser("root"); | update.withUser("root"); | |||
} | } | |||
update.withCommand("/cnb/lifecycle/" + this.name, StringUtils.toS tringArray(this.args)); | update.withCommand("/cnb/lifecycle/" + this.name, StringUtils.toS tringArray(this.args)); | |||
update.withLabel("author", "spring-boot"); | update.withLabel("author", "spring-boot"); | |||
this.bindings.forEach(update::withBinding); | this.bindings.forEach(update::withBinding); | |||
this.env.forEach(update::withEnv); | this.env.forEach(update::withEnv); | |||
if (this.networkMode != null) { | if (this.networkMode != null) { | |||
update.withNetworkMode(this.networkMode); | update.withNetworkMode(this.networkMode); | |||
} | } | |||
this.securityOptions.forEach(update::withSecurityOption); | ||||
} | } | |||
} | } | |||
End of changes. 3 change blocks. | ||||
0 lines changed or deleted | 11 lines changed or added |