Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,427 Commits 1 Branch 72 Tags
08208bd1415f26e5bc2e5339f002fb7954b70e50
Commit Graph

1427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Hazlett
08208bd141 Merge pull request #1463 from mschygulla/coreos-provisioner 
Provisioner for CoreOS
 2015-09-02 14:44:50 -04:00
Evan Hazlett
f8b0ca86c2 Merge pull request #1780 from paultag/paultag/cleanup/remove-redundent-redundent-logic 
Remove redundent assignment to InsecureSkipVerify
 2015-08-31 11:25:34 -04:00
Paul Tagliamonte
e75902ffbf Remove redundent assignment to InsecureSkipVerify 
This second codepath is redundent, since tlsConfig.InsecureSkipVerify is
assigned to earlier in that function body. In addition, there's no need
to wrap the assignment in a check on that boolean value in this case.

Signed-off-by: Paul Tagliamonte <paultag@gmail.com>
 2015-08-30 19:42:33 -04:00
Evan Hazlett
b8f7c3446b Merge pull request #1674 from csakoda/fix-VBox-getRandomIPinSubnet 
Fix VirtualBox DHCPServer always uses x.x.x.1, despite getRandomIPinSubnet()
 2015-08-28 18:29:01 -04:00
Evan Hazlett
ff1d6587ea Merge pull request #1750 from hairyhenderson/go15 
Updating to Go 1.5
 2015-08-28 18:28:26 -04:00
Dave Henderson
3a49c165bd Updating to Go 1.5 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2015-08-23 15:12:59 -04:00
Evan Hazlett
816d60203a Merge pull request #1743 from skatsuta/ls-mark-inactive 
commands: show "-" in ACTIVE column for inactive machines
 2015-08-21 10:18:09 -04:00
Nathan LeClaire
c02b1c413e Merge pull request #1512 from imikushin/build-on-machine 
Add support for building Docker Machine binaries remotely (without bind mount)
 2015-08-21 07:52:10 +09:00
Nathan LeClaire
52dc5734a7 Merge pull request #1735 from praveen12bnitt/1733-virtualbox-network-tuning 
added support for configuring nictype and nicpromise mode in virtualbox
 2015-08-21 07:51:30 +09:00
Palanivelrajan Balasubramanian
3f090d3f47 Added virtio-net as a supported nictype per review comments. 
Signed-off-by: Palanivelrajan Balasubramanian <praveen12bnitt@gmail.com>
 2015-08-20 16:47:50 -04:00
Evan Hazlett
93366f22be Merge pull request #1741 from frapposelli/GH-1740 
[GH-1740] Fix cpu allocation bug
 2015-08-20 11:16:11 -04:00
Fabio Rapposelli
ffe1a7940b [GH-1740] Fix cpu allocation bug 
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-08-20 15:40:06 +02:00
Palanivelrajan Balasubramanian
5f362aca6b added support for configuring nictype and nicpromise mode in virtualbox 
Signed-off-by: Palanivelrajan Balasubramanian <praveen12bnitt@gmail.com>
 2015-08-19 16:49:42 -04:00
Evan Hazlett
e416ac17d8 Merge pull request #1726 from brandoncc/patch-1 
Fix typo
 2015-08-19 14:52:43 -04:00
Ivan Mikushin
3c1caa5acb Build on any (even remote) docker 
Signed-off-by: Ivan Mikushin <i.mikushin@gmail.com>
 2015-08-19 13:18:25 +05:00
Brandon Conway
b876d5f81f Fix typo 2015-08-18 11:12:59 -07:00
Soshi Katsuta
6496c44261 commands: show "-" in the ACTIVE column for inactive machines 
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
 2015-08-19 01:04:48 +09:00
Nathan LeClaire
9661bf89e1 Merge pull request #1690 from jonmort/disable-ssh-multiplex 
Disable ssh multiplex explicitly
 2015-08-18 11:38:17 +09:00
Nathan LeClaire
627658242d Merge pull request #1686 from nathanleclaire/makefile 
Prioritize using make in build, cleanup a few things in build script
 2015-08-18 09:55:38 +09:00
Nathan LeClaire
28831d1f65 Prioritize using make in build 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-08-14 15:41:03 -07:00
Nathan LeClaire
b101c29011 Merge pull request #1687 from ehazlett/upgrade-fix-debian 
fixes upgrade for debian/ubuntu for new package name
 2015-08-13 16:56:49 -07:00
Evan Hazlett
ca2ab8c137 remove sudo -E for provisioning 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-08-13 17:16:41 -04:00
Jon Mort
219e5686bf disable ssh multiplex explicitly 
Signed-off-by: Jon Mort <jonmort@gmail.com>
 2015-08-13 15:09:23 +01:00
Evan Hazlett
52a9c70277 debian/ubuntu: do not upgrade the system for a single package 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-08-13 08:55:16 -04:00
Evan Hazlett
f3f8b268e0 fixes upgrade for debian/ubuntu for new package name 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-08-13 01:24:15 -04:00
Nathan LeClaire
02ef8557a2 Merge pull request #1670 from ehazlett/version-0.5.0-dev 
bump dev version
 2015-08-12 15:51:32 -07:00
