Commit Graph

716 Commits

Author SHA1 Message Date
Evan Hazlett b9043e370d godep: fix upstream errors; update naturalsort
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 16:18:22 -04:00
Evan Hazlett 7a336225e1 Merge pull request #815 from ehazlett/vbox-restart-stopped
vbox: fix issue where could not restart a stopped instance
2015-03-19 15:58:58 -04:00
Evan Hazlett 407f75d109 Merge pull request #816 from ehazlett/changelog-updates
update changelog
2015-03-19 10:25:45 -04:00
Evan Hazlett bd9816ad0e update changelog
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 10:25:11 -04:00
Evan Hazlett 1f84966dc5 Merge pull request #814 from hairyhenderson/revert-811-revert-783
un-revert "Fixing `config` and `env` bad handling of paths with spaces"
2015-03-19 10:06:05 -04:00
Dave Henderson 3dfc436e07 Revert "revert "Fixing config and env bad handling of paths with spaces""
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-19 10:03:42 -04:00
Evan Hazlett 46e187669f Merge pull request #804 from hairyhenderson/machine-env-docs-762
docs: Normalizing `docker-machine config` references to `docker-machine env`
2015-03-19 10:01:47 -04:00
Dave Henderson ef37a157fc --tls is now --tlsverify
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-19 09:55:20 -04:00
Evan Hazlett e1a35bb267 vbox: fix issue where could not restart a stopped instance
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 09:53:40 -04:00
Dave Henderson 7bcb85f9a9 More tweaks - making sure eval is mentioned
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-19 09:44:23 -04:00
Evan Hazlett 703ea4b497 Merge pull request #811 from ehazlett/revert-783
revert "Fixing `config` and `env` bad handling of paths with spaces"
2015-03-18 22:13:57 -04:00
Evan Hazlett e781ae7269 revert "Fixing config and env bad handling of paths with spaces"
This causes a regression when using with the Docker CLI:

FATA[0000] Couldn't read ca cert
"/home/ehazlett/.docker/machine/machines/dev"/ca.pem

