From f7f333f92fed534c80542769c285f1164b102e30 Mon Sep 17 00:00:00 2001
From: Jeff <jeffzhang@yunify.com>
Date: Thu, 25 Apr 2019 15:43:12 +0800
Subject: [PATCH] update travis build

---
 .travis.yml                                   |  2 +-
 .../Dockerfile                                |  0
 hack/docker_build.sh                          | 33 ++++++++++++++++---
 hack/docker_push.sh                           | 10 ------
 4 files changed, 29 insertions(+), 16 deletions(-)
 rename build/{controller-manager => ks-controller-manager}/Dockerfile (100%)
 delete mode 100755 hack/docker_push.sh

diff --git a/.travis.yml b/.travis.yml
index 9f8c4c4d5..320e73b93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,6 @@ script:
 deploy:
   skip_cleanup: true
   provider: script
-  script: bash hack/docker_build.sh && bash hack/docker_push.sh
+  script: bash hack/docker_build.sh 
   on:
     branch: master
diff --git a/build/controller-manager/Dockerfile b/build/ks-controller-manager/Dockerfile
similarity index 100%
rename from build/controller-manager/Dockerfile
rename to build/ks-controller-manager/Dockerfile
diff --git a/hack/docker_build.sh b/hack/docker_build.sh
index 4ce3c4fa4..acb89be1a 100755
--- a/hack/docker_build.sh
+++ b/hack/docker_build.sh
@@ -1,9 +1,32 @@
 #!/usr/bin/env bash
 
- docker build -f build/ks-apigateway/Dockerfile -t kubespheredev/ks-apigateway:latest .
- docker build -f build/ks-apiserver/Dockerfile -t kubespheredev/ks-apiserver:latest .
- docker build -f build/ks-iam/Dockerfile -t kubespheredev/ks-account:latest .
+set -ex
+set -o pipefail
 
- docker build -f build/controller-manager/Dockerfile -t kubespheredev/ks-controller-manager:latest .
+REPO=kubespheredev
+TAG=latest
 
- docker build -f ./pkg/db/Dockerfile -t kubespheredev/ks-devops:flyway ./pkg/db/
+# check if build was triggered by a travis cronjob
+if [[ ! -v TRAVIS_EVENT_TYPE ]]; then
+    echo "TRAVIS_EVENT_TYPE is not set, treat as regular build"
+elif [[ -z "$TRAVIS_EVENT_TYPE" ]]; then
+    echo "TRAVIS_EVENT_TYPE is empty, also normaly build"
+elif [ $TRAVIS_EVENT_TYPE == "cron" ]; then
+    TAG=dev-$(date +%Y%m%d)
+fi
+
+
+docker build -f build/ks-apigateway/Dockerfile -t $REPO/ks-apigateway:$TAG.
+docker build -f build/ks-apiserver/Dockerfile -t $REPO/ks-apiserver:$TAG.
+docker build -f build/ks-iam/Dockerfile -t $REPO/ks-account:$TAG.
+docker build -f build/ks-controller-manager/Dockerfile -t $REPO/ks-controller-manager:$TAG.
+docker build -f ./pkg/db/Dockerfile -t $REPO/ks-devops:flyway-$TAG ./pkg/db/
+
+# Push image to dockerhub, need to support multiple push
+
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+docker push $REPO/ks-apigateway:$TAG
+docker push $REPO/ks-apiserver:$TAG
+docker push $REPO/ks-account:$TAG
+docker push $REPO/ks-controller-manager:$TAG
+docker push $REPO/ks-devops:flyway-$TAG
diff --git a/hack/docker_push.sh b/hack/docker_push.sh
deleted file mode 100755
index 605816b6c..000000000
--- a/hack/docker_push.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Push image to dockerhub, need to support multiple push
-
-echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-docker push kubespheredev/ks-apigateway:latest
-docker push kubespheredev/ks-apiserver:latest
-docker push kubespheredev/ks-account:latest
-docker push kubespheredev/ks-controller-manager:latest
-docker push kubespheredev/ks-devops:flyway