Commit Graph

2684 Commits

Author SHA1 Message Date
Kent Wang 6f3648735c Fix filenames of loggers.
Signed-off-by: Kent Wang <pragkent@gmail.com>
2015-10-10 16:28:45 +08:00
Olivier Gambier 6a5219b879 Merge pull request #1961 from dmp42/12-targets-fix
Fix building in docker
2015-10-09 15:44:14 -07:00
Nathan LeClaire caab273780 Merge pull request #1878 from ggiamarchi/openstack/add_env_vars
Add environment varibles for OpenStack flags
2015-10-09 14:39:58 -07:00
Olivier Gambier 7c8fc35c69 Don't build test files in cmd
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-10-09 14:33:32 -07:00
Olivier Gambier f4f3814d11 Fix building in docker
- now has the default build target on `make`
- test depends on non-bogus target

Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-10-09 11:12:48 -07:00
Guillaume Giamarchi 6829837fd5 Add environment varibles for OpenStack flags
Some flags for the OpenStack driver did not have
a corresponding environment variable.

Among others, this is needed to run bats core tests
with the OpenStack driver.

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-10-09 15:16:00 +02:00
Nathan LeClaire fcb14b98d2 Merge pull request #1949 from dmp42/11-plugins-prep
Prepare build for plugins PR
2015-10-08 17:13:06 -07:00
Nathan LeClaire a7d08d9bcd Merge pull request #1950 from nathanleclaire/wonk_dial
Display error message only when create was otherwise successful
2015-10-08 16:34:03 -07:00
Nathan LeClaire 074d7e3add Merge pull request #1957 from kacole2/improveHostnameError
clarified hostname error with valid characters
2015-10-08 16:29:45 -07:00
Olivier Gambier 53658e8932 Merge pull request #1933 from hironobu-s/openstack-ip-version
Add --openstack-ip-version option
2015-10-08 16:26:08 -07:00
Hironobu Saitoh f659e817b4 Add --openstack-ip-version option
This option allows users to specify IP version.

Signed-off-by: Hironobu Saitoh <hiro@hironobu.org>
2015-10-09 07:29:48 +09:00
Kendrick Coleman 3ed0377956 clarified hostname error with valid characters
this is a fix for #1922 to add in a valid character error message.

Signed-off-by: Kendrick Coleman <kendrickcoleman@gmail.com>
2015-10-08 15:15:09 -04:00
Nathan LeClaire 2399bfe578 Merge pull request #1952 from nathanleclaire/vbox_version
Move VBox detection to Precreate and print version
2015-10-08 11:01:31 -07:00
Nathan LeClaire 571712122d Merge pull request #1909 from skatsuta/saved-host-active
Change 'ls' to not report 'Saved' hosts as active when $DOCKER_HOST is not set
2015-10-08 11:00:45 -07:00
Soshi Katsuta 5af32bcdd3 commands: make `ls` to not report saved hosts to be active when $DOCKER_HOST is not set
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
2015-10-09 00:59:33 +09:00
Nathan LeClaire f0ebeab041 Move VBox detection to Precreate and print version
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-07 20:41:26 -07:00
Nathan LeClaire b1ed661da9 Display error message only when create was otherwise successful
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-07 20:29:19 -07:00
Olivier Gambier 56160e0058 Prepare build for plugins PR
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-10-07 18:02:58 -07:00
Nathan LeClaire 870d5c9340 Merge pull request #1941 from nathanleclaire/fix_storage_path
Fix broken --storage-path flag
2015-10-07 17:10:57 -07:00
Nathan LeClaire 94c551b964 Fix broken --storage-path flag
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-07 13:31:00 -07:00
Nathan LeClaire cc00ece828 Merge pull request #1940 from nathanleclaire/gh_api_rate_limit
Add --github-api-token flag and troubleshooting section
2015-10-07 13:03:59 -07:00
Olivier Gambier 306807b286 Merge pull request #1944 from dgageot/1943-fix-contributing-guide
Fix #1943 - binaries location
2015-10-07 11:29:56 -07:00
David Gageot 97ca43708a Fix binaries location
Signed-off-by: David Gageot <david@gageot.net>
2015-10-07 15:06:47 +02:00
Nathan LeClaire a5b0ebe0ec Add --github-api-token flag and troubleshooting section
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-06 15:12:18 -07:00
Gianpaolo Macario b01442c6bb fix IPV6NetworkMaskPrefixLength value parsing #1692
Adapted from 941c70cb01

Signed-off-by: Gianpaolo Macario <gmacario@gmail.com>
2015-10-06 22:43:55 +02:00
Nathan LeClaire ca4e17027d Merge pull request #1920 from yanzay/master
Additional info message while waiting for IP address to be assigned to the Droplet.
2015-10-05 14:17:54 -07:00
Nathan LeClaire bd03e83239 Merge pull request #1873 from djimenez/detectShellWindows
Issue #1867 improve detectShell for windows
2015-10-05 13:32:53 -07:00
moxiegirl c8f9b98c1d Merge pull request #1927 from VolCh/patch-1
Update release version number in install doc
2015-10-05 13:27:45 -07:00
Vladimir Chernyshev dd47c9c74e Update release version number
0.4.1

Signed-off-by: Vladimir Chernyshev <volch5@gmail.com>
2015-10-02 11:27:24 +03:00
Nathan LeClaire fe5a72299d Merge pull request #1870 from kechol/add-argument-assertion
Add argument assertions to inspect/status/url commands
2015-10-01 12:21:33 -07:00
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
Alexey Grachov 2992237b03 Additional info message while waiting for IP address.
It takes a lot of time to assign the IP to droplet, so informing user
about this hang looks like good idea.

Signed-off-by: Alexey Grachov <grachov.alexey@gmail.com>
2015-09-30 12:00:08 +03: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