fd74b5fbc9
Fixed issue with docs not getting built due to ssl error.
...
Signed-off-by: Ken Cochrane <ken@docker.com >
Upstream-commit: 7f261ebe6cc60c01fd10f5f86f1c22d512be3f5f
Component: engine
2014-10-01 21:11:10 -04:00
68f6cb4aa6
Merge pull request #8337 from tjwebb123/patch-1
...
Update host_integration.md
Upstream-commit: 23221c55665ca63fb2ff9d7e846665a2506a7a0f
Component: engine
2014-10-01 15:37:02 -07:00
9710588070
Merge pull request #8316 from duglin/Issue4787
...
Add a note about using an open schema model - Issue #4787
Upstream-commit: 04251b3e544d82db2dfc140bd27172a7f1876e5e
Component: engine
2014-10-01 11:21:09 -07:00
142c3f0753
Add a note about using an open schema model
...
Closes : #4787
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: c8f3151aa6a0b68674aa68061b723424278a54c5
Component: engine
2014-10-01 11:05:12 -07:00
fc1af766be
Merge pull request #8313 from duglin/Issue4877
...
Add missing "tag" parameter to tag API - Issue #4877
Upstream-commit: f852233a015d0f65ff1cd4e475e21ba9b9143c3c
Component: engine
2014-10-01 10:34:57 -07:00
4149b93c3c
Update host_integration.md
...
Upstream-commit: f10a08887e939936662071e5609670f7da9fb62c
Component: engine
2014-10-01 14:51:47 +01:00
1df0784591
Merge pull request #8299 from vieux/pr_7425
...
Add --security-opts options to allow user to customize container labels and apparmor profile
Upstream-commit: d40ab6f1238c78ea84645e516f1f24d7991798b0
Component: engine
2014-09-30 17:53:11 -07:00
98ca654d42
Merge pull request #8291 from mieciu/master
...
Source the bash_completion after installation
Upstream-commit: 5e69f4a1885310e8e4dd386bb4ff8c2d80bec40f
Component: engine
2014-09-30 15:55:25 -04:00
5ab43c288e
Merge pull request #8286 from ClusterHQ/8285-volume-api-docs
...
Document Volumes and Binds
Upstream-commit: 1d199f2d8508adb1d759fedc31d9e6ccf7df25ae
Component: engine
2014-09-30 15:53:41 -04:00
1dd6380138
Adding exec remote API documentation along with minor code cleanup.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 021ecb1d1355e8291a5a872c761a1e367072e308
Component: engine
2014-09-30 18:26:58 +00:00
5cc74547b7
update docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 226bc669aa9a886c5a6855e054b751e72d20971b
Component: engine
2014-09-30 18:15:23 +00:00
d5dfd4845d
Add missing "tag" parameter to tag API
...
Closes #4877
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ee0b64f7a79b7d704110d1f541710ae6fba5eb37
Component: engine
2014-09-30 10:53:29 -07:00
ce150ab801
Filter containers by status.
...
A continuation of #7616 .
Adds `docker ps --filter=status=(restarting|running|paused|stopped)` option.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ea09f036824aee74112a75ac99579ae4f10251b5
Component: engine
2014-09-29 20:11:19 -07:00
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
fe37a1db8f
Add --security-opts options to allow user to customize security configuration
...
security-opts will allow you to customise the security subsystem.
For example the labeling system like SELinux will run on a container.
--security-opt="label:user:USER" : Set the label user for the container
--security-opt="label:role:ROLE" : Set the label role for the container
--security-opt="label:type:TYPE" : Set the label type for the container
--security-opt="label:level:LEVEL" : Set the label level for the container
--security-opt="label:disabled" : Turn off label confinement for the container
Since we are passing a list of string options instead of a space separated
string of options, I will change function calls to use InitLabels instead of
GenLabels. Genlabels interface is Depracated.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 87e732a0f3503517d7a66804bb9a7f74977347e5
Component: engine
2014-09-30 00:06:22 +00: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
17d871fa05
Source the bash_completion after installation
...
Signed-off-by: Przemek Hejman <przemyslaw.hejman@gmail.com >
Upstream-commit: 9f59e2223d59829892e57d38b95cd951d1fbdc9e
Component: engine
2014-09-29 23:37:51 +02: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
fb99c55930
Document Volumes and Binds
...
Signed-off-by: Jean-Paul Calderone <jean-paul@clusterhq.com >
Upstream-commit: 8e70d553f93e624b38bef6bc4aa3dd2e4bed6a81
Component: engine
2014-09-29 14:59:48 -04: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
