Fred Lifton
c12fb48a8a
Merge pull request #10435 from SvenDowideit/add-dhe-placeholder-docs
...
DHE documentation placeholder and Navbar changes
2015-01-29 10:23:57 -08:00
Fred Lifton
5b9b5aff06
Merge pull request #10293 from SvenDowideit/test-9952
...
comment out the docker and curl lines we'll run later
2015-01-29 10:18:53 -08:00
Fred Lifton
9e10a888a3
Merge pull request #10428 from mehulkar/patch-1
...
Improve explanation of port mapping from containers
2015-01-29 10:07:24 -08:00
Mehul Kar
f1bc02e91f
Improve explanation of port mapping from containers
...
Signed-off-by: Mehul Kar <mehul.kar@gmail.com>
2015-01-29 09:09:44 -08:00
James Turnbull
ba8e1673ad
Merge pull request #10351 from duglin/FixDocsWorkdir
...
Fix docs so WORKDIR mentions it works for COPY and ADD too
2015-01-29 09:52:01 -05:00
Sven Dowideit
0ce3a49d64
DHE documentation placeholder and Navbar changes
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-01-29 20:50:43 +10:00
Sebastiaan van Stijn
c0969ed3d8
Replace "base" with "ubuntu" in documentation
...
The API documentation uses the "base" image in various
places. The "base" image is deprecated and it is no longer
possible to download this image.
This changes the API documentation to use "ubuntu" in stead.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-01-28 22:54:10 +01:00
James Turnbull
8d49ebd338
Merge pull request #10408 from estesp/fix-ipv6-docs
...
Fix incorrect IPv6 addresses/subnet notations in docs
2015-01-27 23:24:52 -05:00
Phil Estes
5945de43b0
Fix incorrect IPv6 addresses/subnet notations in docs
...
Fixes a few typos in IPv6 addresses. Will make it easier for users who
actually try and copy/paste or use the example addresses directly.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-01-27 22:45:43 -05:00
Sven Dowideit
de52a1998d
Merge pull request #10374 from SvenDowideit/add-ip-range-for-webhooks
...
tell users they can what IP range Hub webhooks can come from so they can...
2015-01-28 11:55:09 +10:00
Sven Dowideit
1d04cc513a
Add the registry mirror document to the menu
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2015-01-28 10:47:11 +10:00
James Turnbull
3ac5596fe0
Merge pull request #10369 from mcfiredrill/etc-host-typo
...
fix /etc/host typo in remote API docs
2015-01-27 18:35:16 -05:00
James Turnbull
b2b284b5cd
Merge pull request #10373 from chenhanxiao/docker-build-typo
...
docs: fix a typo in docker-build man page
2015-01-27 18:25:55 -05:00
Michael Crosby
e04cc93a2c
Merge pull request #10113 from imreFitos/master
...
docs: remove NAT rule when removing bridge
2015-01-27 11:22:53 -08:00
Sven Dowideit
6774be62d6
tell users they can what IP range Hub webhooks can come from so they can filter
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
2015-01-27 14:58:29 +10:00
Chen Hanxiao
dcfa881a7b
docs: fix a typo in docker-build man page
...
s/Dockefile/Dockerfile
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-01-27 11:19:02 +08:00
Doug Davis
f709da192c
Fix docs so WORKDIR mentions it works for COPY and ADD too
...
The docs around COPY/ADD already mentioned that it will do a relative
copy/add based on WORKDIR, so that part is already ok. Just needed to
tweak the WORKDIR section since w/o mentioning COPY/ADD it can be misleading.
Noticed by @phemmer
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-01-26 17:13:44 -08:00
Tony Miller
87d2adf070
fix /etc/host typo in remote API docs
...
Signed-off-by: Tony Miller <mcfiredrill@gmail.com>
2015-01-27 10:12:54 +09:00
Sven Dowideit
a79d363d2d
Merge pull request #10344 from SvenDowideit/pr_out_change_to_load_the_json_gz_file
...
Change to load the json.gz file
2015-01-27 11:12:07 +10:00
James Turnbull
c48f61cb7a
Merge pull request #10343 from unclejack/shrink_sprites-small_360
...
docs: shrink sprites-small_360.png
2015-01-26 19:28:40 -05:00
Sven Dowideit
f3fef31277
Merge pull request #10272 from mcfiredrill/document-extrahosts-remote-api
...
document the ExtraHosts parameter for /containers/create for the remote ...
2015-01-27 10:25:00 +10:00
Sven Dowideit
60089ace48
as we're not using the search suggestion feature only load the search_content when we have a search ?q= param
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2015-01-27 09:57:45 +10:00
Sven Dowideit
64f67af2b2
set the content-type for the search_content.json.gz
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2015-01-27 09:57:44 +10:00
Sven Dowideit
a78130467a
Change to load the json.gz file
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2015-01-27 09:57:44 +10:00
unclejack
1e41d57bd4
docs: compress search_content.json for release
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Docker-DCO-1.1-Signed-off-by: unclejack <unclejacksons@gmail.com> (github: SvenDowideit)
2015-01-27 09:57:43 +10:00
unclejack
6bbf19dfbe
docs: shrink sprites-small_360.png
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-01-26 08:11:20 +02:00
DiuDiugirl
471006c02f
Fix a minor typo
...
Docker inspect can also be used on images, this patch fixed the
minor typo in file docker/flags.go and docs/man/docker.1.md
Signed-off-by: DiuDiugirl <sophia.wang@pku.edu.cn>
2015-01-24 15:08:33 +08:00
Tony Miller
54c10fe81d
document the ExtraHosts parameter for /containers/create for the remote API
...
I think this was added from version 1.15.
Signed-off-by: Tony Miller <mcfiredrill@gmail.com>
2015-01-23 23:52:04 +09:00
James Turnbull
d3a6a53fa5
Merge pull request #10292 from SvenDowideit/pr_out_update_using_supervisord_md
...
Update using_supervisord.md
2015-01-23 00:09:25 -05:00
Sven Dowideit
992beb2a96
Merge pull request #9952 from flowlo/doc-https
...
doc: Improve article on HTTPS
2015-01-23 12:34:57 +10:00
Sven Dowideit
eaf1b88212
comment out the docker and curl lines we'll run later
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2015-01-23 12:31:39 +10:00
GennadySpb
99dc224d85
Update using_supervisord.md
...
Fix factual error
change made by: GennadySpb <lipenkov@gmail.com>
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
2015-01-23 10:43:57 +10:00
Lorenz Leutgeb
a51554988e
Fix inconsistent formatting
...
Colon was bold, but regular at other occurences.
Blame cf27b310c4
Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
2015-01-22 21:46:01 +01:00
Lorenz Leutgeb
048b20e58a
doc: Minor semantical/editorial fixes in HTTPS article
...
"read-only" vs. "only readable by you"
Refer to:
https://github.com/docker/docker/pull/9952#discussion_r22690266
Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
2015-01-22 21:37:39 +01:00
Lorenz Leutgeb
6ca2875e58
doc: Editorial changes as suggested by @fredlf
...
Refer to:
* https://github.com/docker/docker/pull/9952#discussion_r22686652
* https://github.com/docker/docker/pull/9952#discussion_r22686804
Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
2015-01-22 21:37:39 +01:00
Lorenz Leutgeb
02a793c6a1
doc: Improve article on HTTPS
...
* Adjust header to match _page_title
* Add instructions on deletion of CSRs and setting permissions
* Simplify some path expressions and commands
* Consqeuently use ~ instead of ${HOME}
* Precise formulation ('key' vs. 'public key')
* Fix wrong indentation of output of `openssl req`
* Use dash ('--') instead of minus ('-')
Remark on permissions:
It's not a problem to `chmod 0400` the private keys, because the
Docker daemon runs as root (can read the file anyway) and the Docker
client runs as user.
Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
2015-01-22 21:37:39 +01:00
Andrew C. Bodine
51060ee07a
Adds docs for /containers/(id)/attach/ws api endpoint
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
2015-01-21 18:37:08 -08:00
Michael Crosby
edaf23b7a7
Merge pull request #10145 from duglin/Issue10141
...
Docker run -e FOO should erase FOO if FOO isn't set in client env
2015-01-21 14:16:51 -08:00
Michael Crosby
db9b1e3654
Update to docker stats documentation
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 11:44:23 -08:00
Michael Crosby
4b173199fd
Exit cli when all containers when no more containers to monitor
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 08:55:23 -08:00
Michael Crosby
76141a0077
Add documentation for stats feature
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:47 -08:00
Fred Lifton
620b58068f
Merge pull request #10173 from SvenDowideit/release-1.5-combined-documentation
...
An initial quick import of documentation from Compose, Machine and Swarm
2015-01-20 17:08:55 -08:00
James Turnbull
a276706719
Merge pull request #10206 from jfrazelle/add-docs-memory-swap
...
Add docs for `--memory-swap`.
2015-01-20 18:20:13 -05:00
Fred Lifton
e6a70a6f81
Merge pull request #10135 from coolljt0725/update_link_docs
...
Update the docs for --link accept container id
2015-01-19 18:12:50 -08:00
Michael Crosby
1efc940e6f
Merge pull request #10124 from duglin/Issue10034
...
Add the list of possible values for --log-level to help text
2015-01-19 17:09:18 -08:00
Jessica Frazelle
7bb4b56cf9
Add docs for `--memory-swap`.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-19 16:17:58 -08:00
Sven Dowideit
04d1b93fce
Merge pull request #10170 from thaJeztah/docs-note-environment-vars
...
Document that ENV vars are not automatically updated
2015-01-20 10:04:25 +10:00
Sven Dowideit
e08858a80d
Merge pull request #10175 from fossilet/patch-1
...
Add usage of port mapping for Boot2docker.
2015-01-20 10:03:32 +10:00
James Turnbull
826e0beade
Merge pull request #10192 from icecrime/9951_client_proxy_doc
...
Add documentation for HTTP proxies
2015-01-19 18:55:25 -05:00
Tibor Vass
50ff27caa1
Merge pull request #9826 from icecrime/8318_whitespace_add_copy
...
Support whitespace in paths for ADD and COPY
2015-01-19 18:37:53 -05:00