Nathan LeClaire
49764bb47a Merge pull request #1622 from rawkode/virtualbox-no-vbfs-share-flag 
Added option to disable virtualbox vbfs mount of users home directory
 2015-08-12 13:25:18 -07:00
Chuck Sakoda
c2c942411b Assign the last octet of random subnet IP to a random value, instead of always 1 
Signed-off-by: Chuck Sakoda <cms235@gmail.com>
 2015-08-12 13:20:58 -07:00
David McKay
07e7604f0e * Added option to disable virtualbox vbfs user home directory mount 
* Updated documentation with new option
* Updated flag name

Signed-off-by: David McKay <david@rawkode.com>
 2015-08-12 20:37:06 +01:00
Nathan LeClaire
5e486e6bf2 Merge pull request #1667 from ehazlett/digitalocean-ssh-user 
digitalocean: enable specifying ssh user
 2015-08-11 11:24:24 -07:00
Evan Hazlett
8f82b76274 Merge pull request #1669 from moxiegirl/fix-index-links 
Fixing links that weren't resolving
 2015-08-11 12:02:06 -04:00
Mary Anthony
ecb727822c Fixing links that weren't resolving 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-11 08:59:18 -07:00
Evan Hazlett
eaf593b3d3 bump dev version 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-08-11 11:44:48 -04:00
Martin Schygulla
8328e96d93 Provisioner for CoreOS 
Signed-off-by: Martin Schygulla <martin.schygulla@gmail.com>
 2015-08-11 15:38:39 +02:00
Evan Hazlett
cf10bf45b5 Merge pull request #1668 from ehazlett/carry-1454-ec2-private-address 
Amazon Ec2 - Add the option amazonec2-use-private-address
 2015-08-11 07:32:23 -04:00
Rodrigo Reis
04b435c832 Amazon Ec2 - Add the option amazonec2-use-private-address 
Signed-off-by: Rodrigo Reis <rodrigo@rodrigoreis.com>
 2015-08-11 07:29:13 -04:00
Evan Hazlett
8299069a46 digitalocean: enable specifying ssh user 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-08-11 07:01:52 -04:00
Evan Hazlett
c1acb74d7a Merge pull request #1508 from ericsage/filter_names 
Add name filter for #1488
 2015-08-11 06:33:09 -04:00
Evan Hazlett
226dc8d15a Merge pull request #1660 from ehazlett/changelog-0.4 
changelog updates for 0.4.0
 2015-08-10 15:16:03 -04:00
Evan Hazlett
c5f0cfa041 do not time travel and learn to spell 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-08-10 13:44:07 -04:00
Evan Hazlett
83743d3134 Merge pull request #1647 from agup006/640-azure-docker-machine 
Add Azure Swarm Master Port endpoint configuration when using docker …
 2015-08-10 10:03:05 -04:00
Evan Hazlett
0c96ea0de2 Merge pull request #1656 from mattjmcnaughton/1651-single-check-for-active-machine 
Use a single function for checking active machine
 2015-08-10 10:01:09 -04:00
Evan Hazlett
459915c57c changelog updates for 0.4.0 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-08-10 09:52:46 -04:00
Matt McNaughton
003770f2d4 Use a single function for checking active machine 
Fix https://github.com/docker/machine/issues/1651

As pointed out in the issue above, the `active` and `ls` commands used
different methods for determing the active machine. This commit defines
a single method on the `host` struct called `IsActive` which provides
a uniform check for machine activness. `IsActive` returns true only
if `DOCKER_HOST == url` and the state is not stopped - previously the
`active` command only checked the url.

* Add a single `host` method `IsActive` for determining if a machine is
  active.

Signed-off-by: Matt McNaughton <mattjmcnaughton@gmail.com>
 2015-08-07 15:58:51 -04:00
Nathan LeClaire
1c6960f5ca Merge pull request #1653 from nathanleclaire/integration-fixups 
Add some fixups to the integration tests
 2015-08-06 14:08:29 -07:00
Anurag Gupta
938290f773 removed extra code and fixed code formatting in azure addDockerEndpoint 
Signed-off-by: Anurag Gupta <agup006@gmail.com>
 2015-08-06 18:32:30 +00:00
Nathan LeClaire
d79f1eb9f3 Add some fixups to the integration tests 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-08-06 00:42:56 -07:00
moxiegirl
73c548c1f9 Merge pull request #1649 from moxiegirl/update-build-infrastructure 
Install and infrastructure fixes
 2015-08-05 16:12:16 -07:00
Mary Anthony
1749d99b31 - Updating install docs fixes #1648 
- Updating the Dockerfile to lastest
- Adding support for building all the public doc projects from machine

Signed-off-by: Mary Anthony <mary@docker.com>

Michael's comments

Signed-off-by: Mary Anthony <mary@docker.com>

Adding in comments from nathan

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-05 16:06:50 -07:00
Anurag Gupta
99544a4cb0 Add Azure Swarm Master Port endpoint configuration when using docker machine. 
Signed-off-by: Anurag Gupta <agup006@gmail.com>
 2015-08-05 08:17:51 +00:00