Commit Graph

2764 Commits

Author SHA1 Message Date
Victoria Bialas
5d92f351de fixed typos which were referencing the wrong example machnines
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-03-31 08:38:52 -07:00
Nathan LeClaire
51fb3f0c0c Merge pull request #3251 from jsirois/jsirois/driver/test_flags
Add a test for create command flag handling.
2016-03-30 10:52:29 -07:00
John Sirois
5f802ce66c Add a test for create command flag handling.
This complements the fix in 705865fa by adding a test for unset flags
with defaults as well as other combinations of set and unset flags.

Signed-off-by: John Sirois <john.sirois@gmail.com>
2016-03-30 11:31:56 -06:00
Nathan LeClaire
88827d3324 Merge pull request #3243 from tpires/3141_fix_check_docker_running
FIX #3141 Refactor netstat command and tests
2016-03-29 14:40:58 -07:00
Nathan LeClaire
9c645cb823 Merge pull request #3245 from jsirois/jsirois/issues/3242
Fixup create command flag application.
2016-03-29 14:37:09 -07:00
Nathan LeClaire
90b4c3895d Merge pull request #3235 from mmalchuk/master
Correct error handling for external SSH client
2016-03-29 14:36:37 -07:00
John Sirois
705865fa70 Fixup create command flag application.
Previously StringSlice flag defaults were not respected.  These use
special handling and that handling did not take account of default
values, always over-writing them.  Expand the CommandLine interface to
take advantage of the underlying codegansta/cli.Context IsSet method and
guard default string slice overwrites with an IsSet test.

Signed-off-by: John Sirois <john.sirois@gmail.com>
2016-03-29 11:53:22 -06:00
Maksim Malchuk
f2acfa9492 Correct error handling for external SSH client
In some cases, (e.g. private key not accessible or has incorrect
permissions) docker-machine failed with error "Something went wrong
running an SSH command!". This commit will add the correct debug
messages and show the correct errors for the bad private keys.

Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2016-03-29 03:32:00 +03:00
Tiago Pires
a6f19ef936 FIX #3141 Refactor netstat command and tests
Updated `netstat` command to minimize its output with `-t` and `-l`
flags.
Refactored regex on `libmachine/provision/utils.go`:`checkDaemonUp` to
avoid `matchNetstatOut` returning `true` when remote machine has a
similar port to dockerPort listening (e.g. dockerPort := 2376 and
remote machine has port 23760 listening).
Refactored `utils_test.go` with more accurate `netstat` output.

Signed-off-by: Tiago Pires <tandrepires@gmail.com>
2016-03-28 23:29:26 +01:00
Nathan LeClaire
0d58079bf5 Merge pull request #3233 from AndreLouisCaron/env-silent-in-cmd
Silences docker-machine env command on Windows.
2016-03-28 11:55:39 -07:00
Andre Caron
b85531506a Silences docker-machine env command on Windows.
Signed-off-by: Andre Caron <andre.l.caron@gmail.com>
2016-03-25 09:03:53 -04:00
Nathan LeClaire
8141874120 Merge pull request #3230 from nathanleclaire/bump_v0.7.0-rc1
Add changes for 0.7.0-rc1
2016-03-24 13:17:31 -07:00
Nathan LeClaire
751cdcea27 Add changes for 0.7.0-rc1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-03-24 12:47:06 -07:00
Nathan LeClaire
5239e6ed03 Merge pull request #3223 from ahmetalpbalkan/azure-known-issue
azure.md: Add known issue notice
2016-03-23 16:26:59 -07:00
Nathan LeClaire
899206ced7 Merge pull request #3221 from nathanleclaire/dont_munge_bootlocal_on_restart
Prevent /var/lib/boot2docker/bootlocal.sh munging on restart
2016-03-23 14:47:15 -07:00
Ahmet Alp Balkan
196d2924ac azure.md: Add known issue notice
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-23 11:42:34 -07:00
Nathan LeClaire
bc89bf5e8d Prevent /var/lib/boot2docker/bootlocal.sh munging on restart
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-03-22 12:22:15 -07:00
Nathan LeClaire
137adfe306 Merge pull request #3214 from exoscale/feature/update-egoscale
exoscale: support for CoreOS
2016-03-22 11:49:39 -07:00
Nathan LeClaire
cec812ae2f Merge pull request #3215 from sivel/rackspace-active-timeout
Add --rackspace-active-timeout argument to rackspace driver
2016-03-22 11:49:21 -07:00
Nathan LeClaire
c390ecd730 Merge pull request #3218 from dgageot/simple-appveyor
Simplify appveyor config
2016-03-22 11:48:40 -07:00
Vincent Bernat
05aea83271 exoscale: add support for CoreOS
The egoscale binding for exoscale was limiting the images that could be
selected by a user to Ubuntu one only. Enable the use of arbitrary
images. For example, the following images are now available:

 - centos-6.6
 - centos-7.1
 - coreos-stable-835
 - debian-7
 - debian-8
 - ubuntu-12.04
 - ubuntu-14.04
 - ubuntu-15.10

The default user for non-Ubuntu images are not "ubuntu". Let the user
choose the appropriate user ("core" for CoreOS and "debian" for Debian).

CoreOS user are likely to want the ability to provide custom user data
as it enables the configuration of the etcd cluster. We add an option to
provide custom user data file. Moreover, we remove some of the default
options as they are not supported in CoreOS and are useless on
Debian/Ubuntu:

 - Resizing of rootfs is already done on all images by default.
 - Docker Machine will set the hostname as part of the provisioning.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2016-03-22 08:20:35 +01:00
