Skip to content

Commit aa9e75e

Browse files
wilkinsonawilkinsona
committed
Merge branch '3.3.x' into 3.4.x
Closes gh-45610
2 parents c0bb27a + 5ed981d commit aa9e75e

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/dockerTest/java/org/springframework/boot/buildpack/platform/docker/DockerApiIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ class DockerApiIntegrationTests {
3636
@Test
3737
void pullImage() throws IOException {
3838
this.docker.image()
39-
.pull(ImageReference.of("gcr.io/paketo-buildpacks/builder:base"), null,
39+
.pull(ImageReference.of("docker.io/paketobuildpacks/builder:base"), null,
4040
new TotalProgressPullListener(new TotalProgressBar("Pulling: ")));
4141
}
4242

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -155,14 +155,14 @@ void buildInvokesBuilderWithDefaultImageTags() throws Exception {
155155
Image builderImage = loadImage("image-with-no-run-image-tag.json");
156156
Image runImage = loadImage("run-image.json");
157157
given(docker.image()
158-
.pull(eq(ImageReference.of("gcr.io/paketo-buildpacks/builder:latest")), isNull(), any(), isNull()))
158+
.pull(eq(ImageReference.of("docker.io/paketobuildpacks/builder:latest")), isNull(), any(), isNull()))
159159
.willAnswer(withPulledImage(builderImage));
160160
given(docker.image()
161161
.pull(eq(ImageReference.of("docker.io/cloudfoundry/run:latest")), eq(ImagePlatform.from(builderImage)),
162162
any(), isNull()))
163163
.willAnswer(withPulledImage(runImage));
164164
Builder builder = new Builder(BuildLog.to(out), docker, null);
165-
BuildRequest request = getTestRequest().withBuilder(ImageReference.of("gcr.io/paketo-buildpacks/builder"));
165+
BuildRequest request = getTestRequest().withBuilder(ImageReference.of("docker.io/paketobuildpacks/builder"));
166166
builder.build(request);
167167
assertThat(out.toString()).contains("Running creator");
168168
assertThat(out.toString()).contains("Successfully built image 'docker.io/library/my-application:latest'");
@@ -202,14 +202,14 @@ void buildInvokesBuilderWithNoStack() throws Exception {
202202
Image builderImage = loadImage("image-with-empty-stack.json");
203203
Image runImage = loadImage("run-image.json");
204204
given(docker.image()
205-
.pull(eq(ImageReference.of("gcr.io/paketo-buildpacks/builder:latest")), isNull(), any(), isNull()))
205+
.pull(eq(ImageReference.of("docker.io/paketobuildpacks/builder:latest")), isNull(), any(), isNull()))
206206
.willAnswer(withPulledImage(builderImage));
207207
given(docker.image()
208208
.pull(eq(ImageReference.of("docker.io/cloudfoundry/run:base-cnb")), eq(ImagePlatform.from(builderImage)),
209209
any(), isNull()))
210210
.willAnswer(withPulledImage(runImage));
211211
Builder builder = new Builder(BuildLog.to(out), docker, null);
212-
BuildRequest request = getTestRequest().withBuilder(ImageReference.of("gcr.io/paketo-buildpacks/builder"));
212+
BuildRequest request = getTestRequest().withBuilder(ImageReference.of("docker.io/paketobuildpacks/builder"));
213213
builder.build(request);
214214
assertThat(out.toString()).contains("Running creator");
215215
assertThat(out.toString()).contains("Successfully built image 'docker.io/library/my-application:latest'");

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -206,9 +206,9 @@ void pullWhenListenerIsNullThrowsException() {
206206

207207
@Test
208208
void pullPullsImageAndProducesEvents() throws Exception {
209-
ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base");
210-
URI createUri = new URI(IMAGES_URL + "/create?fromImage=gcr.io%2Fpaketo-buildpacks%2Fbuilder%3Abase");
211-
URI imageUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/json");
209+
ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base");
210+
URI createUri = new URI(IMAGES_URL + "/create?fromImage=docker.io%2Fpaketobuildpacks%2Fbuilder%3Abase");
211+
URI imageUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/json");
212212
given(http().post(eq(createUri), isNull())).willReturn(responseOf("pull-stream.json"));
213213
given(http().get(imageUri)).willReturn(responseOf("type/image.json"));
214214
Image image = this.api.pull(reference, null, this.pullListener);
@@ -221,9 +221,9 @@ void pullPullsImageAndProducesEvents() throws Exception {
221221

222222
@Test
223223
void pullWithRegistryAuthPullsImageAndProducesEvents() throws Exception {
224-
ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base");
225-
URI createUri = new URI(IMAGES_URL + "/create?fromImage=gcr.io%2Fpaketo-buildpacks%2Fbuilder%3Abase");
226-
URI imageUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/json");
224+
ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base");
225+
URI createUri = new URI(IMAGES_URL + "/create?fromImage=docker.io%2Fpaketobuildpacks%2Fbuilder%3Abase");
226+
URI imageUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/json");
227227
given(http().post(eq(createUri), eq("auth token"))).willReturn(responseOf("pull-stream.json"));
228228
given(http().get(imageUri)).willReturn(responseOf("type/image.json"));
229229
Image image = this.api.pull(reference, null, this.pullListener, "auth token");
@@ -385,8 +385,8 @@ void inspectWhenReferenceIsNullThrowsException() {
385385

386386
@Test
387387
void inspectInspectImage() throws Exception {
388-
ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base");
389-
URI imageUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/json");
388+
ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base");
389+
URI imageUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/json");
390390
given(http().get(imageUri)).willReturn(responseOf("type/image.json"));
391391
Image image = this.api.inspect(reference);
392392
assertThat(image.getLayers()).hasSize(46);
@@ -402,15 +402,15 @@ void exportLayersWhenReferenceIsNullThrowsException() {
402402
@Test
403403
@SuppressWarnings("removal")
404404
void exportLayersWhenExportsIsNullThrowsException() {
405-
ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base");
405+
ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base");
406406
assertThatIllegalArgumentException().isThrownBy(() -> this.api.exportLayerFiles(reference, null))
407407
.withMessage("Exports must not be null");
408408
}
409409

410410
@Test
411411
void exportLayersExportsLayerTars() throws Exception {
412-
ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base");
413-
URI exportUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/get");
412+
ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base");
413+
URI exportUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/get");
414414
given(DockerApiTests.this.http.get(exportUri)).willReturn(responseOf("export.tar"));
415415
MultiValueMap<String, String> contents = new LinkedMultiValueMap<>();
416416
this.api.exportLayers(reference, (name, archive) -> {
@@ -437,8 +437,8 @@ void exportLayersExportsLayerTars() throws Exception {
437437

438438
@Test
439439
void exportLayersWithSymlinksExportsLayerTars() throws Exception {
440-
ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base");
441-
URI exportUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/get");
440+
ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base");
441+
URI exportUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/get");
442442
given(DockerApiTests.this.http.get(exportUri)).willReturn(responseOf("export-symlinks.tar"));
443443
MultiValueMap<String, String> contents = new LinkedMultiValueMap<>();
444444
this.api.exportLayers(reference, (name, archive) -> {
@@ -466,8 +466,8 @@ void exportLayersWithSymlinksExportsLayerTars() throws Exception {
466466
@Test
467467
@SuppressWarnings("removal")
468468
void exportLayerFilesDeletesTempFiles() throws Exception {
469-
ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base");
470-
URI exportUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/get");
469+
ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base");
470+
URI exportUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/get");
471471
given(DockerApiTests.this.http.get(exportUri)).willReturn(responseOf("export.tar"));
472472
List<Path> layerFilePaths = new ArrayList<>();
473473
this.api.exportLayerFiles(reference, (name, path) -> layerFilePaths.add(path));
@@ -477,8 +477,8 @@ void exportLayerFilesDeletesTempFiles() throws Exception {
477477
@Test
478478
@SuppressWarnings("removal")
479479
void exportLayersWithNoManifestThrowsException() throws Exception {
480-
ImageReference reference = ImageReference.of("gcr.io/paketo-buildpacks/builder:base");
481-
URI exportUri = new URI(IMAGES_URL + "/gcr.io/paketo-buildpacks/builder:base/get");
480+
ImageReference reference = ImageReference.of("docker.io/paketobuildpacks/builder:base");
481+
URI exportUri = new URI(IMAGES_URL + "/docker.io/paketobuildpacks/builder:base/get");
482482
given(DockerApiTests.this.http.get(exportUri)).willReturn(responseOf("export-no-manifest.tar"));
483483
String expectedMessage = "Exported image '%s' does not contain 'index.json' or 'manifest.json'"
484484
.formatted(reference);

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/type/image-archive-index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"size": 529,
88
"annotations": {
99
"containerd.io/distribution.source.gcr.io": "paketo-buildpacks/adoptium",
10-
"io.containerd.image.name": "gcr.io/paketo-buildpacks/adoptium:latest",
10+
"io.containerd.image.name": "docker.io/paketobuildpacks/adoptium:latest",
1111
"org.opencontainers.image.ref.name": "latest"
1212
}
1313
}

0 commit comments

Comments
 (0)