summaryrefslogtreecommitdiff
path: root/omnibus/Gemfile
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-08-29 16:57:58 -0700
committerTim Smith <tsmith@chef.io>2018-08-29 16:57:58 -0700
commit32ef9b880690d28f4dddffd30323326e36427e71 (patch)
tree1b23080e3f8f75af06dabe1309446d5c9800e44a /omnibus/Gemfile
parent359a22032d742d24fe04eb54a57a08ddabd42049 (diff)
downloadchef-32ef9b880690d28f4dddffd30323326e36427e71.tar.gz
Build chef omnibus package with Chef 14 / Berkshelf 7omnibus_chef14
We had an ohai pin we needed during the Chef 14 dev cycle that isn't needed anymore. We also pinned Berkshelf to a crazy old version. Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'omnibus/Gemfile')
-rw-r--r--omnibus/Gemfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 1876755d84..a1cd1bbe48 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -11,10 +11,10 @@ gem "pedump"
# by running `bundle install --without development` to speed up build times.
group :development do
# Use Berkshelf for resolving cookbook dependencies
- gem "berkshelf", "~> 4.0"
+ gem "berkshelf", ">= 7.0"
- # temp pin for chef 14 development
- gem "ohai", "~> 13.0"
+ # We pin here to the last release Ohai so prevent more current chef coming in
+ gem "ohai", "~> 14.0"
# Use Test Kitchen with Vagrant for converging the build environment
gem "test-kitchen", "~> 1.21"