Commit 8b5f914b authored by Andy Wilkinson's avatar Andy Wilkinson

Revert "Merge branch '2.4.x'"

This reverts commit 97b26b48, reversing
changes made to 6f9b1ed6.

See gh-25840
parent 58a9fb40
...@@ -38,6 +38,8 @@ import org.gradle.testkit.runner.TaskOutcome; ...@@ -38,6 +38,8 @@ import org.gradle.testkit.runner.TaskOutcome;
import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS; import org.junit.jupiter.api.condition.OS;
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.DockerApi;
import org.springframework.boot.buildpack.platform.docker.type.ImageName; import org.springframework.boot.buildpack.platform.docker.type.ImageName;
...@@ -68,10 +70,13 @@ class BootBuildImageIntegrationTests { ...@@ -68,10 +70,13 @@ class BootBuildImageIntegrationTests {
String projectName = this.gradleBuild.getProjectDir().getName(); String projectName = this.gradleBuild.getProjectDir().getName();
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("docker.io/library/" + projectName); assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
assertThat(result.getOutput()).contains("---> Test Info buildpack building"); ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
assertThat(result.getOutput()).contains("env: BP_JVM_VERSION=8.*"); try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
assertThat(result.getOutput()).contains("---> Test Info buildpack done"); container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
removeImage(projectName); }
finally {
new DockerApi().image().remove(imageReference, false);
}
} }
@TestTemplate @TestTemplate
...@@ -83,13 +88,16 @@ class BootBuildImageIntegrationTests { ...@@ -83,13 +88,16 @@ class BootBuildImageIntegrationTests {
String projectName = this.gradleBuild.getProjectDir().getName(); String projectName = this.gradleBuild.getProjectDir().getName();
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("docker.io/library/" + projectName); assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
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");
File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs"); File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs");
assertThat(buildLibs.listFiles()) assertThat(buildLibs.listFiles())
.containsExactly(new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".war")); .containsExactly(new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".war"));
removeImage(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);
}
} }
@TestTemplate @TestTemplate
...@@ -100,12 +108,16 @@ class BootBuildImageIntegrationTests { ...@@ -100,12 +108,16 @@ class BootBuildImageIntegrationTests {
String projectName = this.gradleBuild.getProjectDir().getName(); String projectName = this.gradleBuild.getProjectDir().getName();
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("docker.io/library/" + projectName); 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"); File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs");
assertThat(buildLibs.listFiles()) assertThat(buildLibs.listFiles())
.containsExactly(new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".war")); .containsExactly(new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".war"));
removeImage(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);
}
} }
@TestTemplate @TestTemplate
...@@ -115,9 +127,13 @@ class BootBuildImageIntegrationTests { ...@@ -115,9 +127,13 @@ class BootBuildImageIntegrationTests {
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT"); BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("example/test-image-name"); assertThat(result.getOutput()).contains("example/test-image-name");
assertThat(result.getOutput()).contains("---> Test Info buildpack building"); ImageReference imageReference = ImageReference.of(ImageName.of("example/test-image-name"));
assertThat(result.getOutput()).contains("---> Test Info buildpack done"); try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
removeImage("example/test-image-name"); container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
}
finally {
new DockerApi().image().remove(imageReference, false);
}
} }
@TestTemplate @TestTemplate
...@@ -127,9 +143,13 @@ class BootBuildImageIntegrationTests { ...@@ -127,9 +143,13 @@ class BootBuildImageIntegrationTests {
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT"); BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("example/test-image-custom"); assertThat(result.getOutput()).contains("example/test-image-custom");
assertThat(result.getOutput()).contains("---> Test Info buildpack building"); ImageReference imageReference = ImageReference.of(ImageName.of("example/test-image-custom"));
assertThat(result.getOutput()).contains("---> Test Info buildpack done"); try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
removeImage("example/test-image-custom"); container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
}
finally {
new DockerApi().image().remove(imageReference, false);
}
} }
@TestTemplate @TestTemplate
...@@ -137,13 +157,17 @@ class BootBuildImageIntegrationTests { ...@@ -137,13 +157,17 @@ class BootBuildImageIntegrationTests {
writeMainClass(); writeMainClass();
writeLongNameResource(); writeLongNameResource();
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT", BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT",
"--imageName=example/test-image-cmd", "--builder=springci/spring-boot-cnb-builder:0.0.1", "--imageName=example/test-image-cmd", "--builder=paketobuildpacks/builder:full",
"--runImage=paketobuildpacks/run:tiny-cnb"); "--runImage=paketobuildpacks/run:full-cnb");
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("example/test-image-cmd"); assertThat(result.getOutput()).contains("example/test-image-cmd");
assertThat(result.getOutput()).contains("---> Test Info buildpack building"); ImageReference imageReference = ImageReference.of(ImageName.of("example/test-image-cmd"));
assertThat(result.getOutput()).contains("---> Test Info buildpack done"); try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
removeImage("example/test-image-cmd"); container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
}
finally {
new DockerApi().image().remove(imageReference, false);
}
} }
@TestTemplate @TestTemplate
...@@ -151,13 +175,24 @@ class BootBuildImageIntegrationTests { ...@@ -151,13 +175,24 @@ class BootBuildImageIntegrationTests {
writeMainClass(); writeMainClass();
writeLongNameResource(); writeLongNameResource();
String projectName = this.gradleBuild.getProjectDir().getName(); String projectName = this.gradleBuild.getProjectDir().getName();
ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=ALWAYS"); BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=ALWAYS");
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("Pulled builder image").contains("Pulled run image"); 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"); result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).doesNotContain("Pulled builder image").doesNotContain("Pulled run image"); assertThat(result.getOutput()).doesNotContain("Pulled builder image").doesNotContain("Pulled run image");
removeImage(projectName); try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
}
finally {
new DockerApi().image().remove(imageReference, false);
}
} }
@TestTemplate @TestTemplate
...@@ -168,9 +203,13 @@ class BootBuildImageIntegrationTests { ...@@ -168,9 +203,13 @@ class BootBuildImageIntegrationTests {
String projectName = this.gradleBuild.getProjectDir().getName(); String projectName = this.gradleBuild.getProjectDir().getName();
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("docker.io/library/" + projectName); assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
assertThat(result.getOutput()).contains("---> Test Info buildpack building") ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
.contains("---> Test Info buildpack done"); try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
removeImage(projectName); container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
}
finally {
new DockerApi().image().remove(imageReference, false);
}
} }
@TestTemplate @TestTemplate
...@@ -181,10 +220,11 @@ class BootBuildImageIntegrationTests { ...@@ -181,10 +220,11 @@ class BootBuildImageIntegrationTests {
writeBuildpackContent(); writeBuildpackContent();
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT"); BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
String projectName = this.gradleBuild.getProjectDir().getName(); String projectName = this.gradleBuild.getProjectDir().getName();
ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("docker.io/library/" + projectName); assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
assertThat(result.getOutput()).contains("---> Hello World buildpack"); assertThat(result.getOutput()).contains("---> Hello World buildpack");
removeImage(projectName); new DockerApi().image().remove(imageReference, false);
} }
@TestTemplate @TestTemplate
...@@ -196,10 +236,11 @@ class BootBuildImageIntegrationTests { ...@@ -196,10 +236,11 @@ class BootBuildImageIntegrationTests {
tarGzipBuildpackContent(); tarGzipBuildpackContent();
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT"); BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
String projectName = this.gradleBuild.getProjectDir().getName(); String projectName = this.gradleBuild.getProjectDir().getName();
ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("docker.io/library/" + projectName); assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
assertThat(result.getOutput()).contains("---> Hello World buildpack"); assertThat(result.getOutput()).contains("---> Hello World buildpack");
removeImage(projectName); new DockerApi().image().remove(imageReference, false);
} }
@TestTemplate @TestTemplate
...@@ -210,24 +251,24 @@ class BootBuildImageIntegrationTests { ...@@ -210,24 +251,24 @@ class BootBuildImageIntegrationTests {
String projectName = this.gradleBuild.getProjectDir().getName(); String projectName = this.gradleBuild.getProjectDir().getName();
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
assertThat(result.getOutput()).contains("docker.io/library/" + projectName); assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
removeImage(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);
}
} }
@TestTemplate @TestTemplate
void buildsImageWithBinding() throws IOException { void failsWithBindingContainingInvalidCertificate() throws IOException {
writeMainClass(); writeMainClass();
writeLongNameResource(); writeLongNameResource();
writeCertificateBindingFiles(); writeCertificateBindingFiles();
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT"); BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
String projectName = this.gradleBuild.getProjectDir().getName(); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.FAILED);
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.getOutput()).contains("failed to decode certificate")
assertThat(result.getOutput()).contains("docker.io/library/" + projectName); .contains("/platform/bindings/certificates/test.crt");
assertThat(result.getOutput()).contains("---> Test Info buildpack building");
assertThat(result.getOutput()).contains("binding: certificates/type=ca-certificates");
assertThat(result.getOutput()).contains("binding: certificates/test1.crt=---certificate one---");
assertThat(result.getOutput()).contains("binding: certificates/test2.crt=---certificate two---");
assertThat(result.getOutput()).contains("---> Test Info buildpack done");
removeImage(projectName);
} }
@TestTemplate @TestTemplate
...@@ -245,7 +286,6 @@ class BootBuildImageIntegrationTests { ...@@ -245,7 +286,6 @@ class BootBuildImageIntegrationTests {
writeLongNameResource(); writeLongNameResource();
BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT"); BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.FAILED); 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"); assertThat(result.getOutput()).containsPattern("Builder lifecycle '.*' failed with status code");
} }
...@@ -370,19 +410,10 @@ class BootBuildImageIntegrationTests { ...@@ -370,19 +410,10 @@ class BootBuildImageIntegrationTests {
try (PrintWriter writer = new PrintWriter(new FileWriter(type))) { try (PrintWriter writer = new PrintWriter(new FileWriter(type))) {
writer.print("ca-certificates"); writer.print("ca-certificates");
} }
File cert1 = new File(bindingDir, "test1.crt"); File cert = new File(bindingDir, "test.crt");
try (PrintWriter writer = new PrintWriter(new FileWriter(cert1))) { try (PrintWriter writer = new PrintWriter(new FileWriter(cert))) {
writer.println("---certificate one---"); writer.println("not a valid certificate");
} }
File cert2 = new File(bindingDir, "test2.crt");
try (PrintWriter writer = new PrintWriter(new FileWriter(cert2))) {
writer.println("---certificate two---");
}
}
private void removeImage(String name) throws IOException {
ImageReference imageReference = ImageReference.of(ImageName.of(name));
new DockerApi().image().remove(imageReference, false);
} }
} }
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1" buildpacks = [ "paketo-buildpacks/java" ]
buildpacks = [ "spring-boot/test-info" ]
} }
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
buildpacks = [ "file://${projectDir}/buildpack/hello-world" ] buildpacks = [ "file://${projectDir}/buildpack/hello-world" ]
} }
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
buildpacks = [ "file://${projectDir}/hello-world.tgz" ] buildpacks = [ "file://${projectDir}/hello-world.tgz" ]
} }
...@@ -8,6 +8,6 @@ targetCompatibility = '1.8' ...@@ -8,6 +8,6 @@ targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
imageName = "example/test-image-custom" imageName = "example/test-image-custom"
builder = "springci/spring-boot-cnb-builder:0.0.1" builder = "paketobuildpacks/builder:full"
runImage = "paketobuildpacks/run:tiny-cnb" runImage = "paketobuildpacks/run:full-cnb"
} }
...@@ -8,5 +8,4 @@ targetCompatibility = '1.8' ...@@ -8,5 +8,4 @@ targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
imageName = "example/test-image-name" imageName = "example/test-image-name"
builder = "springci/spring-boot-cnb-builder:0.0.1"
} }
...@@ -9,7 +9,3 @@ bootBuildImage { ...@@ -9,7 +9,3 @@ bootBuildImage {
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
}
\ No newline at end of file
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" ] bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" ]
} }
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1" environment = ["BP_JVM_VERSION": "13.9.9"]
environment = ["FORCE_FAILURE": "true"]
} }
...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8' ...@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage { bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ] buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ]
} }
...@@ -9,7 +9,3 @@ if (project.hasProperty('applyWarPlugin')) { ...@@ -9,7 +9,3 @@ if (project.hasProperty('applyWarPlugin')) {
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
bootBuildImage {
builder = "springci/spring-boot-cnb-builder:0.0.1"
}
...@@ -25,6 +25,8 @@ import java.util.Random; ...@@ -25,6 +25,8 @@ import java.util.Random;
import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith; 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.DockerApi;
import org.springframework.boot.buildpack.platform.docker.type.ImageName; import org.springframework.boot.buildpack.platform.docker.type.ImageName;
...@@ -54,9 +56,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -54,9 +56,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
assertThat(original).doesNotExist(); assertThat(original).doesNotExist();
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("docker.io/library/build-image:0.0.1.BUILD-SNAPSHOT") .contains("docker.io/library/build-image:0.0.1.BUILD-SNAPSHOT")
.contains("---> Test Info buildpack building").contains("env: BP_JVM_VERSION=8.*") .contains("Successfully built image");
.contains("---> Test Info buildpack done").contains("Successfully built image"); ImageReference imageReference = ImageReference.of(ImageName.of("build-image"),
removeImage("build-image", "0.0.1.BUILD-SNAPSHOT"); "0.0.1.BUILD-SNAPSHOT");
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
}
finally {
removeImage(imageReference);
}
}); });
} }
...@@ -71,9 +79,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -71,9 +79,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
assertThat(classifier).doesNotExist(); assertThat(classifier).doesNotExist();
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("docker.io/library/build-image-classifier:0.0.1.BUILD-SNAPSHOT") .contains("docker.io/library/build-image-classifier:0.0.1.BUILD-SNAPSHOT")
.contains("---> Test Info buildpack building").contains("env: BP_JVM_VERSION=8.*") .contains("Successfully built image");
.contains("---> Test Info buildpack done").contains("Successfully built image"); ImageReference imageReference = ImageReference.of(ImageName.of("build-image-classifier"),
removeImage("build-image-classifier", "0.0.1.BUILD-SNAPSHOT"); "0.0.1.BUILD-SNAPSHOT");
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
}
finally {
removeImage(imageReference);
}
}); });
} }
...@@ -90,9 +104,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -90,9 +104,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
assertThat(original).doesNotExist(); assertThat(original).doesNotExist();
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("docker.io/library/build-image-classifier-source:0.0.1.BUILD-SNAPSHOT") .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"); .contains("Successfully built image");
removeImage("build-image-classifier-source", "0.0.1.BUILD-SNAPSHOT"); 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);
}
}); });
} }
...@@ -108,9 +128,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -108,9 +128,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
assertThat(original).isFile(); assertThat(original).isFile();
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("docker.io/library/build-image-with-repackage:0.0.1.BUILD-SNAPSHOT") .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"); .contains("Successfully built image");
removeImage("build-image-with-repackage", "0.0.1.BUILD-SNAPSHOT"); 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);
}
}); });
} }
...@@ -127,9 +153,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -127,9 +153,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
assertThat(original).isFile(); assertThat(original).isFile();
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("docker.io/library/build-image-classifier-with-repackage:0.0.1.BUILD-SNAPSHOT") .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"); .contains("Successfully built image");
removeImage("build-image-classifier-with-repackage", "0.0.1.BUILD-SNAPSHOT"); 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);
}
}); });
} }
...@@ -146,9 +178,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -146,9 +178,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
assertThat(original).isFile(); assertThat(original).isFile();
assertThat(buildLog(project)).contains("Building image").contains( assertThat(buildLog(project)).contains("Building image").contains(
"docker.io/library/build-image-classifier-source-with-repackage:0.0.1.BUILD-SNAPSHOT") "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"); .contains("Successfully built image");
removeImage("build-image-classifier-source-with-repackage", "0.0.1.BUILD-SNAPSHOT"); 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);
}
}); });
} }
...@@ -164,9 +202,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -164,9 +202,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
assertThat(original).doesNotExist(); assertThat(original).doesNotExist();
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("docker.io/library/build-image-war-packaging:0.0.1.BUILD-SNAPSHOT") .contains("docker.io/library/build-image-war-packaging:0.0.1.BUILD-SNAPSHOT")
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
.contains("Successfully built image"); .contains("Successfully built image");
removeImage("build-image-war-packaging", "0.0.1.BUILD-SNAPSHOT"); ImageReference imageReference = ImageReference.of(ImageName.of("build-image-war-packaging"),
"0.0.1.BUILD-SNAPSHOT");
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
}
finally {
removeImage(imageReference);
}
}); });
} }
...@@ -183,9 +227,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -183,9 +227,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
assertThat(original).doesNotExist(); assertThat(original).doesNotExist();
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("example.com/test/build-image:0.0.1.BUILD-SNAPSHOT") .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"); .contains("Successfully built image");
removeImage("example.com/test/build-image", "0.0.1.BUILD-SNAPSHOT"); 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);
}
}); });
} }
...@@ -194,14 +244,18 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -194,14 +244,18 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
mavenBuild.project("build-image").goals("package") mavenBuild.project("build-image").goals("package")
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .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.imageName", "example.com/test/cmd-property-name:v1")
.systemProperty("spring-boot.build-image.builder", "springci/spring-boot-cnb-builder:0.0.1") .systemProperty("spring-boot.build-image.builder", "paketobuildpacks/builder:full")
.systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run:tiny-cnb") .systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run:full-cnb")
.execute((project) -> { .execute((project) -> {
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("example.com/test/cmd-property-name:v1") .contains("example.com/test/cmd-property-name:v1").contains("Successfully built image");
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done") ImageReference imageReference = ImageReference.of("example.com/test/cmd-property-name:v1");
.contains("Successfully built image"); try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
removeImage("example.com/test/cmd-property-name", "v1"); container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
}
finally {
removeImage(imageReference);
}
}); });
} }
...@@ -211,21 +265,34 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -211,21 +265,34 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT").execute((project) -> { .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT").execute((project) -> {
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("docker.io/library/build-image-v2-builder:0.0.1.BUILD-SNAPSHOT") .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"); .contains("Successfully built image");
removeImage("docker.io/library/build-image-v2-builder", "0.0.1.BUILD-SNAPSHOT"); 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);
}
}); });
} }
@TestTemplate @TestTemplate
void whenBuildImageIsInvokedWithEmptyEnvEntry(MavenBuild mavenBuild) { void whenBuildImageIsInvokedWithEmptyEnvEntry(MavenBuild mavenBuild) {
mavenBuild.project("build-image-empty-env-entry").goals("package").prepare(this::writeLongNameResource) mavenBuild.project("build-image-empty-env-entry").goals("package")
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT").execute((project) -> { .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
.prepare(this::writeLongNameResource).execute((project) -> {
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("docker.io/library/build-image-empty-env-entry:0.0.1.BUILD-SNAPSHOT") .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"); .contains("Successfully built image");
removeImage("build-image-empty-env-entry", "0.0.1.BUILD-SNAPSHOT"); 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);
}
}); });
} }
...@@ -235,24 +302,25 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -235,24 +302,25 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT").execute((project) -> { .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT").execute((project) -> {
assertThat(buildLog(project)).contains("Building image") assertThat(buildLog(project)).contains("Building image")
.contains("docker.io/library/build-image-custom-buildpacks:0.0.1.BUILD-SNAPSHOT") .contains("docker.io/library/build-image-custom-buildpacks:0.0.1.BUILD-SNAPSHOT")
.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
.contains("Successfully built image"); .contains("Successfully built image");
removeImage("docker.io/library/build-image-custom-buildpacks", "0.0.1.BUILD-SNAPSHOT"); ImageReference imageReference = ImageReference
.of("docker.io/library/build-image-custom-buildpacks:0.0.1.BUILD-SNAPSHOT");
try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
}
finally {
removeImage(imageReference);
}
}); });
} }
@TestTemplate @TestTemplate
void whenBuildImageIsInvokedWithBinding(MavenBuild mavenBuild) { void failsWithBindingContainingInvalidCertificate(MavenBuild mavenBuild) {
mavenBuild.project("build-image-bindings").goals("package") mavenBuild.project("build-image-bindings").goals("package")
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT").execute((project) -> { .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
assertThat(buildLog(project)).contains("Building image") .executeAndFail((project) -> assertThat(buildLog(project)).contains("Building image")
.contains("docker.io/library/build-image-bindings:0.0.1.BUILD-SNAPSHOT") .contains("failed to decode certificate")
.contains("---> Test Info buildpack building") .contains("/platform/bindings/ca-certificates/test.crt"));
.contains("binding: ca-certificates/type=ca-certificates")
.contains("binding: ca-certificates/test1.crt=---certificate one---")
.contains("binding: ca-certificates/test2.crt=---certificate two---");
removeImage("docker.io/library/build-image-bindings", "0.0.1.BUILD-SNAPSHOT");
});
} }
@TestTemplate @TestTemplate
...@@ -266,7 +334,6 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -266,7 +334,6 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
mavenBuild.project("build-image-builder-error").goals("package") mavenBuild.project("build-image-builder-error").goals("package")
.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
.executeAndFail((project) -> assertThat(buildLog(project)).contains("Building image") .executeAndFail((project) -> assertThat(buildLog(project)).contains("Building image")
.contains("---> Test Info buildpack building").contains("Forced builder failure")
.containsPattern("Builder lifecycle '.*' failed with status code")); .containsPattern("Builder lifecycle '.*' failed with status code"));
} }
...@@ -298,8 +365,7 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests { ...@@ -298,8 +365,7 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
} }
} }
private void removeImage(String name, String version) { private void removeImage(ImageReference imageReference) {
ImageReference imageReference = ImageReference.of(ImageName.of(name), version);
try { try {
new DockerApi().image().remove(imageReference, false); new DockerApi().image().remove(imageReference, false);
} }
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<buildpacks> <buildpacks>
<buildpack>urn:cnb:builder:example/does-not-exist:0.0.1</buildpack> <buildpack>urn:cnb:builder:example/does-not-exist:0.0.1</buildpack>
</buildpacks> </buildpacks>
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<bindings> <bindings>
<binding>${basedir}/bindings/ca-certificates:/platform/bindings/ca-certificates</binding> <binding>${basedir}/bindings/ca-certificates:/platform/bindings/ca-certificates</binding>
</bindings> </bindings>
......
...@@ -23,9 +23,8 @@ ...@@ -23,9 +23,8 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<env> <env>
<FORCE_FAILURE>true</FORCE_FAILURE> <BP_JVM_VERSION>13.9.9</BP_JVM_VERSION>
</env> </env>
</image> </image>
</configuration> </configuration>
......
...@@ -43,11 +43,6 @@ ...@@ -43,11 +43,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
......
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
......
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
......
...@@ -21,11 +21,6 @@ ...@@ -21,11 +21,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
......
<?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>
/*
* 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 @@ ...@@ -23,8 +23,8 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder> <builder>paketobuildpacks/builder:full</builder>
<runImage>paketobuildpacks/run:tiny-cnb</runImage> <runImage>paketobuildpacks/run:full-cnb</runImage>
</image> </image>
</configuration> </configuration>
</execution> </execution>
......
...@@ -23,9 +23,10 @@ ...@@ -23,9 +23,10 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<buildpacks> <buildpacks>
<buildpack>spring-boot/test-info</buildpack> <buildpack>gcr.io/paketo-buildpacks/bellsoft-liberica:latest</buildpack>
<buildpack>gcr.io/paketo-buildpacks/executable-jar:latest</buildpack>
<buildpack>gcr.io/paketo-buildpacks/spring-boot:latest</buildpack>
</buildpacks> </buildpacks>
</image> </image>
</configuration> </configuration>
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<name>example.com/test/build-image:${project.version}</name> <name>example.com/test/build-image:${project.version}</name>
</image> </image>
</configuration> </configuration>
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
</goals> </goals>
<configuration> <configuration>
<image> <image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
<env> <env>
<EMPTY_KEY></EMPTY_KEY> <EMPTY_KEY></EMPTY_KEY>
</env> </env>
......
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
</goals> </goals>
<configuration> <configuration>
<finalName>final-name</finalName> <finalName>final-name</finalName>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
......
...@@ -22,11 +22,6 @@ ...@@ -22,11 +22,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
......
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
......
...@@ -21,11 +21,6 @@ ...@@ -21,11 +21,6 @@
<goals> <goals>
<goal>build-image</goal> <goal>build-image</goal>
</goals> </goals>
<configuration>
<image>
<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
</image>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
......
= 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 Docker Hub via `docker login` using the `springci` repository credentials
* Use `pack` to create the builder image and publish it to Docker Hub:
[source,bash]
----
$ cd builder
$ pack builder create springci/spring-boot-cnb-builder:0.0.1 --config builder.toml --publish
----
# 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 = "index.docker.io/paketobuildpacks/build:1.2.2-tiny-cnb"
run-image = "index.docker.io/paketobuildpacks/run:tiny-cnb"
run-image-mirrors = ["gcr.io/paketo-buildpacks/run:tiny-cnb"]
#!/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 "---> Test Info buildpack done"
#!/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
\ No newline at end of file
# 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"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment