docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-14 04:50:52 +03:00
Code Activity
47,845 Commits 124 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Li
2eb1215a60 Fixed setup screen spacing. 2015-06-11 14:30:48 -07:00
Xian Chaobo
2389760e95 refresh config fields 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-11 14:28:21 -07:00
Arnaud Porterie
71ead0ef5c Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI 
Adjust disallowed CpuShares in /containers/create
 2015-06-11 14:20:50 -07:00
Sean Li
cad849b74e Settings and container ip and ports widget. 2015-06-11 14:20:06 -07:00
Jessie Frazelle
0de7065897 Merge pull request #13801 from bexelbie/bex_manpage_indention 
Updates man page generation to use go-md2man v1.0.2
 2015-06-11 14:12:17 -07:00
Nathan LeClaire
e91c28fad6 Check for IP to be assigned before returning from Start() 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-11 14:02:27 -07:00
Nathan LeClaire
6d26992101 Merge pull request #1347 from ehazlett/fix-vbox-panic 
vbox: fix panic with custom cidr
 2015-06-11 14:02:04 -07:00
Ben Firshman
e3525d64b5 Merge pull request #1537 from aanand/reorder-service-utils 
Reorder service.py utility methods
 2015-06-11 21:55:33 +01:00
Ben Firshman
bd246fb011 Merge pull request #1538 from thieman/tnt-serivce-misspelled 
Correct misspelling of "Service" in an error message
 2015-06-11 21:54:53 +01:00
Adrian Mouat
f670f00058 Fix typo 
I think negociate is very occasionally used, but it certainly looks wrong to me.

Signed-off-by: Adrian Mouat <adrian.mouat@gmail.com>
 2015-06-11 21:45:26 +01:00
Evan Hazlett
5a59fa8f12 added deprecation comment 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-11 16:24:49 -04:00
Jessie Frazelle
98391f0a39 Merge pull request #13890 from moxiegirl/vieux-fix 
Updating with fix for first line and the vieux/amy comment on website
 2015-06-11 13:22:03 -07:00
Olivier Gambier
6deedd29d9 Merge pull request #615 from allingeek/master 
Adding a volume for the default 'registry-dev' location.
 2015-06-11 12:51:36 -07:00
Mary Anthony
566466e714 Updating with fix for first line and the vieux/amy comment on website 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-11 12:48:01 -07:00
Jessie Frazelle
cada9b54b5 Merge pull request #13865 from Mic92/zfs-selinux 
zfs: correctly apply selinux context
 2015-06-11 12:42:06 -07:00
Victor Vieux
5acddc30b8 Merge pull request #916 from 4is2cbetter/fix_test_script 
cannot comment on one line command
 2015-06-11 11:53:22 -07:00
Stephen Day
a5b21fa8f0 Merge pull request #617 from dmp42/pathchange 
Saner default data location
 2015-06-11 11:42:24 -07:00
Sean Li
7375216f19 Settings page polish. 2015-06-11 11:32:31 -07:00
Olivier Gambier
ad23a43bc4 Enhance building doc to reflect the new data default location 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-11 11:08:16 -07:00
Evan Hazlett
f26fb12664 vbox: fix panic with custom cidr 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-11 14:04:48 -04:00
Travis Thieman
f31d4c8a93 Correct misspelling of "Service" in an error message 
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
 2015-06-11 14:03:08 -04:00
Sean Li
ee130fa346 Settings pages tweak. 2015-06-11 11:01:53 -07:00
Stephen Day
fc796f1722 Merge pull request #584 from xiekeyang/panic 
Panic: Add Handler
 2015-06-11 11:01:43 -07:00
Phil Estes
9b43f5a3a1 Split client and server cipher suite list in TLS defaults 
Per @ewindisch, removing the CBC ciphers from the client preferred TLS
cipher suites.  This will allow a future version of the server to also
remove the CBC ciphers from the accepted list.

This changes the server default to client + additional CBC cipher list,
and client default to the non-CBC ciphers.

Also, cipher order preference is modified so that best and highest-bit count
ciphers are most preferred.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-06-11 14:00:31 -04:00
Alexandre Beslic
316f535936 Merge pull request #931 from vieux/add_ttl_discovery 
add ttl placeholder to discovery
 2015-06-11 10:33:08 -07:00
