Move gem install to start of postinst, before regenerating Gemfile.lock
This commit is contained in:
parent
27a7b7ef1f
commit
1bcb4acac8
2 changed files with 5 additions and 4 deletions
5
debian/gitlab.postinst
vendored
5
debian/gitlab.postinst
vendored
|
@ -61,6 +61,11 @@ 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
|
||||
|
||||
#######################################################################
|
||||
# update Gemfile.lock and yarn.lock, always
|
||||
#######################################################################
|
||||
|
|
4
debian/rake-tasks.sh
vendored
4
debian/rake-tasks.sh
vendored
|
@ -8,10 +8,6 @@ export DB RAILS_ENV
|
|||
|
||||
cd /usr/share/gitlab
|
||||
|
||||
# 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
|
||||
# Remove all lines from Gemfile.lock
|
||||
runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/Gemfile.lock && \
|
||||
truncate -s 0 ${gitlab_data_dir}/Gemfile.lock"
|
||||
|
|
Loading…
Reference in a new issue