David Gageot
1d09691a35 Simplify appveyor config
Signed-off-by: David Gageot <david@gageot.net>
2016-03-22 07:05:58 +01:00
Nathan LeClaire
593fe2b4d0 Merge pull request #3168 from jtnord/issue-2989
[Issue-2989] Allow non administrators to create docker-machines
2016-03-21 17:31:52 -07:00
James Nord
a5da41de6e Allow hyper-v driver to be used from non admin accounts and clean up the fixed disk after convertion.
Signed-off-by: James Nord <jnord@cloudbees.com>
2016-03-21 21:00:53 +00:00
Matt Martz
bd5ea7c335 Add --rackspace-active-timeout argument to rackspace driver
Signed-off-by: Matt Martz <matt@sivel.net>
2016-03-21 11:54:17 -05:00
David Gageot
e536ed6738 Merge pull request #3200 from ppadala/patch-1
Specify the format for azure-image specification
2016-03-17 17:59:54 +01:00
David Gageot
e0f41d3014 Merge pull request #3204 from znz/fix-typo
fix a typo (--create -> create)
2016-03-17 17:59:17 +01:00
Kazuhiro NISHIYAMA
c146111ede fix a typo (--create -> create)
Signed-off-by: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
2016-03-18 00:27:16 +09:00
Pradeep Padala
6baf69e236 Specify the format for azure-image specification
Signed-off-by: Pradeep Padala <pradeep@containerx.io>
2016-03-16 16:04:16 -07:00
Nathan LeClaire
5802eed1c7 Merge pull request #3196 from troyfontaine/aws_docs_update
Updated docs for AWS
2016-03-16 15:54:33 -07:00
Troy Fontaine
ab559c542f Added suggested modifications
Signed-off-by: Troy Fontaine <tfontaine@troyfontaine.com>
2016-03-15 22:44:20 -05:00
Troy Fontaine
036d2d99a2 Updated docs for AWS
Signed-off-by: Troy Fontaine <tfontaine@troyfontaine.com>
2016-03-15 18:10:04 -05:00
Nathan LeClaire
25672016fa Merge pull request #3194 from ahmetalpbalkan/azure-static-ip
azure: Add --azure-static-public-ip flag
2016-03-15 11:40:11 -07:00
Nathan LeClaire
3e1aaca74e Merge pull request #3195 from BSWANG/master
Add docker daemon systemd requirement on redhat
2016-03-15 11:39:52 -07:00
Nathan LeClaire
282fdebeaf Merge pull request #3124 from StefanScherer/set-nictype1
Add flag --virtualbox-nictype to set NIC type of eth0
2016-03-15 11:39:10 -07:00
bingshen.wbs
9914e4027e add systemd requirement
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
2016-03-15 16:19:54 +08:00
Ahmet Alp Balkan
b898c07ad6 azure: Add --azure-static-public-ip flag
This flag creates Azure VMs with static public IPs that don’t
get released when the VM is deallocated.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-14 21:47:51 -07:00
Nathan LeClaire
ef4823f2ac Merge pull request #3159 from ahmetalpbalkan/azure-arm
New Microsoft Azure docker-machine driver
2016-03-14 18:28:51 -07:00
Ahmet Alp Balkan
9fd035ecba azure.md: Address docs comments
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-14 17:36:24 -07:00
Nathan LeClaire
6d41f4ae46 Merge pull request #3172 from xinxian0458/issue-3145
fixed issue-3145, enable engine-install-url in CentOS.
2016-03-14 15:25:12 -07:00
Stefan Scherer
f0ac1c00ea Add flag --virtualbox-nictype to set nictype1
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-03-14 22:49:27 +01:00
Jie Zhang
93fe1d199f fixed issue-3145, enable engine-install-url in CentOS.
Signed-off-by: Jie Zhang <zhangjie0220@gmail.com>
2016-03-14 14:24:44 +08:00
David Gageot
ae3244d172 Merge pull request #3186 from dweomer/readme-fix-outbound-404-to-unoffocial-master-binaries
address #2718 by removing the section with bad link
2016-03-13 18:33:39 +01:00
Jacob Blain Christen
1ff3d36665 address #2718 by removing the section referring to unofficial master binaries in the README
Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
2016-03-13 00:50:11 -07:00
Ahmet Alp Balkan
44200e7a04 Case-insensitive Azure Resource Provider matching
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-12 18:18:53 -08:00
Nathan LeClaire
67485c60a8 Merge pull request #3165 from paul-callahan/3060-vboxnet-iface-conflict
add code and tests to detect vboxnet collision with host interfaces
2016-03-11 15:52:36 -08:00
Ahmet Alp Balkan
809104d7ea azure.md: Documentation clarification
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-11 13:31:03 -08:00
David Gageot
5648ebe83b Merge pull request #3097 from tpires/1858-generic-engine-port
FIX #1858 Add engine port
2016-03-11 21:21:35 +01:00
Tiago Pires
63ea976b1d FIX #1858 Add engine port
Added flag `--generic-engine-port` to `generic` drive in order to specify other port than `2376` on
Docker engine.
Updated `generic` driver documentation.

Signed-off-by: Tiago Pires <tandrepires@gmail.com>
2016-03-11 13:13:30 +00:00
Ahmet Alp Balkan
ec33a7dfc3 Add RELEASE.md note about deprecation notice
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-10 17:00:54 -08:00