Commit Graph

6869 Commits

Author SHA1 Message Date
Shawn Neal 068b5cf0b9 Move Windows symlink re-establishment after reboot into capability
This reduces the complexity and likelihood of provisioner bugs.
2014-04-30 17:36:36 -07:00
Mitchell Hashimoto 9c420b8738 providers/virtualbox: set proper mac address on priv net [GH-3588] 2014-04-30 17:09:29 -07:00
Mitchell Hashimoto 53939d0a47 Update travis, don't need to install custom Bundler 2014-04-30 15:34:47 -07:00
Mitchell Hashimoto ed908a5ed3 Merge pull request #3587 from aspiers/bundler-1.6
add support for bundler >= 1.6.x
2014-04-30 15:34:12 -07:00
Mitchell Hashimoto f80fdfa32a privisoners/salt: proper bootstrap URL [GH-3583] 2014-04-30 15:32:20 -07:00
Adam Spiers 36e924b73e add support for bundler >= 1.6.x
bundler changed their API for Bundler::UI in 1.6.0 via this commit:

  https://github.com/bundler/bundler/commit/5e38e2d7

This caused various issues, e.g.

  https://github.com/mitchellh/vagrant/issues/3451
  https://github.com/test-kitchen/test-kitchen/issues/401

which will hopefully be resolved by teaching vagrant to cope with both
API versions.
2014-04-30 23:32:16 +01:00
Mitchell Hashimoto ac95cb5785 Update README 2014-04-30 10:10:56 -07:00
Mitchell Hashimoto 224ee8003d Merge pull request #3585 from aspiers/backport-3277-old-virtualboxen
backport GH-3277 fix for missing interpolation to older drivers
2014-04-30 09:22:59 -07:00
Mitchell Hashimoto df399d8610 providers/docker: use the proper class 2014-04-30 09:22:02 -07:00
Adam Spiers 082bf37df8 backport GH-3277 fix for missing interpolation to older drivers
The original fix for the "missing interpolation argument :stderr" bug
was in d4b3f226, but it only addressed the driver for VirtualBox 4.3:

  https://github.com/mitchellh/vagrant/issues/3277

