File tree Expand file tree Collapse file tree 2 files changed +16
-1
lines changed
Expand file tree Collapse file tree 2 files changed +16
-1
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,10 @@ ENV GITLAB_VERSION=${VERSION} \
1616 GITLAB_CACHE_DIR="/etc/docker-gitlab" \
1717 RAILS_ENV=production \
1818 NODE_ENV=production \
19- NO_SOURCEMAPS=true
19+ NO_SOURCEMAPS=true \
20+ # v18.5.2 : minimum = 16.5, maximum = 17.x (currently 17.6, is 170006)
21+ POSTGRESQL_SERVER_REQUIRED_VERSION_MINIMUM=160005 \
22+ POSTGRESQL_SERVER_REQUIRED_VERSION_MAXIMUM=170100
2023
2124ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \
2225 GITLAB_SHELL_INSTALL_DIR="${GITLAB_HOME}/gitlab-shell" \
Original file line number Diff line number Diff line change @@ -190,11 +190,23 @@ gitlab_generate_postgresqlrc() {
190190
191191 echo " - Detected server version: ${DB_SERVER_VERSION} "
192192
193+ # remove leading zero (prior to 10.x it was like "090605" so that cannot treated as number)
194+ DB_SERVER_VERSION=" ${DB_SERVER_VERSION## +(0)} "
195+
193196 # Anyway, we can get major version (8, 9, 10 and so on) by dividing by 10000.
194197 # DB_SERVER_VERSION_MAJOR=${DB_SERVER_VERSION%%.*}
195198 DB_SERVER_VERSION_MAJOR=$(( DB_SERVER_VERSION/ 10000 ))
196199 DB_CLIENT_VERSION_PACKAGE_NAME=
197200
201+ # Check version requirement
202+ if [[ " ${DB_SERVER_VERSION} " -lt " ${POSTGRESQL_SERVER_REQUIRED_VERSION_MINIMUM} "
203+ || " ${DB_SERVER_VERSION} " -gt " ${POSTGRESQL_SERVER_REQUIRED_VERSION_MAXIMUM} "
204+ ]]; then
205+ echo " Version requirement mismatch! (${POSTGRESQL_SERVER_REQUIRED_VERSION_MINIMUM} < ${DB_SERVER_VERSION} < ${POSTGRESQL_SERVER_REQUIRED_VERSION_MAXIMUM} )"
206+ echo " Aborting.."
207+ return 1
208+ fi
209+
198210 if [[ " ${DB_SERVER_VERSION_MAJOR} " -ge 10 ]]; then
199211 # v10 or later: use "rough major version" as version number in package name
200212 DB_CLIENT_VERSION_PACKAGE_NAME=${DB_SERVER_VERSION_MAJOR}
You can’t perform that action at this time.
0 commit comments