DockerSpec.java (spring-boot-2.7.3) | : | DockerSpec.java (spring-boot-2.7.4) | ||
---|---|---|---|---|
skipping to change at line 25 | skipping to change at line 25 | |||
*/ | */ | |||
package org.springframework.boot.gradle.tasks.bundling; | package org.springframework.boot.gradle.tasks.bundling; | |||
import groovy.lang.Closure; | import groovy.lang.Closure; | |||
import org.gradle.api.Action; | import org.gradle.api.Action; | |||
import org.gradle.api.GradleException; | import org.gradle.api.GradleException; | |||
import org.gradle.api.tasks.Input; | import org.gradle.api.tasks.Input; | |||
import org.gradle.api.tasks.Nested; | import org.gradle.api.tasks.Nested; | |||
import org.gradle.api.tasks.Optional; | import org.gradle.api.tasks.Optional; | |||
import org.gradle.util.ConfigureUtil; | ||||
import org.springframework.boot.buildpack.platform.docker.configuration.DockerCo nfiguration; | import org.springframework.boot.buildpack.platform.docker.configuration.DockerCo nfiguration; | |||
/** | /** | |||
* Encapsulates Docker configuration options. | * Encapsulates Docker configuration options. | |||
* | * | |||
* @author Wei Jiang | * @author Wei Jiang | |||
* @author Scott Frederick | * @author Scott Frederick | |||
* @since 2.4.0 | * @since 2.4.0 | |||
*/ | */ | |||
skipping to change at line 125 | skipping to change at line 124 | |||
public void builderRegistry(Action<DockerRegistrySpec> action) { | public void builderRegistry(Action<DockerRegistrySpec> action) { | |||
action.execute(this.builderRegistry); | action.execute(this.builderRegistry); | |||
} | } | |||
/** | /** | |||
* Customizes the {@link DockerRegistrySpec} that configures authenticati on to the | * Customizes the {@link DockerRegistrySpec} that configures authenticati on to the | |||
* builder registry. | * builder registry. | |||
* @param closure the closure to apply | * @param closure the closure to apply | |||
*/ | */ | |||
public void builderRegistry(Closure<?> closure) { | public void builderRegistry(Closure<?> closure) { | |||
builderRegistry(ConfigureUtil.configureUsing(closure)); | builderRegistry(Closures.asAction(closure)); | |||
} | } | |||
/** | /** | |||
* Returns the {@link DockerRegistrySpec} that configures authentication to the | * Returns the {@link DockerRegistrySpec} that configures authentication to the | |||
* publishing registry. | * publishing registry. | |||
* @return the registry spec | * @return the registry spec | |||
*/ | */ | |||
@Nested | @Nested | |||
public DockerRegistrySpec getPublishRegistry() { | public DockerRegistrySpec getPublishRegistry() { | |||
return this.publishRegistry; | return this.publishRegistry; | |||
skipping to change at line 153 | skipping to change at line 152 | |||
public void publishRegistry(Action<DockerRegistrySpec> action) { | public void publishRegistry(Action<DockerRegistrySpec> action) { | |||
action.execute(this.publishRegistry); | action.execute(this.publishRegistry); | |||
} | } | |||
/** | /** | |||
* Customizes the {@link DockerRegistrySpec} that configures authenticati on to the | * Customizes the {@link DockerRegistrySpec} that configures authenticati on to the | |||
* publishing registry. | * publishing registry. | |||
* @param closure the closure to apply | * @param closure the closure to apply | |||
*/ | */ | |||
public void publishRegistry(Closure<?> closure) { | public void publishRegistry(Closure<?> closure) { | |||
publishRegistry(ConfigureUtil.configureUsing(closure)); | publishRegistry(Closures.asAction(closure)); | |||
} | } | |||
/** | /** | |||
* Returns this configuration as a {@link DockerConfiguration} instance. This method | * Returns this configuration as a {@link DockerConfiguration} instance. This method | |||
* should only be called when the configuration is complete and will no l onger be | * should only be called when the configuration is complete and will no l onger be | |||
* changed. | * changed. | |||
* @return the Docker configuration | * @return the Docker configuration | |||
*/ | */ | |||
DockerConfiguration asDockerConfiguration() { | DockerConfiguration asDockerConfiguration() { | |||
DockerConfiguration dockerConfiguration = new DockerConfiguration (); | DockerConfiguration dockerConfiguration = new DockerConfiguration (); | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 2 lines changed or added |