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
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier Gambier
b3e83da3e6 Cleanup and fix deps 
Signed-off-by: Olivier Gambier <olivier@docker.com>
 2015-11-03 21:07:34 -08:00
Hu Keping
f8a665cd82 Replace tab with space on script 
It may inconsistent on different hosts(8/4 spaces per tab).

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-11-04 10:50:40 +08:00
Alexandre Beslic
229b742570 Merge pull request #1377 from vieux/compose_1.5 
update compose to 1.5.0
 2015-11-03 17:14:58 -08:00
Alexander Morozov
cec31abfea Remove unnecessary var decls 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-03 17:03:40 -08:00
Jeffrey Morgan
a60128c6a1 Reduce size of VM for windows quickstart to avoid hanging 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-11-03 17:00:09 -08:00
Brian Goff
c9208953fa Merge pull request #17630 from LK4D4/syscall_umount_warn 
Do not ignore error from syscall.Unmount
 2015-11-03 19:58:19 -05:00
Victor Vieux
f3bffb2dd9 update compose to 1.5.0 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-11-03 16:45:09 -08:00
Peter Malmgren
f6896b61ff Fix docker status incorrectly reports containerized. Fixes #17037 
Signed-off-by: Peter Malmgren <ptmalmgren@gmail.com>
 2015-11-04 00:08:46 +00:00
Jess Frazelle
562a1263f2 Merge pull request #17665 from LK4D4/setupwd_refactor 
Reorder code slightly in setupWorkingDirectory
 2015-11-03 15:56:10 -08:00
Jess Frazelle
e704182c9c Merge pull request #17614 from LK4D4/fix_golint 
Update linting tools to latest versions
 2015-11-03 15:32:12 -08:00
Richard Scothern
dd32fbe615 Before allowing a schema1 manifest to be stored in the registry, ensure that it 
contains equal length History and FSLayer arrays.

This is required to prevent malformed manifests being put to the registry and
failing external verification checks.

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
 2015-11-03 15:19:46 -08:00
Richard Scothern
603ffd58e1 Merge pull request #1150 from RichardScothern/carry-1070 
Add Storage Driver Context.
 2015-11-03 15:15:48 -08:00
Alexander Morozov
bb66c16871 Reorder code slightly in setupWorkingDirectory 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-03 14:33:31 -08:00
Sebastiaan van Stijn
67630bef47 Merge pull request #17649 from rsmoorthy/rsmoorthy-patch-1 
volume plugin doc update
 2015-11-03 23:33:20 +01:00
Jessica Frazelle
45788bb62d add fedora 23 for all the crazies who already want it 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-03 14:01:55 -08:00
Jeffrey Morgan
b6f08f43f0 Bump versions 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-11-03 13:51:56 -08:00
Ben Firshman
76f35282cb Fix first sentence in docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-11-03 13:43:03 -08:00
David Calavera
65ffd917c6 Merge pull request #17663 from tiborvass/merge_release_v1.9.0 
Merge release v1.9.0
 2015-11-03 13:40:37 -08:00
Tibor Vass
78f8a1224c Change version to 1.10.0-dev 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-11-03 16:17:07 -05:00
Nathan LeClaire
04cfa58445 Merge pull request #2152 from nathanleclaire/bump_0.5.0 
Bump to v0.5.0
 2015-11-03 12:20:26 -08:00
Nathan LeClaire
8153d432ce Bump to v0.5.0 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-11-03 12:10:04 -08:00
Tibor Vass
8b0e32b151 Bump version to v1.9.0 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-11-03 15:08:56 -05:00
Nathan LeClaire
c6d6eb863a Merge pull request #2151 from todorez/fix-ip-clash 
Fix DHCP server and host-only adapter IP address clash
 2015-11-03 12:06:26 -08:00
Nathan LeClaire
786437901c Merge pull request #2148 from nathanleclaire/no_driver_ls 
Ensure that ls will still work when plugin cannot be found
 2015-11-03 11:58:14 -08:00
