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
cr7pt0gr4ph7
edcbe2eb4d Simplify unit tests in config/config_test.py by using class variables instead of methods for parametrizing tests. 
Signed-off-by: cr7pt0gr4ph7 <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Lukas Waslowski
ad00f3dd21 Handle the 'network_mode' key when merging multiple compose files. 
Fixes docker/compose#2840.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Lukas Waslowski
c77a8cfe3b Correctly merge the 'services/<service>/networks' key in the case of multiple compose files. 
Fixes docker/compose#2839.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Lukas Waslowski
8548b75582 Separate MergePortsTest from MergeListsTest and add MergeNetworksTest. 
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-23 11:52:51 -08:00
Michael Käufl
c1be49ad53 Used absolute links in readme 
This prevents links being broken on pypi
(e.g. https://pypi.python.org/pypi/docs/index.md#features)

Signed-off-by: Michael Käufl <docker-compose@c.michael-kaeufl.de>
 2016-02-23 11:52:51 -08:00
Aanand Prasad
a716bdc482 Update Swarm integration guide and make it an official part of the docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit
abec6f5891 Change special case from '_', None to () 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit
c195915263 Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit
34d8f9b55a Mangle the tests. They pass for better or worse! 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
jrabbit
f5533c1ed8 If an env var is passthrough but not defined on the host don't set it. This doesn't change too much code and keeps the generators. 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-23 11:52:51 -08:00
Nishant Totla
633a2ba065 Merge pull request #1856 from vieux/add_reschedule_compose_test 
add a reschedule test with compose
 2016-02-23 11:40:57 -08:00
Nishant Totla
4f3c23cbee Merge pull request #1858 from skohar/remove_redundant_space 
Remove redundant spaces
 2016-02-23 11:19:58 -08:00
Daniel Nephin
722e3a2fc7 Merge remote-tracking branch 'docker/release' into bump-1.6.1 2016-02-23 11:15:34 -08:00
Daniel Nephin
d451578152 Make environment variables without a value the same as docker-cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:14:59 -08:00
Daniel Nephin
4b04280db8 Revert "Change special case from '_', None to ()" 
This reverts commit 677c50650c.

Revert "Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior"

This reverts commit 0019037712.

Revert "Mangle the tests. They pass for better or worse!"

This reverts commit 7ab9509ce6.

Revert "If an env var is passthrough but not defined on the host don't set it."

This reverts commit 6540efb3d3.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:13:57 -08:00
Daniel Nephin
1d67e6f0f0 Merge pull request #2995 from dnephin/fix_warning_about_bools 
Fix warning about boolean values
 2016-02-23 11:11:54 -08:00
Aaron Lehmann
7571572305 Merge pull request #1471 from RichardScothern/tag-headers 
Enable proxying registries to downgrade fetched manifests to Schema 1.
 2016-02-23 11:08:46 -08:00
Daniel Nephin
ba799d2e86 Merge pull request #2996 from dnephin/fix_abort_on_container_exit 
Fix abort on container exit
 2016-02-23 10:52:12 -08:00
Tibor Vass
9ec015edff Merge pull request #20618 from icecrime/fix_TestExec 
Fix flaky TestExec
 2016-02-23 13:44:04 -05:00
Ryan McLaughlin
d14cef441d fixing the path of the key pair 
Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>

Fixed a bit of grammar

Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>
 2016-02-23 11:32:28 -07:00
David Lawrence
9e9802bdd0 Merge pull request #573 from docker/validate-meta-on-parse 
Adds extra validation when calling `XFromSigned` functions
 2016-02-23 10:17:02 -08:00
Riyaz Faizullabhoy
d6d788c31b add links to release tags, 0.2 will exist soon 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-02-23 10:12:03 -08:00
David Lawrence
926964df29 Merge pull request #585 from endophage/download_valid_children 
check validity of children during download
 2016-02-23 10:08:20 -08:00
Arnaud Porterie
0a7755ab4e Fix flaky TestExec 
The container started with `-d` as part of the test requires a `waitRun`
to ensure it is actually running before attempting any other operation.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2016-02-23 09:51:09 -08:00
John Howard
800c9e81ea Windows: Updates for virtual user account 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-23 09:47:52 -08:00
Nalin Dahyabhai
6cdc4ba6cd Try to handle changing names for journal packages 
When checking if we have the development files for libsystemd's journal
APIs, check for either 'libsystemd >= 209' and 'libsystemd-journal'.  If
we find 'libsystemd', define the 'journald' tag, which defaults to using
the 'libsystemd.pc' file.  If we find the older 'libsystemd-journal',
define both the 'journald' and 'journald_compat' tags, which causes the
'libsystemd-journal.pc' file to be consulted instead.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
 2016-02-23 12:24:27 -05:00
Riyaz Faizullabhoy
bc6b260eaa Add changelog for release tracking 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-02-23 09:22:51 -08:00
David Calavera
bd4fb00fb6 Add mounts to docker ps. 
- Allow to filter containers by volume with `--filter volume=name` and `filter volume=/dest`.
- Show their names in the list with the custom format `{{ .Mounts }}`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-02-23 12:10:24 -05:00
Brian Goff
0f18fa939c Merge pull request #20591 from nerdalert/logrus_dbg_msg 
Fixed logrus client/server mismatch debug msg
 2016-02-23 11:59:37 -05:00
Vincent Demeester
20fc13b56d Merge pull request #20613 from aidanhs/aphs-ipv6-docs-followup 
Update docs for enableipv6
 2016-02-23 17:57:58 +01:00
David Calavera
9d882cbb44 Merge pull request #20581 from stweil/master 
Fix some typos in comments and strings
 2016-02-23 08:20:53 -08:00
David Calavera
1e02a0810e Merge pull request #20590 from HackToday/fixdoc 
Fix doc format issue
 2016-02-23 08:20:03 -08:00
Aidan Hobson Sayers
82d486848d Update docs for enableipv6 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2016-02-23 16:10:54 +00:00
Sebastiaan van Stijn
98d6dedde3 Merge pull request #20597 from zhuguihua/fix_markdown_style_error_in_man_page 
Fix markdown style error in man page
 2016-02-23 16:15:46 +01:00
Sebastiaan van Stijn
f3b5fdc23d Merge pull request #20514 from calavera/github_templates 
Add tempates for new issues and pull requests.
 2016-02-23 15:27:52 +01:00
Vincent Demeester
783d6c64cf Merge pull request #20500 from ZJUshuaizhou/master 
Update docker_remote_api_v1.22.md
 2016-02-23 14:54:01 +01:00
Doug Davis
dbec35ffd3 Merge pull request #20598 from wenchma/typo 
Fix typo
 2016-02-23 07:28:50 -05:00
Shijiang Wei
d7af031114 make the json log writer much faster 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2016-02-23 19:28:06 +08:00
Wen Cheng Ma
8474bbff45 Fix typo 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-02-23 17:27:55 +08:00
Zhu Guihua
2aa4280d93 Fix markdown style error in man page 
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
 2016-02-23 16:10:17 +08:00
Michal Minar
21a0878665 Commit blob with known size 
Signed-off-by: Michal Minar <miminar@redhat.com>
 2016-02-23 08:44:06 +01:00
ZJUshuaizhou
220a188ae8 update all the versions from v1.19 to v1.23 
update v1.22

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update all the versions docs

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

revert v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

revert v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>
 2016-02-23 14:34:27 +08:00
David Lawrence
1e99830716 check validity of children during download and don't overwrite already loaded children 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2016-02-22 20:47:58 -08:00
Brent Salisbury
a499ad8e4e Fixed logrus client/server mismatch debug msg 
Signed-off-by: Brent Salisbury <brent@docker.com>
 2016-02-22 23:36:33 -05:00
Ying Li
be3520c011 Update the integration tests after rebase 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-02-22 19:52:18 -08:00
Kai Qiang Wu(Kennan)
4d4d1e7f82 Fix doc format issue 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-02-23 03:42:10 +00:00
Ying Li
8ca8f073fa Have isValidRootRoleStructure take both role names in order to construct an ErrInvalidMetadata 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-02-22 19:39:54 -08:00
Ying Li
191307fc07 specifying other non-base roles on the root metadata is not invalid 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-02-22 19:16:32 -08:00
Ying Li
61dad28b1e Validate that snapshot and timestamp have required sha256 checksums 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-02-22 19:16:32 -08:00
Ying Li
4b13e7d358 Refactor RootRole verification into a helper function used by root and targets validation 
Signed-off-by: Ying Li <ying.li@docker.com>
 2016-02-22 19:16:32 -08:00