centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-06 03:08:58 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,979 Commits 56 Branches 28 Tags
fcb975cfd17cfbe45b7f6661c2c1c4a94de04c94
Commit Graph

2941 Commits

Author SHA1 Message Date
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
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
Fred Lifton
f6777c7a40 Adds new section for Known Issues to Release Notes. 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2015-01-15 16:09:48 -08:00
Sven Dowideit
9725433988 Merge pull request #10104 from thaJeztah/docs-add-note-to-cli-export 
Docs: Add note that export doesn't include volume data.
 2015-01-16 12:15:46 +13:00
James Turnbull
25a8602cba Merge pull request #9840 from nhsiehgit/searchapidocs 
updated search api docs to include pagination changes
 2015-01-15 17:40:04 -05:00
Doug Davis
ed13110e88 Add the list of possible values for --log-level to help text 
Closes #10034

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-01-15 12:20:41 -08:00
Nathan Hsieh
c252d5f3f4 changed format of cli note 
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
 2015-01-15 08:39:16 -08:00
Sebastiaan van Stijn
67588d0ec4 Docs: Add note that export doesn't include volume data. 
The documentation on `docker export` doesn't mention that
data in volumes is not included in the export.

This adds a note that volumes are not part of the export
and refers to the "Backup, restore, or migrate data volumes"
to give the user some pointers.

Relates to https://github.com/docker/docker/issues/10095

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-01-15 16:54:45 +01:00
imre Fitos
d10d0e568e docs: remove NAT rule when removing bridge 
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com>
 2015-01-14 23:06:13 -05:00
Sven Dowideit
18a2c77435 Add build --pull and evenets --filter flags to the docs for 1.4 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-01-15 15:20:48 +13:00
Nathan Hsieh
92ef40a826 added note to man & cli docs on search limit 
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
 2015-01-14 18:03:09 -08:00
Alexander Morozov
95c0f07966 Merge pull request #10093 from crosbymichael/readonly-containers 
Add --read-only for read only container rootfs
 2015-01-14 15:56:51 -08:00
Michael Crosby
409407091a Add --readonly for read only container rootfs 
Add a --readonly flag to allow the container's root filesystem to be
mounted as readonly.  This can be used in combination with volumes to
force a container's process to only write to locations that will be
persisted.  This is useful in many cases where the admin controls where
they would like developers to write files and error on any other
locations.

Closes #7923
Closes #8752

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-14 15:41:31 -08:00