Nathan LeClaire
9a4bc9a20d Ensure that ls will still work when plugin cannot be found 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-11-03 11:35:30 -08:00
Todor Minchev
36ca9c6063 Fix DHCP server and host-only adapter IP address clash 
When setting up a host-only network we need to pass the IP address
of the host adapter (e.g 192.168.99.1) to the getRandomIPinSubnet function.
Passing the network address (e.g 192.168.1.0) can result in bypassing the IP
clash check and having the same address assigned to both the DHCP server
and the host-only network interface.

Signed-off-by: Todor Minchev <todor.minchev@linux.intel.com>
 2015-11-03 11:26:31 -08:00
Antonio Murdaca
474b16af8e Merge pull request #17659 from cpuguy83/17646_keep_em_running 
Fix network settings inspect tests
 2015-11-03 20:25:01 +01:00
Richard Scothern
bc6e4cdceb Add a generic error type to capture non-typed errors 
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
 2015-11-03 11:19:44 -08:00
amitshukla
9637cb40cd Fix for issue 664: https://github.com/docker/distribution/issues/664 
Errors thrown by storage drivers don't have the name of the driver, causing user
confusion about whether the error is coming from Docker or from a storage driver.
This change adds the storage driver name to each error message.

This required changing ErrUnsupportedDriver to a type, leading to code changes
whenever ErrUnsupportedDriver is used.  The tests check whether the driver name
appears in the error message.

Signed-off-by: Amit Shukla <amit.shukla@docker.com>
 2015-11-03 11:19:17 -08:00
Brian Goff
c30b9e590c Merge pull request #17606 from mountkin/increase-max-retries 
increase the maxJSONDecodeRetry in json log reader
 2015-11-03 13:45:45 -05:00
Jeffrey Morgan
c2f2f536ff Temporary disable boot2docker migration 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-11-03 10:43:06 -08:00
Viktor Stanchev
44d08567d9 Merge pull request #941 from vikstrous/notary_docs 
update dockerfile, notary docs
 2015-11-03 10:40:57 -08:00
Aanand Prasad
9c8173dbfd Merge pull request #2309 from dnephin/bump-1.5.0 
WIP: Bump 1.5.0
 2015-11-03 18:31:56 +00:00
Michael Crosby
aff8bd178c Merge pull request #17638 from calavera/move_net_stats_collector 
Make the stats collector to collect network stats.
 2015-11-03 10:31:40 -08:00
Jeffrey Morgan
499253898b Bump Kitematic & fix checkbox bugs 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-11-03 10:09:45 -08:00
Srini Brahmaroutu
81b3d2eec9 after the changes to unit test framework, fixing gccgo to run unit tests 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-11-03 17:57:06 +00:00
Daniel Nephin
77ff37a853 Bump 1.5.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
40341674bd Re-order extends docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
62ebdce5a9 Replace composition with Compose app. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
58de4e0c26 Document using multiple Compose files use cases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
dbd6c62b70 Changes to production.md for working with multiple Compose files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
887c6753f8 Support a volume to the docs directory and add --watch, so docs can be refreshed. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
bd35896892 Remove duplication from extends docs. 
Start restructuring extends docs in preparation for adding documentation about using multiple compose files.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Richard Scothern
a9da0e5100 Merge pull request #1114 from lebauce/swift-temp-url 
Redirect support in Swift driver
 2015-11-03 09:34:01 -08:00
Aanand Prasad
4ebe68e612 Merge pull request #2290 from dnephin/docs_multi_file_compose 
Docs for using multiple compose files
 2015-11-03 17:14:57 +00:00
Brian Goff
3564895e84 Fix network settings inspect tests 
Makes sure the containers are actually running when inspecting so the
ip info is actually populated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-11-03 12:12:19 -05:00
Daniel Nephin
9286e62449 On a test failure only show the last 100 lines of daemon output. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:54:59 -05:00
Daniel Nephin
621d1a5167 Fix networking tests to work with new API in engine rc4 (https://github.com/docker/docker/pull/17536) 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:54:59 -05:00
Daniel Nephin
e503e085ac Re-order extends docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:52:44 -05:00
Diogo Mónica
0b3377a86c Merge pull request #263 from jfrazelle/update-canonical 
rebased canonical/json off go 1.5.1
 2015-11-03 16:52:32 +00:00