From 67a09a9123f9c5c7748b4e387cbbea41e5d0c295 Mon Sep 17 00:00:00 2001 From: johnniang Date: Fri, 10 May 2019 16:12:24 +0800 Subject: [PATCH] Let halo version off Dockerfile --- Dockerfile | 2 +- scripts/docker-build-dev.sh | 2 +- scripts/docker-build-release.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6414d62ad..266446422 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.beta.jar +ARG JAR_FILE=build/libs/halo.jar ARG PORT=8090 ARG TIME_ZONE=Asia/Shanghai diff --git a/scripts/docker-build-dev.sh b/scripts/docker-build-dev.sh index 710e49b97..8030313cc 100755 --- a/scripts/docker-build-dev.sh +++ b/scripts/docker-build-dev.sh @@ -5,6 +5,6 @@ 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 build --build-arg JAR_FILE=build/libs/halo-$VERSION.jar -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 index 35141299d..53deed31a 100755 --- a/scripts/docker-build-release.sh +++ b/scripts/docker-build-release.sh @@ -5,6 +5,6 @@ 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 build --build-arg JAR_FILE=build/libs/halo-$VERSION.jar -t $DOCKER_USERNAME/halo -t $DOCKER_USERNAME/$VERSION . docker images docker push $DOCKER_USERNAME/halo