Médi-Rémi Hashim
d22d32d61f
Grammatical mistake in docs
...
Change `The team can now use this image by run their own containers.` to `The team can now use this image by running their own containers.`
2014-11-01 21:22:43 +00:00
Fred Lifton
4d4a7b81bf
Merge pull request #8884 from thomasleveil/userguide-so26652877
...
Reword a sentence bringing confusion about docker links
2014-10-31 17:09:16 -07:00
Jessie Frazelle
92bb497201
Merge pull request #8167 from brahmaroutu/expose_ports_1834
...
adding support for port ranges on --expose
2014-10-31 16:20:08 -07:00
Srini Brahmaroutu
fd774a818c
adding support for port ranges on --expose
...
Closes #1834
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2014-10-31 23:06:30 +00:00
Michael Crosby
7cb12133ae
Merge pull request #8818 from coolljt0725/fix_exec_help
...
Fix docker exec help messages.
2014-10-31 14:36:01 -07:00
Jessie Frazelle
058aa0cbc2
Merge pull request #8894 from vieux/fix_docs_filter
...
add missing 'current filter' to ps
2014-10-31 14:26:29 -07:00
Victor Vieux
f95d73dfd4
add missing 'current filter' to ps
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-10-31 18:28:10 +00:00
Michael Crosby
0f9f5f3fdf
Merge pull request #8839 from irachex/dns-search-doc
...
Add docs for --dns-search=.
2014-10-31 11:25:57 -07:00
Thomas LEVEIL
906985123a
Reword a sentence bringing confusion about docker links
...
As [discovered][1] doing user support, the sentence `You've learned that a link creates a
source container that can provide information about itself to a recipient container` brings
confusion.
[1]: http://stackoverflow.com/questions/26652877/how-to-avoid-redundant-container-linking-in-docker-when-propagating-ip-addresses/26654203?noredirect=1#comment41945048_26654203
Signed-off-by: Thomas LEVEIL <thomasleveil@gmail.com >
2014-10-31 13:00:59 +00:00
Huayi Zhang
eaa050fdb8
Mapping change in code
...
Signed-off-by: Huayi Zhang <irachex@gmail.com >
2014-10-31 09:57:54 +08:00
Sven Dowideit
107898a773
Merge pull request #8837 from sawalls/patch-2
...
ubuntulinux.md - old commands, typo, section movement
2014-10-30 18:48:24 -07:00
Lei Jitang
d8b17d785a
Fix docker exec command help messages
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2014-10-31 09:36:07 +08:00
Scott Walls
bc62a35ffb
ubuntulinux.md - old commands, typo, section movement
...
- Removed some commands related to autocomplete/symlinks that don't seem to be required anymore on Ubuntu 14.04
- Fixed one minor typo ("see LINK _for_ details," not "see LINK details")
- Moved section "Giving non-root access" to top level, rather than being under Ubuntu 13 (the section isn't specific to Ubuntu 13, and even references Ubuntu 14).
Signed-off-by: Scott Walls <sawalls@umich.edu >
2014-10-30 18:28:37 -07:00
Tibor Vass
e43d9f713e
Docs edits for dropping SSLv3 and under + release notes for 1.3.1
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
docs/sources/index.md
Conflicts:
docs/sources/index.md
2014-10-30 19:44:42 -04:00
Tibor Vass
6a1ff022b0
Do not verify certificate when using --insecure-registry on an HTTPS registry
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
registry/registry.go
registry/registry_test.go
registry/service.go
registry/session.go
Conflicts:
registry/endpoint.go
registry/registry.go
2014-10-30 19:44:09 -04:00
Michael Crosby
48f7384d63
Expand documentation for --insecure-registries
...
Signed-off-by: Michael Crosby <michael@docker.com >
2014-10-30 19:41:55 -04:00
unclejack
380c8320a7
make http usage for registry explicit
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Conflicts:
daemon/config.go
daemon/daemon.go
graph/pull.go
graph/push.go
graph/tags.go
registry/registry.go
registry/service.go
2014-10-30 19:41:55 -04:00
Fred Lifton
c3762c3abf
Merge pull request #8822 from wilsaj/patch-2
...
Update host integration article
2014-10-30 12:19:36 -07:00
Andy Wilson
9542ea7218
doc: Update host integration article
...
Update for changes in docker 1.2. Running the docker daemon with "-r=false" has been deprecated in favor of per-container restart policies.
Signed-off-by: wilsaj <wilson.andrew.j+github@gmail.com >
2014-10-30 13:39:45 -05:00
Huayi Zhang
36ffbd7acf
Add docs for --dns-search=.
...
PR 6720 introduce that use `--dns-search=.` will not set `search` in `/etc/resolv.conf`.
Signed-off-by: Huayi Zhang <irachex@gmail.com >
2014-10-30 21:04:35 +08:00
James Turnbull
b63a254522
Merge pull request #8747 from SvenDowideit/lets-tell-them-more-about-exec
...
Add a link to some documentation about exec.
2014-10-30 07:56:55 -04:00
Fred Lifton
461d33eeb0
Adds new Docs Style Guide.
...
Includes changes to mkdocs yml and removes style info from docs Read Me, adding a link instead.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Conflicts:
docs/README.md
Revisions to style guide based on review.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
More Style Guide revisions based on review.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
A few more style guide copy edits
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-10-29 16:43:58 -07:00
Sven Dowideit
7d538542ca
Merge pull request #8790 from cloojure/patch-2
...
Update faq.md
2014-10-28 19:55:00 -07:00
Sven Dowideit
f1ddda6cf7
Merge pull request #8808 from nhsiehgit/dockerfiletut
...
changed dockerfile back button to look nicer
2014-10-28 19:41:18 -07:00
Sven Dowideit
90221e28d6
Merge pull request #8646 from ndeloof/patch-3
...
Update docker_remote_api.md
2014-10-28 19:08:55 -07:00
James Turnbull
75ae546377
Merge pull request #8750 from matm/patch-2
...
dockerimages.md: typo fix
2014-10-28 22:04:43 -04:00
James Turnbull
01454a50cc
Merge pull request #8762 from fredlf/tutorial-tweaks
...
Tweaks to Dockerfile tutorial
2014-10-28 22:04:23 -04:00
Jessie Frazelle
eb1b785e67
Merge pull request #8772 from aluzzardi/docker-info-mem-cpu
...
Expose # of CPUs and memory available on docker info.
2014-10-28 14:14:10 -07:00
Nathan Hsieh
7597f27276
changed dockerfile back button to look nicer
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
2014-10-28 11:52:49 -07:00
Erik Hollensbe
e377716b37
builder: Update documentation WRT environment replacement
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
2014-10-27 23:37:27 +00:00
Alan Thompson
6e208b7f1c
Update faq.md
...
Minor language clarification.
2014-10-26 19:57:52 -07:00
Andrea Luzzardi
61f8001c23
Expose # of CPUs and memory available on docker info.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-24 15:56:37 -07:00
James Turnbull
78075abf81
Merge pull request #8746 from aluzzardi/bump-api-v1.16
...
Bump API to v1.16.
2014-10-24 16:47:48 -04:00
Fred Lifton
fcae37402a
Add back Best Practices link.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-10-24 13:17:14 -07:00
Fred Lifton
cc45b13ad4
Tweaks to Dockerfile tutorial
...
Made a few tweaks to Dockerfile tutorial links and removed some cruft from the tutorial itself.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-10-24 12:00:47 -07:00
Andrea Luzzardi
ca6cc65609
Bump API to v1.16.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2014-10-24 11:25:44 -07:00
Nicolas De loof
ab03e898ff
Document alternate command to check encrypted TCP socket
...
as curl command seems to fail on OSX Mavericks
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
2014-10-24 09:15:15 +02:00
Mathias Monnerville
417fde550e
dockerimages.md: typo fix
2014-10-24 09:09:20 +02:00
Sven Dowideit
7f1ea7129e
Add a link to some documentation about exec.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-24 12:41:19 +10:00
James Turnbull
8f79bd964f
Merge pull request #8695 from SvenDowideit/add-details-to-entrypoint-docs
...
Rewrite ENTRYPOINT documentation covering all the combinations with exam...
2014-10-23 21:37:36 -04:00
Sven Dowideit
0390d04d8a
Rewrite ENTRYPOINT documentation covering all the combinations with examples.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-23 12:12:08 +10:00
Sven Dowideit
bb3e33154d
Merge pull request #8673 from SvenDowideit/whats-docker-version
...
DOCKER_VERSION and docker-version havn't been implemented.
2014-10-22 19:03:54 -07:00
Torstein Husebø
64cb772538
Correct url from github.com/dotcloud/docker{,-py}
...
to github.com/docker/docker{,-py}
Signed-off-by: Torstein Husebø <torstein@huseboe.net >
2014-10-22 16:57:39 +02:00
Sven Dowideit
6aeda16995
Merge pull request #8682 from wpp/update_linking_documentation
...
Update linking documentation
2014-10-21 21:01:51 -07:00
Sven Dowideit
a9258f7849
Merge pull request #8680 from wilsaj/patch-1
...
Docfix: fix cli dashes in boot2docker resizing article
2014-10-21 21:00:53 -07:00
James Turnbull
ca500e0039
Merge pull request #8651 from flisky/patch-1
...
fix a small typo
2014-10-21 23:40:34 -04:00
Philipp Weissensteiner
5df2c878a1
Update container linking documentation
...
As of 1.3 `docker ps` no longer shows links between containers.
This updates the documentation to reflect that change.
sudo docker docker inspect -f "{{ .HostConfig.Links }}" web
Signed-off-by: Philipp Weissensteiner <mail@philippweissensteiner.com >
2014-10-21 21:58:05 +02:00
Andy Wilson
36dae27fa2
fix cli dashes in boot2docker resizing article
...
The CLI commands had long dashes that won't work on most terminals when copy pasting.
Signed-off-by: wilsaj <wilson.andrew.j+github@gmail.com >
2014-10-21 11:38:19 -05:00
Sven Dowideit
6ed610fb80
DOCKER_VERSION and docker-version havn't been implemented.
...
So far, it looks like the declarations are not used, and so its safer not to
confuse people into thinking they do something.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-21 16:04:11 +10:00
Sven Dowideit
9e137ceb57
Link to run reference from cli doc
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
2014-10-21 11:21:11 +10:00