Merge branch 'develop' of github.com:FlowCI/flow-platform

Author: yunheli

.gitignore

@@ -1,9 +1,12 @@
+velocity.log
 .idea/
 *.iml
 .DS_Store
 deploy.sh
 api-doc/
 
+velocity.log*
+
 node_modules/
 apidoc/
 dist/

Dockerfile

@@ -16,6 +16,11 @@ ENV MVN_CACHE=/root/.m2
 ADD ./docker/mysqld.cnf /etc/mysql/conf.d/mysqld.cnf
 VOLUME /var/lib/mysql
 
+# mount docker
+# docker in docker volume map happens some error
+# VOLUME /var/lib/docker
+COPY ./docker/daemon.json /etc/docker/daemon.json
+
 # config tomcat
 COPY ./docker/tomcat-users.xml $CATALINA_HOME/conf
 
@@ -33,6 +38,13 @@ RUN cd $FLOW_PLATFORM_SOURCE_CODE \
     && rm -rf $FLOW_PLATFORM_SOURCE_CODE \
     && rm -rf $MVN_CACHE
 
+
+# add aliyun proxy
+ADD ./docker/settings.xml /root/.m2/
+
+# cache mvn package
+VOLUME /root/.m2/repository
+
 # setup flow.ci default configuration
 COPY ./docker/app-cc.properties $FLOW_PLATFORM_CONFIG_DIR
 COPY ./docker/app-api.properties $FLOW_PLATFORM_CONFIG_DIR

config/app-api.properties

@@ -23,14 +23,17 @@ api.zone.default = default
 api.user.expire = 86400000
 
 ### domain ###
-domain.api = http://localhost:8080
-domain.web = http://localhost:3000
-domain.cc = http://localhost:8080
+domain.api = http://api_domain:8080/flow-api
+domain.web = http://web_domain:3000
+domain.cc = http://api_doamin:8080/flow-control-center
 
 system.email = [email protected]
 system.username = admin
 system.password = 123456
 
+## flowci started success tip
+jfiglet.message =  FlowCi Started Success 
+
 ## plugin repos url
 plugins.repository = https://raw.githubusercontent.com/flowci/plugins/master/repository.json
 

config/app-cc.properties

@@ -38,8 +38,8 @@ queue.cmd.idle_agent.timeout = 30
 queue.cmd.idle_agent.period = 5
 
 ### agent config ###
-agent.config.ws = ws://localhost:8088
-agent.config.cc = http://localhost:8080
+agent.config.ws = ws://api_domain:8080/flow-api
+agent.config.cc = http://api_domain:8080/flow-control-center
 
 ### task toggles ###
 task.zone.toggle.keep_idle_agent = false

docker/app-api.properties

@@ -31,9 +31,15 @@ system.email = ${FLOW_SYS_EMAIL}
 system.username = ${FLOW_SYS_USERNAME}
 system.password = ${FLOW_SYS_PASSWORD}
 
+
+## flowci started success tip
+jfiglet.message =  FlowCi Started Success 
+
 ## plugin repos url
 plugins.repository = https://raw.githubusercontent.com/flowci/plugins/master/repository.json
 
+api.run.indocker = true
+
 task.job.toggle.execution_timeout = true
 ## 6s expire job
 task.job.toggle.execution_create_session_duration = 1800

docker/app-cc.properties

@@ -16,8 +16,8 @@ hibernate.hbm2ddl.auto = validate
 cc.workspace = ${HOME}/flow-ci/flow-control-center
 
 ### zookeeper config ###
-zk.server.embedded = true
-zk.host = ${FLOW_API_DOMAIN}:2181
+zk.server.embedded = ${FLOW_ZOOKEEPER_EMBEDDED}
+zk.host = ${FLOW_ZOOKEEPER_HOST}:${FLOW_ZOOKEEPER_PORT}
 zk.timeout = 30
 zk.node.root = flow-agents
 

docker/daemon.json

@@ -0,0 +1,4 @@
+{
+  "registry-mirrors": ["https://registry.docker-cn.com"],
+  "storage-driver": "vfs"
+}

docker/flow-platform-base-dockerfile

@@ -25,5 +25,9 @@ RUN curl -fsSL http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binar
     && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven \
     && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
 
+# install docker and start docker
+RUN curl -fsSL get.docker.com -o get-docker.sh \
+    && sh get-docker.sh
+
 # install mysql
 RUN apt-get install -y mysql-server

docker/flow.ci.backend.cmd.sh

@@ -11,9 +11,29 @@ fi
 
 # set mysql host, default 127.0.0.1
 if [[ ! -n $MYSQL_HOST ]]; then
-	export $MYSQL_HOST=127.0.0.1
+	export MYSQL_HOST=127.0.0.1
 fi
 
+# set default port, default is 2181
+if [[ ! -n $FLOW_ZOOKEEPER_PORT ]]; then
+    export FLOW_ZOOKEEPER_PORT=2181
+fi
+
+# set zookeeper is embedded or not, default is true
+if [[ ! -n $FLOW_ZOOKEEPER_EMBEDDED ]]; then
+    export FLOW_ZOOKEEPER_EMBEDDED=true
+fi
+
+if [[ $FLOW_ZOOKEEPER_EMBEDDED = "true" ]]; then
+	export FLOW_ZOOKEEPER_HOST=$FLOW_API_DOMAIN
+else
+	if [[ ! -n $FLOW_ZOOKEEPER_HOST ]]; then
+		echo "Because you select auto define zookeeper, Please set FLOW_ZOOKEEPER_HOST"
+		exit 1;
+	fi
+fi
+
+
 # set default port, default is 8080
 if [[ ! -n $PORT ]]; then
 	export PORT=8080
@@ -80,6 +100,8 @@ echo "running migration"
 /flyway/flyway -user=$MYSQL_USER -password=$MYSQL_PASSWORD -ignoreMissingMigrations=true -baselineOnMigrate=true -baselineVersion=1.0 -locations=filesystem:$MIGRATION_PATH/cc -url=jdbc:mysql://$MYSQL_HOST:3306/flow_cc_db  migrate
 echo "finish migration"
 
+# start docker
+service docker start
 
 # Four: everything ready, to run tomcat
 exec $cmd

docker/plugin-environment-dockerfile

@@ -0,0 +1,13 @@
+#
+# Plguin Base Dockerfile
+# Image Name: flowci/plugin-environment
+#
+# https://github.com/FlowCI/flow-platform
+#
+FROM maven:3.5-jdk-8
+
+ADD settings.xml /root/.m2/
+
+# cache mvn package
+VOLUME /root/.m2/repository
+