diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 55ee2a964..24a6b4ecb 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,8 +26,9 @@ jobs: # failsafe.groups configuration depends on the env setup. FAILSAFE_GROUPS: '' steps: - - name: Setup Minikube # add an if for the kubernetes target only? - uses: manusa/actions-setup-minikube@v2.10.0 + - name: Setup Minikube + if: ${{ matrix.target == 'kubernetes' }} + uses: manusa/actions-setup-minikube@v2.13.0 with: driver: docker container runtime: containerd @@ -36,6 +37,7 @@ jobs: github token: ${{ secrets.GITHUB_TOKEN }} start args: "--memory='4gb' --cpus='2'" - name: Enable minikube registry + if: ${{ matrix.target == 'kubernetes' }} run: | minikube addons enable registry kubectl port-forward --namespace kube-system service/registry 5000:80 & @@ -58,7 +60,7 @@ jobs: - name: Build and run integration tests for Docker target (${{ matrix.java }}) if: ${{ matrix.target == 'docker' }} run: | - ./mvnw package -Dfailsafe.groups=org.arquillian.cube.docker.impl.requirement.RequiresDocker -Dcontainerless.skip.tests=true + ./mvnw verify -Dfailsafe.groups=org.arquillian.cube.docker.impl.requirement.RequiresDocker -Dcontainerless.skip.tests=true - name: Build and run integration tests for Kubernetes target (${{ matrix.java }}) if: ${{ matrix.target == 'kubernetes' }} run: | @@ -71,5 +73,6 @@ jobs: '${{ github.workspace }}/**/surefire-reports/*.*' '${{ github.workspace }}/**/*.log' - name: Stop minikube + if: ${{ matrix.target == 'kubernetes' }} run: | minikube stop diff --git a/containerless/pom.xml b/containerless/pom.xml index 61c46d5af..2150c1c09 100755 --- a/containerless/pom.xml +++ b/containerless/pom.xml @@ -70,7 +70,6 @@ **/*Daytime* node daytime - 1.30 tcp://localhost:2375 diff --git a/core/src/test/java/org/arquillian/cube/impl/client/container/ContainerConfigurationControllerTest.java b/core/src/test/java/org/arquillian/cube/impl/client/container/ContainerConfigurationControllerTest.java index 9e76c8def..ef703a5fc 100644 --- a/core/src/test/java/org/arquillian/cube/impl/client/container/ContainerConfigurationControllerTest.java +++ b/core/src/test/java/org/arquillian/cube/impl/client/container/ContainerConfigurationControllerTest.java @@ -33,7 +33,7 @@ public class ContainerConfigurationControllerTest extends AbstractManagerTestBase { public static final String CUBE_ID = "test"; - private static final String CONTENT = "" + "image: tutum/tomcat:7.0\n" + "exposedPorts: [8089/tcp]\n" + private static final String CONTENT = "" + "image: tomcat:10.1.30\n" + "exposedPorts: [8089/tcp]\n" + "portBindings: [8090->8089/tcp]"; @Mock diff --git a/docker/assertj/pom.xml b/docker/assertj/pom.xml index 276f8bb24..fddc73cfa 100644 --- a/docker/assertj/pom.xml +++ b/docker/assertj/pom.xml @@ -14,7 +14,6 @@ com.github.docker-java docker-java - ${version.docker-java} provided diff --git a/docker/docker/pom.xml b/docker/docker/pom.xml index 50f313a4a..e20adf8b0 100644 --- a/docker/docker/pom.xml +++ b/docker/docker/pom.xml @@ -7,9 +7,28 @@ ../pom.xml Arquillian Cube Docker + + 2.1.1 + 1.3.2 + arquillian-cube-docker + + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} + + + javax.annotation + javax.annotation-api + ${version.javax.annotation-api} + + org.arquillian.cube arquillian-cube-api diff --git a/docker/docker/src/main/java/org/arquillian/cube/docker/impl/client/DockerContainerDefinitionParser.java b/docker/docker/src/main/java/org/arquillian/cube/docker/impl/client/DockerContainerDefinitionParser.java index 16977e8b4..fcc1e896e 100644 --- a/docker/docker/src/main/java/org/arquillian/cube/docker/impl/client/DockerContainerDefinitionParser.java +++ b/docker/docker/src/main/java/org/arquillian/cube/docker/impl/client/DockerContainerDefinitionParser.java @@ -54,7 +54,7 @@ public static DockerCompositions convert(DefinitionFormat definitionFormat, URI. private static DockerCompositions convert(URI uri, DefinitionFormat definitionFormat) throws IOException { try { - Path definitionFilePath = Paths.get(uri); + Path definitionFilePath = uri.getScheme() == null ? Paths.get(uri.toString()).toAbsolutePath() : Paths.get(uri); return convert(definitionFilePath, definitionFormat); } catch (FileSystemNotFoundException e) { String content = ""; diff --git a/docker/docker/src/main/resources/META-INF/services/org.arquillian.cube.spi.requirement.Constraint b/docker/docker/src/main/resources/META-INF/services/org.arquillian.cube.spi.requirement.Constraint index 4ae031d1f..de8b5d1bf 100644 --- a/docker/docker/src/main/resources/META-INF/services/org.arquillian.cube.spi.requirement.Constraint +++ b/docker/docker/src/main/resources/META-INF/services/org.arquillian.cube.spi.requirement.Constraint @@ -1,2 +1 @@ -org.arquillian.cube.docker.impl.requirement.DockerMachineRequirement org.arquillian.cube.docker.impl.requirement.DockerRequirement diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/await/AwaitStrategyTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/await/AwaitStrategyTest.java index 1264cd848..c321b3ea0 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/await/AwaitStrategyTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/await/AwaitStrategyTest.java @@ -32,7 +32,7 @@ public class AwaitStrategyTest { @Test public void should_be_able_to_create_http_await_strategy() { String containerDefinition = "tomcat:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " exposedPorts: [8089/tcp]\n" + " await:\n" + " strategy: http\n" + @@ -316,7 +316,7 @@ public void should_create_log_scanning_await_strategy_without_defaults() { @Test public void should_parse_command() { String containerDefinition = "tomcat:\n" - + " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " exposedPorts: [8089/tcp]\n" + " await:\n" + " strategy: docker_health\n" diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AfterStartContainerObserverTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AfterStartContainerObserverTest.java index a1834eb25..0fc6e2046 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AfterStartContainerObserverTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AfterStartContainerObserverTest.java @@ -34,7 +34,7 @@ public class AfterStartContainerObserverTest extends AbstractManagerTestBase { private static final String CONTAINER_COPY_CONFIGURATION = "tomcat_default:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " afterStart:\n" + " - copy:\n" + " to: /test\n" + @@ -42,7 +42,7 @@ public class AfterStartContainerObserverTest extends AbstractManagerTestBase { private static final String CONTAINER_CUSTOM_AFTER_START_ACTION_CONFIGURATION = "tomcat_default:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " afterStart:\n" + " - customAfterStartAction:\n" + " strategy: org.arquillian.cube.docker.impl.afterStart.CustomAfterStartActionImpl"; diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AfterStopContainerObserverTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AfterStopContainerObserverTest.java index 12ad95cde..166d324ca 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AfterStopContainerObserverTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AfterStopContainerObserverTest.java @@ -40,7 +40,7 @@ public class AfterStopContainerObserverTest extends AbstractManagerTestBase { private static final String CONTAINER_COPY_CONFIGURATION = "tomcat_default:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " afterStop:\n" + " - copy:\n" + " from: /test\n" + @@ -48,7 +48,7 @@ public class AfterStopContainerObserverTest extends AbstractManagerTestBase { private static final String CONTAINER_LOG_CONFIGURATION = "tomcat_default:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " afterStop:\n" + " - log:\n" + " to: "; diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AutomaticResolutionAutostartParserTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AutomaticResolutionAutostartParserTest.java index 41a7f3ff3..ef3ddf1a2 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AutomaticResolutionAutostartParserTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/AutomaticResolutionAutostartParserTest.java @@ -28,7 +28,7 @@ public void shouldStartNoneDeployableContainersWithRegisteredNetwork() { + "tomcat:\n" + - " image: tutum/tomcat:7.0\n" + " image: tomcat:10.1.30\n" + " exposedPorts: [8089/tcp]\n" + @@ -40,7 +40,7 @@ public void shouldStartNoneDeployableContainersWithRegisteredNetwork() { + "pingpong:\n" + - " image: jonmorehouse/ping-pong\n" + " image: tsongpon/pingpong\n" + " exposedPorts: [8080/tcp]\n" + @@ -68,7 +68,7 @@ public void shouldNotStartManualContainers() { String config = "tomcat:\n" + - " image: tutum/tomcat:7.0\n" + " image: tomcat:10.1.30\n" + " exposedPorts: [8089/tcp]\n" + @@ -78,7 +78,7 @@ public void shouldNotStartManualContainers() { + "pingpong:\n" + - " image: jonmorehouse/ping-pong\n" + " image: tsongpon/pingpong\n" + " exposedPorts: [8080/tcp]\n" + diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/BeforeStopContainerObserverTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/BeforeStopContainerObserverTest.java index bc4ea7d2d..989c39483 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/BeforeStopContainerObserverTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/BeforeStopContainerObserverTest.java @@ -38,7 +38,7 @@ public class BeforeStopContainerObserverTest extends AbstractManagerTestBase { private static final String CONTAINER_COPY_CONFIGURATION = "tomcat_default:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " beforeStop:\n" + " - copy:\n" + " from: /test\n" + @@ -46,14 +46,14 @@ public class BeforeStopContainerObserverTest extends AbstractManagerTestBase { private static final String CONTAINER_LOG_CONFIGURATION = "tomcat_default:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " beforeStop:\n" + " - log:\n" + " to: "; private static final String CONTAINER_CUSTOM_BEFORE_STOP_ACTION_CONFIGURATION = "tomcat_default:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " beforeStop:\n" + " - customBeforeStopAction:\n" + " strategy: org.arquillian.cube.docker.impl.beforeStop.CustomBeforeStopActionImpl"; diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeConfigurationTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeConfigurationTest.java index 2d0e97327..76557e8b2 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeConfigurationTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeConfigurationTest.java @@ -30,7 +30,7 @@ public class CubeConfigurationTest { private static final String CONTENT = "tomcat:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " exposedPorts: [8089/tcp]\n" + " await:\n" + " strategy: static\n" + @@ -39,7 +39,7 @@ public class CubeConfigurationTest { private static final String CONTENT2 = "tomcat2:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " exposedPorts: [8089/tcp]\n" + " await:\n" + " strategy: static\n" + @@ -50,7 +50,7 @@ public class CubeConfigurationTest { "web:\n" + " build: .\n" + " ports:\n" + - " - \"5000:5000\"\n" + + " - \"5432:5000\"\n" + " volumes:\n" + " - .:/code\n" + " links:\n" + @@ -60,7 +60,7 @@ public class CubeConfigurationTest { private static final String OVERRIDE_CUSTOM = "tomcat:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " await:\n" + " strategy: polling\n" + " afterStart: \n" + @@ -97,19 +97,19 @@ public class CubeConfigurationTest { private static final String VERSION_2_WITH_SPACE_SEPERATED_COMMAND = "version: '2'\n" + "services:\n" + " wildfly:\n" - + " image: \"jboss/wildfly\"\n" + + " image: \"quay.io/wildfly/wildfly:33.0.2.Final-jdk11\"\n" + " command: /opt/jboss/wildfly/bin/standalone.sh -b 0.0.0.0 -bmanagement 0.0.0.0"; private static final String VERSION_2_WITH_SPACE_AND_QUOTES_SEPERATED_COMMAND = "version: '2'\n" + "services:\n" + " wildfly:\n" - + " image: \"jboss/wildfly\"\n" + + " image: \"quay.io/wildfly/wildfly:33.0.2.Final-jdk11\"\n" + " command: \"/opt/jboss/wildfly/bin/standalone.sh -b 0.0.0.0 -bmanagement 0.0.0.0\""; private static final String VERSION_2_WITH_ARRAY_COMMAND = "version: '2'\n" + "services:\n" + " wildfly:\n" - + " image: \"jboss/wildfly\"\n" + + " image: \"quay.io/wildfly/wildfly:33.0.2.Final-jdk11\"\n" + " command: [\"/opt/jboss/wildfly/bin/standalone.sh\", \"-b\", \"0.0.0.0\", \"-bmanagement\", \"0.0.0.0\"]"; @Rule @@ -194,12 +194,12 @@ public void should_load_volumes_from_docker_compose_version_2() { public void shouldChangeNamesInParallelizeStarCubes() { String content = "tomcat*:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping*\n" + "ping*:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " exposedPorts: [8089/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -224,12 +224,12 @@ public void shouldChangeNamesInParallelizeStarCubes() { public void shouldAddEnvVarsWithHostNameInParallelizeStarCubes() { String content = "tomcat*:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping*\n" + "ping*:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " exposedPorts: [8089/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -255,12 +255,12 @@ public void shouldAddEnvVarsWithHostNameInParallelizeStarCubes() { public void shouldChangePortBindingToPrivatePortsInParallelizeStarCubes() { String content = "tomcat*:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping*\n" + "ping*:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " exposedPorts: [8089/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -285,12 +285,12 @@ public void shouldChangePortBindingToPrivatePortsInParallelizeStarCubes() { public void shouldChangeStarLinksInParallelizeStarCubes() { String content = "tomcat*:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping*\n" + "ping*:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " exposedPorts: [8089/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -316,12 +316,12 @@ public void shouldChangeStarLinksInParallelizeStarCubes() { public void shouldParallelizeStarCubesUsingRemappingAlias() { String content = "tomcat*:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping*:bb\n" + "ping*:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " exposedPorts: [8089/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -358,10 +358,10 @@ public void shouldParallelizeNetworks() { " network3*:\n" + " driver: bridge\n" + "tomcat:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " networkMode: network3*\n" + "ping:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " networks:\n" + " - network1*\n" + " - network2\n"; @@ -423,7 +423,7 @@ public void should_override_custom_cube_properties() throws IOException { final CubeContainer tomcat = dockerContainersContent.get("tomcat"); assertThat(tomcat, is(notNullValue())); - assertThat(tomcat.getImage().getTag(), is("7.0")); + assertThat(tomcat.getImage().getTag(), is("10.1.30")); assertThat(tomcat.getAwait().getStrategy(), is("polling")); assertThat(tomcat.getAfterStart().size(), is(1)); assertThat(tomcat.getBeforeStop().size(), is(1)); @@ -489,7 +489,7 @@ public void should_load_cube_configuration_from_cube_file_if_no_file_is_provided assertThat(actualTomcat, is(notNullValue())); String image = actualTomcat.getImage().toImageRef(); - assertThat(image, is("tomcat:7.0")); + assertThat(image, is("tomcat:10.1.30")); } @Test @@ -511,7 +511,7 @@ public void should_parse_and_load_configuration_file() { assertThat(actualTomcat, is(notNullValue())); String image = actualTomcat.getImage().toImageRef(); - assertThat(image, is("tutum/tomcat:7.0")); + assertThat(image, is("tomcat:10.1.30")); } @Test @@ -540,7 +540,7 @@ public void should_parse_and_load_configuration_file_from_container_configuratio assertThat(actualTomcat, is(notNullValue())); String image = actualTomcat.getImage().toImageRef(); - assertThat(image, is("tutum/tomcat:7.0")); + assertThat(image, is("tomcat:10.1.30")); assertThat(dockerContainersContent.get("tomcat2"), is(notNullValue())); } @@ -566,7 +566,7 @@ public void should_parse_and_load_configuration_file_from_container_configuratio assertThat(actualTomcat, is(notNullValue())); String image = actualTomcat.getImage().toImageRef(); - assertThat(image, is("tutum/tomcat:7.0")); + assertThat(image, is("tomcat:10.1.30")); } @Test @@ -587,32 +587,32 @@ public void should_parse_and_load_configuration_from_container_configuration_res assertThat(actualTomcat, is(notNullValue())); String image = actualTomcat.getImage().toImageRef(); - assertThat(image, is("tutum/tomcat:7.0")); + assertThat(image, is("tomcat:10.1.30")); } @Test public void should_be_able_to_extend_and_override_toplevel() throws Exception { String config = - "tomcat6:\n" + - " image: tutum/tomcat:6.0\n" + + "tomcat9:\n" + + " image: tomcat:9.0.95\n" + " exposedPorts: [8089/tcp]\n" + " await:\n" + " strategy: static\n" + " ip: localhost\n" + " ports: [8080, 8089]\n" + - "tomcat7:\n" + - " extends: tomcat6\n" + - " image: tutum/tomcat:7.0\n"; + "tomcat10:\n" + + " extends: tomcat9\n" + + " image: tomcat:10.1.30\n"; Map parameters = new HashMap(); parameters.put("dockerContainers", config); parameters.put("definitionFormat", DefinitionFormat.CUBE.name()); CubeDockerConfiguration cubeConfiguration = CubeDockerConfiguration.fromMap(parameters, null); - CubeContainer tomcat7 = cubeConfiguration.getDockerContainersContent().get("tomcat7"); - Assert.assertEquals("tutum/tomcat:7.0", tomcat7.getImage().toImageRef()); - Assert.assertTrue(tomcat7.getAwait() != null); - Assert.assertEquals("8089/tcp", tomcat7.getExposedPorts().iterator().next().toString()); + CubeContainer tomcat10 = cubeConfiguration.getDockerContainersContent().get("tomcat10"); + Assert.assertEquals("tomcat:10.1.30", tomcat10.getImage().toImageRef()); + Assert.assertTrue(tomcat10.getAwait() != null); + Assert.assertEquals("8089/tcp", tomcat10.getExposedPorts().iterator().next().toString()); } @Test @@ -621,16 +621,16 @@ public void should_be_able_to_read_network_configuration() { "networks:\n" + " mynetwork:\n " + " driver: bridge\n" + - "tomcat6:\n" + - " image: tutum/tomcat:6.0\n" + + "tomcat9:\n" + + " image: tomcat:9.0.95\n" + " exposedPorts: [8089/tcp]\n" + " await:\n" + " strategy: static\n" + " ip: localhost\n" + " ports: [8080, 8089]\n" + - "tomcat7:\n" + - " extends: tomcat6\n" + - " image: tutum/tomcat:7.0\n"; + "tomcat10:\n" + + " extends: tomcat9\n" + + " image: tomcat:10.1.30\n"; Map parameters = new HashMap(); parameters.put("dockerContainers", config); @@ -662,7 +662,7 @@ public void should_set_global_removeVolumes_option_if_not_set_on_container_level public void should_container_level_removeVolumes_option_overwrite_global_value() { String config1 = "tomcat:\n" + - " image: tutum/tomcat:6.0\n" + + " image: tomcat:10.1.30\n" + " removeVolumes: false"; Map parameters = new HashMap(); @@ -676,7 +676,7 @@ public void should_container_level_removeVolumes_option_overwrite_global_value() String config2 = "tomcat:\n" + - " image: tutum/tomcat:6.0\n" + + " image: tomcat:10.1.30\n" + " removeVolumes: true"; parameters.put(CubeDockerConfiguration.REMOVE_VOLUMES, "false"); diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeRegistrarTestCase.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeRegistrarTestCase.java index 92b9afe32..c02777ab6 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeRegistrarTestCase.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeRegistrarTestCase.java @@ -19,7 +19,7 @@ public class CubeRegistrarTestCase extends AbstractManagerTestBase { private static final String CONTENT = "tomcat:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " exposedPorts: [8089/tcp]\n" + " await:\n" + " strategy: static\n" + diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CustomResolutionAutoStartParserTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CustomResolutionAutoStartParserTest.java index 7fd563969..87403fe7e 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CustomResolutionAutoStartParserTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CustomResolutionAutoStartParserTest.java @@ -18,14 +18,14 @@ public class CustomResolutionAutoStartParserTest extends AbstractManagerTestBase private static final String CONTENT = "tomcat:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " exposedPorts: [8089/tcp]\n" + " await:\n" + " strategy: static\n" + " ip: localhost\n" + " ports: [8080, 8089]\n" + "go:\n" + - " image: tutum/tomcat:7.0\n"; + " image: tomcat:10.1.30\n"; @Override protected void addExtensions(List> extensions) { diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/DockerImageControllerTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/DockerImageControllerTest.java index 0a46678a6..a84067a57 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/DockerImageControllerTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/DockerImageControllerTest.java @@ -74,7 +74,7 @@ public void should_not_remove_docker_image_as_not_built_by_cube() { DockerClientExecutor executor = Mockito.mock(DockerClientExecutor.class); String config = "pingpong:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " exposedPorts: [8080/tcp]\n" + " portBindings: [8080->8080/tcp]\n"; diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/NetworkLifecycleControllerTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/NetworkLifecycleControllerTest.java index b9d741701..30d69ae41 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/NetworkLifecycleControllerTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/NetworkLifecycleControllerTest.java @@ -36,16 +36,16 @@ public void shouldStartNetworks() { "networks:\n" + " mynetwork:\n " + " driver: bridge\n" + - "tomcat6:\n" + - " image: tutum/tomcat:6.0\n" + + "tomcat9:\n" + + " image: tomcat:9.0.95\n" + " exposedPorts: [8089/tcp]\n" + " await:\n" + " strategy: static\n" + " ip: localhost\n" + " ports: [8080, 8089]\n" + - "tomcat7:\n" + - " extends: tomcat6\n" + - " image: tutum/tomcat:7.0\n"; + "tomcat10:\n" + + " extends: tomcat9\n" + + " image: tomcat:10.1.30\n"; Map parameters = new HashMap(); parameters.put("dockerContainers", config); @@ -74,16 +74,16 @@ public void shouldStopNetworks() { "networks:\n" + " mynetwork:\n " + " driver: bridge\n" + - "tomcat6:\n" + - " image: tutum/tomcat:6.0\n" + + "tomcat9:\n" + + " image: tomcat:9.0.95\n" + " exposedPorts: [8089/tcp]\n" + " await:\n" + " strategy: static\n" + " ip: localhost\n" + " ports: [8080, 8089]\n" + - "tomcat7:\n" + - " extends: tomcat6\n" + - " image: tutum/tomcat:7.0\n"; + "tomcat10:\n" + + " extends: tomcat9\n" + + " image: tomcat:10.1.30\n"; Map parameters = new HashMap(); parameters.put("dockerContainers", config); diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/config/ConfigParserTestCase.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/config/ConfigParserTestCase.java index 5a2469227..ddf11d2d2 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/config/ConfigParserTestCase.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/config/ConfigParserTestCase.java @@ -10,7 +10,7 @@ public class ConfigParserTestCase { private static final String CONTENT = "tomcat:\n" + - " image: tutum/tomcat:7.0\n" + + " image: tomcat:10.1.30\n" + " buildImage:\n" + " dockerfileLocation: src/test/resources/undertow\n" + " exposedPorts: [8089/tcp]\n" + @@ -26,8 +26,8 @@ public void shouldBeAbleToLoadStrategy() throws Exception { DockerCompositions containers = ConfigUtil.load(CONTENT); CubeContainer container = containers.get("tomcat"); - Assert.assertEquals("tutum/tomcat", container.getImage().getName()); - Assert.assertEquals("7.0", container.getImage().getTag()); + Assert.assertEquals("tomcat", container.getImage().getName()); + Assert.assertEquals("10.1.30", container.getImage().getTag()); Assert.assertEquals(1, container.getExposedPorts().size()); ExposedPort exposedPort = container.getExposedPorts().iterator().next(); diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/container/DockerServerIPConfiguratorTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/container/DockerServerIPConfiguratorTest.java index fe0b8bc53..2aab284c6 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/container/DockerServerIPConfiguratorTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/container/DockerServerIPConfiguratorTest.java @@ -35,7 +35,7 @@ public class DockerServerIPConfiguratorTest extends AbstractManagerTestBase { public static final String CUBE_ID = "test"; - private static final String CONTENT = "" + "image: tutum/tomcat:7.0\n" + "exposedPorts: [8089/tcp]\n" + private static final String CONTENT = "" + "image: tomcat:10.1.30\n" + "exposedPorts: [8089/tcp]\n" + "portBindings: [8090->8089/tcp]"; @Mock diff --git a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/util/SinglePortBindResolverTest.java b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/util/SinglePortBindResolverTest.java index d6b6f4421..92451f3ac 100644 --- a/docker/docker/src/test/java/org/arquillian/cube/docker/impl/util/SinglePortBindResolverTest.java +++ b/docker/docker/src/test/java/org/arquillian/cube/docker/impl/util/SinglePortBindResolverTest.java @@ -15,12 +15,12 @@ public class SinglePortBindResolverTest { public void should_resolve_single_bind_port() { String content = "tomcat:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping\n" + "ping:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " exposedPorts: [8089/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -37,12 +37,12 @@ public void should_resolve_single_bind_port() { public void should_throw_exception_with_resolve_two_bind_port() { String content = "tomcat:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp, 8081/tcp]\n" + " links:\n" + " - ping\n" + "ping:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " exposedPorts: [8089/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -58,12 +58,12 @@ public void should_throw_exception_with_resolve_two_bind_port() { public void should_throw_exception_with_resolve_two_bind_port_from_different_containers() { String content = "tomcat:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping\n" + "ping:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " portBindings: [8081/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -79,12 +79,12 @@ public void should_throw_exception_with_resolve_two_bind_port_from_different_con public void should_resolve_two_bind_port_from_different_containers_with_exclusions() { String content = "tomcat:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping\n" + "ping:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " portBindings: [8081/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -101,12 +101,12 @@ public void should_resolve_two_bind_port_from_different_containers_with_exclusio public void should_resolve_two_bind_port_from_different_containers_with_exposed_port() { String content = "tomcat:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping\n" + "ping:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " portBindings: [8081/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -123,12 +123,12 @@ public void should_resolve_two_bind_port_from_different_containers_with_exposed_ public void should_throw_exception_when_resolve_two_bind_port_from_different_containers_with_same_exposed_port() { String content = "tomcat:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping\n" + "ping:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " portBindings: [8080/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; @@ -144,12 +144,12 @@ public void should_throw_exception_when_resolve_two_bind_port_from_different_con public void should_resolve_two_bind_port_from_different_containers_with_exposed_port_value_if_no_matches() { String content = "tomcat:\n" + - " image: tutum/tomcat:8.0\n" + + " image: tomcat:10.1.30\n" + " portBindings: [8080/tcp]\n" + " links:\n" + " - ping\n" + "ping:\n" + - " image: jonmorehouse/ping-pong\n" + + " image: tsongpon/pingpong\n" + " portBindings: [8081/tcp]\n" + "storage:\n" + " image: tutum/mongodb"; diff --git a/docker/docker/src/test/resources/cube.yml b/docker/docker/src/test/resources/cube.yml index e44f95527..c2dfdf8ca 100644 --- a/docker/docker/src/test/resources/cube.yml +++ b/docker/docker/src/test/resources/cube.yml @@ -1,7 +1,7 @@ tomcat: - image: tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: polling env: [TOMCAT_PASS=mypass, JAVA_OPTS=-Dcom.sun.management.jmxremote.port=8089 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false] - portBindings: [8089/tcp, 8080/tcp] \ No newline at end of file + portBindings: [8089/tcp, 8080/tcp] diff --git a/docker/docker/src/test/resources/myapp/docker-compose-multiple-networks.yml b/docker/docker/src/test/resources/myapp/docker-compose-multiple-networks.yml index ac7d17dd3..5c0886877 100644 --- a/docker/docker/src/test/resources/myapp/docker-compose-multiple-networks.yml +++ b/docker/docker/src/test/resources/myapp/docker-compose-multiple-networks.yml @@ -2,7 +2,7 @@ version: '2' services: pingpong: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong ports: - "8080:8080" networks: @@ -13,4 +13,4 @@ networks: front: driver: bridge back: - driver: bridge \ No newline at end of file + driver: bridge diff --git a/docker/docker/src/test/resources/test-topologies/topology1.yaml b/docker/docker/src/test/resources/test-topologies/topology1.yaml index 44b88dca0..bffd25120 100644 --- a/docker/docker/src/test/resources/test-topologies/topology1.yaml +++ b/docker/docker/src/test/resources/test-topologies/topology1.yaml @@ -1,5 +1,5 @@ tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: static diff --git a/docker/ftest-container-star-operator/pom.xml b/docker/ftest-container-star-operator/pom.xml index 13e063755..5f172e2ba 100644 --- a/docker/ftest-container-star-operator/pom.xml +++ b/docker/ftest-container-star-operator/pom.xml @@ -17,9 +17,9 @@ - org.jboss.spec - jboss-javaee-7.0 - ${version.javaee_7} + org.wildfly.bom + wildfly-ee + 33.0.0.Final pom import @@ -49,20 +49,18 @@ - org.jboss.spec.javax.servlet - jboss-servlet-api_3.1_spec - provided + jakarta.servlet + jakarta.servlet-api - org.jboss.spec.javax.ejb - jboss-ejb-api_3.2_spec - provided + jakarta.ejb + jakarta.ejb-api - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - provided + jakarta.annotation + jakarta.annotation-api + org.wildfly.arquillian wildfly-arquillian-container-remote diff --git a/docker/ftest-container-star-operator/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java b/docker/ftest-container-star-operator/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java index c6cf3774d..30d060013 100644 --- a/docker/ftest-container-star-operator/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java +++ b/docker/ftest-container-star-operator/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/HelloWorld") public class HelloWorldServlet extends HttpServlet { diff --git a/docker/ftest-container-star-operator/src/test/resources/wildfly/Dockerfile b/docker/ftest-container-star-operator/src/test/resources/wildfly/Dockerfile index fd8191e45..173333f73 100644 --- a/docker/ftest-container-star-operator/src/test/resources/wildfly/Dockerfile +++ b/docker/ftest-container-star-operator/src/test/resources/wildfly/Dockerfile @@ -1,3 +1,3 @@ -FROM jboss/wildfly:10.1.0.Final +FROM quay.io/wildfly/wildfly:33.0.2.Final-jdk11 RUN /opt/jboss/wildfly/bin/add-user.sh -up mgmt-users.properties admin Admin#70365 --silent CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0"] diff --git a/docker/ftest-docker-compose-v2-git-context/docker-compose.yml b/docker/ftest-docker-compose-v2-git-context/docker-compose.yml index b87d703ad..630e87296 100644 --- a/docker/ftest-docker-compose-v2-git-context/docker-compose.yml +++ b/docker/ftest-docker-compose-v2-git-context/docker-compose.yml @@ -1,8 +1,8 @@ version: '2' -services: | +services: pingpong: build: - context: https://github.com/lordofthejars/pingpongdockerfile.git + context: https://github.com/tsongpon/pingpong.git dockerfile: Dockerfile ports: - - "5000:8080" \ No newline at end of file + - "5432:8080" diff --git a/docker/ftest-docker-compose-v2-git-context/pom.xml b/docker/ftest-docker-compose-v2-git-context/pom.xml index e8b196bc2..1376a51bb 100644 --- a/docker/ftest-docker-compose-v2-git-context/pom.xml +++ b/docker/ftest-docker-compose-v2-git-context/pom.xml @@ -46,7 +46,11 @@ org.slf4j slf4j-api - 1.7.21 + test + + + org.slf4j + slf4j-simple test diff --git a/docker/ftest-docker-compose-v2-git-context/src/test/java/org/arquillian/cube/git/PingPongIT.java b/docker/ftest-docker-compose-v2-git-context/src/test/java/org/arquillian/cube/git/PingPongIT.java index 53e146e65..79298c0de 100644 --- a/docker/ftest-docker-compose-v2-git-context/src/test/java/org/arquillian/cube/git/PingPongIT.java +++ b/docker/ftest-docker-compose-v2-git-context/src/test/java/org/arquillian/cube/git/PingPongIT.java @@ -31,7 +31,7 @@ public class PingPongIT { @Test public void should_receive_ok_message() throws IOException { - URL obj = new URL("http://" + ip + ":" + port); + URL obj = new URL("http://" + ip + ":" + port + "/ping"); HttpURLConnection con = (HttpURLConnection) obj.openConnection(); // optional default is GET @@ -51,6 +51,6 @@ public void should_receive_ok_message() throws IOException { } in.close(); - assertThat(response.toString(), is("{ \"status\": \"OK\"}")); + assertThat(response.toString(), is("pong")); } } diff --git a/docker/ftest-docker-compose-v2/docker-compose.yml b/docker/ftest-docker-compose-v2/docker-compose.yml index a12cdc4b7..b58bf96ac 100644 --- a/docker/ftest-docker-compose-v2/docker-compose.yml +++ b/docker/ftest-docker-compose-v2/docker-compose.yml @@ -4,10 +4,10 @@ services: env_file: envs build: src/test/resources/tomcat ports: - - "8089:8089" + - "8090:8089" - "8088:8088" - - "8081:8080" + - "8080:8080" networks: - front-tier networks: - front-tier: \ No newline at end of file + front-tier: diff --git a/docker/ftest-docker-compose-v2/pom.xml b/docker/ftest-docker-compose-v2/pom.xml index ea4301e39..cbfdc925d 100644 --- a/docker/ftest-docker-compose-v2/pom.xml +++ b/docker/ftest-docker-compose-v2/pom.xml @@ -11,23 +11,10 @@ 1.1.1.Final - 1.1.0.Final - 1.12 + 1.2.1.Final tcp://localhost:2375 - - - - org.jboss.spec - jboss-javaee-7.0 - ${version.javaee_7} - pom - import - - - - org.jboss.arquillian.junit @@ -51,23 +38,20 @@ - org.jboss.spec.javax.servlet - jboss-servlet-api_3.1_spec - provided - - - org.jboss.spec.javax.ejb - jboss-ejb-api_3.2_spec - provided + org.slf4j + slf4j-api + test - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - provided + org.slf4j + slf4j-simple + test + - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec + jakarta.platform + jakarta.jakartaee-web-api + 9.0.0 provided @@ -113,7 +97,7 @@ - tomcat-7 + tomcat true @@ -123,7 +107,7 @@ org.jboss.arquillian.container - arquillian-tomcat-remote-7 + arquillian-tomcat-remote-10 ${version.tomcat} test diff --git a/docker/ftest-docker-compose-v2/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java b/docker/ftest-docker-compose-v2/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java index c6cf3774d..30d060013 100644 --- a/docker/ftest-docker-compose-v2/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java +++ b/docker/ftest-docker-compose-v2/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/HelloWorld") public class HelloWorldServlet extends HttpServlet { diff --git a/docker/ftest-docker-compose-v2/src/test/resources/arquillian.xml b/docker/ftest-docker-compose-v2/src/test/resources/arquillian.xml index 14da8f6d2..2bb5a922b 100644 --- a/docker/ftest-docker-compose-v2/src/test/resources/arquillian.xml +++ b/docker/ftest-docker-compose-v2/src/test/resources/arquillian.xml @@ -9,7 +9,7 @@ ${docker.api.version} - docker-compose.yml + ./docker-compose.yml diff --git a/docker/ftest-docker-compose-v2/src/test/resources/tomcat/Dockerfile b/docker/ftest-docker-compose-v2/src/test/resources/tomcat/Dockerfile index ebe407796..fee318c09 100644 --- a/docker/ftest-docker-compose-v2/src/test/resources/tomcat/Dockerfile +++ b/docker/ftest-docker-compose-v2/src/test/resources/tomcat/Dockerfile @@ -1,5 +1,6 @@ -FROM tomcat:7.0.75-jre8 - +FROM tomcat:10.1.30 +RUN cp -avT webapps.dist/manager webapps/manager +ADD context.xml webapps/manager/META-INF/ ADD tomcat-users.xml conf/ CMD ["catalina.sh","run"] diff --git a/docker/ftest-docker-compose-v2/src/test/resources/tomcat/context.xml b/docker/ftest-docker-compose-v2/src/test/resources/tomcat/context.xml new file mode 100644 index 000000000..6375744db --- /dev/null +++ b/docker/ftest-docker-compose-v2/src/test/resources/tomcat/context.xml @@ -0,0 +1,7 @@ + + + + diff --git a/docker/ftest-docker-compose-v2/src/test/resources/tomcat/tomcat-users.xml b/docker/ftest-docker-compose-v2/src/test/resources/tomcat/tomcat-users.xml index 1b16099e5..8a33cf7d8 100644 --- a/docker/ftest-docker-compose-v2/src/test/resources/tomcat/tomcat-users.xml +++ b/docker/ftest-docker-compose-v2/src/test/resources/tomcat/tomcat-users.xml @@ -1,9 +1,8 @@ + - - - - \ No newline at end of file + + diff --git a/docker/ftest-docker-containerobject-dsl/src/test/java/org/arquillian/cube/containerobject/dsl/PingPongIT.java b/docker/ftest-docker-containerobject-dsl/src/test/java/org/arquillian/cube/containerobject/dsl/PingPongIT.java index b9a1e393f..a92b89283 100644 --- a/docker/ftest-docker-containerobject-dsl/src/test/java/org/arquillian/cube/containerobject/dsl/PingPongIT.java +++ b/docker/ftest-docker-containerobject-dsl/src/test/java/org/arquillian/cube/containerobject/dsl/PingPongIT.java @@ -23,8 +23,9 @@ public class PingPongIT { @DockerContainer Container pingpong = Container.withContainerName("pingpong") - .fromImage("jonmorehouse/ping-pong") + .fromImage("hashicorp/http-echo:alpine") .withPortBinding(8080) + .withCommand("-text=OK", "-listen=:8080") .build(); @Test diff --git a/docker/ftest-docker-containerobject/pom.xml b/docker/ftest-docker-containerobject/pom.xml index 1056e8078..cd6fbe1e6 100644 --- a/docker/ftest-docker-containerobject/pom.xml +++ b/docker/ftest-docker-containerobject/pom.xml @@ -24,7 +24,19 @@ jcabi-ssh 1.5 test + + + com.jcraft + jsch + + + + com.github.mwiede + jsch + 0.2.20 + + junit junit diff --git a/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/FtpContainer.java b/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/FtpContainer.java index 1d9a7259f..3f83382b9 100644 --- a/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/FtpContainer.java +++ b/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/FtpContainer.java @@ -7,12 +7,11 @@ @Cube(value = "ftp", portBinding = {FtpContainer.BIND_PORT + "->21/tcp", - "37185->37185/tcp", "37186->37186/tcp", "37187->37187/tcp", - "37188->37188/tcp", "37189->37189/tcp", "37190->37190/tcp"}, + "21000->21000/tcp", "21001->21001/tcp", "21002->21002/tcp", "21003->21003/tcp", "21004->21004/tcp", "21005->21005/tcp", + "21006->21006/tcp", "21007->21007/tcp", "21008->21008/tcp", "21009->21009/tcp", "21010->21010/tcp"}, awaitPorts = 21) -@Image("dipakpawar231/proftpd:v1") -@Environment(key = "USERNAME", value = FtpContainer.USERNAME) -@Environment(key = "PASSWORD", value = FtpContainer.PASSWORD) +@Image("delfer/alpine-ftp-server") +@Environment(key = "USERS", value = FtpContainer.USERNAME + "|" + FtpContainer.PASSWORD) public class FtpContainer { static final String USERNAME = "alex"; @@ -44,7 +43,7 @@ public int getBindPort() { public boolean isFilePresentInContainer(String filename) { try ( final InputStream file = dockerClient.copyArchiveFromContainerCmd("ftp", - "/ftp/" + filename).exec()) { + "/ftp/" + getUsername() + "/" + filename).exec()) { return file != null; } catch (Exception e) { return false; diff --git a/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/JSchIT.java b/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/JSchIT.java index cb4122019..6ae910db5 100644 --- a/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/JSchIT.java +++ b/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/JSchIT.java @@ -2,11 +2,9 @@ import com.jcabi.ssh.SSH; import com.jcabi.ssh.Shell; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.SftpException; -import java.io.File; + import java.io.IOException; -import org.apache.commons.io.FileUtils; + import org.apache.commons.io.IOUtils; import org.arquillian.cube.docker.impl.requirement.RequiresDocker; @@ -18,7 +16,6 @@ import org.junit.runner.RunWith; @Category({ RequiresDocker.class}) - @RunWith(ArquillianConditionalRunner.class) public class JSchIT { @@ -29,7 +26,7 @@ public class JSchIT { SshdContainer sshdContainer; @Test - public void shouldCopyFileToSFtp() throws JSchException, SftpException, IOException { + public void shouldExecuteRemoteCommand() throws IOException { String privateKey = IOUtils.toString( JSchIT.class.getResourceAsStream("/org/arquillian/cube/containerobject/SshdContainer/test_rsa"), "UTF-8"); System.out.println(privateKey); @@ -41,10 +38,4 @@ public void shouldCopyFileToSFtp() throws JSchException, SftpException, IOExcept ).exec("echo 'Hello, world!'"); System.out.println(hello); } - - private File createFile() throws IOException { - final File testFile = folder.newFile("testFile"); - FileUtils.write(testFile, "Hello World"); - return testFile; - } } diff --git a/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/PingPongContainer.java b/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/PingPongContainer.java index 9ea281d0b..107e3bbde 100644 --- a/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/PingPongContainer.java +++ b/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/PingPongContainer.java @@ -9,7 +9,7 @@ import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.docker.DockerDescriptor; -@Cube(value = "pingpong", portBinding = "5000->8080/tcp") +@Cube(value = "pingpong", portBinding = "5432->8080/tcp") public class PingPongContainer { @HostIp @@ -21,8 +21,9 @@ public class PingPongContainer { @CubeDockerFile public static Archive createContainer() { String dockerDescriptor = Descriptors.create(DockerDescriptor.class) - .from("jonmorehouse/ping-pong") + .from("hashicorp/http-echo:alpine") .expose(8080) + .cmd("-text=OK", "-listen=:8080") .exportAsString(); return ShrinkWrap.create(GenericArchive.class) .add(new StringAsset(dockerDescriptor), "Dockerfile"); diff --git a/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/PingPongIT.java b/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/PingPongIT.java index 63307c208..9c55bba13 100644 --- a/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/PingPongIT.java +++ b/docker/ftest-docker-containerobject/src/test/java/org/arquillian/cube/containerobject/PingPongIT.java @@ -27,8 +27,8 @@ public class PingPongIT { @Test public void shouldReturnOkAsPong() throws IOException { String pong = ping(); - assertThat(pong, containsString("OK")); - assertThat(pingPongContainer.getConnectionPort(), is(5000)); + assertThat(pong, is("OK")); + assertThat(pingPongContainer.getConnectionPort(), is(5432)); } public String ping() throws IOException { diff --git a/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/Dockerfile b/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/Dockerfile index eccecd2dc..24fd80718 100644 --- a/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/Dockerfile +++ b/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/Dockerfile @@ -7,10 +7,10 @@ RUN mkdir -p /var/run/sshd # create a test user RUN useradd test -d /home/test && \ mkdir -p /home/test/.ssh && \ - echo 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDP6koCuiTAT6L1wjhSds7n2wfb3y7Xv32ZfXr3kQpEeuZS07Z8Dfd5m5W7+qCRjWxZRrkmTdt4Z7ijC9emXu+gEDGB7rZvnAYw3J60rwB2IQHPDsrA/GgBJEaeA0I1HqAwxd28wHu8yzh1aEumjg5fhNxu+PZpoNRpEUG4kyVQ/w== your_email@example.com' > /home/test/.ssh/authorized_keys && \ + echo 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDMQ6XuOyuzQ+MhypKDSXmc8vXhXqQ7Lz+x4bMPL3nkv1tllbC577P39H/gUwsKSjywdnFV6imZwp3tqTlgfhszYVWEsH+ZnXvpxioMEQP4Z5S6aho0yYjL1I10Gv2M0oMN5DEFBKHllJJeL59XzJSlo0pi5CYH5g2LFd8iVzzQlasNsu0Y+I+/eaghuEL3RCznU5HeMlOcvYcHFuH9ZGLATgcihkEQV/EjozLmyzDIbNvugt+3zrAlYqktokd1OMBSC39a3o/ZCk11qKQYRStAIq4/dvcj38dKn7E2zoTXlkTTlxVAXzkWTDx58pVmorhYMA20+qU7zWnx4aXLF4mN12mPNLL7mCvSLZbz5Wcx0G1Wf+YDwsepXNkUkYC8aA/0T2fQYTtHANH0pqRl5fiSb1Jsxbs0vVCCQbqKor13OcHVnISV8ygcIBSyApN0xjAD35VTiiRMIwjNdTLzGZYYq8IvQ/7sxbWB3+Hzs4fkX9gJK52KByuLjV+2cbAe7T8= login@example.com' > /home/test/.ssh/authorized_keys && \ chown -R test:test /home/test && \ chmod 0600 /home/test/.ssh/authorized_keys && \ echo "test:test" | chpasswd -ENTRYPOINT ["/usr/sbin/sshd", "-D", "-e"] \ No newline at end of file +ENTRYPOINT ["/usr/sbin/sshd", "-D", "-e"] diff --git a/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/test_rsa b/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/test_rsa index 00d5d0ddc..571c93506 100644 --- a/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/test_rsa +++ b/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/test_rsa @@ -1,15 +1,38 @@ ------BEGIN RSA PRIVATE KEY----- -8glbkhKvJ9OAOwX7iy7gcWzBLsENZouu/KIUg3yRIUQruM04Dvrd1Dv9mWifVHWT -1mAqeln1MRi3vR841NEhGD4vF3FmxY6tX+SYijEQ6RYcIthNTmc2GHf0hW2/yiny -0hjeoq1RYalD8SHknCM9ah2vHxVt6skBFpMoRJk9H56rEw+3TmZ7Fy5D0woT6fk2 -Gl/Ntdr+h2fbWopPm6ZLoX32hFBE2mwRgjfC5Kwx3zDcSW2VGCZ2sBc/cFcv7B5z -lCcoR1xGj62sg2v9TCvdZ6hSBugbJ0w8pkrDCBBvK6ZrMqAZg/vp9uwB1bYh+VL3 -rFlisD5qMI3/RTIw8Lh0loWAmS4Hn/Kq/SqXfyJT7zsXeF0aY3j+vRlx9qzb2rHZ -wKAq8vevVDOLT2y/rrKMBbKm7rPNFDyldTjnB9yX2dsod8oMhsxgqmPqrR1ukbdo -vd3SIHa+DjoA+gwZlpbas586oZZn3r83k5NbgUsn+ewOCax7B6RfMEtWKg+LVMYV -H+H4L/wLtMZcjYK/SnFhufweRjPzTnnJpd/Bq9P7DilodZygbBhR4k8/s8TbpQHr -yEeE9PKf6q+6NAd70KdLzTxf4T+P9svkW0pB6il/V3XWVrxpcdvlxRF7Xyi935Ay -GL2IvUK9Ndfns/bvjPqq6PpX/W8tr4qIeUakqsI1DsYkoKDALiqpXKWDhGHX6MxG -Ki01wA3D4Me3Yzgx71HPy9p6ujU/2Az0udp9he2WoKvEh1X7Bk9VRVnatP7tADUS -lC17Y2PevdUlYETS31x1gJ0lW+NROs7jwC9sgssykVriZoXftiWpuQVcGO1yyT6G ------END RSA PRIVATE KEY----- +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn +NhAAAAAwEAAQAAAYEAzEOl7jsrs0PjIcqSg0l5nPL14V6kOy8/seGzDy955L9bZZWwue+z +9/R/4FMLCko8sHZxVeopmcKd7ak5YH4bM2FVhLB/mZ176cYqDBED+GeUumoaNMmIy9SNdB +r9jNKDDeQxBQSh5ZSSXi+fV8yUpaNKYuQmB+YNixXfIlc80JWrDbLtGPiPv3moIbhC90Qs +51OR3jJTnL2HBxbh/WRiwE4HIoZBEFfxI6My5sswyGzb7oLft86wJWKpLaJHdTjAUgt/Wt +6P2QpNdaikGEUrQCKuP3b3I9/HSp+xNs6E15ZE05cVQF85Fkw8efKVZqK4WDANtPqlO81p +8eGlyxeJjddpjzSy+5gr0i2W8+VnMdBtVn/mA8LHqVzZFJGAvGgP9E9n0GE7RwDR9KakZe +X4km9SbMW7NL1QgkG6iqK9dznB1ZyElfMoHCAUsgKTdMYwA9+VU4okTCMIzXUy8xmWGKvC +L0P+7MW1gd/h87OH5F/YCSudigcri41ftnGwHu0/AAAFiFqWtJZalrSWAAAAB3NzaC1yc2 +EAAAGBAMxDpe47K7ND4yHKkoNJeZzy9eFepDsvP7Hhsw8veeS/W2WVsLnvs/f0f+BTCwpK +PLB2cVXqKZnCne2pOWB+GzNhVYSwf5mde+nGKgwRA/hnlLpqGjTJiMvUjXQa/YzSgw3kMQ +UEoeWUkl4vn1fMlKWjSmLkJgfmDYsV3yJXPNCVqw2y7Rj4j795qCG4QvdELOdTkd4yU5y9 +hwcW4f1kYsBOByKGQRBX8SOjMubLMMhs2+6C37fOsCViqS2iR3U4wFILf1rej9kKTXWopB +hFK0Airj929yPfx0qfsTbOhNeWRNOXFUBfORZMPHnylWaiuFgwDbT6pTvNafHhpcsXiY3X +aY80svuYK9ItlvPlZzHQbVZ/5gPCx6lc2RSRgLxoD/RPZ9BhO0cA0fSmpGXl+JJvUmzFuz +S9UIJBuoqivXc5wdWchJXzKBwgFLICk3TGMAPflVOKJEwjCM11MvMZlhirwi9D/uzFtYHf +4fOzh+Rf2AkrnYoHK4uNX7ZxsB7tPwAAAAMBAAEAAAGAVb597GOVRBKWySwGVaslrD8G/P +xj914toCeMqS62PdIf9SQhg+O9ybOubEWfyEmCcVa+26BIpz1dWxLivYEiPO66XdFTNvI3 +PlpLczY/Uup0Mc5xQsBotpt6Z4ce8Rq7Hb0w4JjhtwQnbvcRreL4cRF7G8kGt+EXxU9Ak+ +NH6Y0yOTVnNsi8WtWgQMte/Pn22YIopLu+gnjCsjSmV95oX65Ba3os3MX1uQ58Qwp/Z1re +9Z+ldryCD6d7Oec5lNjlji4hdeUQRnG3/4wxx9QcY5TTGZAGCJpEUDDeeDOKtsv69soOQe +m7IHoO1iaLdYxScJWE5x+u0y6PMpKWGG2YSPzwBe5VWkqnDtmOiG85gnm7Y89H/qToaKGQ +QmqKGJIuTb+pXgPjK07GLEQOpjFFEDDUfxAov1m+ZWoklMtWM3Ut+pFPGYWpR5gCBHKTOm +kFyW3Vo47Apq6eKSIO5LvsYQtX7yV4ICNDDld3Gu/oEKTDPOaf+GtsVsRrOJ1n5Z2dAAAA +wQCny/YpiFrBalV2QJgdRefGSiCN21fIBEB1OHRmi2DvAaTL/80+GWUe8Mn++dIl8OqIfA +sgu0YjBcedB5FZqy2Pvc3FM3TaE5YDSK16zGcBnx/2l4vJ3R2HZF5mpbBrwrMBTZnz9uwl +1olhHbKXdvg/1dn1VE0JghhqbCY8l56uCgkFJ5Ukz8L+VznU45n4PvLhgs9TuvuclgTdHS +VTe82FeVjqM2ziTshO9AxRYv4IiKsu6DEhziQY9xVMez15mdwAAADBAPDDOlnhdR0WZ/Qw +FJI5BB68xrwYlg45jxvE0jR/BP6vC18WnCks0EiDc5C+PFXRL+e0fScwJIRhupNQ4sjtaE +pFBEJ2KVtfXtTVWSOzMrocvF67XNbixDnP0ycLbvkXJhxUi8L1zfGlvlvNNd1tvO4maX0I +CRuG8AxsTzdf60/t9ZksVa36kP13/w5PAyqydBKCxW2Sf/njES0wnMWRvod43Pd+XNvo4l +GZv+TbkBzyvSzuIbbddhGJvemb1ql0HQAAAMEA2TEVX4vzwNMAgNdNSo7kxVh/fzU74T4L +dNOF3bBBKEl15+/WK2dsM/1uwJdxCmGPPhuG6EgssFEjMIYQP7ptzk5ZTmD1Xm6CUTupHG +DOvzQTjhLmS+fAH6+0tsRjciju8Zpg8XMQsenwo/QPc5DGIbvXQvkSSixvqgAJ5GZ3P+aq +cgROph40hBH/xsl+wgOKah/A0KY9X+5gtz7zroyJIF8qq3pbqL+meXibVVQMQ8JTfgcMKH +HL5rSDBZHtn7ALAAAAEWxvZ2luQGV4YW1wbGUuY29tAQ== +-----END OPENSSH PRIVATE KEY----- diff --git a/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/test_rsa.pub b/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/test_rsa.pub index 707f81c7d..a9af20490 100644 --- a/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/test_rsa.pub +++ b/docker/ftest-docker-containerobject/src/test/resources/org/arquillian/cube/containerobject/SshdContainer/test_rsa.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDP6koCuiTAT6L1wjhSds7n2wfb3y7Xv32ZfXr3kQpEeuZS07Z8Dfd5m5W7+qCRjWxZRrkmTdt4Z7ijC9emXu+gEDGB7rZvnAYw3J60rwB2IQHPDsrA/GgBJEaeA0I1HqAwxd28wHu8yzh1aEumjg5fhNxu+PZpoNRpEUG4kyVQ/w== your_email@example.com +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDMQ6XuOyuzQ+MhypKDSXmc8vXhXqQ7Lz+x4bMPL3nkv1tllbC577P39H/gUwsKSjywdnFV6imZwp3tqTlgfhszYVWEsH+ZnXvpxioMEQP4Z5S6aho0yYjL1I10Gv2M0oMN5DEFBKHllJJeL59XzJSlo0pi5CYH5g2LFd8iVzzQlasNsu0Y+I+/eaghuEL3RCznU5HeMlOcvYcHFuH9ZGLATgcihkEQV/EjozLmyzDIbNvugt+3zrAlYqktokd1OMBSC39a3o/ZCk11qKQYRStAIq4/dvcj38dKn7E2zoTXlkTTlxVAXzkWTDx58pVmorhYMA20+qU7zWnx4aXLF4mN12mPNLL7mCvSLZbz5Wcx0G1Wf+YDwsepXNkUkYC8aA/0T2fQYTtHANH0pqRl5fiSb1Jsxbs0vVCCQbqKor13OcHVnISV8ygcIBSyApN0xjAD35VTiiRMIwjNdTLzGZYYq8IvQ/7sxbWB3+Hzs4fkX9gJK52KByuLjV+2cbAe7T8= login@example.com diff --git a/docker/ftest-junit-rules/pom.xml b/docker/ftest-junit-rules/pom.xml index 660490089..2821b21fe 100644 --- a/docker/ftest-junit-rules/pom.xml +++ b/docker/ftest-junit-rules/pom.xml @@ -11,7 +11,6 @@ arquillian-cube-docker-junit-rules - 1.12 tcp://localhost:2375 diff --git a/docker/ftest-junit-rules/src/test/resources/arquillian.xml b/docker/ftest-junit-rules/src/test/resources/arquillian.xml index 97015895e..6d95b3f4b 100644 --- a/docker/ftest-junit-rules/src/test/resources/arquillian.xml +++ b/docker/ftest-junit-rules/src/test/resources/arquillian.xml @@ -9,7 +9,7 @@ CUBE database: - image: zhilvis/h2-db + image: oscarfonts/h2:2.1.214 exposedPorts: [81/tcp, 1521/tcp] await: strategy: polling diff --git a/docker/ftest-reporter/docker-compose.yml b/docker/ftest-reporter/docker-compose.yml index 46d7ac3b8..ab4968d79 100644 --- a/docker/ftest-reporter/docker-compose.yml +++ b/docker/ftest-reporter/docker-compose.yml @@ -1,4 +1,4 @@ pingpong: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong ports: - "8080:8080" diff --git a/docker/ftest-reporter/src/test/java/org/arquillian/cube/drone/PingPongIT.java b/docker/ftest-reporter/src/test/java/org/arquillian/cube/drone/PingPongIT.java index a16684544..69e9258b1 100644 --- a/docker/ftest-reporter/src/test/java/org/arquillian/cube/drone/PingPongIT.java +++ b/docker/ftest-reporter/src/test/java/org/arquillian/cube/drone/PingPongIT.java @@ -1,5 +1,6 @@ package org.arquillian.cube.drone; +import org.apache.http.HttpStatus; import org.arquillian.cube.HostIp; import org.arquillian.cube.HostPort; import org.arquillian.cube.docker.impl.requirement.RequiresDocker; @@ -10,7 +11,7 @@ import org.junit.runner.RunWith; import static io.restassured.RestAssured.get; -import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; @Category({ RequiresDocker.class}) @@ -25,6 +26,6 @@ public class PingPongIT { @Test public void shouldDoPingPong() { - get("http://" + ip + ":" + port).then().assertThat().body("status", equalTo("OK")); + get("http://" + ip + ":" + port + "/ping").then().statusCode(HttpStatus.SC_OK).body(is("pong")); } } diff --git a/docker/ftest-restassured/docker-compose.yml b/docker/ftest-restassured/docker-compose.yml index fb9d121da..568980e95 100644 --- a/docker/ftest-restassured/docker-compose.yml +++ b/docker/ftest-restassured/docker-compose.yml @@ -1,4 +1,4 @@ helloworld: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong ports: - "8080:8080" diff --git a/docker/ftest-restassured/src/test/java/org/arquillian/cube/restassured/PingPongIT.java b/docker/ftest-restassured/src/test/java/org/arquillian/cube/restassured/PingPongIT.java index 9e0c1fd77..e41f89cad 100644 --- a/docker/ftest-restassured/src/test/java/org/arquillian/cube/restassured/PingPongIT.java +++ b/docker/ftest-restassured/src/test/java/org/arquillian/cube/restassured/PingPongIT.java @@ -3,6 +3,8 @@ import io.restassured.RestAssured; import io.restassured.builder.RequestSpecBuilder; import java.net.MalformedURLException; + +import org.apache.http.HttpStatus; import org.arquillian.cube.DockerUrl; import org.arquillian.cube.HealthCheck; import org.arquillian.cube.docker.impl.requirement.RequiresDocker; @@ -13,7 +15,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; @Category({ RequiresDocker.class}) @@ -21,7 +23,7 @@ @HealthCheck public class PingPongIT { - @DockerUrl(containerName = "helloworld", exposedPort = 8080) + @DockerUrl(containerName = "helloworld", exposedPort = 8080, context = "/ping") @ArquillianResource RequestSpecBuilder requestSpecBuilder; @@ -33,6 +35,7 @@ public void should_receive_ok_message() throws MalformedURLException, Interrupte .when() .get() .then() - .assertThat().body("status", equalTo("OK")); + .statusCode(HttpStatus.SC_OK) + .body(is("pong")); } } diff --git a/docker/ftest-standalone-autostart/src/test/resources/arquillian.xml b/docker/ftest-standalone-autostart/src/test/resources/arquillian.xml index 895ccfb76..776e32573 100644 --- a/docker/ftest-standalone-autostart/src/test/resources/arquillian.xml +++ b/docker/ftest-standalone-autostart/src/test/resources/arquillian.xml @@ -9,9 +9,10 @@ CUBE pingpong: - image: jonmorehouse/ping-pong + image: hashicorp/http-echo:alpine exposedPorts: [8080/tcp] portBindings: [80->8080/tcp] + cmd: ["-text=OK", "-listen=:8080"] diff --git a/docker/ftest-standalone-star-operator-docker-compose/docker-compose.yml b/docker/ftest-standalone-star-operator-docker-compose/docker-compose.yml index 0b3cc7d43..a0514fefb 100644 --- a/docker/ftest-standalone-star-operator-docker-compose/docker-compose.yml +++ b/docker/ftest-standalone-star-operator-docker-compose/docker-compose.yml @@ -1,4 +1,4 @@ pingpong*: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong ports: - - "8080:8080" \ No newline at end of file + - "8080:8080" diff --git a/docker/ftest-standalone-star-operator-docker-compose/src/test/java/org/arquillian/cube/StandaloneStarOperatorITCase.java b/docker/ftest-standalone-star-operator-docker-compose/src/test/java/org/arquillian/cube/StandaloneStarOperatorITCase.java index 248fccc7d..cca3f0665 100644 --- a/docker/ftest-standalone-star-operator-docker-compose/src/test/java/org/arquillian/cube/StandaloneStarOperatorITCase.java +++ b/docker/ftest-standalone-star-operator-docker-compose/src/test/java/org/arquillian/cube/StandaloneStarOperatorITCase.java @@ -31,7 +31,7 @@ public class StandaloneStarOperatorITCase { @HostPort(containerName = "pingpong*", value = 8080) int port; - @DockerUrl(containerName = "pingpong*", exposedPort = 8080) + @DockerUrl(containerName = "pingpong*", exposedPort = 8080, context = "/ping") @ArquillianResource private URL url; @@ -52,7 +52,7 @@ public void shouldHaveRandomizedUrlPort() { @Test public void shouldBeAvailable() throws IOException { String pong = ping(); - assertThat(pong, containsString("OK")); + assertThat(pong, is("pong")); } private String ping() throws IOException { diff --git a/docker/ftest-standalone-star-operator/src/test/resources/containers.yml b/docker/ftest-standalone-star-operator/src/test/resources/containers.yml index 1f43f3054..6a65672ef 100644 --- a/docker/ftest-standalone-star-operator/src/test/resources/containers.yml +++ b/docker/ftest-standalone-star-operator/src/test/resources/containers.yml @@ -1,4 +1,5 @@ pingpong*: - image: jonmorehouse/ping-pong:${PING_PONG_VERSION:-latest} - exposedPorts: [8080/tcp] - portBindings: [8080/tcp] + image: hashicorp/http-echo:alpine + exposedPorts: [ 8080/tcp ] + portBindings: [ 80->8080/tcp ] + cmd: [ "-text=OK", "-listen=:8080" ] diff --git a/docker/ftest-standalone/pom.xml b/docker/ftest-standalone/pom.xml index 317337c60..fd392365d 100644 --- a/docker/ftest-standalone/pom.xml +++ b/docker/ftest-standalone/pom.xml @@ -9,7 +9,6 @@ arquillian-cube-docker-ftest-standalone - 1.12 tcp://localhost:2375 diff --git a/docker/ftest-standalone/src/test/resources/arquillian.xml b/docker/ftest-standalone/src/test/resources/arquillian.xml index 824c9dc42..b99222faa 100644 --- a/docker/ftest-standalone/src/test/resources/arquillian.xml +++ b/docker/ftest-standalone/src/test/resources/arquillian.xml @@ -10,7 +10,7 @@ CUBE database: - image: zhilvis/h2-db + image: oscarfonts/h2:2.1.214 exposedPorts: [81/tcp, 1521/tcp] await: strategy: polling diff --git a/docker/ftest-system-properties/docker-compose.yml b/docker/ftest-system-properties/docker-compose.yml index fb9d121da..568980e95 100644 --- a/docker/ftest-system-properties/docker-compose.yml +++ b/docker/ftest-system-properties/docker-compose.yml @@ -1,4 +1,4 @@ helloworld: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong ports: - "8080:8080" diff --git a/docker/ftest/pom.xml b/docker/ftest/pom.xml index 8b29ec282..fb689b6d9 100644 --- a/docker/ftest/pom.xml +++ b/docker/ftest/pom.xml @@ -10,24 +10,11 @@ - 1.1.1.Final - 1.1.0.Final + 1.2.1.Final 5.0.1.Final 1.0.0.Alpha1 - - - - org.jboss.spec - jboss-javaee-7.0 - ${version.javaee_7} - pom - import - - - - org.jboss.arquillian.junit @@ -51,23 +38,9 @@ - org.jboss.spec.javax.servlet - jboss-servlet-api_3.1_spec - provided - - - org.jboss.spec.javax.ejb - jboss-ejb-api_3.2_spec - provided - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - provided - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec + jakarta.platform + jakarta.jakartaee-web-api + 9.0.0 provided @@ -104,7 +77,7 @@ - tomcat-7-jre8-dockerfile + tomcat-dockerfile true @@ -114,7 +87,7 @@ org.jboss.arquillian.container - arquillian-tomcat-remote-7 + arquillian-tomcat-remote-10 ${version.tomcat} test @@ -149,7 +122,7 @@ - wildfly-8 + wildfly-33 wildfly @@ -163,7 +136,7 @@ - wildfly-8-group + wildfly-33-group wildfly-group @@ -177,7 +150,7 @@ - wildfly-8-database + wildfly-33-database wildfly_database database diff --git a/docker/ftest/src/main/java/org/arquillian/cube/persistence/User.java b/docker/ftest/src/main/java/org/arquillian/cube/persistence/User.java index d035613d7..56876f557 100644 --- a/docker/ftest/src/main/java/org/arquillian/cube/persistence/User.java +++ b/docker/ftest/src/main/java/org/arquillian/cube/persistence/User.java @@ -1,8 +1,8 @@ package org.arquillian.cube.persistence; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class User { diff --git a/docker/ftest/src/main/java/org/arquillian/cube/persistence/UserRepository.java b/docker/ftest/src/main/java/org/arquillian/cube/persistence/UserRepository.java index 878e80451..a3cbd8094 100644 --- a/docker/ftest/src/main/java/org/arquillian/cube/persistence/UserRepository.java +++ b/docker/ftest/src/main/java/org/arquillian/cube/persistence/UserRepository.java @@ -1,9 +1,9 @@ package org.arquillian.cube.persistence; -import javax.annotation.sql.DataSourceDefinition; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.annotation.sql.DataSourceDefinition; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; @DataSourceDefinition( name = "java:app/TestDataSource", diff --git a/docker/ftest/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java b/docker/ftest/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java index c6cf3774d..30d060013 100644 --- a/docker/ftest/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java +++ b/docker/ftest/src/main/java/org/arquillian/cube/servlet/HelloWorldServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/HelloWorld") public class HelloWorldServlet extends HttpServlet { diff --git a/docker/ftest/src/test/resources/arquillian.xml b/docker/ftest/src/test/resources/arquillian.xml index e0424a665..817086370 100644 --- a/docker/ftest/src/test/resources/arquillian.xml +++ b/docker/ftest/src/test/resources/arquillian.xml @@ -19,7 +19,7 @@ await: strategy: polling env: ["CATALINA_OPTS=-Djava.security.egd=file:/dev/./urandom", JAVA_OPTS=-Djava.rmi.server.hostname=${docker.tomcat.host} -Dcom.sun.management.jmxremote.rmi.port=8088 -Dcom.sun.management.jmxremote.port=8089 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false] - portBindings: [8089/tcp, 8088/tcp, 8081->8080/tcp] + portBindings: [8090->8089/tcp, 8088/tcp, 8081->8080/tcp] wildfly: buildImage: dockerfileLocation: src/test/resources/wildfly @@ -37,7 +37,7 @@ extends: wildfly portBindings: [8082->8080/tcp, 9992->9990/tcp] database: - image: zhilvis/h2-db + image: oscarfonts/h2:2.1.214 exposedPorts: [81/tcp, 1521/tcp] await: strategy: polling @@ -56,14 +56,14 @@ - wildfly:8.1.0.Final:remote + wildfly:33.0.2.Final-jdk11:remote admin Admin#70365 - wildfly:8.1.0.Final:remote + wildfly:33.0.2.Final-jdk11:remote admin Admin#70365 @@ -71,14 +71,14 @@ - wildfly:8.1.0.Final:remote + wildfly:33.0.2.Final-jdk11:remote admin Admin#70365 - wildfly:8.1.0.Final:remote + wildfly:33.0.2.Final-jdk11:remote admin Admin#70365 diff --git a/docker/ftest/src/test/resources/test-persistence.xml b/docker/ftest/src/test/resources/test-persistence.xml index a4b0cf5fa..a0d3c1211 100644 --- a/docker/ftest/src/test/resources/test-persistence.xml +++ b/docker/ftest/src/test/resources/test-persistence.xml @@ -1,7 +1,7 @@ - + java:app/TestDataSource false diff --git a/docker/ftest/src/test/resources/tomcat/Dockerfile b/docker/ftest/src/test/resources/tomcat/Dockerfile index 7a5461c25..e3a0fd278 100644 --- a/docker/ftest/src/test/resources/tomcat/Dockerfile +++ b/docker/ftest/src/test/resources/tomcat/Dockerfile @@ -1,6 +1,8 @@ -FROM tomcat:7.0.75-jre8 +FROM tomcat:10.1.30 ENV JAVA_OPTS -Dcom.sun.management.jmxremote.port=8089 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false +RUN cp -avT webapps.dist/manager webapps/manager +ADD context.xml webapps/manager/META-INF/ ADD tomcat-users.xml conf/ EXPOSE 8089 -CMD ["catalina.sh","run"] \ No newline at end of file +CMD ["catalina.sh","run"] diff --git a/docker/ftest/src/test/resources/tomcat/context.xml b/docker/ftest/src/test/resources/tomcat/context.xml new file mode 100644 index 000000000..6375744db --- /dev/null +++ b/docker/ftest/src/test/resources/tomcat/context.xml @@ -0,0 +1,7 @@ + + + + diff --git a/docker/ftest/src/test/resources/tomcat/tomcat-users.xml b/docker/ftest/src/test/resources/tomcat/tomcat-users.xml index 1b16099e5..a9399c91d 100644 --- a/docker/ftest/src/test/resources/tomcat/tomcat-users.xml +++ b/docker/ftest/src/test/resources/tomcat/tomcat-users.xml @@ -3,7 +3,5 @@ - - - - \ No newline at end of file + + diff --git a/docker/ftest/src/test/resources/wildfly/Dockerfile b/docker/ftest/src/test/resources/wildfly/Dockerfile index 3ed994e93..173333f73 100644 --- a/docker/ftest/src/test/resources/wildfly/Dockerfile +++ b/docker/ftest/src/test/resources/wildfly/Dockerfile @@ -1,3 +1,3 @@ -from jboss/wildfly:8.2.0.Final +FROM quay.io/wildfly/wildfly:33.0.2.Final-jdk11 RUN /opt/jboss/wildfly/bin/add-user.sh -up mgmt-users.properties admin Admin#70365 --silent -CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0"] \ No newline at end of file +CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0"] diff --git a/docker/pom.xml b/docker/pom.xml index e81141e92..82ebea7b9 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -16,6 +16,7 @@ 2.1.0.Final 2.0.0.Final 2.53.1 + 2.0.16 @@ -44,6 +45,20 @@ + + + + org.slf4j + slf4j-api + ${version.slf4j} + + + org.slf4j + slf4j-simple + ${version.slf4j} + + + commons-lang diff --git a/docker/restassured/src/main/java/org/arquillian/cube/docker/restassured/RequestSpecBuilderResourceProvider.java b/docker/restassured/src/main/java/org/arquillian/cube/docker/restassured/RequestSpecBuilderResourceProvider.java index bf7cc7907..1663966c5 100644 --- a/docker/restassured/src/main/java/org/arquillian/cube/docker/restassured/RequestSpecBuilderResourceProvider.java +++ b/docker/restassured/src/main/java/org/arquillian/cube/docker/restassured/RequestSpecBuilderResourceProvider.java @@ -61,7 +61,7 @@ public Object lookup(ArquillianResource resource, Annotation... qualifiers) { final int bindPort = getBindingPort(containerName, exposedPort); if (bindPort > 0) { - return requestSpecBuilder.setPort(bindPort); + requestSpecBuilder.setPort(bindPort); } else { logger.log(Level.WARNING, String.format("There is no container with id %s.", containerName)); } diff --git a/docs/build-containers.adoc b/docs/build-containers.adoc index 66128ff66..c4e6c6c55 100644 --- a/docs/build-containers.adoc +++ b/docs/build-containers.adoc @@ -13,7 +13,7 @@ Let's see previous example but instead of creating a container from a predefined tomcat: buildImage: # <1> - dockerfileLocation: src/test/resources-tomcat-7-dockerfile/tomcat # <2> + dockerfileLocation: src/test/resources/tomcat # <2> noCache: true # <3> remove: true # <4> dockerfileName: my-dockerfile # <5> @@ -34,9 +34,9 @@ TIP: +dockerfileLocation+ can be a directory that must contains +Dockerfile+ in An example of +Dockerfile+ is: [source, properties] -.src/test/resources-tomcat-7-dockerfile/tomcat/Dockerfile +.src/test/resources/tomcat/Dockerfile ---- -FROM tutum/tomcat:7.0 +FROM tomcat:10.1.30 ENV JAVA_OPTS -Dcom.sun.management.jmxremote.port=8089 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false ADD tomcat-users.xml /tomcat/conf/ # <1> diff --git a/docs/compose.adoc b/docs/compose.adoc index b31c1ee16..f820ec11b 100644 --- a/docs/compose.adoc +++ b/docs/compose.adoc @@ -31,7 +31,7 @@ Then you can create a file called `docker-compose.yml` following docker-compose ---- tomcat: env_file: envs - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 ports: - "8089:8089" - "8088:8088" @@ -64,7 +64,11 @@ For example in case of using Maven, your `pom.xml` should look like: org.slf4j slf4j-api - 1.7.21 + test + + + org.slf4j + slf4j-simple test ---- diff --git a/docs/configuration.adoc b/docs/configuration.adoc index bb74fc1ae..d40c3e444 100644 --- a/docs/configuration.adoc +++ b/docs/configuration.adoc @@ -123,7 +123,7 @@ NOTE: In YAML adding brackets ("[" "]") is for setting a list. [source, yaml] ---- tomcat: # <1> - image: tutum/tomcat:7.0 # <2> + image: tomcat:10.1.30 # <2> exposedPorts: [8089/tcp] # <3> await: # <4> strategy: polling # <5> @@ -197,7 +197,7 @@ _Arquillian Cube_ will read it as if it was defined in `arquilllian.xml` file. .src/test/resources/cube ---- tomcat: - image: tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: polling @@ -217,7 +217,7 @@ networks: # <1> mynetwork: # <2> driver: bridge # <3> tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] networkMode: mynetwork # <4> ---- @@ -232,7 +232,7 @@ You can also use `networks` to connect to more than one network: .src/test/resources/cube ---- tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] networkMode: mynetwork networks: @@ -276,7 +276,7 @@ By default in case you don't specify any _await_ strategy, polling with _ss_ com .Example native ---- tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: native @@ -286,7 +286,7 @@ tomcat: .Example polling using ss command by default ---- tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: polling @@ -300,7 +300,7 @@ tomcat: .Example static ---- tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: static @@ -312,7 +312,7 @@ tomcat: .Example sleeping ---- tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: sleeping @@ -324,7 +324,7 @@ tomcat: .Example log ---- tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: log @@ -344,7 +344,7 @@ tomcat: .Example http ---- tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: http @@ -367,7 +367,7 @@ tomcat: .Example docker_health ---- tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: docker_health @@ -415,7 +415,7 @@ and the configuration comes as: .Example.yml ---- tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: org.arquillian.cube.docker.impl.await.CustomAwaitStrategyImpl @@ -533,7 +533,7 @@ Next snippet shows how to copy a directory from container to local disk: [source, yaml] ---- tomcat_default: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 beforeStop: # <1> - copy: # <2> from: /test @@ -599,7 +599,7 @@ and the configuration comes as: .Example.yml ---- tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 beforeStop: - customBeforeStopAction: strategy: org.arquillian.cube.docker.impl.beforeStop.CustomBeforeStopActionImpl diff --git a/docs/cop.adoc b/docs/cop.adoc index 1d34ec2a7..dfd829876 100644 --- a/docs/cop.adoc +++ b/docs/cop.adoc @@ -47,7 +47,7 @@ The Container Object will be a simple POJO with special annotations: ---- package org.superbiz.containerobject; -@Cube(value = "pingpong", portBinding = "5000->8080/tcp") // <1> +@Cube(value = "pingpong", portBinding = "5432->8080/tcp") // <1> @CubeDockerFile public class PingPongContainer { @@ -71,7 +71,7 @@ public class PingPongContainer { <3> The Container Object hides how to connect to the PingPong server The `@Cube` annotation is used to configure a Container Object. -Its `value` property is used to specify how the started container will be named (in this example `pingpong`) while the `portBinding` property can be used to specify the port binding information for the container instance (in this case `5000->8080/tcp`). +Its `value` property is used to specify how the started container will be named (in this example `pingpong`) while the `portBinding` property can be used to specify the port binding information for the container instance (in this case `5432->8080/tcp`). Notice that `portBinding` can also accept an array, in which case more than one port binding definitions can be specified. The next annotation is `@CubeDockerFile`, which configures how the container is created. @@ -85,7 +85,7 @@ This location must be reachable from the ClassLoader creating the container obje Any Cube can be enriched with any client side enricher. In the previous example a `@HostIp` enricher is used, but it could be enriched similarly with `@CubeIp` (which works similar to `@HostPort`), or a `DockerClient` instance if the field is annotated with `@ArquillianResource`. Finally the `@HostPort` is used to translate the exposed port to the bound port. -In this example the port value will be 5000. Later you will learn briefly why this annotation is important. +In this example the port value will be 5432. Later you will learn briefly why this annotation is important. After creating the container object, you can start using it in your test: @@ -102,7 +102,7 @@ public class PingPongTest { public void shouldReturnOkAsPong() throws IOException { String pong = ping(); assertThat(pong, containsString("OK")); - assertThat(pingPongContainer.getConnectionPort(), is(5000)); + assertThat(pingPongContainer.getConnectionPort(), is(5432)); } } ---- @@ -141,12 +141,12 @@ And in similar way you use `@Deployment` in Arquillian test, you can use `@CubeD [source, java] .PingPongContainer.java ---- -@Cube(value = "pingpong", portBinding = "5000->8080/tcp") +@Cube(value = "pingpong", portBinding = "5432->8080/tcp") public class PingPongContainer { @CubeDockerFile // <1> public static Archive createContainer() { // <2> - String dockerDescriptor = Descriptors.create(DockerDescriptor.class).from("jonmorehouse/ping-pong").exportAsString(); + String dockerDescriptor = Descriptors.create(DockerDescriptor.class).from("tsongpon/pingpong").exportAsString(); return ShrinkWrap.create(GenericArchive.class) .add(new StringAsset(dockerDescriptor), "Dockerfile"); // <3> } @@ -255,7 +255,7 @@ public class PingPongTest { try { String pong = ping(); assertThat(pong, containsString("OK")); - assertThat(pingPongContainer.getConnectionPort(), is(5000)); + assertThat(pingPongContainer.getConnectionPort(), is(5432)); } finally { cubeController.stop("pingpong"); // <3> cubeController.destroy("pingpong"); @@ -288,7 +288,7 @@ Let's see how to use it following the previous Ping Pong example. ---- @DockerContainer // <1> Container pingpong = Container.withContainerName("pingpong") // <2> - .fromImage("jonmorehouse/ping-pong") + .fromImage("tsongpon/pingpong") .withPortBinding(8080) .build(); diff --git a/docs/enrichers.adoc b/docs/enrichers.adoc index 57f656d2f..bc5b3adb3 100644 --- a/docs/enrichers.adoc +++ b/docs/enrichers.adoc @@ -146,7 +146,7 @@ Suppose you have next Docker Container definition in `dockerContainers` property ---- manual_database: - image: zhilvis/h2-db + image: oscarfonts/h2:2.1.214 portBindings: [1521/tcp, 8181->81/tcp] ---- @@ -184,7 +184,7 @@ An example of orchestration can be: links: - database:database # <1> database: - image: zhilvis/h2-db + image: oscarfonts/h2:2.1.214 exposedPorts: [81/tcp, 1521/tcp] await: strategy: polling @@ -193,7 +193,7 @@ An example of orchestration can be: - wildfly:8.1.0.Final:remote + wildfly:33.0.2.Final-jdk11:remote admin Admin#70365 @@ -296,7 +296,7 @@ Suppose you have a _Docker Container_ configuration like: ---- tomcat_default: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: polling diff --git a/docs/example.adoc b/docs/example.adoc index 8bb139e41..8f8914740 100644 --- a/docs/example.adoc +++ b/docs/example.adoc @@ -94,7 +94,7 @@ And finally we need to configure _Tomcat_ remote adapter and *Arquillian Cube* i CUBE tomcat: - image: tutum/tomcat:7.0 + image: tomcat:10.1.30 exposedPorts: [8089/tcp] await: strategy: polling @@ -127,7 +127,7 @@ Notice that in this case you are using _CUBE_ format as orchestration definition Read more at <> section and <>. And that's all. -Now you can run your test and you will see how _tutum/tomcat:7.0_ image is downloaded and started. +Now you can run your test and you will see how _tomcat:10.1.30_ image is downloaded and started. Ports 8080 (Tomcat standard port) and 8089(JMX port used by Arquillian) are exposed. Finally in _env_ section, environment variables are set. Read next link to understand why this is required https://docs.jboss.org/author/display/ARQ/Tomcat+7.0+-+Remote diff --git a/docs/parallel.adoc b/docs/parallel.adoc index 1abb887e4..fb2b8521b 100644 --- a/docs/parallel.adoc +++ b/docs/parallel.adoc @@ -23,15 +23,15 @@ Let's see an example: ---- tomcat*: - image: tutum/tomcat:8.0 + image: tomcat:10.1.30 portBindings: [8080/tcp] links: - ping* ping*: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong exposedPorts: [8089/tcp] pong*: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong exposedPorts: [8089/tcp] depends_on: - "ping*" @@ -55,16 +55,16 @@ So for example the result file could look like: ---- tomcat_123456: - image: tutum/tomcat:8.0 + image: tomcat:10.1.30 portBindings: [54678 -> 8080/tcp] env: [ping_HOSTNAME=ping_123456] links: - ping_123456 ping_123456: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong exposedPorts: [8089/tcp] pong_123456: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong exposedPorts: [8089/tcp] depends_on: - "ping_123456" @@ -85,11 +85,11 @@ Again, adding the special character `*` to the end of the network name will caus testnetwork*: driver: bridge tomcat*: - image: tutum/tomcat:8.0 + image: tomcat:10.1.30 portBindings: [8080/tcp] networkMode: testnetwork* ping*: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong exposedPorts: [8089/tcp] networks: - testnetwork* diff --git a/docs/restassured.adoc b/docs/restassured.adoc index 0539d7db8..b4b559fce 100644 --- a/docs/restassured.adoc +++ b/docs/restassured.adoc @@ -135,9 +135,9 @@ With next docker compose file which starts a ping pong server listening at root .docker-compose.yml ---- helloworld: - image: jonmorehouse/ping-pong + image: tsongpon/pingpong ports: - - "5000:8080" + - "5432:8080" ---- You only need to do: diff --git a/fabric8-maven-plugin-build/src/test/resources/spring-boot-http-booster/src/main/java/io/openshift/booster/service/GreetingEndpoint.java b/fabric8-maven-plugin-build/src/test/resources/spring-boot-http-booster/src/main/java/io/openshift/booster/service/GreetingEndpoint.java index e6d827964..39482397c 100644 --- a/fabric8-maven-plugin-build/src/test/resources/spring-boot-http-booster/src/main/java/io/openshift/booster/service/GreetingEndpoint.java +++ b/fabric8-maven-plugin-build/src/test/resources/spring-boot-http-booster/src/main/java/io/openshift/booster/service/GreetingEndpoint.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; @Path("/") @Component diff --git a/openshift/ftest-containerless/src/test/resources/wildfly/DockerfileTemplate b/openshift/ftest-containerless/src/test/resources/wildfly/DockerfileTemplate index 7475fdbb1..5b5b12878 100644 --- a/openshift/ftest-containerless/src/test/resources/wildfly/DockerfileTemplate +++ b/openshift/ftest-containerless/src/test/resources/wildfly/DockerfileTemplate @@ -1,2 +1,2 @@ -FROM jboss/wildfly:8.2.0.Final +FROM quay.io/wildfly/wildfly:33.0.2.Final-jdk11 COPY ${deployableFilename} /opt/jboss/wildfly/standalone/deployments/${deployableFilename} diff --git a/openshift/ftest/src/test/resources/arquillian.xml b/openshift/ftest/src/test/resources/arquillian.xml index 4005b3d18..4d5f8cde0 100644 --- a/openshift/ftest/src/test/resources/arquillian.xml +++ b/openshift/ftest/src/test/resources/arquillian.xml @@ -10,7 +10,7 @@ - wildfly:8.2.0.Final:remote + wildfly:33.0.2.Final-jdk11:remote admin Admin#70365 diff --git a/pom.xml b/pom.xml index 3b82c13ea..c59a9a959 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jboss jboss-parent - 41 + 46 @@ -70,7 +70,7 @@ 1.8.0.Final 4.13.2 2.2 - 3.3.4 + 3.4.0 6.9.2 2.2 3.2.1 @@ -87,7 +87,6 @@ 1.19.0 1.7.0.Final 2.16.0 - 1.11 1.7.2 3.1.13 @@ -95,6 +94,9 @@ 4.0.1 5.10.1 + + 1.43