Commit Graph

2684 Commits

Author SHA1 Message Date
Olivier Gambier de249c2269 Remove empty test files
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-09-22 21:02:12 -07:00
Olivier Gambier 144b94c251 Fix error reporting on VBoxManage not found
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-09-22 21:01:38 -07:00
Nathan LeClaire f2bb2e0e4e Merge pull request #1893 from nathanleclaire/fix_hostonlyif_oops
Fix failing case creating host only interface
2015-09-22 20:08:22 -07:00
Nathan LeClaire 3b85723982 Fix failing case creating host only interface
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-22 20:02:14 -07:00
Nathan LeClaire 4ced2d8287 Merge pull request #1882 from rwilliams/vbox-duplicate-hostonlyif
Handle bad netmask returned by virtualbox after hostonlyif creation. Fixes #1843
2015-09-22 17:00:40 -07:00
Ron Williams f0279172d5 Merge pull request #1 from nathanleclaire/rwilliams-vbox-duplicate-hostonlyif
Add tests for host only network retrieval feature

Signed-off-by: Ron Williams <ron.a.williams@gmail.com>
2015-09-22 16:47:37 -07:00
Nathan LeClaire fe5b5cf86d Add tests for host only network retrieval feature
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-22 16:29:25 -07:00
Evan Hazlett c1e46c7d7c Merge pull request #1791 from nathanleclaire/ssh_smoother
Remove flag parsing operator requirement for docker-machine ssh, and allow SSH command binary args to be passed
2015-09-21 17:54:23 -04:00
Ron Williams 0b5f4c8454 Handle bad netmask returned by virtualbox after hostonlyif creation. Fixes #1843
Signed-off-by: Ron Williams <ron.a.williams@gmail.com>
2015-09-21 14:09:29 -07:00
Nathan LeClaire 2a15d98575 First steps to make ssh command smoother
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-21 12:16:47 -07:00
Evan Hazlett 0540e5e295 Merge pull request #1885 from dmp42/5-vet-fix
Vet fix
2015-09-21 14:20:10 -04:00
Nathan LeClaire b2d8bcdd75 Remove beta warning message
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-21 11:18:02 -07:00
Evan Hazlett 34731c7894 Merge pull request #1883 from dmp42/4-integration-test
Fix missing dep on circle
2015-09-21 11:25:29 -04:00
Olivier Gambier 09d3dad46b Fix vet errors and enforce vet on travis
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-09-19 16:09:44 -07:00
Olivier Gambier b1701ccb8f Fix missing dep on circle
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-09-19 12:03:32 -07:00
Nathan LeClaire 36b9f25eb7 Merge pull request #1841 from dmp42/4-integration-test
Integration tests & build system enhancements
2015-09-18 16:00:11 -07:00
Olivier Gambier 5fbfbe1ff7 Rehauled build system and integration testing
- USE_CONTAINER allow to seamlessly run targets inside or outside containers
- all build calls have been harmonized, honoring the same env variables
- contributing doc has been streamlined according to that
- kill the distinction between remote and local docker builds
- got rid of some of the byzantine calls in various asorted scripts
- support for static build, debug builds, verbose

Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-09-18 15:47:00 -07:00
Nathan LeClaire 0aca42985b Merge pull request #1874 from ehazlett/debian-provision-fix
fix debian provisioning bug with systemd
2015-09-17 16:46:06 -07:00
Donovan Jimenez 1dfca96c69 Issue #1867 improve detectShell for windows
newer versions of git bash use mintty which doesn't set TERM=cygwin but
does set SHELL appropriately. Allow for SHELL to be detected on windows
and only output the message if its not.

Signed-off-by: Donovan Jimenez <donovan.jimenez@gmail.com>
2015-09-17 15:53:33 -04:00
Evan Hazlett b8150450a6
fix debian provisioning bug with systemd
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-09-17 15:16:18 -04:00
Nathan LeClaire 7e775fcfae Merge pull request #1795 from xiaohui/1150-separate-pkgaction
1150 separate pkgaction into 'pkgaction' and 'serviceaction'
2015-09-17 11:36:59 -07:00
Xiaohui 102007b231 separate pkgaction into 'pkgaction' and 'serviceaction'
ignored IntellJ IDEA files

Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>
2015-09-17 11:15:38 +08:00
Nathan LeClaire 993b5f557f Merge pull request #1810 from xiaohui/cleanup
cleanup log.*ln and correct typos error
2015-09-16 16:38:40 -07:00
Nathan LeClaire b91c117238 Merge pull request #1816 from frapposelli/fusion-fuse-mount
Adding FUSE HGFS mount option
2015-09-16 16:07:31 -07:00
Nathan LeClaire f531eed130 Merge pull request #1848 from dmp42/5-hostsyntax
Fix #1846
2015-09-16 11:52:57 -07:00
Nathan LeClaire 7e1e8b6717 Merge pull request #1842 from moxiegirl/carry-1830
Updating with changes dropped in 1830
2015-09-15 17:42:53 -07:00
Mary Anthony f8535f1397 Updating with changes dropped in 1830
Tweaking language
Incorporate Olivier's comments
Stomp the nit --- a misspelling
Wrapping lines
Possessive

