Commit Graph

2996 Commits

Author SHA1 Message Date
Fred Lifton
99ca215c65 Merge pull request #10752 from psftw/tweak-docs-readme
Clean up explanation of doc branches.
2015-02-13 17:20:59 -08:00
Fred Lifton
ee95aa1b81 Merge pull request #10674 from cpuguy83/cleanup_Dockerfile_manpage
Cleans up docs/man/Dockerfile.5.md
2015-02-13 12:42:19 -08:00
Jessie Frazelle
8b010d9f10 Merge pull request #10715 from icecrime/keyserver_install_dependency
Use gpg from our server if keyserver is down
2015-02-13 11:29:39 -08:00
Brian Goff
14131b65c4 Cleans up docs/man/Dockerfile.5.md
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-13 12:47:58 -05:00
Arnaud Porterie
f058e9c43c 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>
2015-02-13 09:13:29 -08:00
Peter Salvatore
74b050bd0c Clean up explanation of doc branches.
Signed-off-by: Peter Salvatore <peter@psftw.com>
2015-02-12 17:02:56 -05:00
Arnaud Porterie
7a7c00ca08 Update docs for HTTP_PROXY
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-02-12 11:40:56 -08:00
Jessie Frazelle
f4749acad4 Merge pull request #10686 from LK4D4/bump_docs
Bump api version to 1.18
2015-02-11 11:01:28 -08:00
Sven Dowideit
54b59c2b2f Merge pull request #10632 from chenhanxiao/update-TESTFLAGS-docs
docs: emphasis TESTFLAGS and add some descriptions
2015-02-11 12:36:43 +10:00
Alexander Morozov
d92b4232f7 Bump api version to 1.18
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-10 10:48:54 -08:00
Chen Hanxiao
d83b6918a7 docs: emphasis TESTFLAGS and add some descriptions
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-02-10 15:34:33 +08:00
Sven Dowideit
4284715c79 Merge pull request #10652 from SvenDowideit/update-9456
update kernel reqs doc; recommend updates on RHEL
2015-02-10 11:02:42 +10:00
Sven Dowideit
32c6179f47 updates from review
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-10 11:02:05 +10:00
unclejack
b4089114ef update kernel reqs doc; recommend updates on RHEL
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-02-10 11:02:05 +10:00
Sven Dowideit
6257505dbc remove the text-indent and increase the font size
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-10 09:50:02 +10:00
Sven Dowideit
c237f9f201 Simplfy the sidebar html and css, and then allow the text to wrap
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-10 09:50:02 +10:00
James Turnbull
a98355561d Merge pull request #10651 from HammerOfThor/master
docs: fix a typo in registry_mirror.md
2015-02-09 05:05:57 -05:00
Sven Dowideit
c28ea14bbb Merge pull request #10624 from stevekochscience/master
Add link to user guide to end of 14.04 section
2015-02-09 14:05:33 +10:00
Zhang Wei
40486d9709 docs: fix a typo in registry_mirror.md
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-02-09 10:04:55 +08:00
Sven Dowideit
a1eb2bebb8 Merge pull request #10635 from chenhanxiao/docs-Dockerfile-typo
docs: fix a typo in Dockerfile.5.md
2015-02-09 09:50:18 +10:00
Wei-Ting Kuo
2f69da2a5e 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>
2015-02-09 04:36:00 +08:00
Chen Hanxiao
c4340de04f docs: fix a typo in Dockerfile.5.md
s/Mutliple/Multiple

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-02-07 17:09:20 +08:00
Michael Crosby
3807bd9777 Merge pull request #10548 from SvenDowideit/add-webhook-image-list
The Hub build webhooks now list the images that have been built
2015-02-06 15:15:16 -08:00
Michael Crosby
dfa1a84937 Merge pull request #10578 from SvenDowideit/copy-edit-10516-fedora-install
Copy edit 10516 fedora install
2015-02-06 15:14:31 -08:00
Jessie Frazelle
e706be77a4 Merge pull request #10546 from SvenDowideit/update-boolean-flags-help
Documentation on boolean flags is wrong #10517
2015-02-06 15:12:11 -08:00
Jessie Frazelle
c2f82bba0a Merge pull request #10558 from gierschv/doc-remote-url
Documents build API "remote" parameter
2015-02-06 14:51:51 -08:00
Steve Koch
823cb12810 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>
2015-02-06 15:50:51 -07:00
Michael Crosby
7d4bbc2ed8 Merge pull request #10273 from kojiromike/patch-1
Distinguish ENV from setting environment inline
2015-02-06 14:42:02 -08:00
Michael Crosby
e4a49ae188 Merge pull request #10424 from LK4D4/fix_non_tailed_log_format
Fix logs, so now, old and followed logs has same format without []
2015-02-06 14:35:45 -08:00
Alexander Morozov
0f8f04a774 Fix example about ps and linked containers
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-06 14:05:08 -08:00
Tibor Vass
2e947ae407 Merge pull request #10605 from glasnt/readme_format
Format `awsconfig` sample config correctly
2015-02-06 16:55:58 -05:00
Tibor Vass
9c63178e86 Merge pull request #10611 from unclejack/systemd_doc_storage_path
docs/articles/systemd: correct --storage-driver
2015-02-06 16:52:28 -05:00
Michael Crosby
d1f18786ac Merge pull request #10263 from hqhq/hq_check_memoryswap
add check for memoryswap
2015-02-06 13:43:23 -08:00
Sven Dowideit
1e6e68361c Documentation on boolean flags is wrong #10517
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-06 19:52:01 +10:00
Sven Dowideit
eb814e4e70 Do some major rearranging of the fedora/centos/rhel installation docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-06 19:48:19 +10:00
Lokesh Mandvekar
66839cf3a6 update fedora docs to reflect latest rpm changes
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2015-02-06 19:48:19 +10:00
Sven Dowideit
6081a3ca90 Merge pull request #10523 from SvenDowideit/hide-more-old-docker-api-docs
The reference menu is too big to list more than the latest API docs, so ...
2015-02-06 19:26:01 +10:00
unclejack
0b2f734462 docs/articles/systemd: correct --storage-driver
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-02-06 10:52:09 +02:00
Katie McLaughlin
df39336213 Format awsconfig sample config correctly
Reflow change in commit 195f3a3f removed newlines in the config format.

