Commit Graph

1501 Commits

Author SHA1 Message Date
Kazuyuki SUZUKI 2bc53a6ac3 Add argument assertion to inspect/status/url commands
Signed-off-by: Kazuyuki Suzuki <kechol28@gmail.com>
2015-10-01 14:15:29 +09:00
Nathan LeClaire 1588f2217a Merge pull request #1917 from yanzay/master
Remove dead code.
2015-09-29 13:35:47 -07:00
Alexey Grachov b970dddc8b Remove dead code.
Function getMachineDir is not used.

Signed-off-by: Alexey Grachov <grachov.alexey@gmail.com>
2015-09-29 20:30:20 +03:00
Nathan LeClaire 968660f6da Merge pull request #1915 from nathanleclaire/readd_godep
Re-add godep
2015-09-28 12:03:25 -07:00
Nathan LeClaire eff8c21a87 Re-add godep
This change is needed to fix a Continuous Build pipeline run by
@ehazlett which spits out master build binaries for Docker Machine.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-28 11:51:10 -07:00
Evan Hazlett c4cd2385bf Merge pull request #1685 from nathanleclaire/daemon_wait_over_ssh
Fix Docker daemon wait
2015-09-24 16:56:37 -04:00
Nathan LeClaire d063fe598d Merge pull request #1895 from dmp42/8-test
Tests fixes / silence build / add unit tests
2015-09-23 18:08:09 -07:00
Nathan LeClaire 9eef99285e Merge pull request #1901 from nathanleclaire/fix_missing_flag
Fix flag accidentally left out in PR carry
2015-09-23 18:07:39 -07:00
Nathan LeClaire 0a2b9c2784 Fix flag accidentally left out in PR carry
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-23 17:57:52 -07:00
Olivier Gambier b6cb3e2b2d Tests fixes / silence build / add unit tests
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-09-23 16:51:54 -07:00
Nathan LeClaire bee5cb4768 Merge pull request #1894 from dmp42/7-vbox
Fix exec error bubbling
2015-09-23 16:43:23 -07:00
Nathan LeClaire 9453df4859 Fix Docker daemon wait
Also, a few various cleanups are bundled:

1. Only call GetDriver() once to get the object in provision/utils.go
2. SSH command wrapper will return the error and let the consumer decide
   what to do with it instead of bailing automatically on non-255

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-23 15:19:25 -07:00
Nathan LeClaire 1ae222b926 Merge pull request #1889 from nathanleclaire/remove_beta_message
Remove beta warning message
2015-09-23 15:00:03 -07:00
Nathan LeClaire e599819974 Merge pull request #1899 from nathanleclaire/databus23-no_proxy_env
Carry PR from databus23
2015-09-23 14:55:30 -07:00
Nathan LeClaire 670d647216 Update documentation and integration tests for no_proxy
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-23 14:48:51 -07:00
Fabian Ruff 8f49a5bc31 Add doc section about --no-proxy flag
Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-09-23 14:48:48 -07:00
Fabian Ruff d22a4118d0 --no-proxy flag for env command
This optinal flag will add the docker host to the no_proxy environement variable. This is useful for local providers (e.g. virtualbox, fusion) in environments where an http_proxy is set and docker by default tries to connect to the ip via the proxy.

Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-09-23 14:48:01 -07:00
Nathan LeClaire bae2d33e30 Merge pull request #1729 from nathanleclaire/git_r_done_libmachine
Make libmachine consumable by outside world
2015-09-23 13:34:44 -07:00
Nathan LeClaire b5927f10c4 Make libmachine usable by outside world
- Clear out some cruft tightly coupling libmachine to filestore

- Comment out drivers other than virtualbox for now

- Change way too many things

- Mostly, break out the code to be more modular.

- Destroy all traces of "provider" in its current form.  It will be
brought back as something more sensible, instead of something which
overlaps in function with both Host and Store.

- Fix mis-managed config passthru

- Remove a few instances of state stored in env vars

- This should be explicitly communicated in Go-land, not through the
shell.

- Rename "store" module to "persist"

- This is done mostly to avoid confusion about the fact that a concrete
instance of a "Store" interface is oftentimes referred to as "store" in
the code.

- Rip out repetitive antipattern for getting store

- This replaces the previous repetive idiom for getting the cert info, and
consequently the store, with a much less repetitive idiom.

- Also, some redundant methods in commands.go for accessing hosts have
either been simplified or removed entirely.

- First steps towards fixing up tests

- Test progress continues

- Replace unit tests with integration tests

- MAKE ALL UNIT TESTS PASS YAY

- Add helper test files

- Don't write to disk in libmachine/host

- Heh.. coverage check strikes again

- Fix remove code

- Move cert code around

- Continued progress: simplify Driver

- Fixups and make creation work with new model

- Move drivers module inside of libmachine

- Move ssh module inside of libmachine

- Move state module to libmachine

- Move utils module to libmachine

- Move version module to libmachine

- Move log module to libmachine

- Modify some constructor methods around

- Change Travis build dep structure

- Boring gofmt fix

- Add version module

- Move NewHost to store

- Update some boring cert path infos to make API easier to use

- Fix up some issues around the new model

- Clean up some cert path stuff

- Don't use shady functions to get store path :D

- Continue artifact work

- Fix silly machines dir bug

- Continue fixing silly path issues

- Change up output of vbm a bit

- Continue work to make example go

- Change output a little more

- Last changes needed to make create finish properly

- Fix config.go to use libmachine

- Cut down code duplication and make both methods work with libmachine

- Add pluggable logging implementation

- Return error when machine already in desired state

- Update example to show log method

- Fix file:// bug

- Fix Swarm defaults

- Remove unused TLS settings from Engine and Swarm options

- Remove spurious error

- Correct bug detecting if migration was performed

- Fix compilation errors from tests

- Fix most of remaining test issues

- Fix final silly bug in tests

- Remove extraneous debug code

- Add -race to test command

- Appease the gofmt

- Appease the generate coverage

- Making executive decision to remove Travis coverage check

In the early days I thought this would be a good idea because it would
encourage people to write tests in case they added a new module.  Well,
in fact it has just turned into a giant nuisance and made refactoring
work like this even more difficult.

- Move Get to Load
- Move HostListItem code to CLI

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-23 12:30:15 -07:00
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
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