-
Notifications
You must be signed in to change notification settings - Fork 168
Check in .bundle/config --without omnibus_package --frozen #784
Conversation
@@ -11,7 +11,7 @@ pkg/* | |||
# Do not check in the .bundle directory, or any of the files inside it. Those | |||
# files are specific to each particular machine, and are used to persist | |||
# installation options between runs of the bundle install command. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment is no longer correct.
7809f90
to
ab119db
Compare
ab119db
to
817951a
Compare
@@ -0,0 +1,3 @@ | |||
--- | |||
BUNDLE_WITHOUT: omnibus_package | |||
BUNDLE_FROZEN: '1' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to explicitly set BUNDLE_FROZEN or can we use a --deployment flag when needed?
Per the docs: BUNDLE_FROZEN defaults to true when --deployment is used.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chefsalim --deployment does a bunch of other stuff (and in fact BUNDLE_FROZEN is one of the flags it sets). Run bundle install --deployment
on your machine and then look in .bundle/config
and you will see:
BUNDLE_FROZEN: '1'
BUNDLE_PATH: vendor/bundle
BUNDLE_DISABLE_SHARED_GEMS: '1'
This flag is the equivalent of bundle install --frozen
, which is all we want to do.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK
817951a
to
9dc0244
Compare
|
||
To perform a full update of all dependencies everywhere, run `rake dependencies`. This will update the `Gemfile.lock`, `Gemfile.windows.lock`, `omnibus/Gemfile.lock`, `acceptance/Gemfile.lock`, `omnibus/Berksfile.lock`, and `omnibus_overrides.rb`. It will also show you any outdated dependencies due to conflicting constraints. Some outdated dependencies are to be expected; it will inform you if any new ones appear that we don't know about, and tell you how to proceed. | ||
|
||
To add or remove a package from the chef-dk, edit `Gemfile`. To change binary versions, edit `version_policy.rb`. | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Presumably, 'rake bundle:update' or 'rake bundle:install' is required after updating the Gemfile.
Also, will Gemfile.local continue to work (not sure if that worked for chef-dk).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, does the README in chef/acceptance need to be updated as well? Will bundle install/update work from there as usual?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see any Gemfile.local
, but there is no reason that won't work.
You can bundle install and update from omnibus and acceptance as usual, if you like.
👍 w/ minor comments, and pending build/tests in Jenkins stay green |
9dc0244
to
a608c31
Compare
a608c31
to
6b097f0
Compare
6b097f0
to
8081b72
Compare
👍 I wonder if it'll be a pain to do normal bundling things when working with the actual chef-dk codebase, but if it is, we can address it when we find out. |
Add "rake bundle[<args>]" task to unfreeze and work with file
8081b72
to
7a06a12
Compare
Add "rake bundle[]" task to unfreeze and work with file