This change reverts the sample config to the original formatting, which
matches the actual config format of a `awsconfig` file.

Signed-off-by: Katie McLaughlin <katie@glasnt.com>
2015-02-06 13:45:10 +11:00
Fred Lifton
68b0ed54cb Merge pull request #10574 from SvenDowideit/docker-stats-limited-to-libcontainer
For now, docker stats appears to be libcontainer only
2015-02-05 17:52:36 -08:00
James Turnbull
eda9c14cb9 Merge pull request #10560 from MihaiB/docs-typo
docs: fix typo
2015-02-06 00:42:45 +01:00
James Turnbull
abdfb21e3a Merge pull request #10521 from SvenDowideit/docs-not-ready-yet
remove swarm, machine and compose from the 1.5.0 release docs
2015-02-05 03:42:14 +01:00
Fred Lifton
e13a0de7aa Merge pull request #10575 from SvenDowideit/elide-dhe-docs
The DHE documentation will not be published with 1.5.0
2015-02-04 18:16:42 -08:00
Fred Lifton
6dd2364dc2 Merge pull request #10576 from SvenDowideit/devicemapper-spelling-fix
Fix a small spelling error in the dm.blkdiscard docs
2015-02-04 17:42:31 -08:00
Qiang Huang
0c0f0d5ab4 update docs for memory and memoryswap
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-02-05 09:12:56 +08:00
Sven Dowideit
fcb975cfd1 Fix a small spelling error in the dm.blkdiscard docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-05 10:57:33 +10:00
Sven Dowideit
16a15ea581 Add an initial list of new features in Docker Engine 1.5.0
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-05 10:37:15 +10:00
Sven Dowideit
a7a9ce2635 remove swarm, machine and compose from the 1.5.0 release docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-05 10:30:57 +10:00
Sven Dowideit
9867dfa617 The DHE documentation will not be published with 1.5.0
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-05 10:26:53 +10:00
Sven Dowideit
1cc774b4fa Merge pull request #10508 from SvenDowideit/ctrl-backslash-used-to-generate-a-stacktrace
Remove docker attach generates a stacktrace on ctrl-\ docs, as i can't trigger it
2015-02-05 10:21:00 +10:00