Merge pull request #358 from FlowCI/fix/docker_client

Fix/docker client

Author: gy2006

core/pom.xml

@@ -19,6 +19,11 @@
       <artifactId>domain</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.flowci</groupId>
+      <artifactId>docker</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.flowci</groupId>
       <artifactId>sm</artifactId>
@@ -49,11 +54,6 @@
       <artifactId>zookeeper</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.flowci</groupId>
-      <artifactId>pool</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.auth0</groupId>
       <artifactId>java-jwt</artifactId>
@@ -104,11 +104,6 @@
       <artifactId>org.eclipse.jgit</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.rabbitmq</groupId>
       <artifactId>amqp-client</artifactId>

core/src/main/java/com/flowci/core/agent/domain/AgentHost.java

@@ -16,21 +16,16 @@
 
 package com.flowci.core.agent.domain;
 
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
 import com.flowci.core.common.domain.Mongoable;
-
-import org.springframework.data.mongodb.core.index.Indexed;
-
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
+import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @Getter
 @Setter
 @Document(collection = "agent_host")
@@ -73,17 +68,7 @@ public enum Type {
     /**
      * Max agent size on the host
      */
-    private int maxSize = 10;
-
-    /**
-     * Stop agent container if over the idle seconds
-     */
-    private int maxIdleSeconds = 3600;
-
-    /**
-     * Remove agent container if over the offline seconds
-     */
-    private int maxOfflineSeconds = 600;
+    private int maxSize = 5;
 
     /**
      * Tags for all agent holed by host
@@ -94,18 +79,4 @@ public enum Type {
      * Error message if connection fail
      */
     private String error;
-
-    public boolean isOverMaxIdleSeconds(Date date) {
-        if (maxIdleSeconds == NoLimit) {
-            return false;
-        }
-        return date.toInstant().plus(maxIdleSeconds, ChronoUnit.SECONDS).isBefore(Instant.now());
-    }
-
-    public boolean isOverMaxOfflineSeconds(Date date) {
-        if (maxOfflineSeconds == NoLimit) {
-            return false;
-        }
-        return date.toInstant().plus(maxOfflineSeconds, ChronoUnit.SECONDS).isBefore(Instant.now());
-    }
 }

core/src/main/java/com/flowci/core/agent/domain/CreateOrUpdateSshAgentHost.java

@@ -45,11 +45,7 @@ public class CreateOrUpdateSshAgentHost {
 
     private String ip;
 
-    private int maxSize = 10;
-
-    private int maxIdleSeconds = 3600;
-
-    private int maxOfflineSeconds = 600;
+    private int maxSize = 5;
 
     public AgentHost toObj() {
         if (type == AgentHost.Type.SSH) {
@@ -61,8 +57,6 @@ public AgentHost toObj() {
             host.setIp(ip);
             host.setTags(tags);
             host.setMaxSize(maxSize);
-            host.setMaxIdleSeconds(maxIdleSeconds);
-            host.setMaxOfflineSeconds(maxOfflineSeconds);
             return host;
         }
 
@@ -71,8 +65,6 @@ public AgentHost toObj() {
             host.setId(id);
             host.setName(name);
             host.setMaxSize(maxSize);
-            host.setMaxIdleSeconds(maxIdleSeconds);
-            host.setMaxOfflineSeconds(maxOfflineSeconds);
             return host;
         }
 

core/src/main/java/com/flowci/core/agent/domain/LocalUnixAgentHost.java

@@ -28,5 +28,6 @@ public class LocalUnixAgentHost extends AgentHost {
 
     public LocalUnixAgentHost() {
         this.setType(AgentHost.Type.LocalUnixSocket);
+        this.setMaxSize(2);
     }
 }

core/src/main/java/com/flowci/core/agent/domain/SshAgentHost.java

@@ -35,6 +35,8 @@ public class SshAgentHost extends AgentHost {
     @NonNull
     private String ip;
 
+    private int port = 22;
+
     public SshAgentHost() {
         setType(Type.SSH);
     }

core/src/main/java/com/flowci/core/agent/domain/Variables.java

@@ -0,0 +1,14 @@
+package com.flowci.core.agent.domain;
+
+public abstract class Variables {
+
+    public static final String SERVER_URL = "FLOWCI_SERVER_URL";
+
+    public static final String AGENT_TOKEN = "FLOWCI_AGENT_TOKEN";
+
+    public static final String AGENT_LOG_LEVEL = "FLOWCI_AGENT_LOG_LEVEL";
+
+    public static final String AGENT_VOLUMES = "FLOWCI_AGENT_VOLUMES";
+
+    public static final String AGENT_WORKSPACE = "FLOWCI_AGENT_WORKSPACE";
+}