Dave Henderson
cf6136fed0
Allowing generic driver to use ssh-agent to get identities
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-12-09 09:36:08 -05:00
David Gageot
c2ed9e3f1c
Merge pull request #2521 from kunalkushwaha/refactor-provisioning
...
Run Swarm containers in provisioning step using Docker API instead of SSH/shell
2015-12-09 14:58:27 +01:00
David Gageot
c2209b8636
Merge pull request #2536 from jeanlaurent/help-shell
...
List supported value for shell in env command
2015-12-09 14:42:34 +01:00
Jean-Laurent de Morlhon
f37a0290dd
Add shell list to help command
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-09 09:46:03 +01:00
Kunal Kushwaha
f3689349a4
Host provisioing using Docker API
...
Replaces the code of provisioing with Go Templates with DockerAPI
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-12-09 13:05:43 +09:00
Jason Hoos
d5ff6b21ea
Explicitly set umask before invoking vmrun in vmwarefusion
...
For some reason, invoking vmrun with the nogui option doesn't
work right if umask is set to not allow world-readable permissions
by default. This seems to be true at least in VMware Fusion 7.0.x
through 8.0.1. As a workaround, the driver now explicitly sets
the umask to 022 before invoking vmrun.
Signed-off-by: Jason Hoos <jhoos@maestrohealth.com>
2015-12-08 11:45:38 -06:00
David Gageot
768418b98e
Merge pull request #2525 from askb/doc_fix_ls
...
doc update for `dm ls --filter`
2015-12-08 17:58:20 +01:00
David Gageot
aece926d13
Merge pull request #2527 from dgageot/another-virtualisation-issue
...
Detect Yet Another Virtualization issue
2015-12-08 17:58:11 +01:00
David Gageot
52128128fd
Detect Yet Another Virtualization issue
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 17:43:39 +01:00
Anil Belur
3d56a87539
Update docs with examples for `dm ls --filter`.
...
This is a follow-up for PR #2310 .
Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-08 21:12:00 +05:30
David Gageot
caf74d156b
Merge pull request #2524 from askb/docs_fixes
...
Minor usage fix updating the sub-command rm usage with `-f`.
2015-12-08 15:20:33 +01:00
Jean-Laurent de Morlhon
2051e6eeae
Vendoring bugsnag
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-08 13:54:45 +01:00
David Gageot
a708bf7e6c
Cleanup machines only at the end
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 12:28:11 +01:00
David Gageot
17b1e571f2
Group engine options test
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 12:28:11 +01:00
Anil Belur
a2a9ebb078
Minor fix updating the sub-command rm usage with -f.
...
This is a follow up for #2349
Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-08 16:55:54 +05:30
David Gageot
53a7528e4d
Merge pull request #2515 from drankinn/2342_replication_advertise
...
Fixes issue #2342 - Issue provisioning swarm master with --replication through Docker Machine
2015-12-08 10:55:47 +01:00
David Gageot
92854bd31f
Merge pull request #2523 from dgageot/2510-support-dns-names
...
FIX 2510 Support DNS names
2015-12-08 10:54:40 +01:00
David Gageot
be1d75f1c5
Merge pull request #2522 from dgageot/simplify-ls-tests
...
Simplify ls command tests
2015-12-08 10:50:19 +01:00
Jean-Laurent de Morlhon
a729e3e2f6
Merge pull request #2464 from askb/2310_filter_engine_label
...
Fixes issue #2310 - docker-machine ls --filter with engine label
2015-12-08 10:36:21 +01:00
David Gageot
aca111a373
Merge pull request #2489 from jeanlaurent/logrus
...
Replace custom logging system by logrus
2015-12-08 10:27:38 +01:00
David Gageot
c421bb456e
Simplify ls command tests
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 10:18:42 +01:00
David Gageot
eeb568fd27
FIX 2510 Support DNS names
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 10:11:33 +01:00
David Gageot
c41476ee74
Merge pull request #2506 from dgageot/fix-installation-notes
...
Fix installation notes for 0.5.3
2015-12-08 09:39:01 +01:00
David Gageot
db9ca3c3b7
Markdown linting
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 09:20:53 +01:00
David Gageot
3322b8e70c
Fix installation notes for 0.5.3
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 09:16:12 +01:00
David Gageot
8f6b8da399
Merge pull request #2483 from dongmx/master
...
Swarm container net should be host. If use bridge, sometime containers…
2015-12-08 09:03:35 +01:00
David Gageot
6583e64e48
Merge pull request #2486 from dongmx/issue2485
...
issue #2485 , In generic driver If a permanent IP address and hostname has alread in /etc/hosts
2015-12-08 09:01:35 +01:00
David Gageot
44d089a363
Merge pull request #2491 from nathanleclaire/fix_ssh_help
...
Revise SSH help flow and add 'docker-machine ssh' test
2015-12-08 09:01:08 +01:00
David Gageot
9371741bd3
Merge pull request #2514 from xaka/patch-1
...
Align version output with other docker tools
2015-12-08 08:58:34 +01:00
David Gageot
a88d80b345
Merge pull request #2520 from fsoppelsa/2519-orderoptionsopenstackdocs
...
Order options in openstack.md, to make docs more readable
2015-12-08 08:58:12 +01:00
Anil Belur
0b0373d436
Fixes issue #2310 - machine ls --filter with engine label
...
* Added a new members `Labels` to `FilterOptions struct`, and `EngineOptions` to
`HostListItem struct`. `HostListItems` is already being read from the file
store `config.json` which TestFilterHostsReturnSetLabel engine labels.
* Modified `parseFilters()` and added new `func matchesLabel(`) which compares
the one or more label values provided as input.
* Also the changes include added tests for UT and integration.
Note: Have kept `--filter label=<key>=<value>` syntax which is similar to
`docker images --filter` to keep the usability consistent.
review comments from @dgageot
Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-08 10:15:31 +05:30
Fabrizio Soppelsa
8a799b36f8
Order options in openstack.md, to make docs more readable
...
Signed-off-by: Fabrizio Soppelsa <fsoppelsa@mirantis.com>
2015-12-07 19:14:29 -08:00
Nathan LeClaire
ed8ed5f14e
Revise SSH help flow and add 'docker-machine ssh' test
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-07 13:07:57 -08:00
Lance Andersen
60dba4d2d5
added advertise flag to swarm manager
...
Signed-off-by: Lance Andersen <techlance@gmail.com>
2015-12-07 12:37:26 -07:00
Pavel Strashkin
98cf2856db
Align version output with other docker tools
...
```
$ docker-compose -v
docker-compose version 1.5.2, build 7240ff3
$ docker -v
Docker version 1.9.1, build a34a1d5
```
Signed-off-by: Pavel Strashkin <pavel.strashkin@gmail.com>
2015-12-07 10:14:33 -08:00
Jean-Laurent de Morlhon
4792177b11
Logrus Machine Logger
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 18:36:48 +01:00
Jean-Laurent de Morlhon
010a1c76e2
Use logrus
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 11:08:50 +01:00
Jean-Laurent de Morlhon
6fe3b5581e
vendoring logrus
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 11:08:50 +01:00
Jean-Laurent de Morlhon
1079735af8
Remove withFields
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:34:43 +01:00
Jean-Laurent de Morlhon
2e79f67e93
Cleanup stdout/stderr log initialization
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:33:32 +01:00
Jean-Laurent de Morlhon
892e19c019
delete unused method
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:33:32 +01:00
Jean-Laurent de Morlhon
109bea4151
Extract interface and Remove log.print
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:33:32 +01:00
David Gageot
7f499308fc
Merge pull request #2507 from dgageot/dead-code
...
Remove dead code
2015-12-07 09:51:07 +01:00
Jean-Laurent de Morlhon
760e814d43
Merge pull request #2501 from fsoppelsa/2478-sanitizekey
...
Sanitize keynames by replacing dots with underscores
2015-12-07 09:41:34 +01:00
Jean-Laurent de Morlhon
ff54bf1b0c
Merge pull request #2505 from kunalkushwaha/bugfix#2504
...
Bugfix#2504 Rename of temp file fails.
2015-12-07 09:40:42 +01:00
Jean-Laurent de Morlhon
1de66c75e4
Merge pull request #2503 from larskanis/fix-amd-svm-detection-on-linux
...
Fix detection of virtualization support on AMD CPU.
2015-12-07 09:37:54 +01:00
David Gageot
293055fcbc
Remove dead code
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-07 09:15:12 +01:00
Lars Kanis
850e2646a6
Fix detection of virtualisation support on AMD CPU.
...
This also changes the amd test case to /proc/cpuinfo content of
a real AMD CPU.
Signed-off-by: Lars Kanis <lars@greiz-reinsdorf.de>
2015-12-07 07:39:24 +01:00
Kunal Kushwaha
66db37814d
Bugfix#2504 Rename of temp file fails.
...
Tempfile was not closed, so rename opertion was failing.
Minor code refactor is done, to make function more readable.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-12-07 14:02:36 +09:00
Fabrizio
6e43436a3d
Sanitize keynames by replacing dots with underscores
...
Signed-off-by: Fabrizio Soppelsa <fsoppelsa@mirantis.com>
2015-12-05 16:04:35 -08:00