d3be715b86
Merge pull request #10857 from pragmaticfrank/patch-1
...
fix source command for tab-completion
Upstream-commit: 09b785f3bed812736fe7526535088ca73c1fa10d
Component: engine
2015-02-17 20:22:06 -05:00
9067686a86
Merge pull request #10846 from chenhanxiao/pause-unpause-link
...
docs: add See also for description of pause and unpause
Upstream-commit: 6c4e1387d143f8f78738b9e54e7ea761588e3a62
Component: engine
2015-02-17 19:26:56 -05:00
5fc38e9a3e
fix source command for tab-completion
...
source /etc/bash_completion.d/docker.io was not working for me, since the file is called docker, not docker.io.
There might be versions with 'io' ending; star is general enough.
Signed-off-by: Ferenc Szabo <pragmaticfrank@gmail.com >
Upstream-commit: 112829434d5aa517a00d89c3b476233fa277eb94
Component: engine
2015-02-17 16:53:18 +01:00
ee82c91c8a
docs: add See Also for description of pause and unpause
...
make them reference to each other.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: a69b189fc5796248bedc01a9feb34da765c73547
Component: engine
2015-02-17 10:22:28 +08:00
bc6bb1e0e5
Merge pull request #10779 from duglin/10771-FixStatsHelp
...
Fix 'docker stats' help message
Upstream-commit: 9054e4dca3320ec769a02aed8c19aac577688992
Component: engine
2015-02-16 11:18:58 -08:00
53251d070b
Merge pull request #10783 from tianon/BINDDIR-yes-two-Ds
...
Rename BINDDIR to BIND_DIR
Upstream-commit: bce2ae655cea2fe2a57225abb30bce2bf85adfa5
Component: engine
2015-02-16 11:00:44 -08:00
4a9bcf2320
Merge pull request #10571 from jfrazelle/8689-remove-all-aliases
...
Removes the feature to pull all image aliases.
Upstream-commit: 9ea20f260c0a31d6a0e939a099f7005e93507eea
Component: engine
2015-02-16 10:29:20 -08:00
7a0aaa5999
Use newer help out for 'docker' and 'docker run'
...
Closes #10828
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: effa5e2c18f27b81fc46d1a925d04e6af5695459
Component: engine
2015-02-16 08:46:07 -08:00
5beb4d62d0
Merge pull request #10801 from cyrilf/patch-1
...
Documentation - smallest typo correction ever
Upstream-commit: 924b7154baa94e639b8655087e4ba5a5cf0125a4
Component: engine
2015-02-15 20:38:45 -05:00
564ab376d9
docs: fix a typo in Dockerfile.5.md
...
s/Exececutable/Executable
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: bfba622f86eb45e25d4ff6dc6808cd740bd2a671
Component: engine
2015-02-15 11:06:18 +08:00
6fae379b61
Smallest typo correction ever
...
Signed-off-by: Cyril Francesconi <cyrilf7x@gmail.com >
Upstream-commit: 582c360d5741a6dce35af1e7607ee636bcf4eb4c
Component: engine
2015-02-14 17:51:28 +01:00
474b56bd0a
Docs: Improve description on volume removal
...
A comment in https://github.com/docker/docker/issues/6354#issuecomment-74160215
brought to light that the "Managing Data in containers" section contained an
incorrect (or confusing) line;
"Volumes persist until no containers use them"
Which implies that volumes are automatically removed if they are no longer
referenced by a container.
This pull-request attempts to add some information explaining that volumes are
never automatically removed by Docker and adds some extra hints on working
with data volumes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 00f2fd1dd5dee53919cda7ed9f5c70ba8558edb5
Component: engine
2015-02-14 17:04:06 +01:00
3de3653c91
Merge pull request #10752 from psftw/tweak-docs-readme
...
Clean up explanation of doc branches.
Upstream-commit: 99ca215c65e9a482f981790f2d4dbe8d4ccce4be
Component: engine
2015-02-13 17:20:59 -08:00
ac657c8159
Rename BINDDIR to BIND_DIR
...
It turns out the back-to-back `D`s here were tripping people up because visually, it looks like a typo. This renames the variable to `BIND_DIR`, but allows `BINDDIR` to continue working for backwards-compatibility.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 987050a52b0ce6d5ae77554a03af5923304bd3e5
Component: engine
2015-02-13 15:50:42 -07:00
79ea7dd989
Fix 'docker stats' help message
...
Closes #10771
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b55346b3279a3243da8cab82a7ddc427454aba61
Component: engine
2015-02-13 12:45:50 -08:00
ab722f0215
Merge pull request #10674 from cpuguy83/cleanup_Dockerfile_manpage
...
Cleans up docs/man/Dockerfile.5.md
Upstream-commit: ee95aa1b813f53d52e42a7d37a3f4988918058ce
Component: engine
2015-02-13 12:42:19 -08:00
bebced9dfc
Merge pull request #10715 from icecrime/keyserver_install_dependency
...
Use gpg from our server if keyserver is down
Upstream-commit: 8b010d9f10b42377bcd741dfbe00006994bd8adc
Component: engine
2015-02-13 11:29:39 -08:00
b108618571
Cleans up docs/man/Dockerfile.5.md
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 14131b65c41ee9f562c3311e533e0f7d9c9de97b
Component: engine
2015-02-13 12:47:58 -05:00
da0bb2cbb5
Use gpg keyserver pool
...
Make the install script independent from the ubuntu keyserver by using
the sks-keyservers pool instead.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: f058e9c43c8752dedcd4d251ddf105b22d0ed1d5
Component: engine
2015-02-13 09:13:29 -08:00
ba30fcef2a
Clean up explanation of doc branches.
...
Signed-off-by: Peter Salvatore <peter@psftw.com >
Upstream-commit: 74b050bd0cfa897c0ef2fa50e26725af3c29a65e
Component: engine
2015-02-12 17:02:56 -05:00
2c48e42531
Update docs for HTTP_PROXY
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 7a7c00ca0834e6bad0132d834399bcee4d3b957b
Component: engine
2015-02-12 11:40:56 -08:00
ebb652c696
Merge pull request #10686 from LK4D4/bump_docs
...
Bump api version to 1.18
Upstream-commit: f4749acad48f03454c951081a0a3f0149a23e260
Component: engine
2015-02-11 11:01:28 -08:00
2979e456cd
Merge pull request #10632 from chenhanxiao/update-TESTFLAGS-docs
...
docs: emphasis TESTFLAGS and add some descriptions
Upstream-commit: 54b59c2b2f440df0a513a37d7709fc5b0c88773f
Component: engine
2015-02-11 12:36:43 +10:00
5c56835bc1
Bump api version to 1.18
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d92b4232f7c7cb64efd8e56c33238b4426fe22af
Component: engine
2015-02-10 10:48:54 -08:00
04be9f6857
docs: emphasis TESTFLAGS and add some descriptions
...
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: d83b6918a7d18a09f86858709f173277d62c268e
Component: engine
2015-02-10 15:34:33 +08:00
44b33ef557
Merge pull request #10652 from SvenDowideit/update-9456
...
update kernel reqs doc; recommend updates on RHEL
Upstream-commit: 4284715c79acf1cdc4da1e8af4827b157ed08bb6
Component: engine
2015-02-10 11:02:42 +10:00
48d21d06a2
updates from review
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 32c6179f475183ba778cb90656a971cde81340dc
Component: engine
2015-02-10 11:02:05 +10:00
2fa60db4e0
update kernel reqs doc; recommend updates on RHEL
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: b4089114efe23b18218886ec2085455d463c7179
Component: engine
2015-02-10 11:02:05 +10:00
9dcb95789e
remove the text-indent and increase the font size
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 6257505dbc44bb58c56ac92677dbf07548c0c74a
Component: engine
2015-02-10 09:50:02 +10:00
f24997510f
Simplfy the sidebar html and css, and then allow the text to wrap
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: c237f9f201bbf5c4b06fbfd65254eb2af75e136f
Component: engine
2015-02-10 09:50:02 +10:00
d0465f42ac
Merge pull request #10651 from HammerOfThor/master
...
docs: fix a typo in registry_mirror.md
Upstream-commit: a98355561d23a6b02d5c8d8c94e6ff54866efabf
Component: engine
2015-02-09 05:05:57 -05:00
ce923ef765
Merge pull request #10624 from stevekochscience/master
...
Add link to user guide to end of 14.04 section
Upstream-commit: c28ea14bbb5c16cd69aee384d5261f6a53581741
Component: engine
2015-02-09 14:05:33 +10:00
a8cd8cc163
docs: fix a typo in registry_mirror.md
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 40486d97098a457bcafd20691ca28648f373a0dc
Component: engine
2015-02-09 10:04:55 +08:00
f77ee21d7f
Merge pull request #10635 from chenhanxiao/docs-Dockerfile-typo
...
docs: fix a typo in Dockerfile.5.md
Upstream-commit: a1eb2bebb812e22c05eeec057b63810b14f6a563
Component: engine
2015-02-09 09:50:18 +10:00
9851ff3c8f
Update certificates.md
...
`openssl req -new -x509 -text -key client.key -out client.cert` creates a self-sign certificate but not a certificate request.
Signed-off-by: Wei-Ting Kuo <waitingkuo0527@gmail.com >
Upstream-commit: 2f69da2a5ef77966a057ff139d442e9f14ca7083
Component: engine
2015-02-09 04:36:00 +08:00
2fcf439ff5
docs: fix a typo in Dockerfile.5.md
...
s/Mutliple/Multiple
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: c4340de04faec1b9d54da62a8a2174da4d6a301b
Component: engine
2015-02-07 17:09:20 +08:00
6199c38a14
Merge pull request #10548 from SvenDowideit/add-webhook-image-list
...
The Hub build webhooks now list the images that have been built
Upstream-commit: 3807bd97777923cda57879d88e5779fe616191d2
Component: engine
2015-02-06 15:15:16 -08:00
b781d30f81
Merge pull request #10578 from SvenDowideit/copy-edit-10516-fedora-install
...
Copy edit 10516 fedora install
Upstream-commit: dfa1a8493788e3d72eadcd11c221d05306fe9dd0
Component: engine
2015-02-06 15:14:31 -08:00
d10ffd08ef
Merge pull request #10546 from SvenDowideit/update-boolean-flags-help
...
Documentation on boolean flags is wrong #10517
Upstream-commit: e706be77a46b11ed2202e226b10f547aa85a8a85
Component: engine
2015-02-06 15:12:11 -08:00
35392998b3
Merge pull request #10558 from gierschv/doc-remote-url
...
Documents build API "remote" parameter
Upstream-commit: c2f82bba0a7d365ae4712804d9aed50dff788898
Component: engine
2015-02-06 14:51:51 -08:00
72669b3feb
Add link to user guide to end of 14.04 section
...
Adding instructions to exit the test shell and a link to the user guide (as is done in the following sections for 12.04 and 13.04/10
Signed-off-by: Steven Koch <sjkoch@unm.edu >
Upstream-commit: 823cb1281060981a537b4d36315bf0a02074b2a2
Component: engine
2015-02-06 15:50:51 -07:00
4c675886ca
Merge pull request #10273 from kojiromike/patch-1
...
Distinguish ENV from setting environment inline
Upstream-commit: 7d4bbc2ed8305a730267e861bfe71ac7dbd3e373
Component: engine
2015-02-06 14:42:02 -08:00
440786c4fd
Merge pull request #10424 from LK4D4/fix_non_tailed_log_format
...
Fix logs, so now, old and followed logs has same format without []
Upstream-commit: e4a49ae1885a7f80e713d1d1fc852f6e4214dfe6
Component: engine
2015-02-06 14:35:45 -08:00
2d864c1626
Fix example about ps and linked containers
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0f8f04a77492ddf37ca9c163ef0c3ddaf8a93a40
Component: engine
2015-02-06 14:05:08 -08:00
a8eec7f547
Merge pull request #10605 from glasnt/readme_format
...
Format `awsconfig` sample config correctly
Upstream-commit: 2e947ae407252b9389ead7ee7d234bcfa6207342
Component: engine
2015-02-06 16:55:58 -05:00
225cdeb86f
Merge pull request #10611 from unclejack/systemd_doc_storage_path
...
docs/articles/systemd: correct --storage-driver
Upstream-commit: 9c63178e8678afb5d4f1305003d1dd01e4f3a43b
Component: engine
2015-02-06 16:52:28 -05:00
24564a4544
Merge pull request #10263 from hqhq/hq_check_memoryswap
...
add check for memoryswap
Upstream-commit: d1f18786ac009fedb716373ebc2ea6d646d3d8f2
Component: engine
2015-02-06 13:43:23 -08:00
f3b4b47f92
Documentation on boolean flags is wrong #10517
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 1e6e68361c6cc42ab92288e0a0132b14ef6c9426
Component: engine
2015-02-06 19:52:01 +10:00
20a29795dd
Do some major rearranging of the fedora/centos/rhel installation docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: eb814e4e703b4676e0cb410052d1145ee9f8628e
Component: engine
2015-02-06 19:48:19 +10:00
f31f8c4059
update fedora docs to reflect latest rpm changes
...
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org >
Upstream-commit: 66839cf3a6718f844e71d2561cc706c95f5629ec
Component: engine
2015-02-06 19:48:19 +10:00
