From 25155c73449e41bf9f80756c7bed43ba5c6d9e7f Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 17:55:57 +0800 Subject: [PATCH] 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