fix: docker tags

Signed-off-by: Valery Piashchynski <[email protected]>
roadrunner-server · Jun 22, 2023 · f156c45 · f156c45
1 parent 0017447
commit f156c45
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -177,14 +177,12 @@ jobs:
           echo latest_tag_s=$(echo ${GITHUB_REF##*/} | sed -E -e '/-beta|-alpha|-rc/ s/.*//' -e '/^[^-]*$/ s/.*v[0-9]+\..*/latest/'); [[ ! -z "$latest_tag_s" ]] && latest_tag_s="spiralscout/roadrunner:$latest_tag_s" >> $GITHUB_OUTPUT
           echo version_major_s=$(echo ${GITHUB_REF##*/} | sed -E -e '/-beta|-alpha|-rc/ s/.*//' -e '/^[^-]*$/ s/v([0-9]+)\..*/\1/'); [[ ! -z "$version_major_s" ]] && version_major_s="spiralscout/roadrunner:$version_major_s" >> $GITHUB_OUTPUT
           echo version_minor_s=$(echo ${GITHUB_REF##*/} | sed -E -e '/-beta|-alpha|-rc/ s/.*//' -e '/^[^-]*$/ s/v([0-9]+\.[0-9]+).*/\1/' -e '/^[^-]*$/ s/\.0$//'); [[ ! -z "$version_minor_s" ]] && version_minor_s="spiralscout/roadrunner:$version_minor_s" >> $GITHUB_OUTPUT
-          echo version_bugfix_s=$(echo ${GITHUB_REF##*/} | sed -E -e sed -e 's/^[vV ]*//'); [[ ! -z "$version_bugfix_s" ]] && version_bugfix_s="spiralscout/roadrunner:$version_bugfix_s" >> $GITHUB_OUTPUT
 
           echo latest_tag_g=$(echo ${GITHUB_REF##*/} | sed -E -e '/-beta|-alpha|-rc/ s/.*//' -e '/^[^-]*$/ s/.*v[0-9]+\..*/latest/'); [[ ! -z "$latest_tag_g" ]] && latest_tag_g="ghcr.io/roadrunner-server/roadrunner:$latest_tag_g" >> $GITHUB_OUTPUT
           echo version_major_g=$(echo ${GITHUB_REF##*/} | sed -E -e '/-beta|-alpha|-rc/ s/.*//' -e '/^[^-]*$/ s/v([0-9]+)\..*/\1/'); [[ ! -z "$version_major_g" ]] && version_major_g="ghcr.io/roadrunner-server/roadrunner:$version_major_g" >> $GITHUB_OUTPUT
           echo version_minor_g=$(echo ${GITHUB_REF##*/} | sed -E -e '/-beta|-alpha|-rc/ s/.*//' -e '/^[^-]*$/ s/v([0-9]+\.[0-9]+).*/\1/' -e '/^[^-]*$/ s/\.0$//'); [[ ! -z "$version_minor_g" ]] && version_minor_g="ghcr.io/roadrunner-server/roadrunner:$version_minor_g" >> $GITHUB_OUTPUT
-          echo version_bugfix_g=$(echo ${GITHUB_REF##*/} | sed -E -e sed -e 's/^[vV ]*//'); [[ ! -z "$version_bugfix_g" ]] && version_bugfix_g="ghcr.io/roadrunner-server/roadrunner:$version_bugfix_g" >> $GITHUB_OUTPUT
 
-          echo "version_bugfix=$(echo ${GITHUB_REF##*/} | sed -e 's/^[vV ]*//')" >> $GITHUB_OUTPUT
+          echo "version_full=$(echo ${GITHUB_REF##*/} | sed -e 's/^[vV ]*//')" >> $GITHUB_OUTPUT
           echo "timestamp=$(echo $(date +%FT%T%z))" >> $GITHUB_OUTPUT
 
       - name: Build image
@@ -195,14 +193,15 @@ jobs:
           push: true
           platforms: linux/amd64,linux/arm64
           build-args: |
-            APP_VERSION=${{ steps.values.outputs.version_bugfix}}
+            APP_VERSION=${{ steps.values.outputs.version_full}}
             BUILD_TIME=${{ steps.values.outputs.timestamp }}
           tags: |
+            spiralscout/roadrunner:${{ steps.values.outputs.version_full}}
             ${{ steps.values.outputs.latest_tag_s }}
             ${{ steps.values.outputs.version_major_s }}
             ${{ steps.values.outputs.version_minor_s }}
-            ${{ steps.values.outputs.version_bugfix_s }}
+
+            ghcr.io/roadrunner-server/roadrunner:${{ steps.values.outputs.version_full}}
             ${{ steps.values.outputs.latest_tag_g }}
             ${{ steps.values.outputs.version_major_g }}
             ${{ steps.values.outputs.version_minor_g }}
-            ${{ steps.values.outputs.version_bugfix_g }}