ad2a93f102
Merge pull request #8281 from dfarrell07/master
...
Doc update to clarify EXPOSE vs -p functionality.
Upstream-commit: 8128339bc8fe3ed7f5c8fd9cc69a73d2dd519a83
Component: engine
2014-09-29 18:55:11 -07:00
a100820f28
Merge pull request #8280 from duglin/Issue3636
...
Add more info about when build cache is invalidated/used - Issue #3636
Upstream-commit: 4b311e1bd28fb658fe486e99b0d82867bfdd1037
Component: engine
2014-09-29 21:52:42 -04:00
aa28ecc957
Doc update to clarify EXPOSE vs -p functionality.
...
Signed-off-by: Daniel Farrell <dfarrell@redhat.com >
Upstream-commit: 5730abc16728404c328b896c893f9487effbec55
Component: engine
2014-09-29 20:59:12 -04:00
2281e9a92d
Fixed simple typo
...
Signed-off-by: Scott Collier <emailscottcollier@gmail.com >
Upstream-commit: 35aa3fd5f20f1d9575e3f25366680f9ed9f36aa0
Component: engine
2014-09-29 18:58:47 -05:00
9405298e4e
Add more info about when build cache is invalidated/used - Issue #3636
...
Plus some edits as suggested by @jamtur01
Closes #3636
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 83f0f46b7c0475ae1da329cd97a8c0a67bdc2a6a
Component: engine
2014-09-29 14:13:39 -07:00
967d9bcfa2
improve docs for Gentoo Linux installation
...
Changes summary:
* Added available USE flags table(description included).
* Added some tips regarding the use of docker in the Gentoo environment.
* Sorted out docker installation ways.
* Added information about the newly created Gentoo Docker team.
* Misc improvements
Signed-off-by: Pavlos Ratis <dastergon@gentoo.org >
Upstream-commit: f90d201d887028e21290a413046eb1af7fc8e609
Component: engine
2014-09-29 23:59:43 +03:00
e3a9170e4b
Merge pull request #8047 from rhatdan/RemoveLocalDns
...
Remove nameserver 127.0.0.1 line rather then dumping resolv.conf
Upstream-commit: 6cd86028273134f826d775e991fd36b5722bac45
Component: engine
2014-09-29 11:58:27 -07:00
904bd73f75
Merge pull request #8227 from SvenDowideit/list-container-events
...
The list of events that 'grep' told me about
Upstream-commit: 2682393ce18b62867e900edd284d05e5a3280579
Component: engine
2014-09-29 14:34:48 -04:00
54c05cdac0
Merge pull request #8245 from filbranden/patch-1
...
Update google.md to point to latest container-vm version
Upstream-commit: 1dae56c89317bb048e1c07d6fb450628b1f4825c
Component: engine
2014-09-29 14:30:24 -04:00
3ecb3c4d7a
Merge pull request #8230 from duglin/Issue6820
...
add wildcard support to COPY/ADD (part 2 of issue #6820 )
Upstream-commit: 1cd6135972bda50f913315910baba1b17d097338
Component: engine
2014-09-29 11:19:01 -07:00
d50b0e2424
Merge pull request #8246 from brahmaroutu/doc_resize_tty_7840
...
Documenting Container Tty resize api
Upstream-commit: 6fec88f0b3eb8b68f605c0be8809fd86c16e9c3b
Component: engine
2014-09-29 12:29:32 -04:00
7c11f5dee8
Replace utils.CheckLocalDns with bytes.Contains line
...
Since RemoveLocalDns patch will remove all localhost entries
from resolv.conf we no longer need anything more then
!bytes.Contains(resolvConf, []byte("nameserver")
To check for no nameserver entry in dns config.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: a297d6ab8c08a13503fd004ec1ad7ee9e23bd22a
Component: engine
2014-09-29 06:37:31 -04:00
de785f1386
Documenting Container Tty resize api
...
Addresses #7840
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: c7f3fdc629dd654af2fc795c1f3fa1acdaf2552f
Component: engine
2014-09-26 16:26:21 +00:00
821f6c28bc
docker-exec man page is not created.
...
docker-exec.md needs to be renamed in order to build man page.
Should be docker-exec.1.md
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 0a8fb80d99e41f2d8d05f593fd77018e26f4ee2c
Component: engine
2014-09-26 09:31:59 -04:00
dc75eee5a7
Gone Camping
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: afacaba79bc17641858a16bb265c63006a23a8d6
Component: engine
2014-09-26 14:28:39 +10:00
fbb83ba5bc
add wildcard support to copy/add
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: acd40d50799a117c4e7c318abdbc8c14b9eb1632
Component: engine
2014-09-25 20:44:51 -07:00
c5b4eb76ec
Add the 2 image events found using git grep 'Job("log"'
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 71e28f9d645ce3e216f87ad0a56c2800ec98155d
Component: engine
2014-09-26 11:55:36 +10:00
d8fc51798c
The list of events that 'grep' told me about
...
docker(master) $ git grep 'LogEvent("' | sed 's/.*("//' | sed 's/").*//'
| sort | uniq | paste -s -d","
create,destroy,die,export,kill,pause,restart,start,stop,unpause
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 05060a7c9496056fb792330027b7a73aec192697
Component: engine
2014-09-26 11:25:36 +10:00
38bdca26a3
Merge pull request #8209 from brahmaroutu/doc_dockerignore_7724
...
Adding details on how to use .dockerignore file
Upstream-commit: 6df533adb45c50757311e2a6fa11e6344c194ab0
Component: engine
2014-09-26 10:53:36 +10:00
8a89e2c5d1
Update google.md to point to latest container-vm version
...
In order to match the version listed here:
https://cloud.google.com/compute/docs/containers/container_vms#starting_a_bare_container-vm_instance
Upstream-commit: 7c22b3d599ff1ff6431f06849abc1cec231ad705
Component: engine
2014-09-25 15:19:59 -07:00
ac88033623
Adding details on how to use .dockerignore file
...
Addresses #7724
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: d7725ececab8f948356342a032be2f6b370560f5
Component: engine
2014-09-25 12:48:17 -07:00
001f52b09b
Merge pull request #8193 from jfrazelle/8141-pull-all-image-aliases-for-id
...
Pull all image aliases for id
Upstream-commit: 1379c6ec504f348454796b0ac1d46025c183bb4e
Component: engine
2014-09-25 15:22:46 -04:00
326b4331c6
Merge pull request #8228 from SvenDowideit/latest-commandline-doc-changes
...
Updated output from the docker cli help
Upstream-commit: d024a6a316e07603a1f12df4a97dcd9bb0344e07
Component: engine
2014-09-25 12:03:10 -07:00
4092cbb7ff
Pull all image aliases for id. Closes #8141 .
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7d74be162c9704df848c865a9b4bcd4047da9124
Component: engine
2014-09-25 11:48:49 -07:00
d851131502
Merge pull request #7994 from erikh/parser_fix_volume_parsing
...
builder: Fix handling of VOLUME command where multiple volumes are specified in a space delimited list.
Upstream-commit: d369612b416484301e172bfae3fc692e9c176faf
Component: engine
2014-09-25 12:45:48 -04:00
cdd6c2350b
builder: Fix handling of VOLUME command where multiple volumes are
...
specified in a space delimited list.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: a5ca549a18fb5c1006005cc220ab330eec3018de
Component: engine
2014-09-25 09:44:19 -07:00
46317f724f
Updated output from the docker cli help
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: cb6b196ab470dad0ced37e20f525758625e488cb
Component: engine
2014-09-25 16:07:55 +10:00
2dae619626
Merge pull request #8205 from sequenceiq/master
...
Fix code example formatting in best-practices article
Upstream-commit: 4547b6d529df10d83ffc1937abc260c8a2ede743
Component: engine
2014-09-25 12:34:36 +10:00
f81a996837
Merge pull request #8212 from hugoduncan/patch-1
...
Fix quoting of TESTFLAGS in devenvironment.md
Upstream-commit: 243134563903c45b48784856b09ee0c377da82d7
Component: engine
2014-09-25 12:34:12 +10:00
fce5f6490a
Merge pull request #8195 from tiborvass/migrate-get.docker.io
...
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
Upstream-commit: 3fa0ed01425dc6facb85a00338ddf99ed74a86be
Component: engine
2014-09-24 19:06:09 -04:00
8a28fc553b
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 808257654a4147ad9b54cfeddc5d0ad236c26e3f
Component: engine
2014-09-24 18:53:27 -04:00
fb8fce0378
Fix quoting of TESTFLAGS in devenvironment.md
...
Copy and pasting the example should now work, rather than TESTFLAGS being silently ignored.
Upstream-commit: 7aa88a4ff66aa0c256dc15e5e5a4ddda34ed0f46
Component: engine
2014-09-24 13:30:39 -04:00
65521dc5a1
Fix code example formatting in best-practices article
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
Upstream-commit: be4454c4f0ba1a1d9fdd2f0ec7e631403ee61f63
Component: engine
2014-09-24 10:45:56 +02:00
134a1a90ab
Merge pull request #8197 from fredlf/adding_official-repo-guidelines
...
Docs for Official Repo release
Upstream-commit: 8dd11c7175147d31761b647daac10fb18f0420c2
Component: engine
2014-09-23 20:55:07 -07:00
aeb0f3e4bc
Merge pull request #8157 from SvenDowideit/sshd-pam-fix
...
Fix for user kicked off after login on some hosts
Upstream-commit: f68f5fd521270ad9775fb0adfe7516f9e4855ba5
Component: engine
2014-09-23 20:42:27 -07:00
4e7f3a0260
Merge pull request #8178 from SvenDowideit/systemd-example-moved
...
That Systemd example URL isn't there anymore
Upstream-commit: a1609a7324c934ed4d151d75395173c1054f836b
Component: engine
2014-09-23 20:41:13 -07:00
82616b8c9e
Revisions and edits based on feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 950eccab4ad4d79a5afa154849567ddfdf8dc7eb
Component: engine
2014-09-23 18:26:02 -07:00
7f93986b70
Typo and formatting fixes. Copy edits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 6747dfc8031205f0e629a3508f14125b3b66a5b2
Component: engine
2014-09-23 15:51:17 -07:00
756d3489d5
Adding new Dockerfile Best Practices doc, and links thereto.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: d9fd5f6199aebb9ea784f5b23ec97b960f89f3d4
Component: engine
2014-09-23 14:21:00 -07:00
55f5c84e4a
Merge pull request #8101 from jfrazelle/6974-correct-ct-json-stream
...
Change content-type for json stream to application/x-json-stream.
Upstream-commit: 42ec80bec02b7cb921397fc79ca58a18190e2c4b
Component: engine
2014-09-23 11:24:31 -07:00
4116d85932
That URL isn't there anymore
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 46319a5c33c324b26bc4c8ad647632744ef88cbc
Component: engine
2014-09-23 15:04:00 +10:00
84c8b465f8
Merge pull request #8156 from SvenDowideit/tedyoung-patch-1
...
Misc. fixes and formatting clean-up
Upstream-commit: 513f5a358adc9de5ecbca04b6d2225be84837580
Component: engine
2014-09-23 10:16:05 +10:00
b44c9bd465
Apply @tedyoung's changes to the entire set of API docs.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: ab43ad7d5fa8361736446af323c1fce77f150296
Component: engine
2014-09-23 10:09:49 +10:00
6bc23af935
Misc. fixes and formatting clean-up
...
Cleaned up and corrected some invalid "example responses".
Added some missing double-quotes for examples that resulted in invalid JSON.
Other general cleanup of stray characters and typos.
Docker-DCO-1.1-Signed-off-by: Ted M. Young <tedyoung@gmail.com > (github: SvenDowideit)
Upstream-commit: f304d4b190276939c9aff2090925342d16c7405e
Component: engine
2014-09-23 10:09:49 +10:00
a396321542
Merge pull request #8123 from dcro/docs-clarifications
...
Updated the documentation to to clarify random port mapping when using -...
Upstream-commit: 60f6b0299a11212f9562d7df0f126d517fd2d3a6
Component: engine
2014-09-23 09:57:19 +10:00
7b47b2e708
Change content-type for json stream to application/x-json-stream.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 10ab2089ce189d5bea3f7aaac3b5081471309478
Component: engine
2014-09-22 10:29:56 -07:00
eb02e608df
Merge pull request #6101 from LK4D4/ip_range_#4986
...
Implement allocating IPs from CIDR within bridge network
Upstream-commit: 9fb34ae5710faaadc730a7005f785cefc56eed4b
Component: engine
2014-09-22 17:09:16 +03:00
e733686489
Doc update to clarify random port mapping on docker run -P
...
Signed-off-by: Dan Cotora <d@bluevision.ro >
Upstream-commit: a8775d2f9a211b90474b5709ad75b8e1fcb2e189
Component: engine
2014-09-22 08:39:09 +03:00
f30fc49b3d
Fix for user kicked off after login on some hosts
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 7faa43d707e1c0a67262d149cd42dab4bf3f8812
Component: engine
2014-09-22 13:33:38 +10:00
3ebe7ce35b
Merge pull request #8124 from jyrkiput/patch-1
...
Fix detaching from attached container
Upstream-commit: 27226d47c17588c867f2c533b87977955f2ca66e
Component: engine
2014-09-22 09:28:10 +10:00
