Merge pull request #28227 from ayakael/alpine/fix-non-portable-distrorid

[release/3.1] Fix non-portable distrorid alpine generation

Author: carlossanlop

init-distro-rid.sh

@@ -51,7 +51,7 @@ initNonPortableDistroRid()
             # We have forced __PortableBuild=0. This is because -portablebuld
             # has been passed as false.
             if (( ${isPortable} == 0 )); then
-                if [ "${ID}" == "rhel" ]; then
+                if [ "${ID}" == "rhel" ] || [ "${ID}" = "alpine" ]; then
                     # remove the last version digit	
                     VERSION_ID=${VERSION_ID%.*}
                 fi