centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 16:28:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,009 Commits 54 Branches 28 Tags
fc49adbcdfa1c6985fda170f5cac4fe009dee85d
Commit Graph

1009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Hazlett
0748d70b4e consistent naming for DOCKER_TLS_VERIFY env var 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-06 16:29:17 -05:00
Evan Hazlett
989db1bf96 Merge pull request #690 from nathanleclaire/universal_poll_retries 
Introduce universal poll retries function
 2015-03-06 13:55:33 -05:00
Evan Hazlett
5b81fde44a Merge pull request #722 from vieux/keep_swarm_default 
Revert "Use random strategy for Swarms"
 2015-03-06 12:52:56 -05:00
Ben Firshman
8193fe8c1f Add more detail to roadmap 
There's now a bit of a narrative to explain the why, then some links
off to GitHub issues explaining the how.

Closes #680

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-03-06 14:36:16 +00:00
Dave Henderson
093914cbd5 Fixing inaccurate Usage message for the --openstack-net-id option 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-03-06 07:04:06 -05:00
Evan Hazlett
2045708e70 Merge pull request #694 from ehazlett/driver-spec 
Proposal: driver spec v1
 2015-03-06 04:47:40 -06:00
Victor Vieux
b3394fbedf Revert "Use random strategy for Swarms" 
This reverts commit aa3940deb7.

Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-05 15:11:09 -08:00
Evan Hazlett
2121382d08 Merge pull request #718 from cheng--zhang/wording 
Modify description of StartDocker and StopDocker
 2015-03-05 06:47:05 -08:00
Cheng Zhang
b756be37eb Modify description of StartDocker and StopDocker 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2015-03-05 16:09:19 +08:00
Nathan LeClaire
1e983d5ff6 Introduce universal poll retries function 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-04 16:41:48 -08:00
Evan Hazlett
aa3f54c033 Merge pull request #714 from knarz/add_digitalocean_flags_docs 
add the three new DO flags to the docs
 2015-03-04 14:45:26 -08:00
Sascha Hanse
b159381f74 add the three new DO flags to the docs 
Signed-off-by: Sascha Hanse <shanse@gmail.com>
 2015-03-04 22:22:25 +01:00
Evan Hazlett
505c83629f rackspace: enable env var for flavor id 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-04 13:19:08 -08:00
Evan Hazlett
71533dd10f Merge pull request #713 from ehazlett/revert-709 
Revert "Fix check for whether docker is installed"
 2015-03-04 13:18:13 -08:00
Evan Hazlett
8b6ccddd80 Revert "Fix check for whether docker is installed" we need to revisit 
This reverts commit ddc0c50b91.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-04 13:17:00 -08:00
Evan Hazlett
0dcd688799 remove unneeded cleanup from travis config 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-04 13:07:15 -08:00
Evan Hazlett
66664f8b25 Merge pull request #695 from knarz/add_digitalocean_flags 
add flags for ipv6, backups and private networking to the DigitalOcean driver
 2015-03-04 13:06:25 -08:00
Evan Hazlett
839cc67ab6 Merge pull request #709 from nathanleclaire/fix_docker_check 
Fix check for whether docker is installed
 2015-03-04 11:37:53 -08:00
Nathan LeClaire
ddc0c50b91 Fix check for whether docker is installed 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-04 11:34:48 -08:00
Evan Hazlett
6da2128e23 Merge pull request #700 from nathanleclaire/ec2_fixes 
EC2 fixes
 2015-03-03 17:12:02 -08:00
Nathan LeClaire
8d0bf21c6d Fix panic when instance doesn't exist remotely 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-03 14:48:04 -08:00
Nathan LeClaire
a7d1a70442 Fix IP address not being set correctly due to race 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-03 14:47:06 -08:00
Evan Hazlett
9404aa2f88 move driver spec to docs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-03 11:51:56 -08:00
Evan Hazlett
2c8823fab7 Merge pull request #697 from nathanleclaire/ec2_clean 
Clean up unused function
 2015-03-03 11:50:19 -08:00
Nathan LeClaire
3a030c9ccb Clean up unused function 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-03 11:18:08 -08:00
Evan Hazlett
e433f7100f Merge pull request #684 from jonathanmorley/fish-semicolons 
Add semicolons to fish output for docker-machine env command
 2015-03-03 11:15:53 -08:00
