Dave Henderson
9f98a06cdb
Adding quotes to the suggested eval
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-08 13:48:26 -04:00
Evan Hazlett
1b81ddeb90
Merge pull request #882 from tombee/env-usage-hint
...
Added env usage hint for bash and fish shells
2015-04-01 09:22:30 -04:00
Luke Roberts
4fd104c530
Remove unnecessary else
...
Signed-off-by: Luke Roberts <luke@sqwiggle.com>
2015-03-27 13:09:05 -07:00
Tom Barlow
f2b25ae3f1
Refactored env usage hint with @ehazlett's review comments
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-27 17:46:42 +00:00
Tom Barlow
1767b386f6
Moved env usage hint to end of output to avoid shell expansion issue
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-27 17:39:42 +00:00
Tom Barlow
d54021e623
Refactored usage hint into a helper method and updated test
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-27 17:39:42 +00:00
Tom Barlow
fc521f3e57
Added env usage hint for bash and fish shells
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-27 17:39:41 +00:00
Luke Roberts
01f12a6ea0
period for consistency
...
Signed-off-by: Luke Roberts <luke@sqwiggle.com>
2015-03-25 22:28:27 -07:00
Luke Roberts
d410b4b78c
indicate a successful removal of a machine
...
Signed-off-by: Luke Roberts <luke@speak.io>
2015-03-25 22:27:33 -07:00
Evan Hazlett
5f573a81d4
Merge pull request #856 from slashk/env-hangs-on-stopped-machine
...
fixes #855 for docker-machine env on stopped machines
2015-03-25 17:59:22 -07:00
Ken Pepple
be6dcc0905
fixes issue #831 and issue #771 by checking for unset active machine name
...
Signed-off-by: Ken Pepple <ken@solinea.com>
2015-03-25 13:46:46 -07:00
Ken Pepple
df70e68b68
fixes #855 for docker-machine env on stopped machines
...
Signed-off-by: Ken Pepple <ken@solinea.com>
2015-03-23 10:36:48 -07:00
Nathan LeClaire
3b2c8f9845
Migrate (swarmConfig) => (swarmOptions)
...
and (SwarmConfig) => (SwarmOptions)
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Migrate (authConfig) => (authOptions)
(AuthConfig) => (AuthOptions)
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Migrate (hostConfig) => (hostOptions)
(HostConfig) => (HostOptions)
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 23:20:11 -07:00
Evan Hazlett
28789604e9
provisioner: finished migration functions
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-20 23:17:42 -04:00
Nathan LeClaire
7b5c8a023f
Clean up some remaining issues with libmachine merge
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 16:30:46 -07:00
Nathan LeClaire and Simon Thulborn
49feb33457
Implement majority of provisioning changes
...
Signed-off-by: Simon Thulborn <simon+github@thulborn.com>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-20 16:30:46 -07:00
Evan Hazlett
a4832dcfb5
global options not set when using vars
...
When using a custom storage-path the TLS certs are not updated.
This adds a new function to query them from the action.
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-20 11:52:18 -04:00
Evan Hazlett
abd43e8d18
fix storage-path bug
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-20 00:08:58 -04:00
Evan Hazlett
1691d19c9d
libmachine: split swarm and engine options
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Evan Hazlett
31b63a1204
libmachine: add engine and swarm options
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Evan Hazlett
27be8cf28e
initial pass at internal api
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -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
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
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
217f144d25
corrects the rm command line description
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-18 11:20:38 -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
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
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
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
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
72f05505fa
vmwarevsphere: update with new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:41:02 -04:00
Evan Hazlett
9e27af64e3
vmwarefusion: update with new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:27:11 -04:00
Evan Hazlett
bff7e978cf
vmwarevcloudair: update with new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:11:04 -04:00
Evan Hazlett
4b034fd1b6
softlayer: update with new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:58:52 -04:00
Evan Hazlett
272d15343a
rackspace: enable with new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:39:44 -04:00
Evan Hazlett
6c931dadde
openstack: update for new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:27:17 -04:00
Evan Hazlett
7e362cf4a3
hyperv: updated for new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:24:11 -04:00
Evan Hazlett
ec91959979
google: updated to new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:18:18 -04:00
Evan Hazlett
d2869cbd38
Merge remote-tracking branch 'origin/master' into driver-refactor
2015-03-09 22:53:41 -04:00
Evan Hazlett
52a3019d00
azure: updated to driver interface; refactored common GetSSHCommandFromDriver for those that need it
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 22:53:21 -04:00
Evan Hazlett
7404e4d3ff
Merge pull request #736 from shawnzhu/tlsverify-flag
...
uses --tlsverify instead of --tls in config output
2015-03-09 22:49:07 -04:00
Evan Hazlett
51aa826e14
digitalocean: update to driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 22:20:47 -04:00
Evan Hazlett
275cb37602
virtualbox: update to new driver interface
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 17:53:30 -04:00
Evan Hazlett
e43da502f3
refactor commands.go to use host ssh and upgrade
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 12:49:46 -04:00
Ke Zhu
1bb4b95110
keep using --tlsverify between config and env commands
...
Signed-off-by: Ke Zhu <kzhu@us.ibm.com>
2015-03-06 22:22:00 -05:00
Evan Hazlett
0748d70b4e
consistent naming for DOCKER_TLS_VERIFY env var
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-06 16:29:17 -05:00
Jonathan Morley
0462a3b2fc
Add semicolons to fish output for docker-machine env command
...
This allows fish users to use `eval (docker-machine env ...)`
Signed-off-by: Morley, Jonathan <morley.jonathan@gmail.com>
2015-03-03 06:41:08 -05:00
Evan Hazlett
1bf70a15f0
show fish usage upon create
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-27 19:15:02 -05:00
Ke Zhu
bc91ba8577
keep machine config and machine env consistent
...
Signed-off-by: Ke Zhu <kzhu@us.ibm.com>
2015-02-27 11:21:16 -05:00