fc7f35ab54
convert docs Dockerfiles to use docs/base:oss
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-04-28 12:57:23 +00:00
5a270c9751
Merge pull request #3160 from zembutsu/patch-1
...
fix typo
2016-03-08 06:27:09 +01:00
b8b1eb6e9f
fix typo
...
Signed-off-by: Masahito Zembutsu <m.zembutsu@gmail.com>
2016-03-08 13:59:33 +09:00
475053cd7f
Merge pull request #3147 from nathanleclaire/fix_nitpick
...
Fix amazonec2 test nitpicks
2016-03-07 17:13:25 -08:00
7452cb2c4f
Fix amazonec2 test nitpicks
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-03-07 16:45:58 -08:00
f7d4761390
Merge pull request #3140 from SeerUK/master
...
Updated VMWare Fusion driver to attempt to bind mount the share directory, to fix #2050 .
2016-03-07 16:45:19 -08:00
4d68c92a78
Merge pull request #3158 from tyrken/vsphere-port-default
...
Default to port 443 for all vsphere actions, not just creation
2016-03-07 15:20:37 -08:00
8a178781f4
Merge pull request #3157 from ahmetalpbalkan/azure
...
Remove azure driver temporarily + Godeps for new azure driver
2016-03-07 15:20:01 -08:00
b53f020c90
Remove azure driver temporarily
...
This commit temporarily removes Azure driver and its dependencies
from the source tree and adds dependencies for the new Azure driver
(so that Azure driver PR will not have godeps changes and will be
easier to review).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-07 13:34:09 -08:00
1b919459e8
Default to port 443 for all vsphere actions, not just creation
...
Signed-off-by: Tristan Keen <tristan.keen@gmail.com>
2016-03-07 21:31:27 +00:00
06f4d6dba5
Merge pull request #3154 from menglingwei/add-aliyun
...
add Aliyun ECS Docker Machine Driver Plugin
2016-03-06 17:20:37 +01:00
40939942a1
add Aliyun ECS Docker Machine Driver Plugin
...
Signed-off-by: 治世 <xiaobing.meng@alibaba-inc.com>
2016-03-06 13:55:28 +08:00
1a0a740e27
Merge pull request #3111 from jsirois/jsirois/amazoneec2/multiple_sgs
...
Support multiple `--amazonec2-security-group`s.
2016-03-04 11:48:49 -08:00
fa986949e0
Merge pull request #3120 from daehyeok/Driver_env
...
DRIVER environment variable
2016-03-04 07:29:26 +01:00
698958f61a
Merge pull request #3144 from bamarni/do-existing-ssh-key
...
[DigitalOcean] Allow to use an existing SSH key (closes #1445 )
2016-03-03 11:34:15 -08:00
17c6578583
[DigitalOcean] Allow to use an existing SSH key ( closes #1445 )
...
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-03-03 10:35:32 +01:00
494ba5f010
Support multiple `--amazonec2-security-group`s.
...
Maintains support for loading old Driver config.json that use the
singular `SecurityGroupName` field, but also adds a new plural
`SecurityGroupNames` field.
This change also bumps to latest stretchr/testify, in the course of
adding a dep on stretchr/testify/mock to help test the modified
`configureSecurityGroups` code.
The unused `deleteSecurityGroup` is dropped as well.
Signed-off-by: John Sirois <john.sirois@gmail.com>
Signed-off-by: Bill Farner <terasurfer@gmail.com>
2016-03-02 23:30:28 -07:00
83afe2bec2
Merge pull request #3142 from dgageot/small-improvements-libmachine
...
Small improvements libmachine
2016-03-02 17:14:32 -08:00
aa461f079d
DRIVER environment variable
...
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2016-03-02 17:44:15 -07:00
48c9efe622
Merge pull request #3133 from otherjason/google-internal-ip-only
...
Google driver: add `--google-use-internal-ip-only` flag
2016-03-02 14:34:53 -08:00
3aaf16db51
Use a typed error for consumers of libmachine
...
Signed-off-by: David Gageot <david@gageot.net>
2016-03-02 22:35:44 +01:00
e3ff59bd92
Export flags for consumers of libmachine
...
Signed-off-by: David Gageot <david@gageot.net>
2016-03-02 22:27:59 +01:00
ced43e8a09
Updated VMWare Fusion driver to attempt to bind mount the share directory, to fix #2050 .
...
Signed-off-by: Elliot Wright <elliot@elliotwright.co>
2016-03-02 14:37:35 +00:00
e67c78899d
add documentation note about --google-use-internal-ip-only
...
Signed-off-by: Jason Roehm <jroehm@gmail.com>
2016-03-01 15:57:14 -05:00
b87597f012
update docs for --google-use-internal-ip-only
...
Signed-off-by: Jason Roehm <jroehm@gmail.com>
2016-03-01 15:06:39 -05:00
251fd57d0f
Merge pull request #3134 from otherjason/coreos-fix-engine-env
...
fix: --engine-env was not effective when provisioning on CoreOS
2016-03-01 11:53:23 -08:00
5df137e562
fix: --engine-env was not effective when provisioning on CoreOS
...
Signed-off-by: Jason Roehm <jroehm@gmail.com>
2016-03-01 14:04:31 -05:00
6789c51b83
Google driver: add `--google-use-internal-ip-only` flag
...
This addresses previously-closed issue #2876 , which points out that
instances created with the `--google-use-internal-ip` command-line flag
are still assigned an external IP address. The new flag (which implies
the presence of `--google-use-internal-ip` if it isn't specified) will
cause the new instance to have no externally-accessible IP address.
Signed-off-by: Jason Roehm <jroehm@gmail.com>
2016-03-01 12:41:19 -05:00
d87383e8f3
Merge pull request #3121 from nathanleclaire/revert_rax_net_switches
...
Revert "Rackspace/Openstack - Add/enhance --*-net-* create switches."
2016-02-26 13:33:03 -08:00
27e8cf175c
Merge pull request #3122 from pyrotechnick/patch-1
...
Fix typo in DigitalOcean driver
2016-02-26 13:32:56 -08:00
0bdc0c61ce
Fix typo in DigitalOcean driver
...
"defaultSSHUSer" -> "defaultSSHUser"
Signed-off-by: Nicholas Kinsey <pyro@feisty.io>
2016-02-27 06:07:10 +10:00
a8f00e8ba0
Revert "Rackspace/Openstack - Add/enhance --*-net-* create switches."
...
This reverts commit 07cadc68a5
2016-02-26 11:24:23 -08:00
6ef9524dd7
Merge pull request #3110 from jsirois/jsirois/Godep/update
...
Update Godeps.
2016-02-25 16:28:04 -08:00
499cd9f201
Merge pull request #2974 from robertjustjones/rackspace-net-switches
...
Rackspace/Openstack - Add/enhance --*-net-* create switches.
2016-02-25 16:20:07 -08:00
aab419057f
Merge pull request #3112 from thieman/tnt-host-only-ip
...
Determine host-only interface dynamically, stop assuming eth1
2016-02-25 16:16:11 -08:00
b57c4c203f
Determine host-only interface dynamically, stop assuming eth1
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
2016-02-25 12:02:26 -05:00
5896ecff40
Update Godeps.
...
This was a mechanical change:
```
make dep-restore
godep update -goversion
make dep-save
```
Signed-off-by: John Sirois <john.sirois@gmail.com>
2016-02-24 13:13:01 -08:00
8046e13683
Merge pull request #1553 from jasisk/fix-conffile-error
...
Fix apt-get error on conf file conflict
2016-02-23 19:22:07 -08:00
b1999a7820
fix apt-get error on conf file conflict
...
Signed-off-by: Jean-Charles Sisk <jasisk@gmail.com>
2016-02-23 21:30:04 -05:00
0acadcb35f
Merge pull request #3091 from ozlerhakan/doc
...
update command line references
2016-02-22 14:38:22 -08:00
07cadc68a5
Rackspace/Openstack - Add/enhance --*-net-* create switches.
...
Signed-off-by: Robert Jones <robert@justjones.org>
2016-02-21 11:23:38 -06:00
d7e97d0443
update command line references
...
Signed-off-by: Hakan Ozler <hakan.ozler@kodcu.com>
2016-02-20 18:53:33 +02:00
7cc7fbadcc
Merge pull request #3090 from mishak87/patch-1
...
Typo docker-machine -f is shortcut for --format
2016-02-19 16:52:47 -08:00
a1aeae46ec
Fixed rouge paren
...
Signed-off-by: Michal Gebauer <mishak@mishak.net>
2016-02-20 00:30:20 +01:00
568e1b6a6e
Merge pull request #3088 from jmelis/master
...
Add OpenNebula Driver Plugin
2016-02-19 15:32:34 +01:00
b9302b3043
Typo docker-machine -f is shortcut for --format
...
Signed-off-by: Michal Gebauer <mishak@mishak.net>
2016-02-19 15:25:55 +01:00
71bf6ed6cf
Add OpenNebula Driver Plugin
...
Signed-off-by: Jaime Melis <jmelis@opennebula.org>
2016-02-19 13:05:12 +01:00
e28bfc55e0
Merge pull request #3017 from hypriot/set-longmode-on
...
Add option --longmode on to support Windows 32bit hosts
2016-02-19 09:36:17 +01:00
c40f9f7a21
Add option --longmode on to support Windows 32bit hosts
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-02-19 08:51:24 +01:00
2a95370032
Merge pull request #3085 from dgageot/improve-doc-generic
...
Improve Generic driver doc
2016-02-19 08:32:29 +01:00
Sven Dowideit
David Gageot
Masahito Zembutsu
Nathan LeClaire
Nathan LeClaire
Ahmet Alp Balkan
Tristan Keen
menglingwei
Bilal Amarni
John Sirois
Daehyeok Mun
Elliot Wright
Jason Roehm
Nicholas Kinsey
Travis Thieman
Jean-Charles Sisk
Robert Jones
Hakan Ozler
Michal Gebauer
Jean-Laurent de Morlhon
Jaime Melis
Stefan Scherer