mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 03:13:21 +08:00
Merge branch '2.3.x' into 2.4.x
Closes gh-25839
This commit is contained in:
commit
8ac297d6f3
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
* 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.
|
||||
@ -28,8 +28,6 @@ import java.util.Random;
|
||||
import org.gradle.testkit.runner.BuildResult;
|
||||
import org.gradle.testkit.runner.TaskOutcome;
|
||||
import org.junit.jupiter.api.TestTemplate;
|
||||
import org.testcontainers.containers.GenericContainer;
|
||||
import org.testcontainers.containers.wait.strategy.Wait;
|
||||
|
||||
import org.springframework.boot.buildpack.platform.docker.DockerApi;
|
||||
import org.springframework.boot.buildpack.platform.docker.type.ImageName;
|
||||
@ -60,13 +58,10 @@ class BootBuildImageIntegrationTests {
|
||||
String projectName = this.gradleBuild.getProjectDir().getName();
|
||||
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
||||
assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
new DockerApi().image().remove(imageReference, false);
|
||||
}
|
||||
assertThat(result.getOutput()).contains("---> Test Info buildpack building");
|
||||
assertThat(result.getOutput()).contains("env: BP_JVM_VERSION=8.*");
|
||||
assertThat(result.getOutput()).contains("---> Test Info buildpack done");
|
||||
removeImage(projectName);
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
@ -76,13 +71,10 @@ class BootBuildImageIntegrationTests {
|
||||
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
|
||||
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
||||
assertThat(result.getOutput()).contains("example/test-image-name");
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of("example/test-image-name"));
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
new DockerApi().image().remove(imageReference, false);
|
||||
}
|
||||
assertThat(result.getOutput()).contains("---> Test Info buildpack building");
|
||||
assertThat(result.getOutput()).contains("env: BP_JVM_VERSION=8.*");
|
||||
assertThat(result.getOutput()).contains("---> Test Info buildpack done");
|
||||
removeImage("example/test-image-name");
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
@ -92,13 +84,9 @@ class BootBuildImageIntegrationTests {
|
||||
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
|
||||
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
||||
assertThat(result.getOutput()).contains("example/test-image-custom");
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of("example/test-image-custom"));
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
new DockerApi().image().remove(imageReference, false);
|
||||
}
|
||||
assertThat(result.getOutput()).contains("---> Test Info buildpack building");
|
||||
assertThat(result.getOutput()).contains("---> Test Info buildpack done");
|
||||
removeImage("example/test-image-custom");
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
@ -106,17 +94,14 @@ class BootBuildImageIntegrationTests {
|
||||
writeMainClass();
|
||||
writeLongNameResource();
|
||||
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT",
|
||||
"--imageName=example/test-image-cmd", "--builder=paketobuildpacks/builder:full",
|
||||
"--runImage=paketobuildpacks/run:full-cnb");
|
||||
"--imageName=example/test-image-cmd",
|
||||
"--builder=projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1",
|
||||
"--runImage=projects.registry.vmware.com/springboot/run:tiny-cnb");
|
||||
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
||||
assertThat(result.getOutput()).contains("example/test-image-cmd");
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of("example/test-image-cmd"));
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
new DockerApi().image().remove(imageReference, false);
|
||||
}
|
||||
assertThat(result.getOutput()).contains("---> Test Info buildpack building");
|
||||
assertThat(result.getOutput()).contains("---> Test Info buildpack done");
|
||||
removeImage("example/test-image-cmd");
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
@ -124,24 +109,13 @@ class BootBuildImageIntegrationTests {
|
||||
writeMainClass();
|
||||
writeLongNameResource();
|
||||
String projectName = this.gradleBuild.getProjectDir().getName();
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
|
||||
|
||||
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=ALWAYS");
|
||||
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
||||
assertThat(result.getOutput()).contains("Pulled builder image").contains("Pulled run image");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
|
||||
result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
|
||||
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
||||
assertThat(result.getOutput()).doesNotContain("Pulled builder image").doesNotContain("Pulled run image");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
new DockerApi().image().remove(imageReference, false);
|
||||
}
|
||||
removeImage(projectName);
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
@ -159,6 +133,7 @@ class BootBuildImageIntegrationTests {
|
||||
writeLongNameResource();
|
||||
BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
|
||||
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.FAILED);
|
||||
assertThat(result.getOutput()).contains("Forced builder failure");
|
||||
assertThat(result.getOutput()).containsPattern("Builder lifecycle '.*' failed with status code");
|
||||
}
|
||||
|
||||
@ -198,16 +173,12 @@ class BootBuildImageIntegrationTests {
|
||||
String projectName = this.gradleBuild.getProjectDir().getName();
|
||||
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
|
||||
assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
|
||||
assertThat(result.getOutput()).contains("---> Test Info buildpack building");
|
||||
assertThat(result.getOutput()).contains("---> Test Info buildpack done");
|
||||
File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs");
|
||||
assertThat(buildLibs.listFiles())
|
||||
.containsExactly(new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".war"));
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
new DockerApi().image().remove(imageReference, false);
|
||||
}
|
||||
removeImage(projectName);
|
||||
}
|
||||
|
||||
private void writeMainClass() {
|
||||
@ -249,4 +220,9 @@ class BootBuildImageIntegrationTests {
|
||||
}
|
||||
}
|
||||
|
||||
private void removeImage(String name) throws IOException {
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of(name));
|
||||
new DockerApi().image().remove(imageReference, false);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,7 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'org.springframework.boot' version '{version}'
|
||||
}
|
||||
|
||||
sourceCompatibility = '1.8'
|
||||
targetCompatibility = '1.8'
|
@ -8,6 +8,6 @@ targetCompatibility = '1.8'
|
||||
|
||||
bootBuildImage {
|
||||
imageName = "example/test-image-custom"
|
||||
builder = "paketobuildpacks/builder:full"
|
||||
runImage = "paketobuildpacks/run:full-cnb"
|
||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||
runImage = "projects.registry.vmware.com/springboot/run:tiny-cnb"
|
||||
}
|
||||
|
@ -8,4 +8,5 @@ targetCompatibility = '1.8'
|
||||
|
||||
bootBuildImage {
|
||||
imageName = "example/test-image-name"
|
||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||
}
|
||||
|
@ -9,3 +9,7 @@ bootBuildImage {
|
||||
|
||||
sourceCompatibility = '1.8'
|
||||
targetCompatibility = '1.8'
|
||||
|
||||
bootBuildImage {
|
||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||
}
|
@ -7,5 +7,6 @@ sourceCompatibility = '1.8'
|
||||
targetCompatibility = '1.8'
|
||||
|
||||
bootBuildImage {
|
||||
environment = ["BP_JVM_VERSION": "13.9.9"]
|
||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||
environment = ["FORCE_FAILURE": "true"]
|
||||
}
|
||||
|
@ -9,3 +9,7 @@ targetCompatibility = '1.8'
|
||||
bootJar {
|
||||
launchScript()
|
||||
}
|
||||
|
||||
bootBuildImage {
|
||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||
}
|
||||
|
@ -9,3 +9,7 @@ if (project.hasProperty('applyWarPlugin')) {
|
||||
|
||||
sourceCompatibility = '1.8'
|
||||
targetCompatibility = '1.8'
|
||||
|
||||
bootBuildImage {
|
||||
builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
|
||||
}
|
||||
|
@ -16,21 +16,15 @@
|
||||
|
||||
package org.springframework.boot.maven;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.Random;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.junit.jupiter.api.TestTemplate;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.testcontainers.containers.GenericContainer;
|
||||
import org.testcontainers.containers.wait.strategy.Wait;
|
||||
|
||||
import org.springframework.boot.buildpack.platform.docker.DockerApi;
|
||||
import org.springframework.boot.buildpack.platform.docker.type.ImageName;
|
||||
@ -60,15 +54,9 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
assertThat(original).doesNotExist();
|
||||
assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("docker.io/library/build-image:0.0.1.BUILD-SNAPSHOT")
|
||||
.contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of("build-image"),
|
||||
"0.0.1.BUILD-SNAPSHOT");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
.contains("---> Test Info buildpack building").contains("env: BP_JVM_VERSION=8.*")
|
||||
.contains("---> Test Info buildpack done").contains("Successfully built image");
|
||||
removeImage("build-image", "0.0.1.BUILD-SNAPSHOT");
|
||||
});
|
||||
}
|
||||
|
||||
@ -83,15 +71,9 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
assertThat(classifier).doesNotExist();
|
||||
assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("docker.io/library/build-image-classifier:0.0.1.BUILD-SNAPSHOT")
|
||||
.contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of("build-image-classifier"),
|
||||
"0.0.1.BUILD-SNAPSHOT");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
.contains("---> Test Info buildpack building").contains("env: BP_JVM_VERSION=8.*")
|
||||
.contains("---> Test Info buildpack done").contains("Successfully built image");
|
||||
removeImage("build-image-classifier", "0.0.1.BUILD-SNAPSHOT");
|
||||
});
|
||||
}
|
||||
|
||||
@ -108,15 +90,9 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
assertThat(original).doesNotExist();
|
||||
assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("docker.io/library/build-image-classifier-source:0.0.1.BUILD-SNAPSHOT")
|
||||
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
|
||||
.contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of("build-image-classifier-source"),
|
||||
"0.0.1.BUILD-SNAPSHOT");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
removeImage("build-image-classifier-source", "0.0.1.BUILD-SNAPSHOT");
|
||||
});
|
||||
}
|
||||
|
||||
@ -132,15 +108,9 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
assertThat(original).isFile();
|
||||
assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("docker.io/library/build-image-with-repackage:0.0.1.BUILD-SNAPSHOT")
|
||||
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
|
||||
.contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of("build-image-with-repackage"),
|
||||
"0.0.1.BUILD-SNAPSHOT");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
removeImage("build-image-with-repackage", "0.0.1.BUILD-SNAPSHOT");
|
||||
});
|
||||
}
|
||||
|
||||
@ -157,15 +127,9 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
assertThat(original).isFile();
|
||||
assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("docker.io/library/build-image-classifier-with-repackage:0.0.1.BUILD-SNAPSHOT")
|
||||
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
|
||||
.contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference
|
||||
.of(ImageName.of("build-image-classifier-with-repackage"), "0.0.1.BUILD-SNAPSHOT");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
removeImage("build-image-classifier-with-repackage", "0.0.1.BUILD-SNAPSHOT");
|
||||
});
|
||||
}
|
||||
|
||||
@ -182,15 +146,9 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
assertThat(original).isFile();
|
||||
assertThat(buildLog(project)).contains("Building image").contains(
|
||||
"docker.io/library/build-image-classifier-source-with-repackage:0.0.1.BUILD-SNAPSHOT")
|
||||
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
|
||||
.contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference
|
||||
.of(ImageName.of("build-image-classifier-source-with-repackage"), "0.0.1.BUILD-SNAPSHOT");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
removeImage("build-image-classifier-source-with-repackage", "0.0.1.BUILD-SNAPSHOT");
|
||||
});
|
||||
}
|
||||
|
||||
@ -207,15 +165,9 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
assertThat(original).doesNotExist();
|
||||
assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("example.com/test/build-image:0.0.1.BUILD-SNAPSHOT")
|
||||
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
|
||||
.contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference
|
||||
.of("example.com/test/build-image:0.0.1.BUILD-SNAPSHOT");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
removeImage("example.com/test/build-image", "0.0.1.BUILD-SNAPSHOT");
|
||||
});
|
||||
}
|
||||
|
||||
@ -224,18 +176,16 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
mavenBuild.project("build-image").goals("package")
|
||||
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
|
||||
.systemProperty("spring-boot.build-image.imageName", "example.com/test/cmd-property-name:v1")
|
||||
.systemProperty("spring-boot.build-image.builder", "paketobuildpacks/builder:full")
|
||||
.systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run:full-cnb")
|
||||
.systemProperty("spring-boot.build-image.builder",
|
||||
"projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1")
|
||||
.systemProperty("spring-boot.build-image.runImage",
|
||||
"projects.registry.vmware.com/springboot/run:tiny-cnb")
|
||||
.execute((project) -> {
|
||||
assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("example.com/test/cmd-property-name:v1").contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference.of("example.com/test/cmd-property-name:v1");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
.contains("example.com/test/cmd-property-name:v1")
|
||||
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
|
||||
.contains("Successfully built image");
|
||||
removeImage("example.com/test/cmd-property-name", "v1");
|
||||
});
|
||||
}
|
||||
|
||||
@ -245,15 +195,9 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT").execute((project) -> {
|
||||
assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("docker.io/library/build-image-v2-builder:0.0.1.BUILD-SNAPSHOT")
|
||||
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
|
||||
.contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference
|
||||
.of("docker.io/library/build-image-v2-builder:0.0.1.BUILD-SNAPSHOT");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
removeImage("docker.io/library/build-image-v2-builder", "0.0.1.BUILD-SNAPSHOT");
|
||||
});
|
||||
}
|
||||
|
||||
@ -264,42 +208,23 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
.prepare(this::writeLongNameResource).execute((project) -> {
|
||||
assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("docker.io/library/build-image-empty-env-entry:0.0.1.BUILD-SNAPSHOT")
|
||||
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
|
||||
.contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of("build-image-empty-env-entry"),
|
||||
"0.0.1.BUILD-SNAPSHOT");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
removeImage("build-image-empty-env-entry", "0.0.1.BUILD-SNAPSHOT");
|
||||
});
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void whenBuildImageIsInvokedWithZipPackaging(MavenBuild mavenBuild) {
|
||||
mavenBuild.project("build-image-zip-packaging").goals("package")
|
||||
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
|
||||
.prepare(this::writeLongNameResource).execute((project) -> {
|
||||
mavenBuild.project("build-image-zip-packaging").goals("package").prepare(this::writeLongNameResource)
|
||||
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT").execute((project) -> {
|
||||
File jar = new File(project, "target/build-image-zip-packaging-0.0.1.BUILD-SNAPSHOT.jar");
|
||||
assertThat(jar).isFile();
|
||||
assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("docker.io/library/build-image-zip-packaging:0.0.1.BUILD-SNAPSHOT")
|
||||
.contains("Main-Class: org.springframework.boot.loader.PropertiesLauncher")
|
||||
.contains("Successfully built image");
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of("build-image-zip-packaging"),
|
||||
"0.0.1.BUILD-SNAPSHOT");
|
||||
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
|
||||
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
|
||||
container.copyFileFromContainer("/workspace/META-INF/MANIFEST.MF", (inputStream) -> {
|
||||
String text = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))
|
||||
.lines().collect(Collectors.joining("\n"));
|
||||
assertThat(text).contains("Main-Class: org.springframework.boot.loader.PropertiesLauncher");
|
||||
return null;
|
||||
});
|
||||
}
|
||||
finally {
|
||||
removeImage(imageReference);
|
||||
}
|
||||
removeImage("build-image-zip-packaging", "0.0.1.BUILD-SNAPSHOT");
|
||||
});
|
||||
}
|
||||
|
||||
@ -314,6 +239,7 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
mavenBuild.project("build-image-builder-error").goals("package")
|
||||
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
|
||||
.executeAndFail((project) -> assertThat(buildLog(project)).contains("Building image")
|
||||
.contains("---> Test Info buildpack building").contains("Forced builder failure")
|
||||
.containsPattern("Builder lifecycle '.*' failed with status code"));
|
||||
}
|
||||
|
||||
@ -343,7 +269,8 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
|
||||
}
|
||||
}
|
||||
|
||||
private void removeImage(ImageReference imageReference) {
|
||||
private void removeImage(String name, String version) {
|
||||
ImageReference imageReference = ImageReference.of(ImageName.of(name), version);
|
||||
try {
|
||||
new DockerApi().image().remove(imageReference, false);
|
||||
}
|
||||
|
@ -23,8 +23,9 @@
|
||||
</goals>
|
||||
<configuration>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
<env>
|
||||
<BP_JVM_VERSION>13.9.9</BP_JVM_VERSION>
|
||||
<FORCE_FAILURE>true</FORCE_FAILURE>
|
||||
</env>
|
||||
</image>
|
||||
</configuration>
|
||||
|
@ -43,6 +43,11 @@
|
||||
<goals>
|
||||
<goal>build-image</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
</image>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
|
@ -37,6 +37,11 @@
|
||||
<goals>
|
||||
<goal>build-image</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
</image>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
|
@ -27,6 +27,11 @@
|
||||
<goals>
|
||||
<goal>build-image</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
</image>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
|
@ -21,6 +21,11 @@
|
||||
<goals>
|
||||
<goal>build-image</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
</image>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
|
@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.springframework.boot.maven.it</groupId>
|
||||
<artifactId>build-image</artifactId>
|
||||
<version>0.0.1.BUILD-SNAPSHOT</version>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>@java.version@</maven.compiler.source>
|
||||
<maven.compiler.target>@java.version@</maven.compiler.target>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>@project.groupId@</groupId>
|
||||
<artifactId>@project.artifactId@</artifactId>
|
||||
<version>@project.version@</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>build-image</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
@ -0,0 +1,28 @@
|
||||
/*
|
||||
* 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.test;
|
||||
|
||||
public class SampleApplication {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
System.out.println("Launched");
|
||||
synchronized(args) {
|
||||
args.wait(); // Prevent exit"
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@ -23,8 +23,8 @@
|
||||
</goals>
|
||||
<configuration>
|
||||
<image>
|
||||
<builder>paketobuildpacks/builder:full</builder>
|
||||
<runImage>paketobuildpacks/run:full-cnb</runImage>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
<runImage>projects.registry.vmware.com/springboot/run:tiny-cnb</runImage>
|
||||
</image>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
@ -23,6 +23,7 @@
|
||||
</goals>
|
||||
<configuration>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
<name>example.com/test/build-image:${project.version}</name>
|
||||
</image>
|
||||
</configuration>
|
||||
|
@ -23,6 +23,7 @@
|
||||
</goals>
|
||||
<configuration>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
<env>
|
||||
<EMPTY_KEY></EMPTY_KEY>
|
||||
</env>
|
||||
|
@ -24,6 +24,9 @@
|
||||
</goals>
|
||||
<configuration>
|
||||
<finalName>final-name</finalName>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
</image>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
|
@ -27,6 +27,11 @@
|
||||
<goals>
|
||||
<goal>build-image</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
</image>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
@ -25,6 +25,9 @@
|
||||
</executions>
|
||||
<configuration>
|
||||
<layout>ZIP</layout>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
</image>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
@ -21,6 +21,11 @@
|
||||
<goals>
|
||||
<goal>build-image</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<image>
|
||||
<builder>projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1</builder>
|
||||
</image>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
10
src/spring-boot-builder/README.adoc
Normal file
10
src/spring-boot-builder/README.adoc
Normal file
@ -0,0 +1,10 @@
|
||||
= Spring Boot Test Builder
|
||||
|
||||
This directory contains a Cloud Native Buildpacks https://buildpacks.io/docs/concepts/components/builder/[builder] and https://buildpacks.io/docs/concepts/components/buildpack/[buildpack] that is used by integration tests to verify the behavior of the Spring Boot build plugins.
|
||||
|
||||
== Creating the builder
|
||||
|
||||
* Install the https://buildpacks.io/docs/install-pack/[pack CLI]
|
||||
* Authenticate to projects.registry.vmware.com via `docker login`
|
||||
* Use the `build.sh` create the necessary images and push them to the registry
|
||||
|
15
src/spring-boot-builder/build.sh
Executable file
15
src/spring-boot-builder/build.sh
Executable file
@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
set -x -eo pipefail
|
||||
|
||||
docker pull paketobuildpacks/build:tiny-cnb
|
||||
docker tag paketobuildpacks/build:tiny-cnb projects.registry.vmware.com/springboot/build:tiny-cnb
|
||||
docker push projects.registry.vmware.com/springboot/build:tiny-cnb
|
||||
|
||||
docker pull paketobuildpacks/run:tiny-cnb
|
||||
docker tag paketobuildpacks/run:tiny-cnb projects.registry.vmware.com/springboot/run:tiny-cnb
|
||||
docker push projects.registry.vmware.com/springboot/run:tiny-cnb
|
||||
|
||||
cd builder
|
||||
pack builder create projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1 --config builder.toml
|
||||
docker push projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1
|
||||
cd -
|
17
src/spring-boot-builder/builder/builder.toml
Normal file
17
src/spring-boot-builder/builder/builder.toml
Normal file
@ -0,0 +1,17 @@
|
||||
# Buildpacks to include in builder
|
||||
[[buildpacks]]
|
||||
id = "spring-boot/test-info"
|
||||
version = "0.0.1"
|
||||
uri = "../buildpacks/test-info"
|
||||
|
||||
# Order used for detection
|
||||
[[order]]
|
||||
[[order.group]]
|
||||
id = "spring-boot/test-info"
|
||||
version = "0.0.1"
|
||||
|
||||
# Stack that will be used by the builder
|
||||
[stack]
|
||||
id = "io.paketo.stacks.tiny"
|
||||
build-image = "projects.registry.vmware.com/springboot/build:tiny-cnb"
|
||||
run-image = "projects.registry.vmware.com/springboot/run:tiny-cnb"
|
35
src/spring-boot-builder/buildpacks/test-info/bin/build
Executable file
35
src/spring-boot-builder/buildpacks/test-info/bin/build
Executable file
@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eo pipefail
|
||||
|
||||
echo "---> Test Info buildpack building"
|
||||
|
||||
# INPUT ARGUMENTS
|
||||
platform_dir=$2
|
||||
env_dir=${platform_dir}/env
|
||||
bindings_dir=${platform_dir}/bindings
|
||||
|
||||
if [[ -f ${env_dir}/FORCE_FAILURE ]]; then
|
||||
echo "Forced builder failure"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if compgen -G "${env_dir}/*" > /dev/null; then
|
||||
for var in ${env_dir}/*; do
|
||||
echo "env: $(basename ${var})=$(<${var})"
|
||||
done
|
||||
fi
|
||||
|
||||
if compgen -G "${bindings_dir}/*" > /dev/null; then
|
||||
for binding in ${bindings_dir}/*; do
|
||||
for f in ${binding}/*; do
|
||||
echo "binding: $(basename ${binding})/$(basename ${f})=$(<${f})"
|
||||
done
|
||||
done
|
||||
fi
|
||||
|
||||
echo "META-INF/MANIFEST.MF: "
|
||||
if [[ -f META-INF/MANIFEST.MF ]]; then
|
||||
cat META-INF/MANIFEST.MF
|
||||
fi
|
||||
|
||||
echo "---> Test Info buildpack done"
|
28
src/spring-boot-builder/buildpacks/test-info/bin/detect
Executable file
28
src/spring-boot-builder/buildpacks/test-info/bin/detect
Executable file
@ -0,0 +1,28 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eo pipefail
|
||||
|
||||
# 1. CHECK IF APPLICABLE
|
||||
if [[ ! -f META-INF/MANIFEST.MF ]]; then
|
||||
exit 100
|
||||
fi
|
||||
|
||||
# 2. GET ARGS
|
||||
plan_path=$2
|
||||
|
||||
# 3. DECLARE DEPENDENCIES (OPTIONAL)
|
||||
cat >> "${plan_path}" <<EOL
|
||||
# Buildpack provides this dependency
|
||||
#
|
||||
# NOTE: The dependency is provided during the 'build' process.
|
||||
#
|
||||
[[provides]]
|
||||
name = "test-info"
|
||||
|
||||
# Buildpack requires this dependency
|
||||
#
|
||||
# NOTE: Everything aside from 'name' is simply additional information that the providing buildpack can use to resolve
|
||||
# the dependency.
|
||||
#
|
||||
[[requires]]
|
||||
name = "test-info"
|
||||
EOL
|
13
src/spring-boot-builder/buildpacks/test-info/buildpack.toml
Normal file
13
src/spring-boot-builder/buildpacks/test-info/buildpack.toml
Normal file
@ -0,0 +1,13 @@
|
||||
# Buildpack API version
|
||||
api = "0.2"
|
||||
|
||||
# Buildpack ID and metadata
|
||||
[buildpack]
|
||||
id = "spring-boot/test-info"
|
||||
version = "0.0.1"
|
||||
name = "Spring Boot Test Info Buildpack"
|
||||
homepage = "https://github.com/spring-projects/spring-boot"
|
||||
|
||||
# Stacks that the buildpack will work with
|
||||
[[stacks]]
|
||||
id = "io.paketo.stacks.tiny"
|
Loading…
Reference in New Issue
Block a user