Jessie Frazelle
e3821feb13 Merge pull request #13783 from tianon/vendor-pruning 
Add intelligent vendor pruning (via "go list")
 2015-06-11 10:32:53 -07:00
Tianon Gravi
b0d748325f Update "vendor/" 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-11 09:59:12 -07:00
Tianon Gravi
9e4ee3dea5 Add intelligent vendor pruning (via "go list") 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-11 09:59:12 -07:00
Tianon Gravi
f61d595b55 Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-11 09:59:12 -07:00
Olivier Gambier
1ad9ac497c Merge pull request #590 from mattrobenolt/patch-1 
Return valid json from StatusHandler
 2015-06-11 09:51:45 -07:00
Srini Brahmaroutu
eb97de7dee Decoder does not work properly with nested pointers using gcc 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-06-11 16:45:54 +00:00
Doug Davis
b27f960504 Merge pull request #13879 from eolamey/13878-nil-ip-opt-as-empty-string 
Display empty string instead of <nil> when IP opt is nil.
 2015-06-11 09:30:52 -07:00
moxiegirl
9001c4bc48 Merge pull request #13839 from eolamey/13838-fix-docs-url 
Fix docs URL not using https.
 2015-06-11 08:59:35 -07:00
Olivier Gambier
7729294e38 Merge pull request #613 from antoniomercado/remove-nginx-authorization-unset 
Removing Nginx Authorization header unset because it breaks with a user defined index endpoint
 2015-06-11 08:56:02 -07:00
Aanand Prasad
7995fc2ed2 Reorder service.py utility methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-11 11:44:13 -04:00
Evan Hazlett
effa03dad4 Merge pull request #1343 from moxiegirl/1329-migrate-b2b 
Closes #1329 when merged
 2015-06-11 10:09:53 -04:00
Evan Hazlett
9840c4bfe2 Merge pull request #1320 from TrumanLing/update-doc-for-availability-zone 
Update documentation for adding parameter --openstacke-availability-zone
 2015-06-11 10:05:29 -04:00
Brian Goff
4fc6449944 Merge pull request #13861 from mrjana/cnm_integ 
Vendoring libnetwork to fix stale arp cache issue
 2015-06-11 09:12:34 -04:00
Eric-Olivier Lamey
9ad89281ae Display empty string instead of <nil> when IP opt is nil. 
Fixes #13878.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-11 11:14:28 +00:00
Vincent Batts
ef171afdbb Merge pull request #13590 from mountkin/fix-archive-tests 
Add the parent directory to changes set if new files are generated
 2015-06-11 05:12:45 -04:00
Jörg Thalheim
19c31a703f zfs: correctly apply selinux context 
fixes #13858

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-06-11 11:11:37 +02:00
Olivier Gambier
8ed0c66745 Enhancing doc to persist data 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-11 01:41:15 -07:00
Olivier Gambier
69b4b73f7c Merge pull request #619 from neurodesign/fix-README-typo 
Fix typo
 2015-06-11 01:01:19 -07:00
Julien Fernandez
25778270be Fix typo 
Signed-off-by: Julien Fernandez <julien.fernandez@gmail.com>
 2015-06-11 08:50:34 +02:00
Brian (bex) Exelbierd
5d51118c7c Update man page Dockerfile to use go-md2man v1.0.1 and go-lang 1.4 
The main Dockerfile to was updated - this update brings the
sub-directory specific file inline with it.

Fixes #12866

Signed-off-by: Brian Exelbierd <bex@pobox.com>
 2015-06-11 08:36:21 +02:00
Antonio Murdaca
2b27fe17a1 Merge pull request #13862 from Microsoft/10662-fixelementsrestored 
Show actual number of elements restored
 2015-06-11 07:13:19 +02:00
Eric-Olivier Lamey
212dfb45de Fix docs URL not using https. 
Fixes #13838.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-11 04:50:50 +00:00
Jeff Nickoloff
5bd4b5c558 Updating the location of the volume to match the new location of the default registry data location. 
Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>
 2015-06-10 21:24:16 -07:00
Olivier Gambier
6e0cfc17dc Saner default data location 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-06-10 20:54:24 -07:00
Stephen J Day
0f654c25ac Rename the basic access controller to htpasswd 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-06-10 19:41:35 -07:00