From 9b30b3978bec018b003ecda4984770e9e092f344 Mon Sep 17 00:00:00 2001 From: johnniang Date: Wed, 8 May 2019 23:23:26 +0800 Subject: [PATCH 1/6] Add pre_build hook for docker hub --- hooks/pre_build | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 hooks/pre_build diff --git a/hooks/pre_build b/hooks/pre_build new file mode 100644 index 000000000..40d67534e --- /dev/null +++ b/hooks/pre_build @@ -0,0 +1,3 @@ +#!/bin/bash + +./gradlew clean build -x test \ No newline at end of file From a7b3055c59d1ecd433b97cece895b504e1cfd1a5 Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 00:51:34 +0800 Subject: [PATCH 2/6] Update travis config --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee0bf3765..e95c2f11f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,16 @@ language: java jdk: - oraclejdk8 +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - - .autoconf - - $HOME/.m2 + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ script: - - mvn clean package -Pci + - ./gradlew check + - ./gradlew clean build -x test branches: only: - master From e3f07d8c324d415ddf32649422bc8859d6b26ec7 Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 00:52:11 +0800 Subject: [PATCH 3/6] Update travis config --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e95c2f11f..8b44799bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ script: branches: only: - master + - dev notifications: webhooks: - https://fathomless-fjord-24024.herokuapp.com/notify From 1d2e5feec0342d384ec03d630ebc9962d5d6a439 Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 01:29:10 +0800 Subject: [PATCH 4/6] Update pre_build for docker hub autobuild --- hooks/pre_build | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hooks/pre_build b/hooks/pre_build index 40d67534e..2e39a914b 100644 --- a/hooks/pre_build +++ b/hooks/pre_build @@ -1,3 +1,12 @@ #!/bin/bash -./gradlew clean build -x test \ No newline at end of file +./gradlew clean build -x test + +echo "=> Building the binary" +docker run \ + -v $(pwd):/src \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -w="/src" \ + openjdk:8-jdk-alpine \ + ./gradlew clean build -x test +echo "=> Built the binary successfully" \ No newline at end of file From 8b97f0422e72a04485ee845fa2d7f4941add82ef Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 01:39:04 +0800 Subject: [PATCH 5/6] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a482db726..86f1b0167 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,9 @@ VOLUME /tmp ARG JAR_FILE=build/libs/halo-1.0.0.bata.jar ARG PORT=8090 +ARG TIME_ZONE=Asia/Shanghai -ENV TZ=Asia/Shanghai +ENV TZ=${TIME_ZONE} COPY ${JAR_FILE} halo.jar From 3b888d3d89eb90d4a8d069a6801b9e847edda63b Mon Sep 17 00:00:00 2001 From: johnniang Date: Thu, 9 May 2019 01:41:30 +0800 Subject: [PATCH 6/6] Update copy filename of the jar file --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 86f1b0167..6414d62ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp -ARG JAR_FILE=build/libs/halo-1.0.0.bata.jar +ARG JAR_FILE=build/libs/halo-1.0.0.beta.jar ARG PORT=8090 ARG TIME_ZONE=Asia/Shanghai