diff --git a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/AbstractDeploymentTests.java b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/AbstractDeploymentTests.java index d10861b8331..1bcb4e948c4 100644 --- a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/AbstractDeploymentTests.java +++ b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/AbstractDeploymentTests.java @@ -29,6 +29,7 @@ import org.awaitility.core.ConditionTimeoutException; import org.junit.jupiter.api.Test; import org.testcontainers.containers.GenericContainer; import org.testcontainers.images.builder.ImageFromDockerfile; +import org.testcontainers.images.builder.dockerfile.DockerfileBuilder; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.client.RestTemplateBuilder; @@ -122,10 +123,18 @@ abstract class AbstractDeploymentTests { static final class WarDeploymentContainer extends GenericContainer { WarDeploymentContainer(String baseImage, String deploymentLocation, int port) { + this(baseImage, deploymentLocation, port, null); + } + + WarDeploymentContainer(String baseImage, String deploymentLocation, int port, + Consumer dockerfileCustomizer) { super(new ImageFromDockerfile().withFileFromFile("spring-boot.war", findWarToDeploy()) - .withDockerfileFromBuilder((builder) -> builder.from(baseImage) - .add("spring-boot.war", deploymentLocation + "/spring-boot.war") - .build())); + .withDockerfileFromBuilder((builder) -> { + builder.from(baseImage).add("spring-boot.war", deploymentLocation + "/spring-boot.war"); + if (dockerfileCustomizer != null) { + dockerfileCustomizer.accept(builder); + } + })); withExposedPorts(port).withStartupTimeout(Duration.ofMinutes(5)).withStartupAttempts(3); } diff --git a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/OpenLibertyDeploymentTests.java b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/OpenLibertyDeploymentTests.java new file mode 100644 index 00000000000..bb4f48876ba --- /dev/null +++ b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/OpenLibertyDeploymentTests.java @@ -0,0 +1,48 @@ +/* + * Copyright 2012-2023 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.springframework.boot.deployment; + +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; + +/** + * Deployment tests for Open Liberty. + * + * @author Christoph Dreis + * @author Scott Frederick + */ +@Testcontainers(disabledWithoutDocker = true) +class OpenLibertyDeploymentTests extends AbstractDeploymentTests { + + private static final int PORT = 9080; + + @Container + static WarDeploymentContainer container = new WarDeploymentContainer( + "icr.io/appcafe/open-liberty:full-java17-openj9-ubi", "/config/dropins", PORT, + (builder) -> builder.run("sed -i 's/javaee-8.0/jakartaee-10.0/g' /config/server.xml")); + + @Override + WarDeploymentContainer getContainer() { + return container; + } + + @Override + protected int getPort() { + return PORT; + } + +} diff --git a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/TomEEDeploymentTests.java b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/TomEEDeploymentTests.java new file mode 100644 index 00000000000..7bdc8e7d91c --- /dev/null +++ b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/TomEEDeploymentTests.java @@ -0,0 +1,40 @@ +/* + * Copyright 2012-2023 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.springframework.boot.deployment; + +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; + +/** + * Deployment tests for TomEE. + * + * @author Christoph Dreis + * @author Scott Frederick + */ +@Testcontainers(disabledWithoutDocker = true) +class TomEEDeploymentTests extends AbstractDeploymentTests { + + @Container + static WarDeploymentContainer container = new WarDeploymentContainer("tomee:9.1.1-jre17-webprofile", + "/usr/local/tomee/webapps", DEFAULT_PORT); + + @Override + WarDeploymentContainer getContainer() { + return container; + } + +} diff --git a/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/WildflyDeploymentTests.java b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/WildflyDeploymentTests.java new file mode 100644 index 00000000000..3e138ece2c9 --- /dev/null +++ b/spring-boot-system-tests/spring-boot-deployment-tests/src/systemTest/java/org/springframework/boot/deployment/WildflyDeploymentTests.java @@ -0,0 +1,40 @@ +/* + * Copyright 2012-2023 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.springframework.boot.deployment; + +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; + +/** + * Deployment tests for Wildfly. + * + * @author Christoph Dreis + * @author Scott Frederick + */ +@Testcontainers(disabledWithoutDocker = true) +class WildflyDeploymentTests extends AbstractDeploymentTests { + + @Container + static WarDeploymentContainer container = new WarDeploymentContainer("quay.io/wildfly/wildfly:27.0.0.Final-jdk17", + "/opt/jboss/wildfly/standalone/deployments", DEFAULT_PORT); + + @Override + WarDeploymentContainer getContainer() { + return container; + } + +}