6a1da678de
Add missing $HOST in a couple places in HTTPS/TLS setup docs
...
Fix typos in setup docs where tcp://:2376 is used without the $HOST
parameter.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
2015-01-30 11:20:50 -05:00
80b843b731
Some small updates to the dev env docs.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2015-01-29 16:01:05 -08:00
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
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
9e10a888a3
Merge pull request #10428 from mehulkar/patch-1
...
Improve explanation of port mapping from containers
2015-01-29 10:07:24 -08:00
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
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
0ce3a49d64
DHE documentation placeholder and Navbar changes
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-01-29 20:50:43 +10:00
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
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
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
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
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
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
e04cc93a2c
Merge pull request #10113 from imreFitos/master
...
docs: remove NAT rule when removing bridge
2015-01-27 11:22:53 -08:00
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
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
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
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
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
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
992beb2a96
Merge pull request #9952 from flowlo/doc-https
...
doc: Improve article on HTTPS
2015-01-23 12:34:57 +10:00
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
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
a51554988e
Fix inconsistent formatting
...
Colon was bold, but regular at other occurences.
Blame cf27b310c4lorenz.leutgeb@gmail.com >
2015-01-22 21:46:01 +01:00
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
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
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
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
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
db9b1e3654
Update to docker stats documentation
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-01-21 11:44:23 -08:00
76141a0077
Add documentation for stats feature
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-01-20 20:21:47 -08:00
a276706719
Merge pull request #10206 from jfrazelle/add-docs-memory-swap
...
Add docs for `--memory-swap`.
2015-01-20 18:20:13 -05:00
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
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
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
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
e08858a80d
Merge pull request #10175 from fossilet/patch-1
...
Add usage of port mapping for Boot2docker.
2015-01-20 10:03:32 +10:00
826e0beade
Merge pull request #10192 from icecrime/9951_client_proxy_doc
...
Add documentation for HTTP proxies
2015-01-19 18:55:25 -05:00
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
3a1dbef823
Add documentation for HTTP proxies
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-01-19 11:23:31 -08:00
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
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
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
1b4a926377
Fix typo.
...
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com >
2015-01-19 18:02:23 +08:00
9dc2d0b8a3
Add usage of port mapping for Boot2docker.
...
Signed-off-by: Yongzhi Pan <panyongzhi@gmail.com >
2015-01-19 16:44:13 +08:00
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
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
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
73baa673c7
fix typo 'setup/set up'
...
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com >
2015-01-17 11:21:25 -05:00
Phil Estes