Merge pull request #28292 from jeliebig

* pr/28292:
  Polish "Add option to customize cache volume names when building an image"
  Add option to customize cache volume names when building an image

Closes gh-28292

Author: scottfrederick

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java

@@ -38,6 +38,7 @@
  * @author Andrey Shlykov
  * @author Jeroen Meijer
  * @author Rafael Ceccone
+ * @author Julian Liebig
  * @since 2.3.0
  */
 public class BuildRequest {
@@ -74,6 +75,10 @@ public class BuildRequest {
 
 	private final List<ImageReference> tags;
 
+	private final Cache buildCache;
+
+	private final Cache launchCache;
+
 	BuildRequest(ImageReference name, Function<Owner, TarArchive> applicationContent) {
 		Assert.notNull(name, "Name must not be null");
 		Assert.notNull(applicationContent, "ApplicationContent must not be null");
@@ -91,12 +96,14 @@ public class BuildRequest {
 		this.bindings = Collections.emptyList();
 		this.network = null;
 		this.tags = Collections.emptyList();
+		this.buildCache = null;
+		this.launchCache = null;
 	}
 
 	BuildRequest(ImageReference name, Function<Owner, TarArchive> applicationContent, ImageReference builder,
 			ImageReference runImage, Creator creator, Map<String, String> env, boolean cleanCache,
 			boolean verboseLogging, PullPolicy pullPolicy, boolean publish, List<BuildpackReference> buildpacks,
-			List<Binding> bindings, String network, List<ImageReference> tags) {
+			List<Binding> bindings, String network, List<ImageReference> tags, Cache buildCache, Cache launchCache) {
 		this.name = name;
 		this.applicationContent = applicationContent;
 		this.builder = builder;
@@ -111,6 +118,8 @@ public class BuildRequest {
 		this.bindings = bindings;
 		this.network = network;
 		this.tags = tags;
+		this.buildCache = buildCache;
+		this.launchCache = launchCache;
 	}
 
 	/**
@@ -122,7 +131,7 @@ public BuildRequest withBuilder(ImageReference builder) {
 		Assert.notNull(builder, "Builder must not be null");
 		return new BuildRequest(this.name, this.applicationContent, builder.inTaggedOrDigestForm(), this.runImage,
 				this.creator, this.env, this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish,
-				this.buildpacks, this.bindings, this.network, this.tags);
+				this.buildpacks, this.bindings, this.network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -133,7 +142,7 @@ public BuildRequest withBuilder(ImageReference builder) {
 	public BuildRequest withRunImage(ImageReference runImageName) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, runImageName.inTaggedOrDigestForm(),
 				this.creator, this.env, this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish,
-				this.buildpacks, this.bindings, this.network, this.tags);
+				this.buildpacks, this.bindings, this.network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -145,7 +154,7 @@ public BuildRequest withCreator(Creator creator) {
 		Assert.notNull(creator, "Creator must not be null");
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
-				this.network, this.tags);
+				this.network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -161,7 +170,7 @@ public BuildRequest withEnv(String name, String value) {
 		env.put(name, value);
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator,
 				Collections.unmodifiableMap(env), this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish,
-				this.buildpacks, this.bindings, this.network, this.tags);
+				this.buildpacks, this.bindings, this.network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -175,7 +184,8 @@ public BuildRequest withEnv(Map<String, String> env) {
 		updatedEnv.putAll(env);
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator,
 				Collections.unmodifiableMap(updatedEnv), this.cleanCache, this.verboseLogging, this.pullPolicy,
-				this.publish, this.buildpacks, this.bindings, this.network, this.tags);
+				this.publish, this.buildpacks, this.bindings, this.network, this.tags, this.buildCache,
+				this.launchCache);
 	}
 
 	/**
@@ -186,7 +196,7 @@ public BuildRequest withEnv(Map<String, String> env) {
 	public BuildRequest withCleanCache(boolean cleanCache) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
-				this.network, this.tags);
+				this.network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -197,7 +207,7 @@ public BuildRequest withCleanCache(boolean cleanCache) {
 	public BuildRequest withVerboseLogging(boolean verboseLogging) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
-				this.network, this.tags);
+				this.network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -208,7 +218,7 @@ public BuildRequest withVerboseLogging(boolean verboseLogging) {
 	public BuildRequest withPullPolicy(PullPolicy pullPolicy) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, pullPolicy, this.publish, this.buildpacks, this.bindings,
-				this.network, this.tags);
+				this.network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -219,7 +229,7 @@ public BuildRequest withPullPolicy(PullPolicy pullPolicy) {
 	public BuildRequest withPublish(boolean publish) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, publish, this.buildpacks, this.bindings,
-				this.network, this.tags);
+				this.network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -243,7 +253,7 @@ public BuildRequest withBuildpacks(List<BuildpackReference> buildpacks) {
 		Assert.notNull(buildpacks, "Buildpacks must not be null");
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, buildpacks, this.bindings,
-				this.network, this.tags);
+				this.network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -267,7 +277,7 @@ public BuildRequest withBindings(List<Binding> bindings) {
 		Assert.notNull(bindings, "Bindings must not be null");
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, bindings,
-				this.network, this.tags);
+				this.network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -279,7 +289,7 @@ public BuildRequest withBindings(List<Binding> bindings) {
 	public BuildRequest withNetwork(String network) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
-				network, this.tags);
+				network, this.tags, this.buildCache, this.launchCache);
 	}
 
 	/**
@@ -301,7 +311,31 @@ public BuildRequest withTags(List<ImageReference> tags) {
 		Assert.notNull(tags, "Tags must not be null");
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
-				this.network, tags);
+				this.network, tags, this.buildCache, this.launchCache);
+	}
+
+	/**
+	 * Return a new {@link BuildRequest} with an updated build cache.
+	 * @param buildCache the build cache
+	 * @return an updated build request
+	 */
+	public BuildRequest withBuildCache(Cache buildCache) {
+		Assert.notNull(buildCache, "BuildCache must not be null");
+		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
+				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
+				this.network, this.tags, buildCache, this.launchCache);
+	}
+
+	/**
+	 * Return a new {@link BuildRequest} with an updated launch cache.
+	 * @param launchCache the cache
+	 * @return an updated build request
+	 */
+	public BuildRequest withLaunchCache(Cache launchCache) {
+		Assert.notNull(launchCache, "LaunchCache must not be null");
+		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
+				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
+				this.network, this.tags, this.buildCache, launchCache);
 	}
 
 	/**
@@ -421,6 +455,22 @@ public List<ImageReference> getTags() {
 		return this.tags;
 	}
 
+	/**
+	 * Return the custom build cache that should be used by the lifecycle.
+	 * @return the build cache
+	 */
+	public Cache getBuildCache() {
+		return this.buildCache;
+	}
+
+	/**
+	 * Return the custom launch cache that should be used by the lifecycle.
+	 * @return the launch cache
+	 */
+	public Cache getLaunchCache() {
+		return this.launchCache;
+	}
+
 	/**
 	 * Factory method to create a new {@link BuildRequest} from a JAR file.
 	 * @param jarFile the source jar file

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Cache.java

@@ -0,0 +1,125 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.buildpack.platform.build;
+
+import java.util.Objects;
+
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Details of a cache for use by the CNB builder.
+ *
+ * @author Scott Frederick
+ * @since 2.6.0
+ */
+public class Cache {
+
+	/**
+	 * The format of the cache.
+	 */
+	public enum Format {
+
+		/**
+		 * A cache stored as a volume in the Docker daemon.
+		 */
+		VOLUME;
+
+	}
+
+	protected final Format format;
+
+	Cache(Format format) {
+		this.format = format;
+	}
+
+	/**
+	 * Return the details of the cache if it is a volume cache.
+	 * @return the cache, or {@code null} if it is not a volume cache
+	 */
+	public Volume getVolume() {
+		return (this.format.equals(Format.VOLUME)) ? (Volume) this : null;
+	}
+
+	/**
+	 * Create a new {@code Cache} that uses a volume with the provided name.
+	 * @param name the cache volume name
+	 * @return a new cache instance
+	 */
+	public static Cache volume(String name) {
+		Assert.notNull(name, "Name must not be null");
+		return new Volume(name);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null || getClass() != obj.getClass()) {
+			return false;
+		}
+		Cache other = (Cache) obj;
+		return Objects.equals(this.format, other.format);
+	}
+
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(this.format);
+	}
+
+	/**
+	 * Details of a cache stored in a Docker volume.
+	 */
+	public static class Volume extends Cache {
+
+		private final String name;
+
+		Volume(String name) {
+			super(Format.VOLUME);
+			this.name = name;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) {
+				return true;
+			}
+			if (obj == null || getClass() != obj.getClass()) {
+				return false;
+			}
+			if (!super.equals(obj)) {
+				return false;
+			}
+			Volume other = (Volume) obj;
+			return Objects.equals(this.name, other.name);
+		}
+
+		@Override
+		public int hashCode() {
+			int result = super.hashCode();
+			result = 31 * result + ObjectUtils.nullSafeHashCode(this.name);
+			return result;
+		}
+
+	}
+
+}

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Lifecycle.java

