docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
842 Commits 92 Branches 28 Tags
bb08fcfbf9aabdb0989cdae513591a4ed4f0c2e6
Commit Graph

842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Hazlett
bb08fcfbf9 Merge pull request #932 from Fangfenghua/patch-6 
Update index.md
 2015-04-10 09:21:23 -04:00
Evan Hazlett
2ccf832c4d Merge pull request #973 from wlan0/master 
make ssh username configurable for ec2
 2015-04-09 22:28:03 -04:00
Evan Hazlett
5149b14bc9 Merge pull request #984 from ggiamarchi/rackspace/doc#983 
Fix documentation typo
 2015-04-09 11:09:59 -04: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
e506ecb904 Merge pull request #980 from hairyhenderson/eval-quotes 
Adding quotes to the usage hint on `docker-machine env`
 2015-04-09 10:14:46 -04:00
Dave Henderson
9f98a06cdb Adding quotes to the suggested eval 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-08 13:48:26 -04:00
wlan0
ee941e979b make ssh username configurable for ec2 
Signed-off-by: wlan0 <sidharthamn@gmail.com>
 2015-04-07 18:00:06 -07:00
Evan Hazlett
cbbf0ec0eb Merge pull request #966 from nathanleclaire/stability_fixes 
Add a few improvements to stability
 2015-04-07 11:31:15 -04:00
Nathan LeClaire
29999e9b10 Add a few improvements to stability 
This improves on a few issues which are not frequent but do sometimes
come up:

1. Check that the daemon is up before attempting to do anything
   docker-ey in provisioning Ubuntu
2. Set a max retries for SSH so that if a request fails it attempts
   again before giving up

Also have annotated a few of the SSH options slightly better.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-06 13:00:09 -07:00
Evan Hazlett
d0d9aa2d47 Merge pull request #952 from ehazlett/do-fix-waitssh 
digitalocean: remove unneeded wait for ssh
 2015-04-03 16:27:43 -04:00
Evan Hazlett
51a86f7846 digitalocean: remove unneeded wait for ssh 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-03 11:24:21 -04: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
Evan Hazlett
be9113abf8 Merge pull request #934 from ehazlett/driver-doc-updates 
driver doc updates
 2015-04-01 15:57:18 -04:00
Evan Hazlett
10c390fcb9 Merge pull request #938 from normalfaults/patch-1 
Corrected command to load proper swarm environment
 2015-04-01 15:18:13 -04:00
Evan Hazlett
dc2dcfd79b updated docs per comments 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-01 15:11:31 -04:00
Nirmal Mehta
d7d91a4f1d Corrected command to load proper swarm environment 2015-04-01 10:46:43 -04:00
Evan Hazlett
f6192d1363 Merge pull request #937 from sunyuan3/overwritten 
Fix a typo in version.go
 2015-04-01 09:53:14 -04:00
Evan Hazlett
1b81ddeb90 Merge pull request #882 from tombee/env-usage-hint 
Added env usage hint for bash and fish shells
 2015-04-01 09:22:30 -04:00
Yuan Sun
f027b47045 Fix a typo in version.go 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-01 17:56:50 +08:00
Evan Hazlett
45c8673f13 Merge pull request #920 from nathanleclaire/provisioner_upgrade 
Provisioner upgrade
 2015-03-31 12:12:51 -04:00
Evan Hazlett
cfeffa530f Merge pull request #828 from ehazlett/vbox-tcp-port 
vbox: fix race with getting a tcp port
 2015-03-31 11:52:25 -04:00
Evan Hazlett
be9a13e784 Merge pull request #893 from ehazlett/add-sum-release 
adds md5 and sha256 for binaries on release
 2015-03-31 11:51:44 -04:00
Evan Hazlett
1ae0aac23c Merge pull request #919 from crunchywelch/master 
dont fail on trailing newline or empty line in ParseOsRelease()
 2015-03-30 19:32:08 -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
f7fbd39925 driver doc updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-30 19:13:05 -04:00
Aaron Welch
5c3ac31931 return empty key, val strings and nil err when given an empty string in parseLine() 
add Centos test for ParseOsRelease() and blank line in test for ParseLine()
Signed-off-by: Aaron Welch <welch@packet.net>
 2015-03-30 18:41:10 -04:00
Nathan LeClaire
a04b908fd3 Implement upgrade for Ubuntu provisioner 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-30 15:23:25 -07:00
Evan Hazlett
6c8661f16f run sum generation before uploading 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-30 13:48:14 -04:00
Evan Hazlett
d32f30b14e run the sum generation in the release script instead of build 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-30 13:11:33 -04:00
Evan Hazlett
d121c4d742 run sum generation in container 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-30 12:42:36 -04:00
Evan Hazlett
f010a7bb80 Merge pull request #896 from ggiamarchi/dead_code 
Remove dead code
 2015-03-30 11:38:48 -04: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
Evan Hazlett
e12540f947 Merge pull request #898 from mtesselH/master 
Chagning VirtualBox version to the latest one
 2015-03-30 09:27:42 -04:00
Evan Hazlett
2f6f5b9290 Merge pull request #881 from awsmsrc/feature/rm_output 
indicate a successful removal of a machine
 2015-03-30 09:17:35 -04:00
Evan Hazlett
382f71fdda Merge pull request #907 from ehazlett/roadmap 
update roadmap
 2015-03-29 01:03:09 -04:00
Evan Hazlett
64de4e80b7 update roadmap 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-29 01:02:23 -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
Tom Barlow
ddf633a9e4 Rebased, added env var test for virtualbox CPU count 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:49 +00:00
Tom Barlow
6e71cd3917 Replaced export statements in virtualbox integration tests with inline variables 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:49 +00:00
Tom Barlow
f01b9ce800 Specifying env vars inline on BATS doesn't seem to work, switched to export 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:49 +00:00
Tom Barlow
c221a0a42f Moved cleanup of machine store to end of virtualbox integration test 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:49 +00:00
Tom Barlow
0e1db73829 Added bats integration test for virtualbox customisation via env vars 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:49 +00:00
Tom Barlow
97cd23f2e5 Added VIRTUALBOX_MEMORY_SIZE and VIRTUALBOX_DISK_SIZE env vars 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:48 +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
Luke Roberts
4fd104c530 Remove unnecessary else 
Signed-off-by: Luke Roberts <luke@sqwiggle.com>
 2015-03-27 13:09:05 -07:00
Evan Hazlett
ee7617c2e7 Merge pull request #887 from nathanleclaire/listen_on_socket 
Fix unix:// not working inside VM issue
 2015-03-27 11:39:45 -07:00
Guillaume Giamarchi
fb1362ea05 Remove dead code 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2015-03-27 19:25:11 +01:00
Evan Hazlett
5c1b941507 Merge pull request #894 from nathanleclaire/fix_docs_typo 
Fix small docs typo
 2015-03-27 11:20:16 -07:00