From 77b66dab141461f089b0dc52ee1df9e051ab5eaf Mon Sep 17 00:00:00 2001 From: runzexia Date: Mon, 10 Feb 2020 16:36:31 +0800 Subject: [PATCH] push image on branch release 2.1 Signed-off-by: runzexia --- .travis.yml | 15 ++++++++++----- hack/docker_build.sh | 4 ++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c0c8ba7a..f36ca3c9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,13 @@ install: - go get golang.org/x/lint/golint deploy: - skip_cleanup: true - provider: script - script: bash hack/docker_build.sh - on: - branch: master + - skip_cleanup: true + provider: script + script: bash hack/docker_build.sh + on: + branch: master + - skip_cleanup: true + provider: script + script: bash hack/docker_build.sh + on: + branch: release-2.1 diff --git a/hack/docker_build.sh b/hack/docker_build.sh index 83fa96ae6..a6b25cc16 100755 --- a/hack/docker_build.sh +++ b/hack/docker_build.sh @@ -13,6 +13,10 @@ elif [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then TAG=dev-$(date +%Y%m%d) fi +if [[ $TRAVIS_BRANCH == "release-2.1" ]]; then + TAG=release-2.1 +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 .