github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Let halo version off Dockerfile

pull/151/head
johnniang 2019-05-10 16:12:24 +08:00
parent b25c9624ad
commit 67a09a9123
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine
VOLUME /tmp VOLUME /tmp
ARG JAR_FILE=build/libs/halo-1.0.0.beta.jar ARG JAR_FILE=build/libs/halo.jar
ARG PORT=8090 ARG PORT=8090
ARG TIME_ZONE=Asia/Shanghai ARG TIME_ZONE=Asia/Shanghai

2
scripts/docker-build-dev.sh
View File

@ -5,6 +5,6 @@ VERSION=$(ls build/libs | sed 's/.*halo-//' | sed 's/.jar$//')
echo "Halo version: $VERSION" echo "Halo version: $VERSION"
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin 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 images
docker push $DOCKER_USERNAME/halo docker push $DOCKER_USERNAME/halo

2
scripts/docker-build-release.sh
View File

@ -5,6 +5,6 @@ VERSION=$(ls build/libs | sed 's/.*halo-//' | sed 's/.jar$//')
echo "Halo version: $VERSION" echo "Halo version: $VERSION"
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin 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 images
docker push $DOCKER_USERNAME/halo docker push $DOCKER_USERNAME/halo