Evan Hazlett
d00e67b3f7 elaborate on testing for the driver spec 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-03 07:15:07 -05:00
Evan Hazlett
2cf681d792 initial driver spec draft 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-03 07:01:18 -05:00
Jonathan Morley
0462a3b2fc Add semicolons to fish output for docker-machine env command 
This allows fish users to use `eval (docker-machine env ...)`

Signed-off-by: Morley, Jonathan <morley.jonathan@gmail.com>
 2015-03-03 06:41:08 -05:00
Sascha Hanse
5bc443194c Merge branch 'add_digitalocean_flags' of https://github.com/knarz/machine into add_digitalocean_flags 2015-03-03 12:24:20 +01:00
Sascha Hanse
17b928fac0 add flags for ipv6, backups and private networking to the DigitalOcean driver 
Signed-off-by: Sascha Hanse <shanse@gmail.com>
 2015-03-03 12:22:11 +01:00
Evan Hazlett
7bf67e41c9 Merge pull request #615 from ehazlett/integration-testing 
switch to bats for integration testing
 2015-03-02 17:24:47 -05:00
Evan Hazlett
f3bd689485 Merge pull request #689 from ehazlett/ec2-fix-iam-tests 
ec2: fix iam test
 2015-03-02 17:23:45 -05:00
Evan Hazlett
2ea5a976d8 ec2: fix iam test 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-02 17:20:47 -05:00
Evan Hazlett
5f01d4cda5 Merge pull request #449 from sthulb/aws-assign-roles 
IRC Req: EC2 IAM Instance Profile
 2015-03-02 17:12:27 -05:00
Evan Hazlett
588a70ccce Merge pull request #686 from ehazlett/ec2-fix-swarm-port-auth 
ec2: do not try to auth swarm port if exists
 2015-03-02 17:06:48 -05:00
Evan Hazlett
2792f1ec89 ec2: update tests for configuring ip permissions 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-02 16:21:14 -05:00
Simon Thulbourn
2ce70bf5ac adds the ability to set an instance role for ec2 instances 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-03-02 19:01:22 +00:00
Evan Hazlett
f0c70ee8ed ec2: do not try to auth swarm port if exists 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-02 13:14:41 -05:00
Evan Hazlett
c3878a9285 Merge pull request #664 from ehazlett/ec2-fix-subnet-check 
ec2: check subnet exists in vpc
 2015-03-02 13:06:35 -05:00
Evan Hazlett
4cf7caa1e0 Merge pull request #674 from frapposelli/vsphere-driver-fixes 
vSphere driver fixes
 2015-03-02 13:06:12 -05:00
Evan Hazlett
dca385690d Merge pull request #668 from ehazlett/support-fish-in-env 
show fish usage upon create
 2015-03-02 12:20:22 -05:00
Fabio Rapposelli
28fff16745 Driver rework to use upcoming boot2docker/boot2docker#747 patch: 
- Aligned VMX template to Fusion (vmxnet3, pvscsi)
- Bundle ssh keys in a tar and upload it through vmtools
- Power operations moved to graceful shutdown and restart

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-03-01 17:46:30 +01:00
Evan Hazlett
1bf70a15f0 show fish usage upon create 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 19:15:02 -05:00
Evan Hazlett
10b3d7fd9a ec2: remove unneeded subnetid var 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 18:08:33 -05:00
Evan Hazlett
9acef467ff Merge pull request #654 from gierschv/fix-openstack 
Provision OpenStack instances with Docker
 2015-02-27 17:45:43 -05:00
Guillaume Giamarchi
5fa93a0888 Remove dead code 
This method is no longer called since
the docker installation has moved out
of the driver (54f3607).

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2015-02-27 23:13:12 +01:00
Evan Hazlett
32ed441fbb ec2: use filters for GetSubnets; check subnetId in PreCreate for driver 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 16:51:48 -05:00
Evan Hazlett
84cbb48109 Merge pull request #649 from shawnzhu/no-escape-quote 
keep machine URL consistent in machine config and machine env
 2015-02-27 16:03:27 -05:00
Evan Hazlett
19f5b0cb54 ec2: check subnet exists in vpc 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 15:31:48 -05:00