summaryrefslogtreecommitdiff
path: root/omnibus_overrides.rb
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2019-07-10 15:10:09 -0700
committerTim Smith <tsmith84@gmail.com>2019-07-10 15:10:09 -0700
commit385f1beb75eaff2796ce33cacce8c2ee757ef1e0 (patch)
treee14728c4879124d5205cc199858436e42e1427e2 /omnibus_overrides.rb
parent2d614c6959cc4eb5f01c89adf5bafe2666a2a180 (diff)
downloadchef-385f1beb75eaff2796ce33cacce8c2ee757ef1e0.tar.gz
Roll back Rubygems to 3.0.3 to prevent double bundler install
There's nothing important in this release other than a few minor bugfixes. The other alternative was to roll bundler forward to 1.17.3 so that the embedded rubygems bundler matched, but this meant we had bundler 1.17.2 built into ruby 2.6.3 and then 1.17.3 installed on top of that. There's little value in that and it bloats our package size. Let's not do that unless there's a critical bug or CVE we need in rubygems / bundler. This also bumps omnibus-software to include the new ruby cleanup def that fails if we have double bundler and the new rubygems def that removes the rubygems-update gem once rubygems is installed. Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'omnibus_overrides.rb')
-rw-r--r--omnibus_overrides.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 7d2a8221c0..91dfffa469 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -4,7 +4,7 @@
#
# NOTE: You MUST update omnibus-software when adding new versions of
# software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
-override :rubygems, version: "3.0.4"
+override :rubygems, version: "3.0.3" # rubygems ships its own bundler which may differ from bundler defined below and then we get double bundler which results in performance issues / CLI warnings. Make sure these versions match before bumping either.
override :bundler, version: "1.17.2" # currently pinned to what ships in Ruby to prevent double bundler
override "nokogiri", version: "1.10.2"
override "libffi", version: "3.2.1"