1ce2377d8b
Merge pull request #8390 from MalteJ/set-macaddress
...
Adding docker-cli run param to set MAC address
Upstream-commit: 9eb8fcd58a5dc0a6fd812fc2bdc410f36dd63cc0
Component: engine
2014-11-04 07:54:59 -08:00
d1a9c32b50
enhancing set-macaddress docu #2
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: 28605bc4d55bcfc7a5562e4de3e01b1d5cd9bdcd
Component: engine
2014-11-04 15:19:47 +01:00
8be6c529c8
Merge pull request #8924 from pdericson/api-doc-fix
...
Fix typo in api docs: stdou -> stdout
Upstream-commit: b68d7d39bcd96744eec883bb305e907c10fe6aa6
Component: engine
2014-11-03 23:09:16 -08:00
fe1e9f085e
Merge pull request #8907 from icecrime/clarify_user_instruction_doc
...
Clarify USER instruction documentation
Upstream-commit: 8872c2903a36b3fbdb76046a4d15cf994d7e336a
Component: engine
2014-11-03 11:58:56 -08:00
0798cdafc5
Update "official repos" doc to mention 100 char short desc limit
...
The Hub no longer accepts short descriptions over 100 characters.
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: 693b9d335cc1fe688a7fffb62e5da97a5d5a3b13
Component: engine
2014-11-03 10:12:05 -07:00
299f6b0aa6
Fix typo in api docs: stdou -> stdout
...
Upstream-commit: 4437573c96cdc52e98f44356be5c96dff4ce5907
Component: engine
2014-11-03 10:52:50 +00:00
590a54ca61
enhancing set-macaddress docu
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: 971fc2253af77ae4a22a3741fff51d84cd9bc697
Component: engine
2014-11-03 11:43:27 +01:00
3856bb0808
Clarify USER instruction documentation
...
Reuse WORKDIR wording to specify that the USER instructions affect the
following RUN, CMD, and ENTRYPOINT instructions.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: de9bf24750e0a9774a475eae74cbd2c241224e10
Component: engine
2014-11-01 14:04:51 -07:00
c0897a4514
Adding docker-cli run param to set MAC address
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: f2df38050e019c0db265e7c3e38ee0de8948ca77
Component: engine
2014-11-01 15:35:09 +01:00
9fda67e5fe
Merge pull request #8884 from thomasleveil/userguide-so26652877
...
Reword a sentence bringing confusion about docker links
Upstream-commit: 4d4a7b81bf82e243bca07af815cb1fe03193b135
Component: engine
2014-10-31 17:09:16 -07:00
3613ec484c
Merge pull request #8167 from brahmaroutu/expose_ports_1834
...
adding support for port ranges on --expose
Upstream-commit: 92bb49720199918b808bcb7544b69f16e3d45c49
Component: engine
2014-10-31 16:20:08 -07:00
b972337ce2
adding support for port ranges on --expose
...
Closes #1834
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: fd774a818c7d8942922b4f74eabd2a4e14094e1a
Component: engine
2014-10-31 23:06:30 +00:00
e50667ec3a
Merge pull request #8818 from coolljt0725/fix_exec_help
...
Fix docker exec help messages.
Upstream-commit: 7cb12133ae362055ff51d1ea5f71ad9cef6b2fae
Component: engine
2014-10-31 14:36:01 -07:00
214986ab4e
Merge pull request #8894 from vieux/fix_docs_filter
...
add missing 'current filter' to ps
Upstream-commit: 058aa0cbc2f1f85cf777138761389f9bb4af6584
Component: engine
2014-10-31 14:26:29 -07:00
287b15d7a3
add missing 'current filter' to ps
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: f95d73dfd48ad4a3211f2f5e89e8195e2066c939
Component: engine
2014-10-31 18:28:10 +00:00
e8cb0ca4b5
Merge pull request #8839 from irachex/dns-search-doc
...
Add docs for --dns-search=.
Upstream-commit: 0f9f5f3fdfd45ef7759d6b163860aac4436bf9b7
Component: engine
2014-10-31 11:25:57 -07:00
d4dfa6563a
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 >
Upstream-commit: 906985123aa6b7874c3c0e21f0fb5603928ff6dd
Component: engine
2014-10-31 13:00:59 +00:00
c33ebe12c4
Mapping change in code
...
Signed-off-by: Huayi Zhang <irachex@gmail.com >
Upstream-commit: eaa050fdb8fed612b3cd5d204fddaedf27a20370
Component: engine
2014-10-31 09:57:54 +08:00
0dbcc807c8
Merge pull request #8837 from sawalls/patch-2
...
ubuntulinux.md - old commands, typo, section movement
Upstream-commit: 107898a773d7345119917cf8f879a2c71f0a940c
Component: engine
2014-10-30 18:48:24 -07:00
4454d2b409
Fix docker exec command help messages
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d8b17d785a03246cb3a081223a0242469af7d410
Component: engine
2014-10-31 09:36:07 +08:00
4085dd6a28
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 >
Upstream-commit: bc62a35ffb2eeacb3ae79bc65076a01744d78a5d
Component: engine
2014-10-30 18:28:37 -07:00
fce9329c80
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
Upstream-commit: e43d9f713e96daed521034995c00375544f62827
Component: engine
2014-10-30 19:44:42 -04:00
6d16ddef35
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
Upstream-commit: 6a1ff022b0744213ed588d9c16dbb13ce055eda6
Component: engine
2014-10-30 19:44:09 -04:00
3def82482e
Expand documentation for --insecure-registries
...
Signed-off-by: Michael Crosby <michael@docker.com >
Upstream-commit: 48f7384d6365c59b4b61d527630aaf88af24f6dd
Component: engine
2014-10-30 19:41:55 -04:00
6b54bde512
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
Upstream-commit: 380c8320a78dc16da65d9d13004422ac5a0cca53
Component: engine
2014-10-30 19:41:55 -04:00
9d604d6213
Merge pull request #8822 from wilsaj/patch-2
...
Update host integration article
Upstream-commit: c3762c3abf0c217f5d84729cf15d00f9befc4815
Component: engine
2014-10-30 12:19:36 -07:00
59014e2c8a
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 >
Upstream-commit: 9542ea72188614d5b14f9e7fc31c80e6425738c4
Component: engine
2014-10-30 13:39:45 -05:00
3a00799059
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 >
Upstream-commit: 36ffbd7acf60d15942c0591bb4fec498f021331e
Component: engine
2014-10-30 21:04:35 +08:00
abcf5d1b6e
Merge pull request #8747 from SvenDowideit/lets-tell-them-more-about-exec
...
Add a link to some documentation about exec.
Upstream-commit: b63a254522319b9f49cb45f15689968405cf9045
Component: engine
2014-10-30 07:56:55 -04:00
6261aec6ba
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)
Upstream-commit: 461d33eeb0fe1058c9fcea39124c2d1f9e141765
Component: engine
2014-10-29 16:43:58 -07:00
ff26af6419
Merge pull request #8790 from cloojure/patch-2
...
Update faq.md
Upstream-commit: 7d538542ca53488f32db377984b7917480d60917
Component: engine
2014-10-28 19:55:00 -07:00
648f649fec
Merge pull request #8808 from nhsiehgit/dockerfiletut
...
changed dockerfile back button to look nicer
Upstream-commit: f1ddda6cf735e214a3980a000b1cbfb0d893e38a
Component: engine
2014-10-28 19:41:18 -07:00
1b7aca4d0a
Merge pull request #8646 from ndeloof/patch-3
...
Update docker_remote_api.md
Upstream-commit: 90221e28d61ed2a71ebbc8160d60156b8145dc43
Component: engine
2014-10-28 19:08:55 -07:00
088e4a75d9
Merge pull request #8750 from matm/patch-2
...
dockerimages.md: typo fix
Upstream-commit: 75ae54637778e98e06200d2a02afcab6902805aa
Component: engine
2014-10-28 22:04:43 -04:00
025009b453
Merge pull request #8762 from fredlf/tutorial-tweaks
...
Tweaks to Dockerfile tutorial
Upstream-commit: 01454a50cc3fe2bd5a86befa69427dc2bbaa604e
Component: engine
2014-10-28 22:04:23 -04:00
ec0d91155f
Merge pull request #8772 from aluzzardi/docker-info-mem-cpu
...
Expose # of CPUs and memory available on docker info.
Upstream-commit: eb1b785e67784ccc9b521566fbc1737d6177d9ad
Component: engine
2014-10-28 14:14:10 -07:00
3de9330fda
changed dockerfile back button to look nicer
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 7597f27276b1c47da05ad1ae0bbcca21e080d9a7
Component: engine
2014-10-28 11:52:49 -07:00
57b27c44c9
builder: Update documentation WRT environment replacement
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: e377716b377ccc4854f810bbfc3e65a7858163ed
Component: engine
2014-10-27 23:37:27 +00:00
566532574e
Update faq.md
...
Minor language clarification.
Upstream-commit: 6e208b7f1c8130735018940ff95bf8b3662cab72
Component: engine
2014-10-26 19:57:52 -07:00
e6c9b85c85
Expose # of CPUs and memory available on docker info.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 61f8001c23dc4fbd7b1113f20b89a0dbade9aa82
Component: engine
2014-10-24 15:56:37 -07:00
65068e254b
Merge pull request #8746 from aluzzardi/bump-api-v1.16
...
Bump API to v1.16.
Upstream-commit: 78075abf81c45bfca16604919136eae99a2d7bff
Component: engine
2014-10-24 16:47:48 -04:00
462b389e50
Add back Best Practices link.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: fcae37402aac7372414fd4947b7a280bec398557
Component: engine
2014-10-24 13:17:14 -07:00
20fbd71b3d
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)
Upstream-commit: cc45b13ad4e4384f016764c15a52eda95eb548a4
Component: engine
2014-10-24 12:00:47 -07:00
82b5bee9bb
Bump API to v1.16.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: ca6cc6560987a87b8f3b4fe4c3c227d692c49117
Component: engine
2014-10-24 11:25:44 -07:00
4391a7b5ae
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 >
Upstream-commit: ab03e898ff22e1bdb2452cfc2d9aad1313c97fc9
Component: engine
2014-10-24 09:15:15 +02:00
e7c0f6f001
dockerimages.md: typo fix
...
Upstream-commit: 417fde550e30e6e2b8853f73f6c85f25b9c6a80f
Component: engine
2014-10-24 09:09:20 +02:00
083e0d1a65
Add a link to some documentation about exec.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 7f1ea7129e7b87e60ea4b1e4449b0541f6f432c9
Component: engine
2014-10-24 12:41:19 +10:00
a0bb629ead
Merge pull request #8695 from SvenDowideit/add-details-to-entrypoint-docs
...
Rewrite ENTRYPOINT documentation covering all the combinations with exam...
Upstream-commit: 8f79bd964fa58124e0f3f4b1c1fdfef04f16a454
Component: engine
2014-10-23 21:37:36 -04:00
4761e6734e
Rewrite ENTRYPOINT documentation covering all the combinations with examples.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 0390d04d8a236c427f553ead4328f6b4947a61ef
Component: engine
2014-10-23 12:12:08 +10:00
f424039349
Merge pull request #8673 from SvenDowideit/whats-docker-version
...
DOCKER_VERSION and docker-version havn't been implemented.
Upstream-commit: bb3e33154d4be8779981ad74ca381be3cf57063f
Component: engine
2014-10-22 19:03:54 -07:00