@@ -39,6 +39,7 @@
  * @author Phillip Webb
  * @author Scott Frederick
  * @author Jeroen Meijer
+ * @author Julian Liebig
  */
 class Lifecycle implements Closeable {
 
@@ -86,16 +87,37 @@ class Lifecycle implements Closeable {
 		this.platformVersion = getPlatformVersion(builder.getBuilderMetadata().getLifecycle());
 		this.layersVolume = createRandomVolumeName("pack-layers-");
 		this.applicationVolume = createRandomVolumeName("pack-app-");
-		this.buildCacheVolume = createCacheVolumeName(request, ".build");
-		this.launchCacheVolume = createCacheVolumeName(request, ".launch");
+		this.buildCacheVolume = getBuildCacheVolumeName(request);
+		this.launchCacheVolume = getLaunchCacheVolumeName(request);
 	}
 
 	protected VolumeName createRandomVolumeName(String prefix) {
 		return VolumeName.random(prefix);
 	}
 
+	private VolumeName getBuildCacheVolumeName(BuildRequest request) {
+		if (request.getBuildCache() != null) {
+			return getVolumeName(request.getBuildCache());
+		}
+		return createCacheVolumeName(request, "build");
+	}
+
+	private VolumeName getLaunchCacheVolumeName(BuildRequest request) {
+		if (request.getLaunchCache() != null) {
+			return getVolumeName(request.getLaunchCache());
+		}
+		return createCacheVolumeName(request, "launch");
+	}
+
+	private VolumeName getVolumeName(Cache cache) {
+		if (cache.getVolume() != null) {
+			return VolumeName.of(cache.getVolume().getName());
+		}
+		return null;
+	}
+
 	private VolumeName createCacheVolumeName(BuildRequest request, String suffix) {
-		return VolumeName.basedOn(request.getName(), ImageReference::toLegacyString, "pack-cache-", suffix, 6);
+		return VolumeName.basedOn(request.getName(), ImageReference::toLegacyString, "pack-cache-", "." + suffix, 6);
 	}
 
 	private ApiVersion getPlatformVersion(BuilderMetadata.Lifecycle lifecycle) {