Use upstream provided yarn.lock file

This commit is contained in:
Pirate Praveen 2018-10-18 17:13:12 +05:30
parent a16915ae2f
commit 1b01282ee4
3 changed files with 5 additions and 4 deletions

View file

@ -46,7 +46,7 @@ spec usr/share/gitlab
symbol usr/share/gitlab symbol usr/share/gitlab
vendor usr/share/gitlab vendor usr/share/gitlab
VERSION usr/share/gitlab VERSION usr/share/gitlab
yarn.lock usr/share/gitlab yarn.lock /var/lib/gitlab
shared var/lib/gitlab shared var/lib/gitlab
public var/lib/gitlab public var/lib/gitlab
db var/lib/gitlab db var/lib/gitlab

View file

@ -61,8 +61,9 @@ test -f ${gitlab_common_conf} && . ${gitlab_common_conf}
####################################################################### #######################################################################
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"
runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/yarn.lock && \ # Don't modify yarn.lock until all dependencies are packaged
truncate -s 0 ${gitlab_data_dir}/yarn.lock" #runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/yarn.lock && \
#truncate -s 0 ${gitlab_data_dir}/yarn.lock"
runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/yarn-error.log" runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/yarn-error.log"
cd ${gitlab_app_root} cd ${gitlab_app_root}
if ! runuser -u ${gitlab_user} -- sh -c 'bundle --local --quiet'; then if ! runuser -u ${gitlab_user} -- sh -c 'bundle --local --quiet'; then

View file

@ -32,7 +32,7 @@ echo "Installing node modules..."
runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.node_modules' runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.node_modules'
runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/yarn' runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/yarn'
runuser -u ${gitlab_user} -- sh -c 'cd /var/lib/gitlab/yarn; npm install yarn' runuser -u ${gitlab_user} -- sh -c 'cd /var/lib/gitlab/yarn; npm install yarn'
runuser -u ${gitlab_user} -- sh -c '/var/lib/gitlab/yarn/node_modules/.bin/yarn install' runuser -u ${gitlab_user} -- sh -c '/var/lib/gitlab/yarn/node_modules/.bin/yarn --frozen-lockfile install'
echo "Precompiling locales..." echo "Precompiling locales..."
runuser -u ${gitlab_user} -- sh -c 'bundle exec rake gettext:po_to_json' runuser -u ${gitlab_user} -- sh -c 'bundle exec rake gettext:po_to_json'