Signed-off-by: Mary Anthony <mary@docker.com>
2015-09-15 17:00:57 -07:00
Nathan LeClaire 5e698f3d95 Merge pull request #1631 from dgageot/features/startstop
FIX #676 - Support Start/Stop GCE instance
2015-09-15 11:54:51 -07:00
Nathan LeClaire 207a647a40 Merge pull request #1633 from dgageot/features/tags
FIX #1297 - Support additional tags on GCE
2015-09-15 11:54:39 -07:00
Evan Hazlett 48d257aaf1 Merge pull request #1855 from mattjmcnaughton/1849-fix-formatting-in-fatal
Fix Go Vet errors
2015-09-15 14:20:32 -04:00
David Gageot 66078be1e5 FIX #1297 - Support additional tags on GCE
Signed-off-by: David Gageot <david@gageot.net>
2015-09-15 06:56:52 +02:00
David Gageot bb45f83319 FIX #676 - Support Start/Stop GCE instance
Signed-off-by: David Gageot <david@gageot.net>
2015-09-15 06:54:53 +02:00
Matt McNaughton a0b9d179b1 Fix Go Vet errors
This commit makes no changes to code execution, but rather resolves some
`go vet` errors, the majority of which relate to `fatal` being used
instead of `fatalf` during testing.

Signed-off-by: Matt McNaughton <mattjmcnaughton@gmail.com>
2015-09-14 22:37:16 -04:00
Xiaohui dcdd1a4757 cleanup log.*ln, unuseful methods, some typos error …
1. cleanup log.*ln for #1081
2. add "\n" to config command
3. typos error
4. remove unuseful methods: getBasedir@commands.go, and
GetDefaultTestHost@commands_test

Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>
2015-09-14 15:25:50 +08:00
Olivier Gambier 009ed57719 Fix #1846
Signed-off-by: Olivier Gambier <viapanda@gmail.com>
2015-09-13 13:13:58 -07:00
Nathan LeClaire 1a8fb2a071 Merge pull request #1830 from ehazlett/install-link-docs
Clarify Install Location
2015-09-11 14:43:58 -07:00
Nathan LeClaire b52fa33056 Merge pull request #1479 from mschygulla/enhanced-vmwarefusion-driver
[Enhancement] VMware Fusion driver
2015-09-11 14:26:30 -07:00
Nathan LeClaire 7c4d0a5da7 Merge pull request #1642 from ddaze/openstack-retry
openstack: New machine active timeout parameter
2015-09-11 14:25:11 -07:00
Nathan LeClaire 5ba35ac2de Merge pull request #1812 from jclagache/master
1434-Added homebrew cask support for VMware Fusion
2015-09-11 14:21:39 -07:00
Nathan LeClaire 1d5fde2c1a Merge pull request #1834 from dmp42/1-coverage
Enhanced coverage system
2015-09-11 14:19:32 -07:00
Nathan LeClaire 1b0042e69b Merge pull request #1836 from dmp42/2-fmt
Fmt fixes
2015-09-10 19:07:06 -07:00
Olivier Gambier 9d60bb7c73 Fmt fixes
Signed-off-by: Olivier Gambier <viapanda@gmail.com>
2015-09-10 18:27:13 -07:00
Olivier Gambier 4c96efa5fc Better coverage script
- added coveralls integration
- more efficient script logic
- simplified usage

Signed-off-by: Olivier Gambier <viapanda@gmail.com>
2015-09-10 16:28:19 -07:00
Nathan LeClaire 0fb4991068 Merge pull request #1796 from rikdev/powershell-no-profile
Disabled load PowerShell profile when start the powershell.exe
2015-09-10 15:19:47 -07:00
Nathan LeClaire bd168c4050 Merge pull request #1811 from ehazlett/debug-env-var
change debug env var to MACHINE_DEBUG
2015-09-10 14:32:26 -07:00
Evan Hazlett 5b1b4db2ad
add install links for machine
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-09-09 12:52:40 -04:00
jclagache ebbc45abea 1434-Added homebrew cask support for VMware Fusion
This aims to lookup for Vmware Fusion required binaries (vmrun and vmware-vdiskmanager) in the system path first before falling back in the default Vmware Fusion installing path.
Thereby, the vmwarefusion docker-machine driver can now be used even if Vmware Fusion is not installed in its default location (with brew cask for example).
Signed-off-by: Jean-Christophe Lagache <jclagache@gmail.com>
2015-09-08 13:39:56 +02:00
Fabio Rapposelli c3ed882b76 Adding FUSE HGFS mount option
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-09-07 17:31:21 +02:00
Evan Hazlett 3c712ae30a
change debug env var to MACHINE_DEBUG
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-09-05 08:57:03 -04:00
Ivan Ryabchenko d4ce483ebc Disabled load PowerShell profile when start the interpreter powershell.exe
Signed-off-by: Ivan Ryabchenko <rik.ggm@gmail.com>
2015-09-03 02:29:36 +06:00