8e58932db5
Fixed typo
...
Signed-off-by: Ian Lee <IanLee1521@gmail.com>
2015-10-27 19:35:30 -07:00
4cfcc3ba32
Merge pull request #2103 from nathanleclaire/git_tag_mk
...
Pipe error output from git line to /dev/null
2015-10-27 18:26:24 -07:00
fb8d964966
Pipe error output from git line to /dev/null
...
This will simply leave the tag empty if compiled independent of a source
repository.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-27 17:19:41 -07:00
9f01770d7e
Merge pull request #2084 from dgageot/simpler-env-hints
...
Simpler code for env usage hints.
2015-10-27 11:59:51 -07:00
9a26a9fc04
Merge pull request #2097 from dgageot/better-vbox-error-message
...
Print a better error when virtualbox fails
2015-10-27 11:59:24 -07:00
104ebf58cf
Merge pull request #2090 from nathanleclaire/heartbeat_disconnect
...
Stop heartbeat when there is an issue connecting to the server
2015-10-27 11:41:40 -07:00
d316eb7e96
Print a better error when virtualbox fails
...
Instead of printing `exit status 1` we'll print
the stderr output
Signed-off-by: David Gageot <david@gageot.net>
2015-10-27 15:23:29 +01:00
3dd578318a
Stop heartbeat when there is an issue connecting to the server
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-26 12:55:48 -07:00
9fa2f73139
Merge pull request #2032 from hairyhenderson/make-active-work-with-swarm-1311
...
Returning active host when swarm is active
2015-10-26 12:54:44 -07:00
ae973a96c0
Merge pull request #2088 from dgageot/fix-get-hostname
...
Fix get hostname
2015-10-26 11:35:05 -07:00
6c5dc41e6d
Revert "Remove useless duplication on GetSSHHostname"
...
This reverts commit b6462eb6d0
2015-10-26 18:47:14 +01:00
57dc1156de
Revert "Remove duplication over GetIP"
...
This reverts commit 99aacc7b79
2015-10-26 18:47:03 +01:00
a7559fd3a8
Revert "Generic and Base slight cleanups"
...
This reverts commit 19625def22
2015-10-26 18:46:54 +01:00
99b564e804
Merge pull request #2070 from dgageot/1985-build-with-docker-on-travis
...
FIX #1985 Build with Docker on TravisCI
2015-10-26 10:08:18 -07:00
7ecb221444
Merge pull request #2083 from dgageot/remove-dead-code
...
Remove dead code
2015-10-26 10:07:27 -07:00
2d1e6d0163
Simpler code for env usage hints.
...
We can just output the original os.Args in the
eval call.
Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 10:31:18 +01:00
ab1b0ca2e9
Remove dead code
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 09:35:12 +01:00
f155bc9df9
Merge pull request #2073 from nathanleclaire/fix_cert_env
...
Fix cert env
2015-10-26 09:31:26 +01:00
956b0bb65c
FIX #1985 Build with Docker on TravisCI
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 09:20:11 +01:00
ee4a357441
Returning active host when swarm is active
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-24 12:47:49 -04:00
e421a07336
Merge pull request #2072 from nathanleclaire/mk_install
...
Re-add make install to Makefile
2015-10-23 17:43:43 -07:00
fd5f3ad0cc
Re-add make install to Makefile
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-23 16:40:23 -07:00
b038ff4020
Fixes https://github.com/docker/machine/issues/2062
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-23 13:58:32 -07:00
8b9291de64
Merge pull request #2033 from dmp42/03-cleanup
...
Code cleanup
2015-10-23 11:27:44 -07:00
4bd43d604f
Merge pull request #2053 from nathanleclaire/rpc_heartbeat
...
Add heartbeat / automatic server cleanup code
2015-10-23 10:40:45 -07:00
19625def22
Generic and Base slight cleanups
...
- tests for GetIP
- extract default values into consts (user & port)
- better error handling (cert permissions change)
- unexport Driver for generic (linting)
- ordering of methods and variables for better readability
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-10-23 10:38:57 -07:00
4e7f8ed7a6
Merge pull request #1856 from databus23/b2d_gh_enterprise_urls
...
support github enterprise urls for b2d downloads
2015-10-23 10:37:46 -07:00
c99bb22eeb
Merge pull request #2028 from dmp42/02-build-fixes
...
Minor cleanup and fix #2022
2015-10-23 18:50:04 +02:00
8cfc28e37a
Merge pull request #2065 from dgageot/adding-localhost-to-alt_names
...
Adding localhost to the list of alt_names
2015-10-23 09:07:54 -07:00
768a044dad
Merge pull request #2067 from brutasse/patch-1
...
Typo in EXOSCALE_IMAGE
2015-10-23 16:45:08 +02:00
658a6bc1b3
Typo in EXOSCALE_IMAGE
...
Signed-off-by: Bruno Renié <brutasse@gmail.com>
2015-10-23 14:47:30 +02:00
1df80ba111
Adding localhost to the list of alt_names
...
When attempting to connect to the docker api from the machine itself,
the TLS verification of the certificate checked against the public
IP address of the primary interface. This is undesirable on hosts
which have NAT rules that block access to that address by default.
Adding "localhost" to the list of alt_names allows the cert to be
verified and connections to localhost (either 127.0.0.1 or [::1]) to
the port to pass verification. Otherwise one would need to disable
verification just to connect to the local docker instance.
Signed-off-by: David Gageot <david@gageot.net>
2015-10-23 09:57:55 +02:00
76c7accda0
Add heartbeat / automatic server cleanup code
...
This replaces the previous method of attempting to clean up servers when
an unexpected exit occurs in the client (e.g. SIGINT or panic) by a
heartbeat protocol. If the server does not hear from the connecting
client within a certain interval of time (500ms in this commit), it will
de-activate itself. This prevents dangling Docker Machine server
processes from accumulating.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-22 19:44:35 -07:00
0ac5c901d2
Merge pull request #2054 from SvenDowideit/fix-errant-links
...
Fix some links found with linkchecker
2015-10-22 16:16:47 -07:00
834c687226
Fix some links found with linkchecker
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-23 09:07:02 +10:00
9911019102
Merge pull request #1993 from leedm777/completion
...
Adding bash completion and helper scripts
2015-10-22 15:06:27 -07:00
e80e448cd5
Merge pull request #2035 from flavio/add_openSUSE_and_SUSE_provision
...
Add SUSE Enterprise Linux and openSUSE provision
2015-10-22 14:54:58 -07:00
7180ddca87
Adding bash completion and helper scripts
...
This patch adds some bash helper scripts.
* docker-machine.bash - command completion for docker-machine
* docker-machine-prompt.bash - function for putting the active machine
name in PS1
* docker-machine-wrapper.bash - function wrapper adding an `use`
command that runs `eval $(docker-machine env whatever)` in the
current shell.
Signed-off-by: David M. Lee <dlee@respoke.io>
2015-10-22 15:34:42 -05:00
07bcb9a7aa
Merge pull request #2058 from dgageot/improve-cmd-exe-support
...
improve cmd shell support
2015-10-22 11:59:55 -07:00
f6bbbdce7f
Merge pull request #2056 from xiaohui/force-tty-allocation
...
force tty allocation for ssh with multiple '-tt'.
2015-10-22 11:29:31 -07:00
c60b2cb2f9
Merge pull request #1910 from posita/posita/1880-ssl-cert-snafu
...
READY FOR REVIEW - Work-around erroneous SSL: CERTIFICATE_VERIFY_FAILED error with some buggy versions of OpenSSL
2015-10-22 09:57:56 -07:00
11fd9648ac
Merge pull request #1639 from feelobot/validate-ec2-vpc-id-matches-subnet-id
...
Use SDK to Validate VpcID with SubnetId
2015-10-22 09:52:18 -07:00
1bfb34afd3
Merge pull request #2057 from dgageot/remove-dead-code
...
Remove dead code
2015-10-22 09:38:22 -07:00
1a6a9de6c7
Merge pull request #2006 from dgageot/1954-certificate-always-regenerated
...
Investigate 1954 certificate always regenerated
2015-10-22 09:36:11 -07:00
335811df0c
support upgrading b2d from custom urls
...
.
Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-10-22 16:12:21 +02:00
5021ffd2e7
support github enterprise urls for b2d downloads
...
This commit allows downloading boot2docker releases not only from the official releases url (https://api.github.com/repos/boot2docker/boot2docker/releases ) but from arbitrary github repositories that publish releases with a boot2docker.iso artifact. It also supports downloading from github enterprise.
Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-10-22 16:12:21 +02:00
1d3268d128
improve cmd shell support
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Signed-off-by: David Gageot <david@gageot.net>
2015-10-22 12:15:33 +02:00
e2b6a832ac
Add more debug during certificates validation
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-22 11:11:31 +02:00
035c0de9e5
Remove dead code
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-22 11:02:54 +02:00
27cdffe042
force tty allocation for ssh with multiple '-tt'.
...
fix #2037 :
when provision on CentOS 7.0, it needs to force tty allocation with multiple '-t' option.
Otherwise, the ssh command will failed with "sudo: sorry, you must have a tty to run sudo"
in SetHostname.
Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>
2015-10-22 16:26:22 +08:00
Ian Lee
Olivier Gambier
Nathan LeClaire
Nathan LeClaire
David Gageot
Dave Henderson
Olivier Gambier
Bruno Renié
Dave Goehrig
Sven Dowideit
David M. Lee
Fabian Ruff
Stefan Scherer
Xiaohui Liu