realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge tag 'debian/13.12.3+ds1-7' into bullseye-fasttrack

Browse source 
gitlab Debian release 13.12.3+ds1-7
This commit is contained in:
Pirate Praveen 2021-06-21 22:07:29 +05:30
commit 17b0488b0f
4 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
debian/changelog vendored
View file

@ -1,3 +1,23 @@
gitlab (13.12.3+ds1-7) experimental; urgency=medium
* Set GEM_HOME variable in gitlab-debian.conf (this is required for gems
installed from rubygems.org)
-- Pirate Praveen <praveen@debian.org> Mon, 21 Jun 2021 15:14:42 +0530
gitlab (13.12.3+ds1-6) experimental; urgency=medium
* Move gem install to start of postinst, before regenerating Gemfile.lock
(Closes: #990103)
-- Pirate Praveen <praveen@debian.org> Mon, 21 Jun 2021 14:09:44 +0530
gitlab (13.12.3+ds1-5) experimental; urgency=medium
* Add workaround for #989774 (install google-protobuf from rubygems.org)
-- Pirate Praveen <praveen@debian.org> Mon, 21 Jun 2021 01:03:03 +0530
gitlab (13.12.3+ds1-4~fto11+1) bullseye-fasttrack; urgency=medium gitlab (13.12.3+ds1-4~fto11+1) bullseye-fasttrack; urgency=medium
* Rebuild for bullseye-fasttrack. * Rebuild for bullseye-fasttrack.

1
debian/conf/gitlab-debian.conf.example vendored
View file

@ -2,6 +2,7 @@
# Variables with all caps are passed to gitlab app # Variables with all caps are passed to gitlab app
RAILS_ENV=production RAILS_ENV=production
DB=postgres DB=postgres
GEM_HOME=/var/lib/gitlab/.gem
# This will be replaced by debian/rules at the time of build. # This will be replaced by debian/rules at the time of build.
GITLAB_DEBIAN_VERSION="__NEW_VERSION__" GITLAB_DEBIAN_VERSION="__NEW_VERSION__"
SALSA_TAG_URL="https://salsa.debian.org/ruby-team/gitlab/tags/debian/" SALSA_TAG_URL="https://salsa.debian.org/ruby-team/gitlab/tags/debian/"

5
debian/gitlab.postinst vendored
View file

@ -61,6 +61,11 @@ export GEM_HOME=/var/lib/gitlab/.gem
# Read gitlab_user from gitlab-common.conf # Read gitlab_user from gitlab-common.conf
test -f ${gitlab_common_conf} && . ${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 # update Gemfile.lock and yarn.lock, always
####################################################################### #######################################################################

2
debian/rake-tasks.sh vendored
View file

@ -8,8 +8,6 @@ export DB RAILS_ENV
cd /usr/share/gitlab cd /usr/share/gitlab
# Workaround for #966653
/usr/bin/gem install -v 1.30.2 grpc
# Remove all lines from Gemfile.lock # Remove all lines from Gemfile.lock
runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/Gemfile.lock && \ runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/Gemfile.lock && \
truncate -s 0 ${gitlab_data_dir}/Gemfile.lock" truncate -s 0 ${gitlab_data_dir}/Gemfile.lock"