Sebastiaan van Stijn
cc0bfccdf4
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-02-02 13:34:12 -08:00
Chen Hanxiao
0c18ec62f3
docs: fix another typo in docker-build man page
...
s/arbtrary/arbitrary
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-02-02 13:30:11 -08:00
John Tims
a9825c9bd8
Fix documentation typo
...
Signed-off-by: John Tims <john.k.tims@gmail.com >
2015-02-02 13:30:11 -08:00
Phil Estes
9974663ed7
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-02-02 13:30:10 -08:00
Jessica Frazelle
604731a930
Some small updates to the dev env docs.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2015-02-02 13:30:09 -08:00
Sven Dowideit
817d04d992
DHE documentation placeholder and Navbar changes
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-02-02 13:30:09 -08:00
Sven Dowideit
cdff91a01c
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-02-02 13:30:09 -08:00
Mehul Kar
6f26bd0e16
Improve explanation of port mapping from containers
...
Signed-off-by: Mehul Kar <mehul.kar@gmail.com >
2015-02-02 13:30:09 -08:00
Sven Dowideit
072b09c45d
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-27 19:35:26 -08:00
Sven Dowideit
6532a075f3
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 19:35:26 -08:00
Chen Hanxiao
3b4a4bf809
docs: fix a typo in docker-build man page
...
s/Dockefile/Dockerfile
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-01-27 19:35:26 -08:00
Tony Miller
4602909566
fix /etc/host typo in remote API docs
...
Signed-off-by: Tony Miller <mcfiredrill@gmail.com >
2015-01-27 19:35:25 -08:00
Sven Dowideit
588f350b61
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 19:35:25 -08:00
Sven Dowideit
6e5ff509b2
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 19:35:25 -08:00
Sven Dowideit
61d341c2ca
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 19:35:25 -08:00
unclejack
b996d379a1
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 19:35:25 -08:00
unclejack
6646cff646
docs: shrink sprites-small_360.png
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-01-27 19:35:25 -08:00
DiuDiugirl
48754d673c
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-27 19:35:25 -08:00
Tony Miller
08f2fad40b
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-27 19:35:24 -08:00
GennadySpb
f91fbe39ce
Update using_supervisord.md
...
Fix factual error
change made by: GennadySpb <lipenkov@gmail.com >
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
2015-01-27 19:35:24 -08:00
Lorenz Leutgeb
7b2e67036f
Fix inconsistent formatting
...
Colon was bold, but regular at other occurences.
Blame cf27b310c4
Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com >
2015-01-27 19:35:24 -08:00
Lorenz Leutgeb
e130faea1b
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-27 19:35:24 -08:00
Lorenz Leutgeb
38f09de334
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-27 19:35:24 -08:00
Lorenz Leutgeb
f9ba68ddfb
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-27 19:35:23 -08:00
Andrew C. Bodine
32f189cd08
Adds docs for /containers/(id)/attach/ws api endpoint
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com >
2015-01-27 19:35:23 -08:00
imre Fitos
7bf03dd132
fix typo 'setup/set up'
...
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com >
2015-01-27 19:35:23 -08:00
imre Fitos
034aa3b2c4
start docker before checking for updated NAT rule
...
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com >
2015-01-27 19:35:23 -08:00
imre Fitos
6da1e01e6c
docs: remove NAT rule when removing bridge
...
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com >
2015-01-27 19:35:23 -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