Merge pull request #2488 from minrk/post_push

Docker hook fixes
This commit is contained in:
Min RK
2019-03-28 16:02:50 +01:00
committed by GitHub
2 changed files with 13 additions and 2 deletions

View File

@@ -12,8 +12,11 @@ function get_hub_version() {
split=( ${hub_xyz//./ } ) split=( ${hub_xyz//./ } )
hub_xy="${split[0]}.${split[1]}" hub_xy="${split[0]}.${split[1]}"
# add .dev on hub_xy so it's 1.0.dev # add .dev on hub_xy so it's 1.0.dev
if [[ ! -z "${split[3]}" ]]; then if [[ ! -z "${split[3]:-}" ]]; then
hub_xy="${hub_xy}.${split[3]}" hub_xy="${hub_xy}.${split[3]}"
latest=0
else
latest=1
fi fi
} }
@@ -31,3 +34,11 @@ docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:$hub_xy
docker push $DOCKER_REPO:$hub_xy docker push $DOCKER_REPO:$hub_xy
docker tag $ONBUILD:$DOCKER_TAG $ONBUILD:$hub_xy docker tag $ONBUILD:$DOCKER_TAG $ONBUILD:$hub_xy
docker push $ONBUILD:$hub_xyz docker push $ONBUILD:$hub_xyz
# if building a stable release, tag latest as well
if [[ "$latest" == "1" ]]; then
docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest
docker push $DOCKER_REPO:latest
docker tag $ONBUILD:$DOCKER_TAG $ONBUILD:latest
docker push $ONBUILD:latest
fi

View File

@@ -14,7 +14,7 @@ function get_hub_version() {
split=( ${hub_xyz//./ } ) split=( ${hub_xyz//./ } )
hub_xy="${split[0]}.${split[1]}" hub_xy="${split[0]}.${split[1]}"
# add .dev on hub_xy so it's 1.0.dev # add .dev on hub_xy so it's 1.0.dev
if [[ ! -z "${split[3]}" ]]; then if [[ ! -z "${split[3]:-}" ]]; then
hub_xy="${hub_xy}.${split[3]}" hub_xy="${hub_xy}.${split[3]}"
fi fi
} }