Merge pull request #123 from FlowCI/develop

Develop

Author: yang.guo

Dockerfile-agent

@@ -0,0 +1,32 @@
+## flow api config file ##
+
+### JDBC config ###
+jdbc.url = jdbc:mysql://127.0.0.1:3306/flow_api_db?useSSL=false
+jdbc.username = db_username
+jdbc.password = db_password
+jdbc.pool.size = 200
+jdbc.commit.auto = false
+jdbc.connection.timeout = 20000
+
+### Hibernate config ###
+hibernate.show_sql = false
+hibernate.hbm2ddl.auto = validate
+
+### api settings ###
+api.workspace = ${HOME}/flow-api-data
+api.zone.default = default
+
+### expiration duration of token, it's in millisecond ###
+### 86400000 = 1000 * 60 * 60 * 24 = 1 day (will expiration after one day) ###
+api.user.expire = 86400000
+
+### domain ###
+domain.api = http://localhost:8080
+domain.web = http://localhost:3000
+domain.cc = http://localhost:8080
+
+task.job.toggle.execution_timeout = false
+## 6s expire job
+task.job.toggle.execution_create_session_duration = 600
+## 1h expire job
+task.job.toggle.execution_running_duration = 3600

Dockerfile-backend

@@ -10,16 +10,16 @@ jdbc.connection.timeout = 20000
 
 ### hibernate config ###
 hibernate.show_sql = false
-hibernate.hbm2ddl.auto = update
+hibernate.hbm2ddl.auto = validate
 
 ### zookeeper config ###
-zk.server.embedded = false
+zk.server.embedded = true
 zk.host = 127.0.0.1:2181
 zk.timeout = 30
 zk.node.root = flow-agents
 
 # zone names and cloud provider config, ex: a=xxx;b=xxx;c=xxx
-zk.node.zone = test-zone-1;test-zone-2;default
+zk.node.zone = default
 zone.default.agent_session_timeout = 600
 zone.default.default_cmd_timeout = 600
 
@@ -34,12 +34,9 @@ queue.cmd.rabbit.name = flow-cmd-queue-default
 queue.cmd.idle_agent.timeout = 30
 queue.cmd.idle_agent.period = 5
 
-### agent report url config ###
-agent.config.cmd_rt_log_url = ws://localhost:8088/agent/cmd/logging
-agent.config.cmd_report_url = http://localhost:8080/cmd/report
-agent.config.cmd_log_url = http://localhost:8080/cmd/log/upload
-
-agent.secret_key = 1111
+### agent config ###
+agent.config.ws = ws://localhost:8088
+agent.config.cc = http://localhost:8080
 
 ### task toggles ###
 task.zone.toggle.keep_idle_agent = false

build-docker.sh

@@ -1 +1 @@
-version=${client.version}
+version=${agent.version}

config/app-api.properties

@@ -71,8 +71,8 @@ public class AppConfig extends AppConfigBase {
     @Value("${api.workspace}")
     private String workspace;
 
-    @Value("${platform.url}")
-    private String platFormBaseURL;
+    @Value("${domain.cc}")
+    private String ccDomain;
 
     @Bean
     public Path workspace() {
@@ -121,7 +121,7 @@ protected String getVersion() {
 
     @Bean
     public PlatformURL platformURL() {
-        PlatformURL platformURL = new PlatformURL(platFormBaseURL);
+        PlatformURL platformURL = new PlatformURL(ccDomain);
         LOGGER.trace(platformURL.toString());
         return platformURL;
     }