Commit Graph

429 Commits

Author SHA1 Message Date
Sven Dowideit
a69fecb5a2 Our validation tools assume master, but v1.11 engine has a different filename
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-03 00:19:39 +00:00
Sven Dowideit
ea38350640 Merge pull request #3468 from SvenDowideit/more-validation-fixes
More docs validation fixes
(cherry picked from commit e3594a517f)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-02 23:41:51 +00:00
Nathan LeClaire
28d05dba05 Merge pull request #3393 from SvenDowideit/use-docs-base-oss
convert docs Dockerfiles to use docs/base:oss
(cherry picked from commit 0a5abf22b6)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-05-12 01:44:24 +00:00
Nathan LeClaire
e37d0a33df Merge pull request #3360 from nathanleclaire/fix_driver_doc_404
Fix driver reference links
(cherry picked from commit 73bf92b95d)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-05-12 01:43:30 +00:00
Nathan LeClaire
1ee39b147b Merge pull request #3355 from nathanleclaire/bump_version_in_instal_doc
Bump version in install doc
(cherry picked from commit ee17cf455f)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-05-12 01:42:54 +00:00
Nathan LeClaire
bc3cb4361e Merge pull request #3342 from bamarni/doc-generic-sshagent
[Generic] clarified doc / messages about ssh-agent
(cherry picked from commit ee48500fdc)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-05-12 01:42:26 +00:00
Nathan LeClaire
708fb63c9e Merge pull request #3339 from ahmetalpbalkan/az-docs-fix
azure.md: typo fix
(cherry picked from commit a0f3d408d8)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-05-12 01:41:55 +00:00
Tom Deseyn
3dc8a7bdc5 azure.md: Improve documentation based on feedback
Signed-off-by: Tom Deseyn <tom.deseyn@gmail.com>
2016-04-10 20:42:44 +02:00
Tom Deseyn
c1904a1729 azure.md: extend documentation of command line options
Improve doc of azure-subnet-prefix, azure-use-private-ip and
azure-no-public-ip options.
https://github.com/docker/machine/issues/3249

Signed-off-by: Tom Deseyn <tom.deseyn@gmail.com>
2016-04-05 06:14:08 +02:00
Bilal Amarni
f8640357c3 [doc] typo in generic driver
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-04-02 16:11:55 +02:00
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
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
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
e536ed6738 Merge pull request #3200 from ppadala/patch-1
Specify the format for azure-image specification
2016-03-17 17:59:54 +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
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
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
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
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
Ahmet Alp Balkan
ce3cb54482 Update default image to Ubuntu 15.10
- Default image now is ubuntu server 15.10. This ensures consistency with
  other cloud drivers.
- Better error message when virtual machine already exists.
- Change default SSH user from `ubuntu` to `docker-user`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-10 16:36:21 -08:00
Masahito Zembutsu
b8b1eb6e9f fix typo
Signed-off-by: Masahito Zembutsu <m.zembutsu@gmail.com>
2016-03-08 13:59:33 +09:00
Ahmet Alp Balkan
ed95f3baab New Microsoft Azure docker-machine driver
The new driver uses Azure Resource Manager APIs and offers a lot
more functionality compared to the old Azure driver. It is also
easier to authenticate and does not require user to create and place
certificate files. It only has a single required argument.

This is a breaking change: The new driver cannot work with machines
created with the older Azure driver and vice versa (as the APIs are
entirely different and resources are not shared between old/new azure
APIs).

The new driver addresses many issues about the azure driver reported
so far.

This resolves #2742, resolves #1368, resolves #1142, resolves #2236,
resolves #2408, resolves #1126, resolves #774.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-07 19:55:51 -08: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
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
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
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
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
David Gageot
742c87ee3f Improve Generic driver doc
Signed-off-by: David Gageot <david@gageot.net>
2016-02-19 07:25:31 +01:00
Sebastiaan van Stijn
1331811dca docs: remove reference to lxc-docker
The package on apt.dockerproject.org is now called
'docker-engine'.

Also replaced 'dev' with 'default', because that's
the default name for machines.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-18 12:20:26 +01:00
Jean-Laurent de Morlhon
cf7885163c Merge pull request #2932 from sipicsg/master
added hyperv static mac address and vlan option for machine creation
2016-02-18 09:56:34 +01:00
Nathan LeClaire
7ec902189d Merge pull request #3069 from dgageot/3068-dns-proxy-mode
VirtualBox: use dns proxy mode
2016-02-17 13:35:55 -08:00
Nathan LeClaire
7c6316d146 Merge pull request #3073 from miqui/master
add my name to driver contributor list
2016-02-17 12:02:10 -08:00
Michael A. Smith
736ce7b6ab Specify correct name for virtio net nic device
With VirtualBox 5.0.14r105127, 'virtio-net' is not a valid name for the option. The correct option appears to be 'virtio'.

Signed-off-by: Michael A. Smith <michaels@syapse.com>
2016-02-17 11:28:05 -05:00
Miguel Quintero
3ca3a4bf21 add my name
Signed-off-by: Miguel Quintero <miguel.quintero@hpe.com>
2016-02-17 11:15:55 -05:00
David Gageot
3e6c3c05ce FIX #3068 DNS Proxy mode
Signed-off-by: David Gageot <david@gageot.net>
2016-02-17 15:02:27 +01:00
Jean-Laurent de Morlhon
1eaf5a464f Merge pull request #3020 from mssola/swarm-experimental
Added a flag to enable experimental Swarm features
2016-02-13 14:10:44 -08:00
Miquel Sabaté Solà
7e201c4005 Added a flag to enable experimental Swarm features
The `create` command now has the `--swarm-experimental` boolean flag, that
tells the Swarm provisioner to enable experimental features in Swarm.

Fixes #2861

Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
2016-02-13 12:21:20 +01:00
Caio Fernando Bertoldi Paes de Andrade
7e7c6b5ee4 Start local machines on startup (fixes #2857)
Signed-off-by: Caio Fernando Bertoldi Paes de Andrade <caiofbpa@icloud.com>

Carries and closes #3047

modified per Nathan's comments, missed it first time round

modified wording per Seb's comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-12 17:31:58 -08:00
Olivier Gambier
4262a8fde5 Merge pull request #3034 from davemkirk/3025-registry-env-var
Add ENGINE_REGISTRY_MIRROR env var support.
2016-02-11 11:05:34 -08:00
Jean-Laurent de Morlhon
f6cb147f0d Markdown linting in docs/reference directory
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-02-11 09:29:52 -08:00
Mary Anthony
785e183466 Updating Dockerfile
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-10 20:52:47 -08:00