Merge branch '1904-license-automation' into 'master'

Copy licenses.csv file from gitlab-rail to generic location

Closes #1904

See merge request !1447
This commit is contained in:
Marin Jankovski 2017-05-05 10:39:24 +00:00
commit 5478b1aacd
2 changed files with 7 additions and 1 deletions

View File

@ -1,6 +1,6 @@
GIT
remote: https://dev.gitlab.org/gitlab/omnibus.git
revision: a07663531cd734f123f069affc1a7245d971b80c
revision: 5d13b8ee0e81d49fac5ec58df381a13203929488
branch: omnibus-5-4-0
specs:
omnibus (5.4.0)

View File

@ -149,6 +149,12 @@ build do
command "mkdir -p #{install_dir}/embedded/service/gitlab-rails"
sync './', "#{install_dir}/embedded/service/gitlab-rails/", exclude: ['.git', '.gitignore', 'spec', 'features']
# This directory will be deleted after all the licenses copied to it are
# handled by the DependencyInformation task of omnibus. It won't be part
# of the final package, thus causing a redundancy.
command "mkdir -p #{install_dir}/licenses"
copy 'vendor/licenses.csv', "#{install_dir}/licenses/gitlab-rails.csv"
# Create a wrapper for the rake tasks of the Rails app
erb dest: "#{install_dir}/bin/gitlab-rake",
source: 'bundle_exec_wrapper.erb',