Commit 1b83a504 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '229160-follow-up-from-use-the-correct-gitaly-image-tag' into 'master'

Resolve "Follow-up from "Use the correct gitaly image tag""

Closes #229160

See merge request gitlab-org/gitlab!37049
parents d4d42245 273bbd20
......@@ -294,11 +294,11 @@ function base_config_changed() {
function parse_gitaly_image_tag() {
local gitaly_version="${GITALY_VERSION}"
# returns sha if gitaly_version uses a sha
if [[ ${#gitaly_version} -eq 40 ]]; then
echo "${gitaly_version}"
else
# prepend semver version with `v`
if [[ $gitaly_version =~ ^[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?(-ee)?$ ]]; then
echo "v${gitaly_version}"
else
echo "${gitaly_version}"
fi
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment