diff --git a/config/templates/package-scripts/preinst.erb b/config/templates/package-scripts/preinst.erb index 29bf0d61db0f82b58ded9a882cfc94dacc4d673d_Y29uZmlnL3RlbXBsYXRlcy9wYWNrYWdlLXNjcmlwdHMvcHJlaW5zdC5lcmI=..948028d1265d724faa53f54fd785157cc1ec6450_Y29uZmlnL3RlbXBsYXRlcy9wYWNrYWdlLXNjcmlwdHMvcHJlaW5zdC5lcmI= 100644 --- a/config/templates/package-scripts/preinst.erb +++ b/config/templates/package-scripts/preinst.erb @@ -37,4 +37,8 @@ } upgrade_check() { + # Minimum version from which jumps are permitted to current version. + # Follows https://docs.gitlab.com/ee/update/index.html#upgrade-paths + MIN_VERSION=13.0 + # If this succeeds, then gitlab-ctl upgrade-check exists, and passed @@ -40,5 +44,5 @@ # If this succeeds, then gitlab-ctl upgrade-check exists, and passed - if ctl_results=$(gitlab-ctl upgrade-check "${OLD_VERSION_STRING}" "${NEW_MAJOR_VERSION}.${NEW_MINOR_VERSION}") ; then + if ctl_results=$(MIN_VERSION=${MIN_VERSION} gitlab-ctl upgrade-check "${OLD_VERSION_STRING}" "${NEW_MAJOR_VERSION}.${NEW_MINOR_VERSION}") ; then return 0 fi @@ -50,10 +54,6 @@ fi if [ -n "${OLD_VERSION_STRING}" ] ; then - # Minimum version from which jumps are permitted to current version. - # Follows https://docs.gitlab.com/ee/update/index.html#upgrade-paths - MIN_VERSION=13.0 - # Checking # (i) if it is a major version jump # (ii) if existing version is less than required minimum version diff --git a/docker/assets/wrapper b/docker/assets/wrapper index 29bf0d61db0f82b58ded9a882cfc94dacc4d673d_ZG9ja2VyL2Fzc2V0cy93cmFwcGVy..948028d1265d724faa53f54fd785157cc1ec6450_ZG9ja2VyL2Fzc2V0cy93cmFwcGVy 100755 --- a/docker/assets/wrapper +++ b/docker/assets/wrapper @@ -79,7 +79,7 @@ if old_version=$(cat /var/opt/gitlab/gitlab-rails/VERSION) then new_version=$(awk '/^gitlab-(c|e)e/ {print $NF}' /opt/gitlab/version-manifest.txt) - gitlab-ctl upgrade-check "${old_version}" "${new_version}" + MIN_VERSION="13.0" gitlab-ctl upgrade-check "${old_version}" "${new_version}" fi # Copy gitlab.rb for the first time diff --git a/files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb b/files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb index 29bf0d61db0f82b58ded9a882cfc94dacc4d673d_ZmlsZXMvZ2l0bGFiLWN0bC1jb21tYW5kcy9saWIvZ2l0bGFiX2N0bC91cGdyYWRlX2NoZWNrLnJi..948028d1265d724faa53f54fd785157cc1ec6450_ZmlsZXMvZ2l0bGFiLWN0bC1jb21tYW5kcy9saWIvZ2l0bGFiX2N0bC91cGdyYWRlX2NoZWNrLnJi 100644 --- a/files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb +++ b/files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb @@ -1,6 +1,6 @@ module GitlabCtl class UpgradeCheck - MIN_VERSION = '13.0'.freeze + MIN_VERSION = ENV['MIN_VERSION'] || '13.0'.freeze class <<self def valid?(ov, nv)