Commit Graph

79 Commits

Author SHA1 Message Date
Nathan LeClaire 333b7e88a7 Implement docker-machine scp
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-13 17:22:42 -07:00
Evan Hazlett f29c5fc4dc Merge pull request #1086 from zchee/ec2-add-monitoring-flag
[EC2] Add Monitoring flag
2015-05-13 10:49:14 -04:00
Dave Henderson a3c8b3474e Adding --filter flag to ls command
Initially supporting `swarm=`, `state=`, and `driver=` filters.

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-11 20:01:50 -04:00
Nathan LeClaire b672617287 Migrate engine-flag => engine-opt
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-11 11:57:09 -07:00
Evan Hazlett 0060b1cf4b
generic: update docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:10:51 -07:00
Evan Hazlett 8e0b80b015 generic: rename generic-user to generic-ssh-user; update docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:48 -07:00
Nathan LeClaire c602e69448 Read active host from DOCKER_HOST instead of from file
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-04 16:29:04 -07:00
Nathan LeClaire d5728a41c5 Add doc about filtering create flags
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-01 14:26:08 -07:00
Evan Hazlett 6036c28fa5 Merge pull request #1085 from zchee/update-amazonec2-ami
[EC2] Update AMI to release 20150417
2015-05-01 16:40:57 -04:00
Evan Hazlett e2d5aca704 Merge pull request #1089 from zchee/docs-update-gce-flags
Update docs for GCE flags
2015-05-01 16:37:10 -04:00
Evan Hazlett 6a311b0069 Merge pull request #20 from exoscale/feature/exoscale-support
driver: exoscale driver
2015-05-01 16:31:31 -04:00
Evan Hazlett 15fb6c3d79 Merge pull request #1083 from ehazlett/docs-update-env-shell
docs: update usage info for env shell options
2015-05-01 16:11:31 -04:00
Evan Hazlett 32948a2bfd Merge pull request #1087 from nathanleclaire/shell_docs
Add doc for env --shell option
2015-05-01 16:10:45 -04:00
Dave Henderson 7c090a976f Tweak
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-01 16:04:58 -04:00
Evan Hazlett 092521a346 docs: update usage info for env shell options
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-01 14:55:50 -04:00
Nathan LeClaire ef4cccf0b4 Add doc for env --shell option
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-01 11:48:29 -07:00
zhee 37594ef88a Update docs for GCE flags
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-05-01 12:32:56 +09:00
Dave Henderson 2e85fd32e4 Adding docs for the inspect command
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-30 23:03:37 -04:00
zhee 556060f6db Update AMI to release 20150417
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-05-01 10:47:55 +09:00
zhee 8821e7e5ee [EC2] Add Monitoring flag
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-05-01 10:41:47 +09:00
Vincent Bernat fd569c8fdf driver: exoscale driver
Add support for exoscale, a Swiss cloud provider. This pull "egoscale",
a Go binding for exoscale, in godeps.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-30 22:32:02 +02:00
Evan Hazlett a3eb0d077b Merge pull request #1040 from nathanleclaire/engine_options
Implement configurable engine options
2015-04-30 13:55:58 -04:00
Evan Hazlett 6e39096962 Merge pull request #1063 from sthulb/ec2-ip
Add --amazonec2-private-address-only
2015-04-30 12:20:17 -04:00
Simon Thulbourn d0651d0273 Add --amazonec2-private-address-only
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-04-30 16:42:44 +01:00
Nathan LeClaire 2574c8ba5d Implement configurable engine options
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-29 17:58:14 -07:00
Evan Hazlett e8704b14f1
vbox: use single cpu by default
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:45:33 -04:00
Evan Hazlett 56ec00b3d2 Merge pull request #1048 from nathanleclaire/fix_windows_binary
Fix Windows binary path being broken and add -L to remaining commands
2015-04-29 09:26:37 -04:00
Nathan LeClaire 83d48049ac Fix Windows binary path being broken and add -L to remaining commands
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-27 12:06:24 -07:00
Dave Henderson a0f079a627 Enhancing `docker-machine ip` to support multiple host arguments
Fixes #999

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-22 22:10:45 -04:00
darron froese d9048f3c96 Follow the redirects.
Otherwise it just errors with:

