b060268a74
Merge pull request #8748 from duglin/Issue8330
...
Have .dockerignore support Dockerfile/.dockerignore
Upstream-commit: 6d780139c4b7960b482a5f4fbf043adb6673864b
Component: engine
2015-01-06 13:47:42 -08:00
1a4a1b2193
Have .dockerignore support Dockerfile/.dockerignore
...
If .dockerignore mentions either then the client will send them to the
daemon but the daemon will erase them after the Dockerfile has been parsed
to simulate them never being sent in the first place.
an events test kept failing for me so I tried to fix that too
Closes #8330
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6d801a3caa54ad7ef574bc426aa1ffc412c5af82
Component: engine
2015-01-06 10:57:48 -08:00
a47c2e06a0
Merge pull request #9927 from LK4D4/carry_of_9925
...
Fixed minor typo
Upstream-commit: 2389c295562fccfd598d27bd104ddf8a0fb97e3b
Component: engine
2015-01-06 09:54:03 -08:00
8a09cfa886
Fixed minor typo
...
Signed-off-by: Christian Stefanescu <st.chris@gmail.com >
Upstream-commit: 32ac770f753a6435cd83f957c1e5d73722d09974
Component: engine
2015-01-06 09:52:21 -08:00
1802007e16
Merge pull request #9920 from SvenDowideit/publish-all-maps-to-random-ports
...
Explicitly mention that '-P' maps to random ports
Upstream-commit: 0bc2222b3940a8d55c344b9fd03b7934d9d55d6b
Component: engine
2015-01-06 09:39:50 -08:00
f82eddabc6
--help option and help command should print to stdout not stderr
...
--help and help are successful commands so output should not go to error.
QE teams have requested this change, also users doing docker help | less
or docker run --help | less would expect this to work.
Usage statement should only be printed when the user asks for it.
Errors should print error message and then suggest the docker COMMAND --help
command to see usage information.
The current behaviour causes the user to have to search for the error message
and sometimes scrolls right off the screen. For example a error on a
"docker run" command is very difficult to diagnose.
Finally erros should always exit with a non 0 exit code, if the user
makes a CLI error.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: a2b529ead21e6ab9eafcb1b1d2437c725c43a06a
Component: engine
2015-01-06 13:40:14 +01:00
4bf864f7fb
Explicitly mention that '-P' maps to random ports
...
as noted in https://github.com/boot2docker/boot2docker/issues/690
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 7b2331061e428176cf513487745ac496e2bd7027
Component: engine
2015-01-06 17:01:10 +10:00
4e9cb36803
Merge pull request #9855 from ewindisch/sec-doc
...
Improve security doc
Upstream-commit: 1510a324dbd51f3e65ac6ad8ed1bc2e625f2c827
Component: engine
2015-01-06 15:35:30 +10:00
0a26c45c0c
Merge pull request #9884 from flowlo/patch-1
...
doc: Standardise JSON examples
Upstream-commit: ceedaceb5c0065a6fff8c859f07753dc71637c41
Component: engine
2015-01-06 15:32:04 +10:00
e5f832ab99
Merge pull request #9721 from SvenDowideit/add-cloudfront-invalidation-to-docs
...
Add docs Cloudfront cache invalidation
Upstream-commit: 4235e2796ba19e50d6261489e817b8422ba43df0
Component: engine
2015-01-05 16:25:20 -08:00
bb2e382254
Merge pull request #9097 from brahmaroutu/publish_ports_8899
...
add ability to publish range of ports
Upstream-commit: 25f8c2664066a523f3f59f4cc5cdc8cf81c8a7c8
Component: engine
2015-01-05 14:05:47 -08:00
001c1d8220
doc: Broaden JSON standardisation by patching
...
This is:
git format-patch -1 --stdout HEAD \
| patch -p1 docs/sources/reference/api/docker_remote_api_v1.*.md
Applying the changes I initially made on the docs for v1.15 to all
other versions led to acceptable results.
Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com >
Upstream-commit: 975f5b0c281fe579336fc0ffeb49ac0907465a5a
Component: engine
2015-01-05 11:45:10 +01:00
305f19e30d
doc: Try to standardise JSON examples
...
Fixed:
* Invalid JSON
* Inconsistent spacing at colon
Expression for binary data streams (line 468 vs. 1474) remain inconsistent.
Could fix that too, if you like.
Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com >
Upstream-commit: e583cc1eb47c29d7473f1dac7d4f39ddeb8ae1e6
Component: engine
2015-01-03 18:20:59 +01:00
f8347c4fc0
Add list of events in remote API docs
...
Add exec create and exec start to list of events in remote API docs
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
Upstream-commit: fc7f0550965d06dd8dd31fb55c74fe02e9a436dc
Component: engine
2015-01-03 20:40:25 +09:00
986d8f11d2
add ability to publish range of ports
...
Closes #8899
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 2338a9cf5a1ba5576b92e49065335a9c9251ade0
Component: engine
2015-01-02 23:21:26 +00:00
73d7861c36
Merge pull request #9848 from SvenDowideit/add-restart-policy-delay-docs
...
Document that there is a delay before the --restart policy restart, and ...
Upstream-commit: d7f72188ffe3cf98481292d780da463b7de05e58
Component: engine
2014-12-31 12:13:21 -08:00
7792c86d76
Merge pull request #9859 from NateEag/patch-1
...
Grammar fix and style tweak in docs/sources/faq.md
Upstream-commit: 529011cf416857af669cae3e5abdeb6b761ab6b7
Component: engine
2014-12-31 11:58:49 -08:00
87e9875e21
Merge pull request #9491 from SvenDowideit/note-that-volumes-in-b2d-are-special
...
Add a note to point out to new users that B2D bind-mounts are special-ish
Upstream-commit: 880aeab00df218322e246711578690c16312d2a4
Component: engine
2014-12-31 11:15:01 -08:00
af0df9d992
Grammar fix and style tweak in docs/sources/faq.md
...
Just a few things I thought could be improved in the FAQ.
Signed-off-by: Nate Eagleson <nate@nateeag.com >
Upstream-commit: 4e679f218c5da33856df25069368b24e78d8bb85
Component: engine
2014-12-30 21:36:16 -05:00
3eed17c175
Improve security doc
...
Moves some information around, expanding information on
user namespaces, pull/load security, cap add/drop.
Also includes various grammar improvements and edits.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: e704dd31e79114a2156c4fdda3247a181ad6435d
Component: engine
2014-12-30 17:32:25 -05:00
45b07b768f
Add a note to point out to new users that B2D bind-mounts are special-ish
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: e52988528d20a729ed71e47e4d0a5fcb35c92dfc
Component: engine
2014-12-30 13:37:31 +10:00
5ac672fe9b
Talk up the 1.4 change to initialise volumes at time
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 1d4a13867053b58971424f8caf219f935fc66fdd
Component: engine
2014-12-30 13:08:53 +10:00
4d06ba471c
Add docs Cloudfront cache invalidation
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: cfaffd1ad26cf64330b87d0f99a883215b4c5a3e
Component: engine
2014-12-30 12:58:56 +10:00
d5fa05762a
Document that there is a delay before the --restart policy restart, and that its double the last one
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 35873e747d5681e42582f51ea48993382cb893a6
Component: engine
2014-12-30 12:36:04 +10:00
a8c9181bdf
Merge pull request #9800 from vieux/execIDs_inspect
...
Add ExecIDs to docker inspect
Upstream-commit: 12fef2d8df4e5da024418e324f7e3c3e82220a27
Component: engine
2014-12-29 15:32:33 -08:00
fbd81bd660
Merge pull request #9819 from huslage/remove-equal
...
Remove -t="" and -m="".
Upstream-commit: 311d6276adc340c3bcd7ae3be283fca2821874f7
Component: engine
2014-12-29 01:56:15 -05:00
7959035342
Remove -t="" and -m="". Make -t and -m options consistent with help text and other documentation.
...
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
Upstream-commit: 8d7ee3697036d2d1f6c43efcb50b8d8b6c627584
Component: engine
2014-12-26 12:31:01 -05:00
055349b7c9
add docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: bbb92e1436b5a288d07ef8ea0fad80f2c4715faa
Component: engine
2014-12-24 00:12:35 +00:00
ab25e4ba52
Add "OOM killed" event based on OOM state information
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 44cab4a4ff05cb1e499fba19394aadb20fc887b8
Component: engine
2014-12-23 18:22:31 -05:00
50e537246c
Merge pull request #9783 from SvenDowideit/pr_out_debian_wheezy_backports_kernel_updated_to_3_16
...
Debian Wheezy backports kernel updated to 3.16
Upstream-commit: 7a3efc9aa5441285c85724e360811abf6146c464
Component: engine
2014-12-23 11:19:26 +10:00
147e9f2038
Debian Wheezy backports kernel updated to 3.16
...
Replaces #9723
fix by: panticz <mail@konczalski.de > (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 973c3c768be19b80543631ad9515fe05b95b2d22
Component: engine
2014-12-23 11:14:14 +10:00
af134040ea
Merge pull request #9740 from SvenDowideit/pr_out_fixes_as_requested
...
Login with PUTTY instead of using the CMD
Upstream-commit: 197281f5858a90f7fdf8418e19b362fa57a052f3
Component: engine
2014-12-23 11:11:53 +10:00
892e46c364
fixes as requested
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: db165f7d2c3e05bbd7bac8c1188145370c7b1171
Component: engine
2014-12-23 11:06:45 +10:00
4725a40462
Changing the windows installation doc to include instructions how to login
...
using putty instead of CMD
Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk >
Docker-DCO-1.1-Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk > (github: SvenDowideit)
Upstream-commit: 948f33263e95997a9c6596d695c92ab03c630899
Component: engine
2014-12-23 11:06:44 +10:00
4f66ac7b6d
Merge pull request #9782 from SvenDowideit/pr_out_update_debian_version_to_7_7
...
Update Debian version to 7.7
Upstream-commit: dda2b194394f1e0a10219c0b92583276a8b0a788
Component: engine
2014-12-23 11:02:50 +10:00
fab564562c
Update Debian version to 7.7
...
Replaces #9724
fix by: panticz <mail@konczalski.de > (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 491ff81a0b6653d75b2bc4ca81251d7bf5ee9f3f
Component: engine
2014-12-23 10:53:36 +10:00
5364411768
Merge pull request #7003 from porjo/6034-fowardChain
...
Move per-container forward rules to DOCKER chain
Upstream-commit: 04117e4021da9d7fcd376b345074b84ebbd4f0ce
Component: engine
2014-12-22 14:40:42 -08:00
10b295c1df
start new API v1.17 docs
...
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr >
Upstream-commit: 800a8e896e810019b625ad0161c4fc4a04c26845
Component: engine
2014-12-22 09:01:33 +01:00
c1a6d58dbd
Update networking.md with new iptables behaviour
...
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com > (github: porjo)
Upstream-commit: 137ceae9138e535f8b3f4e76bda18f6db954c231
Component: engine
2014-12-21 12:57:32 +10:00
93c395dffa
Merge pull request #9657 from moxiegirl/9655
...
Clarify Mac OS X experience. Signed-off by: Mary Anthony (moxieandmore@g...
Upstream-commit: 3e3749fe4b72c6fe9afd44c35c79c804b3ef1678
Component: engine
2014-12-18 21:29:02 -05:00
bdb7f879f7
Argghhh...I need to automate that signoff. Fixing lack of signoff
...
Signed-off-by: Mary Anthony <moxieandmore@gmail.com >
Upstream-commit: 801fd1af256134b749ee3dd29ea5ed41d2594482
Component: engine
2014-12-18 09:10:08 -08:00
4af408b6c1
Merge pull request #9635 from duglin/Issue3936
...
Allow for relative paths on ADD/COPY
Upstream-commit: 364720b5e7e725cdc466171de873eefdb8609a33
Component: engine
2014-12-18 06:58:50 -08:00
a9b8d39261
Allow for relative paths on ADD/COPY
...
Moved Tianon's PR from: https://github.com/docker/docker/pull/7870
on top of the latest code
Closes : #3936
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f21f9f856e9d5af23521f131799028c2e67c04ed
Component: engine
2014-12-18 05:13:04 -08:00
9667f960f7
Merge pull request #9683 from SvenDowideit/docker-exec-error-when-paused
...
Update the documentation for #9356 fix
Upstream-commit: f2b89166cf3d352298496ea19a7b72bf5b1cba54
Component: engine
2014-12-17 17:04:25 -08:00
f644595194
Merge pull request #9682 from SvenDowideit/scottstamp-stale-links-pr-carry
...
Scottstamp stale links pr carry
Upstream-commit: 5df189a1b0b63d66f1478e12e4e738e2378f26b0
Component: engine
2014-12-17 16:03:55 -08:00
85fa2dc157
redirect openSUSE docs to SUSE doc
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: de2a91970dfd1f6078179ffffd63ec1842c95bd9
Component: engine
2014-12-18 09:05:27 +10:00
21d58a4cf6
docker-run man page has screwed up indenting on --net option
...
This patch fixes the indenting.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: bc1507dfce956846ba1515ccbfcd202c06aa995b
Component: engine
2014-12-17 13:06:13 -05:00
8f8a34a48e
Additions for 1.4.1 release
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 6afe5bf9ede46b81fb63283c55488dbbc50d5a07
Component: engine
2014-12-16 17:40:02 -08:00
9306adcecc
Merge pull request #9652 from yadutaf/master
...
Set HTTP upgrade headers when hijacking connection
Upstream-commit: f538e4be6b56ba4f69b5e5b909dd00b1bcc3081d
Component: engine
2014-12-16 16:21:29 -08:00
6447946d2c
Update connection hijacking documentation with HTTP Upgrade Headers
...
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr >
Upstream-commit: afb06a3ce2e769951a89a889f11b9ab5eea54dff
Component: engine
2014-12-17 00:22:06 +01:00
