Browse Source

Merge branch '2.7.x' into 3.0.x

Closes gh-34600
pull/34503/head
Andy Wilkinson 3 years ago
parent
commit
220c4b671b
  1. 1
      spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
  2. 2
      spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageArchiveManifest.java

1
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java

@ -284,6 +284,7 @@ public class DockerApi { @@ -284,6 +284,7 @@ public class DockerApi {
* @param exports a consumer to receive the layer tar file paths (file can only be
* accessed during the callback)
* @throws IOException on IO error
* @since 2.7.10
*/
public void exportLayerFiles(ImageReference reference, IOBiConsumer<String, Path> exports) throws IOException {
Assert.notNull(reference, "Reference must not be null");

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageArchiveManifest.java

@ -31,7 +31,7 @@ import org.springframework.boot.buildpack.platform.json.MappedObject; @@ -31,7 +31,7 @@ import org.springframework.boot.buildpack.platform.json.MappedObject;
* Image archive manifest information.
*
* @author Scott Frederick
* @since 2.7.9
* @since 2.7.10
*/
public class ImageArchiveManifest extends MappedObject {

Loading…
Cancel
Save