From b2d6dd02549551d269efabc879998d462b483f8a Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 4 May 2020 11:47:03 -0400 Subject: [PATCH] Add pr-# tag to Docker image --- .github/workflows/docker-tags.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-tags.sh b/.github/workflows/docker-tags.sh index 5a43b1fb9..9256cb550 100755 --- a/.github/workflows/docker-tags.sh +++ b/.github/workflows/docker-tags.sh @@ -3,10 +3,15 @@ GIT_TAG="${GITHUB_REF##refs/tags/}" GIT_BRANCH="${GITHUB_REF##refs/heads/}" GIT_SHA=$(git rev-parse --short HEAD) +PR_NUM=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") DOCKER_IMAGE_TAG="--tag ${DOCKER_IMAGE}:sha-${GIT_SHA}" -if [[ $GITHUB_REF != $GIT_TAG ]]; then +if [[ $PR_NUM != "null" ]]; then + DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG} --tag ${DOCKER_IMAGE}:pr-${PR_NUM}" +fi + +if [[ $GITHUB_REF != "$GIT_TAG" ]]; then DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG} --tag ${DOCKER_IMAGE}:${GIT_TAG#v} --tag ${DOCKER_IMAGE}:latest" elif [[ $GITHUB_REF == "refs/heads/master" ]]; then DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG} --tag ${DOCKER_IMAGE}:develop" @@ -14,4 +19,4 @@ elif [[ $GIT_BRANCH = feature/* ]]; then DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG} --tag ${DOCKER_IMAGE}:$(echo $GIT_BRANCH | tr / -)" fi -echo ${DOCKER_IMAGE_TAG} \ No newline at end of file +echo ${DOCKER_IMAGE_TAG}