This reverts commit 3c57799534.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-18 22:10:07 -04:00
Evan Hazlett c63072c42a Merge pull request #810 from ehazlett/changelog-updates
changelog: updated for 0.2.0 release
2015-03-18 21:57:55 -04:00
Evan Hazlett 38e060bc4a changelog: updated for 0.2.0 release
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-18 21:57:07 -04:00
Dave Henderson 022b18f350 docs: Normalizing docker-machine config references to docker-machine env
Fixes #762

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-18 12:37:31 -04:00
Evan Hazlett 46ea081f70 Merge pull request #625 from databus23/b2d_proxy_env
respect proxy settings for b2d downloads
2015-03-18 12:02:17 -04:00
Evan Hazlett a0b0fd33bb Merge pull request #783 from hairyhenderson/env-config-quoted-paths-781
Fixing `config` and `env` bad handling of paths with spaces
2015-03-18 11:41:40 -04:00
Evan Hazlett dbd311943e Merge pull request #803 from ehazlett/fix-rm-cmd-description
corrects the rm command line description
2015-03-18 11:33:12 -04:00
Evan Hazlett 217f144d25 corrects the rm command line description
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-18 11:20:38 -04:00
Evan Hazlett a9fce41071 Merge pull request #802 from ehazlett/revert-772
revert "function GetActive should return real error when file doesn't ex...
2015-03-18 11:07:50 -04:00
Evan Hazlett 391e97b9b4 revert "function GetActive should return real error when file doesn't exist"
This reverts commit 036b6b07b2.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-18 11:05:06 -04:00
Dave Henderson 3c57799534 Fixing config and env bad handling of paths with spaces
Fixes #781

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-18 11:04:47 -04:00
Evan Hazlett bc9b390bde Merge pull request #799 from ahmetalpbalkan/naturalsort
Natural sorting in machine ls command
2015-03-18 10:41:32 -04:00
Evan Hazlett 1c454fd800 Merge pull request #772 from TrumanLing/get_active_machine_failure_improvment
function GetActive should return real error when file doesn't exist
2015-03-18 10:18:15 -04:00
Ahmet Alp Balkan c4b83b4935 Add natural sorting by host name to ls cmd
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-17 23:32:27 -07:00
Ahmet Alp Balkan f2918929b0 Vendor 'github.com/skarademir/naturalsort'
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-17 23:32:26 -07:00
Fabian Ruff ca4fe2a2cb Disable HTTP Keepalives for b2d iso download
Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-03-17 22:31:00 +01:00
Fabian Ruff ac51f9abbd respect proxy settings for b2d downloads
Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-03-17 22:21:20 +01:00
Evan Hazlett 344c7d771a Merge pull request #770 from ehazlett/x509-check-ip-san
certs: x509 check ip san
2015-03-17 14:04:58 -04:00
Evan Hazlett ca8ae29ad2 Merge pull request #784 from hairyhenderson/softlayer-wait-for-transactions
Wait for any activeTransactions to finish during Create
2015-03-17 12:15:54 -04:00
Evan Hazlett da3da50897 DO: updated to new driver spec; updated integration tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-17 11:08:20 -04:00
Evan Hazlett 5403171328 ec2: fix bug where ip address was not updated upon restart
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-17 11:08:20 -04:00
Evan Hazlett d221d8ee97 certs: check if remote is valid and regenerate if not
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-17 11:08:20 -04:00
LingFaKe 036b6b07b2 function GetActive should return real error when file doesn't exist
Signed-off-by: Ling FaKe <lingfake@huawei.com>
2015-03-17 18:42:07 +08:00
Evan Hazlett 89ea1ed4b4 Merge pull request #795 from tianon/eval-env
Add "eval" to every invocation of "docker-machine env"
2015-03-16 22:53:21 -04:00
Evan Hazlett cb7a488c62 Merge pull request #794 from nathanleclaire/hostname_validation_what
Add more detailed info to hostname validation error
2015-03-16 21:33:56 -04:00
Dave Henderson 2da08635e8 Refactoring to move closures into methods
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-03-16 20:53:18 -04:00
Tianon Gravi d6e3dd6b06 Add "eval" to every invocation of "docker-machine env"
See http://unix.stackexchange.com/a/181581 for the rationale behind this change.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-16 18:33:24 -06:00
Nathan LeClaire aad0c5f0a3 Add more detailed info to hostname validation error
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-16 16:48:12 -07:00
Dave Henderson 30e0ca00b6 Wait for any activeTransactions to finish during Create
This adds an additional wait phase to make sure any active Transactions
are completed before Create tries to SSH in to the new host. This is
sometimes necessary because SSH can become available before SoftLayer
is fully done setting up the host and strange things can happen...

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-14 21:33:57 -04:00
Evan Hazlett ff3b733689 Merge pull request #782 from ehazlett/fix-default-docker-dir
fix default docker config dir
2015-03-14 16:17:20 -04:00
Evan Hazlett 9bff87f9bb fix default docker config dir
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-14 16:14:06 -04:00
Evan Hazlett 2486755347 Merge pull request #775 from nathanleclaire/wait_for_ssh
Add generic function to wait for SSH
2015-03-13 17:04:05 -04:00
Evan Hazlett 7a44b3575c Merge pull request #764 from nathanleclaire/wait_for_state
Wait for state before return on start, stop, restart, kill
2015-03-13 17:01:34 -04:00
Nathan LeClaire f890f9b6cd Implement wait for desired state before exiting
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-13 10:26:51 -07:00
Evan Hazlett 345fa3588e Merge pull request #729 from bfirsh/more-detailed-roadmap
Add more detail to roadmap
2015-03-13 09:45:01 -04:00
Ben Firshman e75d4d95e0 Merge pull request #778 from tristan0x/patch-1
Fix layout
2015-03-13 12:43:25 +00:00
Tristan Carel ab6370c511 Fix layout
Fix IBM Softlayer options list on https://docs.docker.com/machine/

Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
2015-03-13 13:36:08 +01:00
Nathan LeClaire 2a0e1eb79a Add generic function to wait for SSH
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-12 14:47:45 -07:00
Evan Hazlett cf136eacd7 Merge pull request #756 from ehazlett/driver-refactor
Driver interface refactor
2015-03-12 17:37:11 -04:00