Commit Graph

2684 Commits

Author SHA1 Message Date
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
Nathan LeClaire a517ef0c42 Merge pull request #3054 from londoncalling/carry-pr-3047
Start local machines on startup (fixes #2857)
2016-02-12 17:36:22 -08: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
David Gageot 87a659efb3 Merge pull request #3042 from dgageot/3016-add-timeout-to-active-command
Add timeout to active command
2016-02-11 14:15:18 -08:00
David Gageot 7a6ca308c4 FIX #3016 Add timeout to active command
Signed-off-by: David Gageot <david@gageot.net>
2016-02-11 13:55:52 -08:00
David Gageot 5178043d02 Merge pull request #3041 from dgageot/3040-fix-slow-test
FIX #3040 Slow test
2016-02-11 13:55:04 -08:00
David Gageot 8345672b18 FIX #3040 Slow test
Signed-off-by: David Gageot <david@gageot.net>
2016-02-11 13:31:36 -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
David Gageot eae3a747b7 Merge pull request #3038 from jeanlaurent/doc-lint-ref
Markdown linting in docs/reference directory
2016-02-11 09:52:03 -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
Jean-Laurent de Morlhon ebed0f14ae Merge pull request #3035 from moxiegirl/remove-tutorials
Updating Dockerfile
2016-02-10 23:37:05 -08:00
Mary Anthony 785e183466 Updating Dockerfile
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-10 20:52:47 -08:00
David Kirk 090c575c0d Add env var support.
Signed-off-by: David Kirk <davemkirk@gmail.com>
2016-02-10 21:25:28 -06:00
moxiegirl 86d002a202 Merge pull request #3033 from londoncalling/docs-machine-d-ami
machine docs: removed references to AMI per @nathanleclaire comments
2016-02-10 15:48:04 -08:00
Victoria Bialas 8c186370b7 machine docs: removed references to AMI per @nathanleclaire comments
fixed grammatical error re: AMI

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-10 15:32:31 -08:00
Jean-Laurent de Morlhon d00e4943b7 Merge pull request #2998 from londoncalling/docs-machine-c
AWS example added to Machine docs cloud provisioning topic
2016-02-10 13:33:01 -08:00
Victoria Bialas 0eb405f1d7 AWS example added to Machine docs cloud provisioning topic, reorganized/streamlined topics, tested against updated driver, and documented per new/easier use of it per Jean-Laurent's fixes
split examples out into separate files (aws, digital ocean)

fixes issue #3028:links to Swarm in overview, cloud topics, cloud examples

fixed links and mis-spelling

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-10 13:09:24 -08:00
Nathan LeClaire 1c07446f5e Merge pull request #3026 from isp0000/patch-1
Missing info when connecting to single esxi host
2016-02-09 21:54:41 -08:00
Dalibor Petras 3998add3b2 Added backticks to the value ha-datacenter.
Signed-off-by: Dalibor Petras <dalibor.petras@gmail.com>
2016-02-10 13:40:44 +11:00
David Gageot 15b5a1d10d Merge pull request #2838 from mssola/export-session
libmachine/ssh: export the NativeClient.Session function
2016-02-09 17:36:25 -08:00
Nathan LeClaire 5a883fd302 Merge pull request #3027 from jeanlaurent/vwsitch-hint
Fix #2995
2016-02-09 17:23:57 -08:00
Nathan LeClaire db1aa13ef2 Merge pull request #3021 from dhiltgen/harden_aws_mark2
Add retry support to AWS driver
2016-02-09 17:23:37 -08:00
Dalibor Petras 59dc2aba5f Missing info when connecting to single esxi host
When connecting to single ESXi host (opposed to vCenter) --vmwarevsphere-datacenter has to be set to "ha-datacenter"

Signed-off-by: Dalibor Petras <dalibor.petras@flowconnect.com>
2016-02-10 12:02:55 +11:00
Jean-Laurent de Morlhon e4ef6d4098 Fix #2995
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-02-09 17:01:26 -08:00
Daniel Hiltgen c568bb8805 Add retry support to AWS driver
Some AWS API failures are retryable, so we should give the option to attempt
retries in these cases.  One particular example is the API rate limiting that
kicks in if you try to create many machines in parallel.  Without this change,
I can only create ~3 machines in parallel, but with this change I can easily
create 10 or more machines in parallel.

While this change helps `ls`, given the current fan-out model for plugins, once
you get a large number of AWS machines, you'll still wind up seeing
"RequestLimitExceeded: Request limit exceeded." errors.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2016-02-09 15:08:43 -08:00
Nathan LeClaire b692d1e374 Merge pull request #3019 from pdalpra/warn-no-upgrade-explicit-b2d-url
Warn that Boot2Docker ISO won't be auto upgraded if its URL is explicitly set
2016-02-08 16:35:54 -08:00
Pierre DAL-PRA 7dcd2c7b25 Warn that Boot2Docker ISO won't be auto upgraded if its URL is explicitly set
Signed-off-by: Pierre DAL-PRA <dalpra.pierre@gmail.com>
2016-02-09 00:50:23 +01:00
Stefan Scherer 78efd68886 Add NoVTXCheck while starting VM
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-02-08 21:39:10 +01:00
Nathan LeClaire 51417fe8a8 Merge pull request #2993 from nathanleclaire/bump_0.7.0-dev
Bump version to 0.7.0-dev
2016-02-04 19:22:57 -08:00
Nathan LeClaire b6b7458ccb Bump version to 0.7.0-dev
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-02-04 14:06:38 -08:00
Nathan LeClaire 7a7dfd7444 Merge pull request #2990 from nathanleclaire/wait_for_ssh_start
Wait for SSH before daemon detection
2016-02-04 13:44:30 -08:00
Nathan LeClaire 5ced31397e Wait for SSH before daemon detection
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-02-04 13:29:46 -08:00
Nathan LeClaire 7660fedf4b Merge pull request #2957 from londoncalling/docs-machine-b
Improve intro to machine docs
2016-02-03 17:37:12 -08:00
Nathan LeClaire 6cffd5a99b Merge pull request #2986 from SvenDowideit/retitle-as-docker-machine
Retitle as Docker Machine
2016-02-03 17:37:01 -08:00
Sven Dowideit fba9db1dee Retitle as Docker Machine
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-02-03 17:01:54 -08:00
Victoria Bialas 63f8f1fb48 WIP: improve intro to machine docs
WIP: rewrite of Machine overview for clarity, add diagrams

rewrite/re-organize Machine topics; incl. get started on local VM, menu order, titles

replaced Swarm info in cloud doc to reference new Swarm provisioning topic per @moxigirl, incorporated review comments per Chanwit into Concepts topic

added mention of Swarm clusters to Overview, and links to Swarm topics in What's next for Overview and Concepts

updates to concepts per @bfirsh comments

updated cloud provisioning topic to illustrated, step-by-step version added for cloud installs per issue #18282

cleanup of links, copy-edits

update to concepts, added link to boot2docker repo and re-worded per Nathan's comments

updates to concepts and cloud example per @dmp42 comments

updated for links and improved intro content for cloud topic

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-03 16:03:36 -08:00
Sipics Gergely a8625397bc added hyperv static mac address and vlan option for machine creation (with doc\drivers update)
Signed-off-by: Gergely Sipics <gergely.sipics@possible.com>
2016-02-03 22:12:47 +01:00
David Gageot 279fd7ca3f Bumping version to 0.6.0-dev
Signed-off-by: David Gageot <david@gageot.net>
2016-02-03 12:03:45 -08:00
David Gageot de118ed9a7 Update changelog for v0.6.0.0-rc4
Signed-off-by: David Gageot <david@gageot.net>
2016-02-03 12:02:21 -08:00
David Gageot a71048c8b4 Bump version to 0.6.0-rc4
Signed-off-by: David Gageot <david@gageot.net>
2016-02-03 11:48:33 -08:00
Nathan LeClaire 7bb4f44fcb Merge pull request #2984 from dgageot/2982-fix-auto-detection
FIX #2982 Fix shell auto detection
2016-02-03 09:42:46 -08:00
Nathan LeClaire 7f6d67c030 Merge pull request #2981 from exoscale/fix/exoscale-endpoint
drivers/exoscale: fix configuration of exoscale endpoint
2016-02-03 09:42:35 -08:00
David Gageot 834b9b4161 FIX #2982 Fix auto detection
Signed-off-by: David Gageot <david@gageot.net>
2016-02-03 08:23:12 -08:00
Vincent Bernat 7a56ddb054 drivers/exoscale: fix configuration of exoscale endpoint
The environment variable was `EXOSCALE_ENDPOINT` but the flag was
`--exoscale-url`. When configuring from flags, the wrong name was
used. Therefore, a user was unable to use an alternate endpoint.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2016-02-03 16:25:28 +01:00
Jean-Laurent de Morlhon 985ca0de70 Bumping version to 0.6.0-dev
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-02-02 17:25:32 -08:00
Jean-Laurent de Morlhon 86272a8752 Update changelog for v0.6.0-rc3
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-02-02 17:19:20 -08:00
Jean-Laurent de Morlhon d2300ca607 Bump version to 0.6.0-rc3
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-02-02 17:01:21 -08:00
Jean-Laurent de Morlhon 092c36c31a Merge pull request #2979 from nathanleclaire/exit_code_3
Exit with code 3 if error is during pre-create check
2016-02-02 16:54:04 -08:00
Nathan LeClaire d27ccb0f6e Exit with code 3 if error is during pre-create check
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-02-02 16:08:57 -08:00
David Gageot 6861665646 Merge pull request #2967 from daehyeok/docs_kvm_driver
Add kvm driver link to docs
2016-02-02 14:18:12 -08:00