Support platform queries for image inspect and export

Signed-off-by: hojooo <ghwn5833@gmail.com>

Author: hojooo

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

@@ -68,6 +68,10 @@ public class DockerApi {
 
 	static final ApiVersion PLATFORM_API_VERSION = ApiVersion.of(1, 41);
 
+    static final ApiVersion INSPECT_PLATFORM_API_VERSION = ApiVersion.of(1, 49);
+
+    static final ApiVersion EXPORT_PLATFORM_API_VERSION = ApiVersion.of(1, 51);
+
 	static final ApiVersion UNKNOWN_API_VERSION = ApiVersion.of(0, 0);
 
 	static final String API_VERSION_HEADER_NAME = "API-Version";
@@ -239,9 +243,12 @@ public Image pull(ImageReference reference, @Nullable ImagePlatform platform,
 						listener.onUpdate(event);
 					});
 				}
-				String digest = digestCapture.getDigest();
-				ImageReference inspectReference = (digest != null) ? reference.withDigest(digest) : reference;
-				return inspect((platform != null) ? PLATFORM_API_VERSION : API_VERSION, inspectReference);
+                ApiVersion callVersion = API_VERSION;
+                if (platform != null) {
+                    callVersion = (getApiVersion().supports(INSPECT_PLATFORM_API_VERSION))
+                            ? INSPECT_PLATFORM_API_VERSION : PLATFORM_API_VERSION;
+                }
+                return inspect(callVersion, reference, platform);
 			}
 			finally {
 				listener.onFinish();
@@ -328,9 +335,20 @@ public void exportLayers(ImageReference reference, @Nullable ImagePlatform platf
 				IOBiConsumer<String, TarArchive> exports) throws IOException {
 			Assert.notNull(reference, "'reference' must not be null");
 			Assert.notNull(exports, "'exports' must not be null");
-			URI uri = (platform != null)
-					? buildUrl(PLATFORM_API_VERSION, "/images/" + reference + "/get", "platform", platform)
-					: buildUrl("/images/" + reference + "/get");
+			URI uri;
+			if (platform != null) {
+				if (getApiVersion().supports(EXPORT_PLATFORM_API_VERSION)) {
+					uri = buildUrl(EXPORT_PLATFORM_API_VERSION, "/images/" + reference + "/get", "platform",
+							platform.toString());
+				}
+				else {
+					// Platform selection for /images/{ref}/get is supported from 1.51
+					uri = buildUrl("/images/" + reference + "/get");
+				}
+			}
+			else {
+				uri = buildUrl("/images/" + reference + "/get");
+			}
 			try (Response response = http().get(uri)) {
 				try (ExportedImageTar exportedImageTar = new ExportedImageTar(reference, response.getContent())) {
 					exportedImageTar.exportLayers(exports);
@@ -362,8 +380,15 @@ public Image inspect(ImageReference reference) throws IOException {
 		}
 
 		private Image inspect(ApiVersion apiVersion, ImageReference reference) throws IOException {
+			return inspect(apiVersion, reference, null);
+		}
+
+		private Image inspect(ApiVersion apiVersion, ImageReference reference, @Nullable ImagePlatform platform)
+				throws IOException {
 			Assert.notNull(reference, "'reference' must not be null");
-			URI imageUri = buildUrl(apiVersion, "/images/" + reference + "/json");
+            URI imageUri = (platform != null)
+                    ? buildUrl(apiVersion, "/images/" + reference + "/json", "platform", platform.toQueryParameter(getApiVersion()))
+                    : buildUrl(apiVersion, "/images/" + reference + "/json");
 			try (Response response = http().get(imageUri)) {
 				return Image.of(response.getContent());
 			}

buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImagePlatform.java

@@ -101,4 +101,31 @@ public static ImagePlatform from(Image image) {
 		return new ImagePlatform(image.getOs(), image.getArchitecture(), image.getVariant());
 	}
 
+	/**
+	 * Return the value to use for the Docker API {@code platform} query parameter for the
+	 * given API version.
+	 *
+	 * For API versions that support JSON (1.49 and above), this method returns a JSON
+	 * object in the form {@code {"os":"...","architecture":"...","variant":"..."}}.
+	 * For lower API versions, the legacy string representation {@code os[/arch[/variant]]}
+	 * is returned.
+	 * @param apiVersion the Docker API version to target
+	 * @return the query parameter value to use for {@code platform}
+	 */
+	public String toQueryParameter(ApiVersion apiVersion) {
+		Assert.notNull(apiVersion, "'apiVersion' must not be null");
+		if (apiVersion.supports(ApiVersion.of(1, 49))) {
+			StringBuilder json = new StringBuilder("{");
+			json.append("\"os\":\"").append(this.os).append("\"");
+			if (this.architecture != null && !this.architecture.isEmpty()) {
+				json.append(",\"architecture\":\"").append(this.architecture).append("\"");
+			}
+			if (this.variant != null && !this.variant.isEmpty()) {
+				json.append(",\"variant\":\"").append(this.variant).append("\"");
+			}
+			json.append("}");
+			return json.toString();
+		}
+		return toString();
+	}
 }