centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 14:25:46 +07:00
Code Issues Packages Projects Releases Wiki Activity
593 Commits 57 Branches 28 Tags
aa3f54c0330ee8459dc03df403ce3a1d51733aa3
Commit Graph

593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Evan Hazlett
c99e4f8fe4 Merge pull request #633 from andrewwatson/fix-629-privateip 
Fix #629 by adding PrivateIPAddress to config.json
 2015-02-27 15:04:28 -05:00
Evan Hazlett
46d92fc326 rename integration test dir; do not run coverage script on integration test 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 12:39:46 -05:00
Evan Hazlett
dd208271f8 check for VM in virtualbox; add stub for coverage 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 12:39:46 -05:00
Evan Hazlett
26d09cf300 add hyperv and softlayer tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 12:32:00 -05:00
Evan Hazlett
d2b584c6c5 add amazonec2, azure, google, vmwarefusion, vmwarevcloudair drivers 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 12:31:03 -05:00
Evan Hazlett
0b4d58d554 google: enable specifying an auth token 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 12:31:03 -05:00
Evan Hazlett
e0bda2075d use function to get binary name (thx @aluzzardi); add digitalocean; add container test 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 12:31:03 -05:00
Evan Hazlett
e33558e6a4 split out drivers 
more flexibility for testing; not all drivers support the same actions

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 12:31:03 -05:00
Evan Hazlett
00a6395667 switch to bats for integration testing 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-27 12:31:03 -05:00
Evan Hazlett
d65f66a75d Merge pull request #658 from frapposelli/fusion-driver-fixes 
Fusion driver fixes
 2015-02-27 11:47:06 -05:00
Fabio Rapposelli
9410b5b208 Add automatic assignments of vCPUs based on host CPUs. 
Fixes #535

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-02-27 17:40:09 +01:00
Fabio Rapposelli
193e2b1613 Major rework, changes include: 
- Use new iso from boot2docker/boot2docker#747
- Make ssh keys persistent across reboots
- Create a tar bundle of ssh keys just like Virtualbox
- Seed ssh keys using VMware Tools
- Added informative messages on stop/start/restart/remove
- Stop command is now gracefully shutting down the VM
- Fixed StopDocker() script
- Added a "not supported" message to upgrade operation

Fixes #507 #542 #430 #532

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-02-27 17:40:09 +01:00
Fabio Rapposelli
3442f8e063 Moved VMX options around, major changes: 
- Moved to a paravirtualized driver for disk (pvscsi)
- Moved to an enhanced paravirtualized nic (vmxnet3)
- Moved CDROM to SATA
- Reverted default power operations to "soft"

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-02-27 17:40:08 +01:00
Ke Zhu
bc91ba8577 keep machine config and machine env consistent 
Signed-off-by: Ke Zhu <kzhu@us.ibm.com>
 2015-02-27 11:21:16 -05:00
Evan Hazlett
d28131ea4b Merge pull request #655 from bfirsh/add-changelog 
Add start of a change log
 2015-02-27 10:35:33 -05:00
Evan Hazlett
98e9802fd9 Merge pull request #644 from Hokutosei/master 
updated google-source-image to the latest LTS release ubuntu-1404-trusty-v20150128
 2015-02-27 10:29:08 -05:00