This backports the fix to the drivers for VirtualBox 4.0, 4.1, and 4.2.
2014-04-30 16:06:20 +01:00
Mitchell Hashimoto 4381b292f5 Merge pull request #3581 from aspiers/require-ruby-2.x
add dependency on Ruby >= 2.0.0
2014-04-29 17:04:09 -07:00
Mitchell Hashimoto d6b7f3a855 Fix tests 2014-04-29 17:02:10 -07:00
Mitchell Hashimoto d90bc9889a core: Lock in plugin install of a specific version 2014-04-29 16:53:12 -07:00
Mitchell Hashimoto 92df8cf6ae Handle a lot of TODOs 2014-04-29 16:50:58 -07:00
Mitchell Hashimoto b08c1a62ce Removing some old files 2014-04-29 16:48:12 -07:00
Mitchell Hashimoto 0b8809006b Merge pull request #3580 from mitchellh/f-tty-docker-run
vagrant docker-run tty
2014-04-29 16:33:11 -07:00
Mitchell Hashimoto 19af4b70e6 providers/docker: with a pty, single target the docker-run cmd 2014-04-29 16:31:43 -07:00
Mitchell Hashimoto 0bb523ebb0 providers/docker: use ssh_run if asking for stdin on execute 2014-04-29 16:27:22 -07:00
Adam Spiers 7315e151c9 add dependency on Ruby >= 2.0.0
Vagrant requires Ruby 2, e.g. for ** keyword arguments.
2014-04-29 23:58:10 +01:00
Mitchell Hashimoto e90e45a8fb providers/docker: pty flag, not functional yet 2014-04-29 15:51:32 -07:00
Mitchell Hashimoto ca5651a0b1 providers/docker: clearer options on docker-logs 2014-04-29 14:28:10 -07:00
Mitchell Hashimoto 013fc729a5 providers/docker: raise better error for local executor 2014-04-29 14:16:24 -07:00
Mitchell Hashimoto 76e337a0d4 website/www: feature preview docker provider 2014-04-29 09:54:39 -07:00
Mitchell Hashimoto 49f1e1d18b Update CHANGELOG.md 2014-04-29 09:46:11 -07:00
Mitchell Hashimoto 384d717a54 Merge pull request #3575 from shadowfax-chc/salt-provision-private-key-perms
provisioner/salt: Set u+w perms on private keys in tmp dir.
2014-04-29 09:44:45 -07:00
Timothy Messier 513a9bf1ab Set u+w perms on private keys in tmp dir.
This should allow additional `vagrant provision` calls to work when
using the salt provisioner and providing private keys. See #3542.
2014-04-29 11:13:12 -04:00
Teemu Matilainen 0a11ecebb1 Merge pull request #3572 from JuanitoFatas/patch/fix-a-typo
[ci skip] Fix a typo in bin/vagrant comment.
2014-04-29 09:18:35 -03:00
Juanito Fatas 17268dc545 [ci skip] Fix a typo in bin/vagrant comment. 2014-04-29 18:36:32 +08:00
Mitchell Hashimoto ad961b24f5 commands/init: force flag [GH-3564] 2014-04-28 20:22:09 -07:00
Mitchell Hashimoto 90234dc32f synced_folders/rsync: fix oddness on Windows 2014-04-28 14:49:33 -07:00
Mitchell Hashimoto d7343c5b56 providers/docker: expand path to share relative to docker env 2014-04-28 11:08:58 -07:00
Mitchell Hashimoto d7ecd99e2e providers/docker: be more lenient about deleting built image 2014-04-28 09:36:55 -07:00
Mitchell Hashimoto 8ed5351dd1 providers/docker: destroy built image on up 2014-04-27 19:36:02 -07:00
Mitchell Hashimoto 27cd8886b3 providers/docker: cleaner reload 2014-04-27 19:27:11 -07:00
Mitchell Hashimoto 12d3e06f69 providers/docker: can docker-run non-existent containers 2014-04-27 19:22:14 -07:00
Mitchell Hashimoto a2b4f31916 providers/docker: don't show cmd if one is not specified 2014-04-27 19:06:39 -07:00
Mitchell Hashimoto 685bdbf1f0 whitespace 2014-04-27 18:58:57 -07:00
Mitchell Hashimoto ee7d2aa059 Merge pull request #3560 from mitchellh/f-docker-run
docker-run command
2014-04-27 18:53:20 -07:00
Mitchell Hashimoto c818a14072 providers/docker: expose ports 2014-04-27 18:37:25 -07:00
Mitchell Hashimoto ff9de3586a providers/docker: run_command doesn't need to actual setup host machine 2014-04-27 18:28:11 -07:00
Mitchell Hashimoto a8822e84d2 providers/docker: fix some extranneous newlines in streamed output 2014-04-27 18:26:12 -07:00
Mitchell Hashimoto f1e1617cfd providers/docker: stream data for run 2014-04-27 18:23:31 -07:00
Mitchell Hashimoto 68fe0b4258 core: Fix bug where if outputting empty string, would output nothing 2014-04-27 18:19:44 -07:00
Mitchell Hashimoto abf7c0526b providers/docker: docker-run command starting points 2014-04-27 18:10:41 -07:00
Mitchell Hashimoto 2694f746a7 providers/virtualbox: no SSH info if not running 2014-04-27 17:26:24 -07:00
Mitchell Hashimoto 03e18d1668 core: better logging around locks 2014-04-27 17:21:46 -07:00
Mitchell Hashimoto 5eeaff1662 whitespace 2014-04-27 16:36:43 -07:00
Mitchell Hashimoto a1af2d920f core: MachineIndex entry invalid if machine with name not in Vagrantfile 2014-04-27 16:35:54 -07:00
Mitchell Hashimoto 89e5ac0ada CHANGELOG 2014-04-27 16:00:19 -07:00
Mitchell Hashimoto ac040102f9 Merge pull request #3544 from benesch/rsync-conservative-chown
synced_folders/rsync: only chown when necessary
2014-04-27 15:59:40 -07:00