651e773954
Merge pull request #8343 from duglin/Issue5278
...
Make fixed font sizes smaller per Issue #5278
Upstream-commit: 3fc04f36e528599a7093a30dd35d920863762fed
Component: engine
2014-10-06 10:11:01 -07:00
6089ee6989
Make fixed font sizes smaller per Issue #5278
...
Closes #5278
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 9c201c5836fcee4455806a06fbada17cabd4296d
Component: engine
2014-10-06 06:49:33 -07:00
712eaeae70
Merge pull request #8388 from merty/patch-1
...
Fixed a typo in "Installing Docker on Mac OS X"
Upstream-commit: 44264f48e43bd556636326229e7e11c0fb8a23e1
Component: engine
2014-10-03 22:03:50 -04:00
4bc322dfa5
Merge pull request #8360 from duglin/Issue5509
...
Add note to docs about lack of shell processing in JSON form - Issue 5509
Upstream-commit: 62391d68a4b9c1dafd52d087a03cf3a847a4f477
Component: engine
2014-10-03 22:03:31 -04:00
f49339f3ba
Merge pull request #8222 from fredlf/adding_official-repo-guidelines
...
Edits and fixes based on review.
Upstream-commit: 95e169a6a14b46c9db6b6d316524b28abfdc3391
Component: engine
2014-10-03 22:03:05 -04:00
5187532659
Fixed a typo in "Installing Docker on Mac OS X"
...
evironment -> environment
Upstream-commit: 81cddaaa7ddd09cd928529e988df28d17a180203
Component: engine
2014-10-03 23:18:40 +03:00
ddc310264c
Merge pull request #8375 from fgrehm/patch-2
...
docs: Update `docker exec` examples
Upstream-commit: 94da44cacf189de091509d73298cfdc19fda557e
Component: engine
2014-10-03 11:30:37 -07:00
b84c9439ff
Merge pull request #8336 from kwk/improve_docs_with_note_about_registry_frontend_web_app
...
Improve docs with note about registry frontend web app
Upstream-commit: 23dc2ca2d5eb74675acf44f0f8b7a8a666c13263
Component: engine
2014-10-03 11:00:32 -07:00
16bdc4eee3
Add note to docs about lack of shell processing in JSON form
...
Closes #5509
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 98ceae1a8499979f725bd04dfbc47ccf831331a7
Component: engine
2014-10-03 05:18:25 -07:00
b21689409c
docs: Update docker exec examples
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com >
Upstream-commit: 6480b30a997a8fe9884504f669b9c5a68d887f55
Component: engine
2014-10-03 01:13:59 -03:00
02413ae0ec
Merge pull request #8351 from kencochrane/8347_fix_broken_doc_build
...
Fixed issue with docs not getting built due to ssl error.
Upstream-commit: 8a0733ce69a12cd129953b903c106ac0f85b818d
Component: engine
2014-10-02 15:58:18 -07:00
6da135ab37
Edits and fixes to Dockerfile Best Practices based on review feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 36db0a30fa471aa96cf5acd8139b554db78cec22
Component: engine
2014-10-02 14:08:39 -07:00
cf801a51a6
Typo: changed "Maintainers" to "maintainers"
...
Signed-off-by: Konrad Kleine <konrad.wilhelm.kleine@gmail.com >
Upstream-commit: e08f22cdb2b1e10661f76582f9a8ba7d1cb80bea
Component: engine
2014-10-02 08:43:30 +02:00
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
ff11ba1435
Print a status message when pull command is executed
...
Using repo tag in the status message for better usability, as per review comments
Added documentation and Changed code to print Status after downloads are complete
Addresses #2404
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: ecff6303a366a5e8fd178b7baa1c64895a3a3622
Component: engine
2014-10-01 22:55:29 +00: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
262a26e82e
Add registry_api_client_libraries.md to mkdocs.yml
...
Signed-off-by: Konrad Kleine <konrad.wilhelm.kleine@gmail.com >
Upstream-commit: 12fe99ae47a3446ef0c2ac01052c263c28345b65
Component: engine
2014-10-01 15:32:21 +02:00
1a57ba4c11
Create registry_api_client_libraries.md
...
Signed-off-by: Konrad Kleine <konrad.wilhelm.kleine@gmail.com >
Upstream-commit: 3446735a3e30788689ea3d66994f9b27b9327e18
Component: engine
2014-10-01 15:20:49 +02: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
b3bf4ac72c
Edits and fixes to Dockerfile Best Practices based on review feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 42b377904b081170c74b6526959cb70215778f21
Component: engine
2014-09-30 13:30:14 -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