Install grpc and google-protobuf before GEM_HOME is set

This commit is contained in:
Pirate Praveen 2021-06-21 23:46:45 +05:30
parent 3823096c59
commit 814e57608e

View file

@ -37,6 +37,13 @@ test -f ${gitlab_common_defaults} && . ${gitlab_common_defaults}
# installation fails and the `postinst' is called with `abort-upgrade',
# `abort-remove' or `abort-deconfigure'.
# These gems should be installed as root for gitlab to find it
# Setting GEM_HOME seems not working for all cases, help welcome to fix it
# Workaround for #966653
/usr/bin/gem install -v 1.30.2 grpc
# Workaround for #989774
/usr/bin/gem install -v 3.17.1 google-protobuf
#######################################################################
# Read debian specific configuration
#######################################################################
@ -50,9 +57,6 @@ cp ${gitlab_debian_conf_example} ${gitlab_debian_conf_private}
test -f ${gitlab_debian_conf} && . ${gitlab_debian_conf}
export DB RAILS_ENV
# Required for embedded gems
export GEM_HOME=/var/lib/gitlab/.gem
# Read default values (we cannot do this before gitlab-debian.conf is exported
# as we want to override variables set by gitlab-debian.conf in earlier gitlab
# versions with gitlab-debian.defaults)
@ -61,10 +65,8 @@ export GEM_HOME=/var/lib/gitlab/.gem
# Read gitlab_user from gitlab-common.conf
test -f ${gitlab_common_conf} && . ${gitlab_common_conf}
# Workaround for #966653
/usr/bin/gem install -v 1.30.2 grpc
# Workaround for #989774
/usr/bin/gem install -v 3.17.1 google-protobuf
# Required for embedded gems
export GEM_HOME=/var/lib/gitlab/.gem
#######################################################################
# update Gemfile.lock and yarn.lock, always