Merge pull request #3 from goodrain/master

sync from goodrain/rainbond

.travis.yml

@@ -7,6 +7,5 @@ git:
   depth: 1
 
 script:
-- 'if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD;fi'
 - 'if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then bash ./release.sh all push; fi'
 - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./release.sh all; fi'

CONTRIBUTING.md

@@ -5,8 +5,10 @@
 make build
 # if you have docker environment
 make image
+# or
+make binary
 # if you what build one component
-make build WHAT=api
+make binary WHAT=api
 make image WHAT=api
 ```
 
@@ -27,7 +29,3 @@ Check Pull Request is another way to contribute.
 ## Documents
 
 When you find any typo or you have awesome contents to supplement, you can also use **Pull Request**.
-
-## Join this project
-
-Contact us via [Mail](mailto:info@goodrain.com)

Makefile

@@ -1,5 +1,5 @@
 GO_LDFLAGS=-ldflags " -w"
-VERSION=5.0
+VERSION=master
 WORK_DIR=/go/src/github.com/goodrain/rainbond
 BASE_NAME=rainbond
 BASE_DOCKER=./hack/contrib/docker

README.md

@@ -47,7 +47,6 @@ Rainbond（云帮）是企业应用的操作系统。 Rainbond支撑企业应用
 1.  [安装 Rainbond 集群](https://www.rainbond.com/docs/stable/getting-started/installation-guide.html)
 2.  [创建第一个应用（服务）](https://www.rainbond.com/docs/stable/user-manual/create-an-app.html)
 3.  [搭建 ServiceMesh 微服务架构](https://www.rainbond.com/docs/stable/microservice/service-mesh/use-case.html)
-4.  [迁移已有企业应用上云]()
 
 ## 社区
 
@@ -110,6 +109,6 @@ Rainbond 遵循 LGPL-3.0 license 协议发布，详情查看[LICENSE](https://gi
 - [Weave Scope](https://github.com/weaveworks/scope)
 - [Ant Design](https://github.com/ant-design/ant-design)
 
-## 加入我们
+## 加入我们 
 
 [非常欢迎热爱技术的你加入我们](https://www.rainbond.com/docs/recruitment/join.html)

cmd/gateway/option/option.go

@@ -100,8 +100,8 @@ func (g *GWServer) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&g.NginxUser, "nginx-user", "root", "nginx user name")
 	fs.IntVar(&g.KeepaliveRequests, "keepalive-requests", 10000, "Number of requests a client can make over the keep-alive connection. ")
 	fs.IntVar(&g.KeepaliveTimeout, "keepalive-timeout", 30, "Timeout for keep-alive connections. Server will close connections after this time.")
-	fs.StringVar(&g.IP, "ip", "0.0.0.0", "Node ip.")           // TODO: more detail
-	fs.DurationVar(&g.ResyncPeriod, "resync-period", 10, "the default resync period for any handlers added via AddEventHandler and how frequently the listener wants a full resync from the shared informer")
+	fs.StringVar(&g.IP, "ip", "0.0.0.0", "Node ip.") // TODO: more detail
+	fs.DurationVar(&g.ResyncPeriod, "resync-period", 10*time.Second, "the default resync period for any handlers added via AddEventHandler and how frequently the listener wants a full resync from the shared informer")
 	// etcd
 	fs.StringSliceVar(&g.EtcdEndpoint, "etcd-endpoints", []string{"http://127.0.0.1:2379"}, "etcd cluster endpoints.")
 	fs.IntVar(&g.EtcdTimeout, "etcd-timeout", 5, "etcd http timeout seconds")

release.sh

@@ -6,7 +6,7 @@ WORK_DIR=/go/src/github.com/goodrain/rainbond
 BASE_NAME=rainbond
 GO_VERSION=1.11
 
-VERSION=5.0
+VERSION=master
 buildTime=$(date +%F-%H)
 git_commit=$(git log -n 1 --pretty --format=%h)
 
@@ -76,6 +76,7 @@ build::image() {
 		sed "s/__RELEASE_DESC__/${release_desc}/" Dockerfile > Dockerfile.release
 		docker build -t ${BASE_NAME}/rbd-$1:${VERSION} -f Dockerfile.release .
 		if [ "$2" = "push" ];then
+		    docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
 			docker push ${BASE_NAME}/rbd-$1:${VERSION}
 		fi	
 		rm -f ./Dockerfile.release