Remove the deprecated things and replace Fabric8 Maven plugin with JK…

…ube maven plugin (#1309) * Remove the deprecated boot2docker module * Remove deperacted docker-machine tests * Remove docker implemention and tests for boot2docker and docker-machine * More removal for boot2docker and docker-machine * Fix NodeTest * Upgrade docker.api.version to 1.30 * Upgrade docker base image * More fix * Upgrade docker version in circle CI * [issues-1311]:Introduce containerless.skip.tests property to skip all tests in containerless module on CircleCI * Remove deprecated docker-compose tests * Deprecate fabric8-maven-plugin and uses jkube maven plugin * Remove doc about deprecated components * More cleanup * Use specic node base image version instead of latest
arquillian · Aug 2, 2024 · 11408cb · 11408cb
1 parent ccb95ee
commit 11408cb
Show file tree

Hide file tree

Showing 95 changed files with 147 additions and 3,095 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,7 @@ commands:
           steps:   
             - run:
                 name: "Maven build for Docker"
-                command: ./mvnw clean package -Dfailsafe.groups=org.arquillian.cube.docker.impl.requirement.RequiresDocker
+                command: ./mvnw clean package -Dfailsafe.groups=org.arquillian.cube.docker.impl.requirement.RequiresDocker -Dcontainerless.skip.tests=true
       - when:
           condition:
             equal: [ kubernetes, << parameters.category >> ]
@@ -46,7 +46,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-          version: 20.10.18
+          version: docker24
           docker_layer_caching: true
       - restore_cache:
           key: circleci-arquillian-cube-{{ checksum "pom.xml" }}

diff --git a/README.adoc b/README.adoc
@@ -29,8 +29,6 @@ include::{asciidoctor-source}/bom.adoc[]
 
 include::{asciidoctor-source}/configuration.adoc[]
 
-include::{asciidoctor-source}/boot2docker-dockermachine.adoc[]
-
 include::{asciidoctor-source}/build-containers.adoc[]
 
 include::{asciidoctor-source}/compose.adoc[]
@@ -57,8 +55,6 @@ include::{asciidoctor-source}/kubernetes.adoc[]
 
 include::{asciidoctor-source}/fabric8.adoc[]
 
-include::{asciidoctor-source}/forge.adoc[]
-
 endif::generated-doc[]
 
 == Future work

diff --git a/containerless/pom.xml b/containerless/pom.xml
@@ -64,11 +64,13 @@
   </build>
 
   <properties>
+    <containerless.skip.tests>false</containerless.skip.tests>
+    <skipTests>${containerless.skip.tests}</skipTests>
     <tests.exp.node>**/*Node*</tests.exp.node>
     <tests.exp.undertow>**/*Daytime*</tests.exp.undertow>
     <tests.container.node>node</tests.container.node>
     <tests.container.undertow>daytime</tests.container.undertow>
-    <docker.api.version>1.12</docker.api.version>
+    <docker.api.version>1.30</docker.api.version>
     <docker.api.url>tcp://localhost:2375</docker.api.url>
   </properties>
 

diff --git a/containerless/src/test/java/org/arquillian/cube/impl/containerless/DaytimeTest.java b/containerless/src/test/java/org/arquillian/cube/impl/containerless/DaytimeTest.java
@@ -6,7 +6,6 @@
 import java.net.URL;
 import java.net.UnknownHostException;
 import org.arquillian.cube.docker.impl.requirement.RequiresDocker;
-import org.arquillian.cube.docker.impl.requirement.RequiresDockerMachine;
 import org.arquillian.cube.requirement.ArquillianConditionalRunner;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.test.api.ArquillianResource;
@@ -22,8 +21,7 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
-@Category({RequiresDocker.class, RequiresDockerMachine.class})
-@RequiresDockerMachine(name = "dev")
+@Category({RequiresDocker.class})
 @RunWith(ArquillianConditionalRunner.class)
 public class DaytimeTest {
 

diff --git a/containerless/src/test/java/org/arquillian/cube/impl/containerless/NodeTest.java b/containerless/src/test/java/org/arquillian/cube/impl/containerless/NodeTest.java
@@ -7,7 +7,6 @@
 import java.net.URL;
 import java.net.UnknownHostException;
 import org.arquillian.cube.docker.impl.requirement.RequiresDocker;
-import org.arquillian.cube.docker.impl.requirement.RequiresDockerMachine;
 import org.arquillian.cube.requirement.ArquillianConditionalRunner;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.test.api.ArquillianResource;
@@ -22,8 +21,7 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
-@Category({RequiresDocker.class, RequiresDockerMachine.class})
-@RequiresDockerMachine(name = "dev")
+@Category({RequiresDocker.class})
 @RunWith(ArquillianConditionalRunner.class)
 public class NodeTest {
 

diff --git a/containerless/src/test/resources/arquillian.xml b/containerless/src/test/resources/arquillian.xml
@@ -6,7 +6,6 @@
 
   <extension qualifier="docker">
     <property name="serverVersion">${docker.api.version}</property>
-    <property name="machineName">dev</property>
     <property name="definitionFormat">CUBE</property>
     <property name="dockerContainers">
             daytime:

diff --git a/containerless/src/test/resources/node/DockerfileTemplate b/containerless/src/test/resources/node/DockerfileTemplate
@@ -1,4 +1,4 @@
-FROM node:0.11.14
+FROM node:22.5.1
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
@@ -7,4 +7,4 @@ ADD ${deployableFilename} /usr/src/app
 RUN npm install
 EXPOSE 8080
 
-CMD [ "npm", "start" ]
+CMD [ "npm", "start" ]
diff --git a/containerless/src/test/resources/undertow/DockerfileTemplate b/containerless/src/test/resources/undertow/DockerfileTemplate
@@ -1,6 +1,6 @@
-FROM java:7
+FROM openjdk:11
 
 WORKDIR /usr/src/server
 COPY ${deployableFilename} /usr/src/server/${deployableFilename}
 EXPOSE 8080
-CMD ["java", "-jar", "${deployableFilename}"]
+CMD ["java", "-jar", "${deployableFilename}"]
diff --git a/docker/docker/src/main/java/org/arquillian/cube/docker/impl/client/Boot2DockerCreator.java b/docker/docker/src/main/java/org/arquillian/cube/docker/impl/client/Boot2DockerCreator.java
diff --git a/.../docker/src/main/java/org/arquillian/cube/docker/impl/client/CubeDockerConfiguration.java b/.../docker/src/main/java/org/arquillian/cube/docker/impl/client/CubeDockerConfiguration.java
@@ -13,7 +13,6 @@
 import org.arquillian.cube.docker.impl.client.config.DockerCompositions;
 import org.arquillian.cube.docker.impl.model.DockerMachineDistro;
 import org.arquillian.cube.docker.impl.util.ConfigUtil;
-import org.arquillian.cube.docker.impl.util.DockerMachine;
 import org.arquillian.cube.docker.impl.util.HomeResolverUtil;
 import org.arquillian.cube.impl.util.IOUtil;
 import org.arquillian.cube.spi.AutoStartParser;
@@ -26,13 +25,7 @@ public class CubeDockerConfiguration {
     public static final String CERT_PATH = "certPath";
     public static final String TLS_VERIFY = "tlsVerify";
     public static final String DOCKER_CONTAINERS = "dockerContainers";
-    public static final String BOOT2DOCKER_PATH = "boot2dockerPath";
-    public static final String DOCKER_MACHINE_PATH = "dockerMachinePath";
-    public static final String DOCKER_MACHINE_NAME = "machineName";
-    public static final String DOCKER_MACHINE_DRIVER = "machineDriver";
     public static final String AUTO_START_ORDER = "autoStartOrder";
-    public static final String DOCKER_MACHINE_CUSTOM_PATH = "dockerMachineCustomPath";
-    public static final String DOCKER_MACHINE_ARQUILLIAN_PATH = "~/.arquillian/machine";
     public static final String CUBE_SPECIFIC_PROPERTIES = "cubeSpecificProperties";
     public static final String CLEAN = "clean";
     public static final String REMOVE_VOLUMES = "removeVolumes";
@@ -54,7 +47,6 @@ public class CubeDockerConfiguration {
     private String dockerServerUri;
     private String dockerRegistry;
     private String boot2DockerPath;
-    private String dockerMachinePath;
     private String machineName;
     private String username;
     private String password;
@@ -93,18 +85,6 @@ public static CubeDockerConfiguration fromMap(Map<String, String> map, Injector
             cubeConfiguration.dockerInsideDockerResolution = Boolean.parseBoolean(map.get(DIND_RESOLUTION));
         }
 
-        if (map.containsKey(BOOT2DOCKER_PATH)) {
-            cubeConfiguration.boot2DockerPath = map.get(BOOT2DOCKER_PATH);
-        }
-
-        if (map.containsKey(DOCKER_MACHINE_PATH)) {
-            cubeConfiguration.dockerMachinePath = map.get(DOCKER_MACHINE_PATH);
-        }
-
-        if (map.containsKey(DOCKER_MACHINE_NAME)) {
-            cubeConfiguration.machineName = map.get(DOCKER_MACHINE_NAME);
-        }
-
         if (map.containsKey(USERNAME)) {
             cubeConfiguration.username = map.get(USERNAME);
         }
@@ -281,15 +261,6 @@ public static String resolveUrl(String machineVersion) {
             + DockerMachineDistro.resolveDistro();
     }
 
-    public static File resolveMachinePath(String machineCustomPath, String machineVersion) {
-        if (StringUtils.isBlank(machineCustomPath)) {
-            machineCustomPath = DOCKER_MACHINE_ARQUILLIAN_PATH;
-        }
-        String dockerMachineFile = HomeResolverUtil.resolveHomeDirectoryChar(
-            machineCustomPath + "/" + machineVersion + "/" + DockerMachine.DOCKER_MACHINE_EXEC);
-        return new File(dockerMachineFile);
-    }
-
     public String getDockerServerUri() {
         return dockerServerUri;
     }
@@ -306,21 +277,11 @@ public String getDockerRegistry() {
         return dockerRegistry;
     }
 
-    public String getBoot2DockerPath() {
-        return boot2DockerPath;
-    }
-
-    public String getDockerMachinePath() {
-        return dockerMachinePath;
-    }
 
     public String getMachineName() {
         return machineName;
     }
 
-    public boolean isDockerMachineName() {
-        return this.getMachineName() != null;
-    }
 
     public String getUsername() {
         return username;
@@ -394,15 +355,6 @@ public String toString() {
         if (dockerRegistry != null) {
             content.append("  ").append(DOCKER_REGISTRY).append(" = ").append(dockerRegistry).append(lineSeparator);
         }
-        if (boot2DockerPath != null) {
-            content.append("  ").append(BOOT2DOCKER_PATH).append(" = ").append(boot2DockerPath).append(lineSeparator);
-        }
-        if (dockerMachinePath != null) {
-            content.append("  ").append(DOCKER_MACHINE_PATH).append(" = ").append(dockerMachinePath).append(lineSeparator);
-        }
-        if (machineName != null) {
-            content.append("  ").append(DOCKER_MACHINE_NAME).append(" = ").append(machineName).append(lineSeparator);
-        }
         if (username != null) {
             content.append("  ").append(USERNAME).append(" = ").append(username).append(lineSeparator);
         }