```
DarronFroeseDD@: docker-machine -v
/usr/local/bin/docker-machine: line 1: syntax error near unexpected token `<'
/usr/local/bin/docker-machine: line 1: `<html><body>You are being <a href="https://s3.amazonaws.com/github-cloud/releases/27494663/a56dd51e-e3cf-11e4-8f5e-ac600ecd75cc?response-content-disposition=attachment%3B%20filename%3Ddocker-machine_darwin-amd64&amp;response-content-type=application/octet-stream&amp;AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&amp;Expires=1429217439&amp;Signature=DpwpQR8DBJn1nW6A5C75gXFBF2k%3D">redirected</a>.</body></html>'
```
2015-04-16 14:52:18 -06:00
Nathan LeClaire ea8402d6f5 Bump to new version
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-16 00:14:12 -05:00
Nathan LeClaire f0265903d1 Update docs with better install instructions
There are a few minor fixes and enhancements for things thrown in, too.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-16 00:01:57 -05:00
Evan Hazlett 7f24584581 Merge pull request #998 from fredlf/adds-release-notes
Adds release notes for upcoming 1.6 release
2015-04-16 00:22:54 -04:00
Fred Lifton f00aeb57d5 Adds release notes for upcoming 1.6 release
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
2015-04-10 14:48:34 -07:00
Evan Hazlett 2a93207bd9 Merge pull request #955 from ggiamarchi/keystone_v3_domains
Keystone v3 domains
2015-04-10 16:57:06 -04:00
Evan Hazlett 7f06122f0d Merge pull request #981 from nathanleclaire/help_users
Add section on how to get help to docs
2015-04-10 16:17:26 -04:00
Nathan LeClaire f4384c16f4 Add section on how to get help to docs
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-10 11:14:05 -07:00
Evan Hazlett bb08fcfbf9 Merge pull request #932 from Fangfenghua/patch-6
Update index.md
2015-04-10 09:21:23 -04:00
Guillaume Giamarchi edbdbd7bbf Support Keystone v3 domains
Fix #679

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-04-09 17:40:21 +02:00
Guillaume Giamarchi 18ff36a649 Fix documentation typo
Fix #983

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-04-09 17:00:04 +02:00
Evan Hazlett b9f191cedd Merge pull request #706 from ehazlett/rackspace-flavor-env-var
rackspace: enable env var for flavor id
2015-04-03 10:39:45 -04:00
Fangfenghua 4583fadd8a Update index.md
Signed-off-by: Fang fenghua <449171342@qq.com>
2015-04-03 02:37:45 +00:00
Evan Hazlett 10e8c446a7
rackspace: update env var and docs for flavor-id
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-02 10:01:42 -04:00
Nirmal Mehta d7d91a4f1d Corrected command to load proper swarm environment 2015-04-01 10:46:43 -04:00
Nathan LeClaire 9b5f395c60 Implement upgrade functionality for boot2docker
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-30 16:18:38 -07:00
Evan Hazlett ee6e6d76e0 Merge pull request #876 from tombee/virtualbox-env-vars
Added VIRTUALBOX_MEMORY_SIZE and VIRTUALBOX_DISK_SIZE env vars
2015-03-30 10:54:21 -04:00
Tom Barlow f17e397d78 Updated docs with environment variables for virtualbox driver
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
2015-03-28 23:08:46 +00:00
Marianna 77af1bd53d Chagning VirtualBox version to the latest one
Signed-off-by: Marianna <mtesselh@gmail.com>
2015-03-27 16:17:02 -07:00
Nathan LeClaire 9ca10bc2c0 Fix small docs typo
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-27 10:51:33 -07:00
Matt Aimonetti b2661e37f7 simplify some of the steps
Signed-off-by: Matt Aimonetti <mattaimonetti@gmail.com>
2015-03-26 19:34:29 -07:00