From 8f5f508b49c694d16f7fe3b7104fe11104d8951d Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 15:00:04 +0800 Subject: [PATCH 1/6] Add build docker image stage for travis --- .travis.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b44799bb..b5aa66c79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,19 @@ cache: directories: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ -script: - - ./gradlew check - - ./gradlew clean build -x test +dist: trusty +jobs: + include: + - stage: test + script: ./gradlew check + - stage: build + script: ./gradlew build -x test + - stage: build docker image + scrip: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build -t $DOCKER_USERNAME/halo . + - docker images + - docker push $DOCKER_USERNAME/halo branches: only: - master From 59590cf1781451090faeeaf7a16b92e081a002fe Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 15:21:30 +0800 Subject: [PATCH 2/6] Update travis.yaml --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b5aa66c79..55cbb349b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,17 @@ jobs: script: ./gradlew check - stage: build script: ./gradlew build -x test - - stage: build docker image + - stage: build-docker-image scrip: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - docker build -t $DOCKER_USERNAME/halo . - docker images - docker push $DOCKER_USERNAME/halo +stages: + - test + - build + - name: build-docker-image + if: branch = master OR branch = dev branches: only: - master From 3dcf20aa3a9ff4abb10c176b3d05856ba8682320 Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 15:26:26 +0800 Subject: [PATCH 3/6] Add jar cache of travis ci --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 55cbb349b..8a7ae1f99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ cache: directories: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ + - $TRAVIS_BUILD_DIR/build/libs/ dist: trusty jobs: include: From 08ee272d784fcd9fb11b32c08c690f78cb514d6a Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 15:35:11 +0800 Subject: [PATCH 4/6] Fix syntax error in travis.yaml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8a7ae1f99..f6d129fd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ jobs: - stage: build script: ./gradlew build -x test - stage: build-docker-image - scrip: + script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - docker build -t $DOCKER_USERNAME/halo . - docker images From ace74a703d4f05e095c5ffbc5c31f39e52d278bc Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 15:54:11 +0800 Subject: [PATCH 5/6] Modify stage condition of build-docker-image --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f6d129fd2..1636702d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ stages: - test - build - name: build-docker-image - if: branch = master OR branch = dev + if: branch = master branches: only: - master From 25155c73449e41bf9f80756c7bed43ba5c6d9e7f Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 17:55:57 +0800 Subject: [PATCH 6/6] Add docker build scripts --- .travis.yml | 16 +++++++++------- scripts/docker-build-dev.sh | 10 ++++++++++ scripts/docker-build-release.sh | 10 ++++++++++ 3 files changed, 29 insertions(+), 7 deletions(-) create mode 100755 scripts/docker-build-dev.sh create mode 100755 scripts/docker-build-release.sh diff --git a/.travis.yml b/.travis.yml index 1636702d6..d4b0ab4fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: java jdk: - oraclejdk8 +env: + - HALO_VERSION="1.0.0.bata" before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ @@ -16,17 +18,17 @@ jobs: script: ./gradlew check - stage: build script: ./gradlew build -x test - - stage: build-docker-image - script: - - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - docker build -t $DOCKER_USERNAME/halo . - - docker images - - docker push $DOCKER_USERNAME/halo + - stage: build-docker-image-for-release + script: ./scripts/docker-build-release.sh + - stage: build-docker-image-for-dev + script: ./scripts/docker-build-dev.sh stages: - test - build - - name: build-docker-image + - name: build-docker-image-for-release if: branch = master + - name: build-docker-image-for-dev + if: branch = dev branches: only: - master diff --git a/scripts/docker-build-dev.sh b/scripts/docker-build-dev.sh new file mode 100755 index 000000000..710e49b97 --- /dev/null +++ b/scripts/docker-build-dev.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +VERSION=$(ls build/libs | sed 's/.*halo-//' | sed 's/.jar$//') + +echo "Halo version: $VERSION" + +echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin +docker build -t $DOCKER_USERNAME/halo:latest-dev -t $DOCKER_USERNAME/halo:$VERSION.dev . +docker images +docker push $DOCKER_USERNAME/halo diff --git a/scripts/docker-build-release.sh b/scripts/docker-build-release.sh new file mode 100755 index 000000000..35141299d --- /dev/null +++ b/scripts/docker-build-release.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +VERSION=$(ls build/libs | sed 's/.*halo-//' | sed 's/.jar$//') + +echo "Halo version: $VERSION" + +echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin +docker build -t $DOCKER_USERNAME/halo -t $DOCKER_USERNAME/$VERSION . +docker images +docker push $DOCKER_USERNAME/halo