summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hain <shain@chef.io>2016-04-05 12:10:48 -0700
committerScott Hain <shain@chef.io>2016-04-05 12:52:58 -0700
commitfbb2cb5e0c9e907a92801a816bb8e9ddc019f733 (patch)
tree342584b5e8e7490d8881f75bac3fab0d67e83718
parent6c3ca1fbbb1c317bd9c9815d564c8f253771d4f7 (diff)
downloadchef-fbb2cb5e0c9e907a92801a816bb8e9ddc019f733.tar.gz
Explicitly pin json gem
-rw-r--r--omnibus/Gemfile6
1 files changed, 6 insertions, 0 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index ef1dec354d..295fb2f490 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -7,6 +7,12 @@ gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git"
# bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 .
gem "pedump", git: "https://github.com/ksubrama/pedump.git", branch: "patch-1"
+# `json_pure` has a bug in it that is failing Chef builds. We include the
+# json gem into the Gemfile so that running `bundle exec` will have
+# this gem on the load path, and cause `require 'json/ext'` to succeed. This
+# prevents loading the `json_pure` gem
+gem "json", ">= 1.8.1"
+
# This development group is installed by default when you run `bundle install`,
# but if you are using Omnibus in a CI-based infrastructure, you do not need
# the Test Kitchen-based build lab. You can skip these unnecessary dependencies