Commit 60e80611 authored by Stan Hu's avatar Stan Hu

Set ICU_DATA to the right path to make Charlock Holmes and libicu work properly

Since `--with-data-packaging=files` is used to install libicu, ICU_DATA needs
to be set or libicu will fail with `U_FILE_ACCESS_ERROR` when attempting
certain conversions. See http://userguide.icu-project.org/icudata for more
details.

Closes gitlab-ce#17415
parent 07d58533
......@@ -40,4 +40,6 @@ build do
make "-j #{workers}", env: env, cwd: cwd
make "install", env: env, cwd: cwd
link "#{install_dir}/embedded/share/icu/#{default_version}", "#{install_dir}/embedded/share/icu/current"
end
......@@ -60,7 +60,10 @@ default['gitlab']['gitlab-rails']['env'] = {
'BUNDLE_GEMFILE' => "#{node['package']['install-dir']}/embedded/service/gitlab-rails/Gemfile",
# PATH to set on the environment
# defaults to /opt/gitlab/embedded/bin:/bin:/usr/bin. The install-dir path is set at build time
'PATH' => "#{node['package']['install-dir']}/bin:#{node['package']['install-dir']}/embedded/bin:/bin:/usr/bin"
'PATH' => "#{node['package']['install-dir']}/bin:#{node['package']['install-dir']}/embedded/bin:/bin:/usr/bin",
# Charlock Holmes and libicu will report U_FILE_ACCESS_ERROR if this is not set to the right path
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/17415#note_13868167
'ICU_DATA' => "#{node['package']['install-dir']}/embedded/share/icu/current"
}
default['gitlab']['gitlab-rails']['internal_api_url'] = nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment