v1.2.0

CHANGELOG.md

@@ -1,4 +1,6 @@
 ## Change Log
+### Version 1.3.0 (2024-11-25)
+- Add ability to connect through socket
 ### Version 1.2.0 (2020-12-28)
 - Deploy using Github Action
 ### Version 1.1.0 (2019-05-03)

README.md

@@ -29,6 +29,19 @@ repositories:
 
 ####  Add the configuration to `application.conf`
 
+```
+docker.remote_host=yourdockerhost.com
+docker.remote_port=2400
+```
+
+#### Connect with socket
+
+```
+docker.use_socket=true
+```
+
+####  Connect with certificate
+
 ```
 docker.remote_host=yourdockerhost.com
 docker.remote_port=2376

app/helpers/docker/DockerUtil.java

@@ -5,7 +5,6 @@
 import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.auth.FixedRegistryAuthSupplier;
 import com.spotify.docker.client.messages.RegistryAuth;
-import com.spotify.docker.client.messages.RegistryConfigs;
 import play.Play;
 
 import java.net.URI;
@@ -26,20 +25,24 @@ public class DockerUtil {
     public static DockerClient createDockerClient() {
         try {
             DefaultDockerClient.Builder builder = DefaultDockerClient.builder();
-            if (getDockerCertDir() != null) {
-                builder
-                        .uri(URI.create("https://" + getDockerRemoteHost() + ":" + getDockerRemotePort("2376")))
-                        .dockerCertificates(DockerCertificates.builder()
-                                .dockerCertPath(Paths.get(getDockerCertDir()))
-                                .build().orNull());
+            if (isUseSocket()) {
+                builder.uri(URI.create("unix:///var/run/docker.sock"));
             } else {
-                builder.uri(URI.create("http://" + getDockerRemoteHost() + ":" + getDockerRemotePort("2400")));
-                if (getDockerAuthorization() != null) {
-                    builder.header("Authorization", "Basic " + getDockerAuthorization());
+                if (getDockerCertDir() != null) {
+                    builder
+                            .uri(URI.create("https://" + getDockerRemoteHost() + ":" + getDockerRemotePort("2376")))
+                            .dockerCertificates(DockerCertificates.builder()
+                                    .dockerCertPath(Paths.get(getDockerCertDir()))
+                                    .build().orNull());
+                } else {
+                    builder.uri(URI.create("http://" + getDockerRemoteHost() + ":" + getDockerRemotePort("2400")));
+                    if (getDockerAuthorization() != null) {
+                        builder.header("Authorization", "Basic " + getDockerAuthorization());
+                    }
+                }
+                if (getRegistryUsername() != null && getRegistryPassword() != null && getRegistryAddress() != null) {
+                    builder.registryAuthSupplier(new FixedRegistryAuthSupplier(getRegistryAuth(), null));
                 }
-            }
-            if (getRegistryUsername() != null && getRegistryPassword() != null && getRegistryAddress() != null) {
-                builder.registryAuthSupplier(new FixedRegistryAuthSupplier(getRegistryAuth(), null));
             }
             return builder.build();
         } catch (Exception e) {
@@ -67,6 +70,10 @@ private static String getDockerRemotePort(String defaultPort) {
         return Play.configuration.getProperty("docker.remote_port", defaultPort);
     }
 
+    private static boolean isUseSocket() {
+        return Boolean.getBoolean(Play.configuration.getProperty("docker.use_socket"));
+    }
+
     private static String getDockerAuthorization() {
         return Play.configuration.getProperty("docker.authorization");
     }

conf/dependencies.yml

@@ -1,4 +1,4 @@
-self: play -> docker 1.2.0
+self: play -> docker 1.3.0
 
 configurations:
     - provided: