docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-06 12:54:24 +03:00
Code Activity
2,703 Commits 92 Branches 28 Tags
f7d4761390b35c537f4d66027fd4c19bfa922d9e
Commit Graph

2703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan LeClaire
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
Nathan LeClaire
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
Nathan LeClaire
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
Ahmet Alp Balkan
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
Tristan Keen
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
David Gageot
06f4d6dba5 Merge pull request #3154 from menglingwei/add-aliyun 
add Aliyun ECS Docker Machine Driver Plugin
 2016-03-06 17:20:37 +01:00
menglingwei
40939942a1 add Aliyun ECS Docker Machine Driver Plugin 
Signed-off-by: 治世 <xiaobing.meng@alibaba-inc.com>
 2016-03-06 13:55:28 +08:00
Nathan LeClaire
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
David Gageot
fa986949e0 Merge pull request #3120 from daehyeok/Driver_env 
DRIVER environment variable
 2016-03-04 07:29:26 +01:00
Nathan LeClaire
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
Bilal Amarni
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
John Sirois
494ba5f010 Support multiple --amazonec2-security-groups. 
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
Nathan LeClaire
83afe2bec2 Merge pull request #3142 from dgageot/small-improvements-libmachine 
Small improvements libmachine
 2016-03-02 17:14:32 -08:00
Daehyeok Mun
aa461f079d DRIVER environment variable 
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
 2016-03-02 17:44:15 -07:00
Nathan LeClaire
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
David Gageot
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
David Gageot
e3ff59bd92 Export flags for consumers of libmachine 
Signed-off-by: David Gageot <david@gageot.net>
 2016-03-02 22:27:59 +01:00
Elliot Wright
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
Jason Roehm
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
Jason Roehm
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
Nathan LeClaire
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
Jason Roehm
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
Jason Roehm
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
Nathan LeClaire
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
Nathan LeClaire
27e8cf175c Merge pull request #3122 from pyrotechnick/patch-1 
Fix typo in DigitalOcean driver
 2016-02-26 13:32:56 -08:00
Nicholas Kinsey
0bdc0c61ce Fix typo in DigitalOcean driver 
"defaultSSHUSer" -> "defaultSSHUser"

Signed-off-by: Nicholas Kinsey <pyro@feisty.io>
 2016-02-27 06:07:10 +10:00
Nathan LeClaire
a8f00e8ba0 Revert "Rackspace/Openstack - Add/enhance --*-net-* create switches." 
This reverts commit 07cadc68a5.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-02-26 11:24:23 -08:00
Nathan LeClaire
6ef9524dd7 Merge pull request #3110 from jsirois/jsirois/Godep/update 
Update Godeps.
 2016-02-25 16:28:04 -08:00
Nathan LeClaire
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
Nathan LeClaire
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
Travis Thieman
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
John Sirois
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
Nathan LeClaire
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
Jean-Charles Sisk
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
Nathan LeClaire
0acadcb35f Merge pull request #3091 from ozlerhakan/doc 
update command line references
 2016-02-22 14:38:22 -08:00
Robert Jones
07cadc68a5 Rackspace/Openstack - Add/enhance --*-net-* create switches. 
Signed-off-by: Robert Jones <robert@justjones.org>
 2016-02-21 11:23:38 -06:00
Hakan Ozler
d7e97d0443 update command line references 
Signed-off-by: Hakan Ozler <hakan.ozler@kodcu.com>
 2016-02-20 18:53:33 +02:00
Nathan LeClaire
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
Michal Gebauer
a1aeae46ec Fixed rouge paren 
Signed-off-by: Michal Gebauer <mishak@mishak.net>
 2016-02-20 00:30:20 +01:00
Jean-Laurent de Morlhon
568e1b6a6e Merge pull request #3088 from jmelis/master 
Add OpenNebula Driver Plugin
 2016-02-19 15:32:34 +01:00
Michal Gebauer
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
Jaime Melis
71bf6ed6cf Add OpenNebula Driver Plugin 
Signed-off-by: Jaime Melis <jmelis@opennebula.org>
 2016-02-19 13:05:12 +01:00
Jean-Laurent de Morlhon
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
Stefan Scherer
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
Jean-Laurent de Morlhon
2a95370032 Merge pull request #3085 from dgageot/improve-doc-generic 
Improve Generic driver doc
 2016-02-19 08:32:29 +01:00
David Gageot
742c87ee3f Improve Generic driver doc 
Signed-off-by: David Gageot <david@gageot.net>
 2016-02-19 07:25:31 +01:00
Nathan LeClaire
0c9adcb01e Merge pull request #3082 from patrikerdes/3015_active_timeout_error_message 
Fix #3015
 2016-02-18 11:31:39 -08:00
David Gageot
7070fe863b Merge pull request #3075 from synfinatic/adt-enable-fusion-timesync 
Enable syncing time for VMWare Fusion guests
 2016-02-18 17:57:18 +01:00
David Gageot
20ec62b05f Merge pull request #3081 from thaJeztah/no-more-lxc 
docs: remove reference to lxc-docker
 2016-02-18 17:57:07 +01:00
Patrik Erdes
e7c58ea7ae Fix #3015 
Signed-off-by: Patrik Erdes <patrik@erdes.se>
 2016-02-18 12:28:22 +01:00