Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove nodejs from the final package #955

Merged
merged 1 commit into from
Oct 6, 2016
+14 −4
Merged

Remove nodejs from the final package #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions omnibus/config/software/cleanup.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
# Delete cached .gem files and git checkouts
delete "#{install_dir}/embedded/lib/ruby/gems/2.2.0/cache/*.gem"
delete "#{install_dir}/embedded/service/gem/ruby/2.2.0/cache/*.gem"
# Remove nodejs
delete "#{install_dir}/embedded/nodejs"
# strip gecode shared object files related to gecode installs
command "strip #{install_dir}/embedded/lib/libgecode*.so.32.0"
command "strip #{install_dir}/embedded/lib/ruby/gems/2.2.0/gems/dep-selector-libgecode-*/lib/dep-selector-libgecode/vendored-gecode/lib/*.so"
Expand Down
2 changes: 1 addition & 1 deletion omnibus/files/private-chef-cookbooks/private-chef/recipes/oc_id.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
# Also set the RAILS_ENV as is needed.
environment("RAILS_ENV" => "production",
"VERSION" => `ls -1 /opt/opscode/embedded/service/oc_id/db/migrate | tail -n 1 | sed -e "s/_.*//g"`.chomp,
"PATH" => "/opt/opscode/embedded/bin:/opt/opscode/embedded/nodejs/bin")
"PATH" => "/opt/opscode/embedded/bin")

only_if { is_data_master? }
end
Expand Down
2 changes: 1 addition & 1 deletion omnibus/files/private-chef-cookbooks/private-chef/templates/default/sv-oc_id-run.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ exec 2>&1

DIR=/opt/opscode/embedded/service/oc_id
export RAILS_ENV=production
export PATH=/opt/opscode/embedded/bin:/opt/opscode/embedded/nodejs/bin:$PATH
export PATH=/opt/opscode/embedded/bin:$PATH
export LD_LIBRARY_PATH=/opt/opscode/embedded/lib
export HOME=$DIR

Expand Down
12 changes: 10 additions & 2 deletions src/oc-id/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ source 'https://rubygems.org'

gem 'rails', '= 4.2.5.2'
gem 'chef', '~> 11.14'
gem 'coffee-rails', '~> 4.0.0'
gem 'jbuilder', '~> 1.2'
gem 'jquery-rails'
gem 'jwt' # For Zendesk SSO
gem 'rails_config', '~> 0.4.2'
gem 'rb-readline', '~> 0.5.2', require: false
gem 'sass-rails', '>= 4.0.3'
gem 'turbolinks', '~> 2.2.1'
gem 'uglifier', '~> 2.4.0'
gem 'unicorn-rails', '~> 1.1.0'
gem 'omniauth', '~> 1.2.1'
gem 'omniauth-chef'
Expand All @@ -24,6 +22,16 @@ gem 'newrelic_rpm'

gem 'doorkeeper', '~> 1.4.0'

#
# These gems require a javascript runtime. We don't want to ship a
# javascript runtime so we put them in a separate group such that they
# don't get automatically required by rake.
#
group :node do
gem 'coffee-rails', '~> 4.0.0'
gem 'uglifier', '~> 2.4.0'
end

group :development, :test do
# Loading it this way makes it work with Ruby 2.1.2. See
# https://github.com/nixme/jazz_hands/issues/25
Expand Down