diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/dockerTest/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/dockerTest/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java index 4fb4e72c30..bf720ec5fb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/dockerTest/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/dockerTest/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2024 the original author or authors. + * Copyright 2012-2025 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. @@ -36,7 +36,7 @@ class DockerApiIntegrationTests { @Test void pullImage() throws IOException { this.docker.image() - .pull(ImageReference.of("gcr.io/paketo-buildpacks/builder:base"), null, + .pull(ImageReference.of("docker.io/paketobuildpacks/builder:base"), null, new TotalProgressPullListener(new TotalProgressBar("Pulling: "))); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java index 13169ebf2d..654c9b06f5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java @@ -68,7 +68,7 @@ import static org.mockito.Mockito.times; class BuilderTests { private static final ImageReference PAKETO_BUILDPACKS_BUILDER = ImageReference - .of("gcr.io/paketo-buildpacks/builder"); + .of("docker.io/paketobuildpacks/builder"); private static final ImageReference LATEST_PAKETO_BUILDPACKS_BUILDER = PAKETO_BUILDPACKS_BUILDER.inTaggedForm(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java index 4a17fcc30b..309760fb7a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java @@ -205,9 +205,9 @@ class DockerApiTests { @Test void pullPullsImageAndProducesEvents() throws Exception { - ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base"); - URI createUri = new URI(IMAGES_URL + "/create?fromImage=gcr.io%2Fpaketo-buildpacks%2Fbuilder%3Abase"); - URI imageUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/json"); + ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base"); + URI createUri = new URI(IMAGES_URL + "/create?fromImage=docker.io%2Fpaketobuildpacks%2Fbuilder%3Abase"); + URI imageUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/json"); given(http().post(eq(createUri), isNull())).willReturn(responseOf("pull-stream.json")); given(http().get(imageUri)).willReturn(responseOf("type/image.json")); Image image = this.api.pull(reference, null, this.pullListener); @@ -220,9 +220,9 @@ class DockerApiTests { @Test void pullWithRegistryAuthPullsImageAndProducesEvents() throws Exception { - ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base"); - URI createUri = new URI(IMAGES_URL + "/create?fromImage=gcr.io%2Fpaketo-buildpacks%2Fbuilder%3Abase"); - URI imageUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/json"); + ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base"); + URI createUri = new URI(IMAGES_URL + "/create?fromImage=docker.io%2Fpaketobuildpacks%2Fbuilder%3Abase"); + URI imageUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/json"); given(http().post(eq(createUri), eq("auth token"))).willReturn(responseOf("pull-stream.json")); given(http().get(imageUri)).willReturn(responseOf("type/image.json")); Image image = this.api.pull(reference, null, this.pullListener, "auth token"); @@ -384,8 +384,8 @@ class DockerApiTests { @Test void inspectInspectImage() throws Exception { - ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base"); - URI imageUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/json"); + ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base"); + URI imageUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/json"); given(http().get(imageUri)).willReturn(responseOf("type/image.json")); Image image = this.api.inspect(reference); assertThat(image.getLayers()).hasSize(46); @@ -393,8 +393,8 @@ class DockerApiTests { @Test void exportLayersExportsLayerTars() throws Exception { - ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base"); - URI exportUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/get"); + ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base"); + URI exportUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/get"); given(DockerApiTests.this.http.get(exportUri)).willReturn(responseOf("export.tar")); MultiValueMap contents = new LinkedMultiValueMap<>(); this.api.exportLayers(reference, (name, archive) -> { @@ -421,8 +421,8 @@ class DockerApiTests { @Test void exportLayersWithSymlinksExportsLayerTars() throws Exception { - ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base"); - URI exportUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/get"); + ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base"); + URI exportUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/get"); given(DockerApiTests.this.http.get(exportUri)).willReturn(responseOf("export-symlinks.tar")); MultiValueMap contents = new LinkedMultiValueMap<>(); this.api.exportLayers(reference, (name, archive) -> { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-archive-index.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-archive-index.json index 4369b7ce05..04fbe78552 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-archive-index.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-archive-index.json @@ -7,7 +7,7 @@ "size": 529, "annotations": { "containerd.io/distribution.source.gcr.io": "paketo-buildpacks/adoptium", - "io.containerd.image.name": "gcr.io/paketo-buildpacks/adoptium:latest", + "io.containerd.image.name": "docker.io/paketobuildpacks/adoptium:latest", "org.opencontainers.image.ref.name": "latest" } }