centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 08:18:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,834 Commits 54 Branches 28 Tags
c81fb7fa4a41dfdc21eb37dade0eb71bd1dfa855
Commit Graph

2902 Commits

Author SHA1 Message Date
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
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
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
Arnaud Porterie
3a1dbef823 Add documentation for HTTP proxies 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-01-19 11:23:31 -08:00
Doug Davis
9ab73260f8 Docker run -e FOO should erase FOO if FOO isn't set in client env 
See #10141 for more info, but the main point of this is to make sure
that if you do "docker run -e FOO ..." that FOO from the current env
is passed into the container.  This means that if there's a value, its
set.  But it also means that if FOO isn't set then it should be unset in
the container too - even if it has to remove it from the env.  So,
   unset HOSTNAME
   docker run -e HOSTNAME busybox env
should _NOT_ show HOSTNAME in the list at all

Closes #10141

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-01-19 08:00:32 -08:00
James Turnbull
27602f2a21 Merge pull request #10138 from ShockwaveNN/patch-1 
fix link to introducion on 'Working with Docker Images' page
 2015-01-19 10:53:15 -05:00
James Turnbull
6286c0711f Merge pull request #10167 from bgazzera/master 
There was a missing command to re-run the web container.
 2015-01-19 10:50:08 -05:00
Liang-Chi Hsieh
1b4a926377 Fix typo. 
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com>
 2015-01-19 18:02:23 +08:00
Yongzhi Pan
9dc2d0b8a3 Add usage of port mapping for Boot2docker. 
Signed-off-by: Yongzhi Pan <panyongzhi@gmail.com>
 2015-01-19 16:44:13 +08:00
Sven Dowideit
1b2032c82e An initial quick import of documentation from Compose, Machine and Swarm 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2015-01-19 14:23:39 +10:00
Lei Jitang
750373875e Update the docs for --link accept container id 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-01-19 09:57:44 +08:00
Sebastiaan van Stijn
3fb06dc104 Document that ENV vars are not automatically updated 
Unlike the entries in `/etc/hosts`, environment-variables for linked
containers are not automatically updated if the linked container is
restarted.

This adds a note to the documentation in;
https://docs.docker.com/userguide/dockerlinks/#environment-variables
and
https://docs.docker.com/reference/run/#env-environment-variables

To make users aware that this is the case and recommends them to use
the `/etc/hosts` entries in stead.

I added this change because users were expecting environment variables
to be updated automatically as well (https://github.com/docker/docker/issues/10164).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-01-19 00:23:57 +01:00
Bruno Gazzera
44cde56333 There was a missing command to re-run the web container. 
Signed-off-by: Bruno Gazzera <bgazzera@paginar.com>
 2015-01-18 12:17:49 -03:00
imre Fitos
73baa673c7 fix typo 'setup/set up' 
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com>
 2015-01-17 11:21:25 -05:00
Jessie Frazelle
00d19150bb Merge pull request #9941 from SvenDowideit/build-pull-option-docs 
Add build --pull and evenets --filter flags to the docs for 1.4
 2015-01-16 13:49:56 -08:00
Jessie Frazelle
eaf3c6f1ac Merge pull request #10125 from estesp/9960-add-backingfs-info 
Add backing filesystem info to `docker info` command where applicable
 2015-01-16 13:41:37 -08:00
Phil Estes
48b1dd0084 Add backing filesystem info to docker info command where applicable 
Fixes #9960

This adds the output of a "Backing Filesystem:" entry to `docker info`
to overlay, aufs, and devicemapper graphdrivers. The default list
includes a fairly complete list of common filesystem names from
linux/include/uapi/linux/magic.h, but if the backing filesystem is not
recognized, the code will simply show "<unknown>"

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2015-01-16 14:43:43 -05:00
James Turnbull
30468cdbae Merge pull request #10127 from fredlf/known-issues 
Adds new section for Known Issues to Release Notes.
 2015-01-16 09:45:34 -05:00
Pavel Lobashov
43b9736842 fix link to introducion on 'Working with Docker Images' page 
Old link go to Table of content page, but by context it should go to 'understaning-docker' pag

Signed-off-by: Pavel Lobashov <shockwavenn@gmail.com>
 2015-01-16 14:16:10 +03:00
imre Fitos
457f212373 start docker before checking for updated NAT rule 
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com>
 2015-01-15 21:32:38 -05:00
Fred Lifton
22437eb960 Merge pull request #9937 from SvenDowideit/add-https-test 
Add a containerised test for the https cert doc
 2015-01-15 17:53:40 -08:00