Make sure the release builds for the UI version to be consistent with the binary version.

build-support/functions/20-build.sh

@@ -26,6 +26,7 @@ function build_ui {
    # Arguments:
    #   $1 - Path to the top level Consul source
    #   $2 - The docker image to run the build within (optional)
+   #   $3 - Version override
    #
    # Returns:
    #   0 - success
@@ -52,6 +53,11 @@ function build_ui {
    # parse the version
    version=$(parse_version "${sdir}")
    
+   if test -n "$3"
+   then
+      version="$3"
+   fi
+   
    local commit_hash="${GIT_COMMIT}"
    if test -z "${commit_hash}"
    then

build-support/functions/30-release.sh

@@ -448,7 +448,8 @@ function build_release {
       fi
       
       status_stage "==> Building UI for version ${vers}"
-      build_ui "${sdir}" "${UI_BUILD_TAG}"
+      # passing the version to override the version determined via tags
+      build_ui "${sdir}" "${UI_BUILD_TAG}" "${vers}"
       if test $? -ne 0
       then
          err "ERROR: Failed to build the ui"