Merge branch 'develop'

.github/workflows/ci-dev.yml

@@ -11,15 +11,29 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: 📁 Check out the repository
+        uses: actions/checkout@v3
+
+      - name: 🏗 Set up JDK 8
         uses: actions/setup-java@v3
         with:
           java-version: '8'
           distribution: 'zulu'
 
-      - name: Build with Gradle
-        run: gradle build
+      - name: 🐳 Check Docker version
+        run: docker version
+
+      - name: 🐳 Check running containers
+        run: docker ps
+
+      - name: 🔨 Build the project
+        run: gradle build -x test --stacktrace
+        env:
+          GITHUB_USERNAME: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 🧪 Run tests
+        run: gradle test --stacktrace
         env:
           GITHUB_USERNAME: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -10,7 +10,7 @@ subprojects {
     apply plugin: 'maven-publish'
     apply plugin: "com.github.johnrengelman.shadow"
 
-    version = '1.3.2'
+    version = '1.3.3'
     group = 'io.github.nullptr'
 
     java {
@@ -40,6 +40,18 @@ subprojects {
         mavenCentral()
     }
 
+    dependencies {
+        testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
+        testImplementation 'org.slf4j:log4j-over-slf4j:2.0.6'
+    }
+
+    test {
+        useJUnitPlatform()
+        testLogging {
+            events "passed", "skipped", "failed"
+        }
+    }
+
     publishing {
         publications {
             mavenJava(MavenPublication) { publication ->

docker/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    api 'com.github.docker-java:docker-java-transport-zerodep:3.2.13'
-    api 'com.github.docker-java:docker-java:3.2.13'
+    api 'com.github.docker-java:docker-java-transport-zerodep:3.3.1'
+    api 'com.github.docker-java:docker-java:3.3.1'
     api project(':tools')
 }

docker/src/main/java/io/github/nullptr/tools/docker/DockerManager.java

@@ -5,7 +5,7 @@
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
 import io.github.nullptr.tools.builder.IBuilder;
-import io.github.nullptr.tools.docker.container.DockerContainerManager;
+import io.github.nullptr.tools.docker.container.ContainerManager;
 import io.github.nullptr.tools.docker.image.DockerImageManager;
 import io.github.nullptr.tools.docker.infos.DockerInfoManager;
 import io.github.nullptr.tools.docker.network.DockerNetworkManager;
@@ -50,7 +50,7 @@ public class DockerManager {
     /**
      * The container manager.
      */
-    private final DockerContainerManager containerManager;
+    private final ContainerManager containerManager;
 
     /**
      * The Docker manager constructor, used to manage all the docker operations through the API.
@@ -70,7 +70,7 @@ public class DockerManager {
         this.swarmManager = new DockerSwarmManager(this);
         this.volumeManager = new DockerVolumeManager(this);
         this.networkManager = new DockerNetworkManager(this);
-        this.containerManager = new DockerContainerManager(this);
+        this.containerManager = new ContainerManager(this);
     }
 
     /**
@@ -125,7 +125,7 @@ public DockerNetworkManager getNetworkManager() {
      * Get the container manager.
      * @return The container manager.
      */
-    public DockerContainerManager getContainerManager() {
+    public ContainerManager getContainerManager() {
         return this.containerManager;
     }
 

docker/src/main/java/io/github/nullptr/tools/docker/container/DockerContainerManager.java → docker/src/main/java/io/github/nullptr/tools/docker/container/ContainerManager.java

@@ -16,12 +16,12 @@
 /**
  * The manager for docker containers.
  */
-public class DockerContainerManager {
+public class ContainerManager {
 
     /**
      * The logger.
      */
-    private static final Logger LOGGER = LoggerFactory.getLogger(DockerContainerManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ContainerManager.class);
 
     /**
      * The docker manager.
@@ -32,7 +32,7 @@ public class DockerContainerManager {
      * The docker container manager constructor.
      * @param manager The manager, to get Docker client instance.
      */
-    public DockerContainerManager(DockerManager manager) {
+    public ContainerManager(DockerManager manager) {
         this.manager = manager;
     }
 

docker/src/main/java/io/github/nullptr/tools/docker/utils/DockerHost.java

@@ -1,5 +1,7 @@
 package io.github.nullptr.tools.docker.utils;
 
+import io.github.nullptr.tools.platform.PlatformHelper;
+import io.github.nullptr.tools.platform.PlatformOS;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -38,8 +40,8 @@ public enum DockerHost {
      * @return The host.
      */
     public String getHost() {
-        if (System.getProperty("os.name").toLowerCase().contains("win") && this.host.startsWith("unix://")) {
-            LoggerFactory.getLogger(DockerHost.class).warn("Windows does not support unix sockets. Using tcp instead.");
+        if (PlatformHelper.isOn(PlatformOS.WINDOWS) && this.host.startsWith("unix://")) {
+            LoggerFactory.getLogger(DockerHost.class).warn("Windows does not support unix sockets. Use tcp instead.");
         }
 
         return this.host;

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists