From 26d5f9f30634427a59e856eae8c685df83f6a954 Mon Sep 17 00:00:00 2001 From: Adrian Macneil Date: Thu, 22 Jul 2021 16:09:57 -0700 Subject: [PATCH] Strip leading 'v' for docker image tags (#224) --- .github/workflows/publish-docker.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish-docker.sh b/.github/workflows/publish-docker.sh index 8a927c3..fc6f7c6 100755 --- a/.github/workflows/publish-docker.sh +++ b/.github/workflows/publish-docker.sh @@ -26,19 +26,17 @@ function publish { docker_push "$SRC_IMAGE" "$GHCR_IMAGE:$tag" } -# Publish current branch/tag (e.g. `main` or `v1.2.3`) -ver=${GITHUB_REF##*/} -publish "$ver" - -# Publish major/minor/latest for version tags if [[ "$GITHUB_REF" = refs/tags/v* ]]; then - major_ver=${ver%%.*} # e.g. `v1` - publish "$major_ver" - - minor_ver=${ver%.*} # e.g. `v1.2` - publish "$minor_ver" + # Publish major/minor/patch/latest version tags + ver=${GITHUB_REF#refs/tags/v} + publish "$ver" # e.g. `1.2.3` + publish "${ver%.*}" # e.g. `1.2` + publish "${ver%%.*}" # e.g. `1` publish "latest" +else + # Publish branch + publish "${GITHUB_REF##*/}" fi # Clear credentials