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
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
d2d0349752
Merge pull request #9601 from dchen1107/master
...
Using container-vm image alias instead of specific name with version.
Upstream-commit: d79bc04e7bd728ed3ca4bffc463235bb2980670d
Component: engine
2014-12-16 11:01:15 -08:00
f37c881351
Merge pull request #9651 from kdomanski/filter_docs
...
Document container list filtering in API docs
Upstream-commit: 92d24e3b7cfca1a18ee8412c1bf6650758096355
Component: engine
2014-12-16 01:38:49 -05:00
7e0c2fb835
Update the documentation for #9356 fix
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: c9ca5c4dd3a90332cc40d25175e3b54aca1212a8
Component: engine
2014-12-16 15:25:15 +10:00
912c56d931
add Scott's link checker script, and fix what it finds
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: fbb9223b1adc16834768acaa7a5776697825deb2
Component: engine
2014-12-16 14:46:25 +10:00
dcaedcf606
Update debian.md
...
Fixed anchor links for Jessie/Wheezy (broken on docs.docker.com)
Update debian.md
Signed-off-by: Scott Stamp <scott@hypermine.com >
Upstream-commit: 4e7fb6b1f03173b0fbc41c18c9e9857b5708974a
Component: engine
2014-12-16 12:49:53 +10:00
ecd4852381
Fix volumes-from/bind-mounts passed in on start
...
Fixes #9628
Slightly reverts #8683 , HostConfig on start is _not_ deprecated.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d44c9f91472eb3df4c38c669134df04b2ccf9953
Component: engine
2014-12-15 16:51:15 -05:00
dd3d46bab0
Add available filters for containers, images and events to API docs.
...
Signed-off-by: Kamil Domański <kamil@domanski.co > (github: kdomanski)
Upstream-commit: 51da97628a0ffb2a1c4be2c4d1bbcb09537d6c8d
Component: engine
2014-12-15 16:51:29 +01:00
159fd556c5
Add container list filtering to API docs.
...
Signed-off-by: Kamil Domański <kamil@domanski.co > (github: kdomanski)
Upstream-commit: 37bdb05615763f94f7877cce3426752d43b48ff7
Component: engine
2014-12-15 16:50:56 +01:00
9158ffcf49
Merge pull request #9633 from estesp/docs-ubuntu-install
...
DOCS: Update Ubuntu install instructions regarding dated Ubuntu docker.io
Upstream-commit: 24a81829284c9c9966f3dbc239dff9adca09d5ef
Component: engine
2014-12-15 04:52:27 -05:00
55530bfc16
Merge pull request #9556 from nealmcb/9555-https-no-sudo
...
Fixes #9555 : sudo not needed with cert authn
Upstream-commit: e4b2f802ae669f4a89b04576ac92c95858773810
Component: engine
2014-12-15 15:08:03 +11:00
8f45a1fd40
Fixed errors in release notes
...
Fixed a missing link and a few small formatting issues. Also deleted 1.3 notes as originally intended.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: afc262cc3ab68129104e3d799f8a2694f61aa68f
Component: engine
2014-12-12 17:18:21 -08:00
00d7210a86
Using container-vm image alias instead of specific name with version.
...
Signed-off-by: Dawn Chen <dawnchen@google.com >
Upstream-commit: 0b3caf1f78c167239d7879d3bfd0d0d95a48a3d7
Component: engine
2014-12-12 11:28:54 -08:00
092ddf63ff
Adds User Invites to Hub Docs
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: bf05f78d700532bb7504a2e1fd388f81c48aa2e6
Component: engine
2014-12-12 10:34:15 -08:00
85ddb11009
Update Ubuntu install instructions regarding dated Ubuntu docker.io
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: bb25f54a9953ce4d87cddad880befb016aa276d7
Component: engine
2014-12-12 11:57:23 -05:00
e5b08a1313
Include fred's release notes for 1.4.0.
...
He is unfortunately out of power and internet because of storms :(
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: a65396b079c1b05255553af8cde3a94d7796e752
Component: engine
2014-12-11 19:00:34 -08:00
b544394ad7
docs: Add release notes
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: fdabd6b14e394721aaf61402bb88073e7eb424bf
Component: engine
2014-12-11 16:29:28 -05:00
8ccacca9b5
Merge pull request #9566 from jfrazelle/btrfs-overlayfs
...
add note to docs about overlay + btrfs unsupported
Upstream-commit: eba451b6595e72ab7bb23af5ba76ce0038a81d00
Component: engine
2014-12-11 09:32:10 +11:00
a9df8138c1
add note to docs about overlay + btrfs
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 340ea25ac1c01561399175e4de8cecc2928ccf4b
Component: engine
2014-12-10 14:29:41 -08:00
f19d3d8426
Merge pull request #9318 from shishir-a412ed/doc-cpu-share
...
Enhanced description for 'docker run' command, -c/--cpu-shares flag
Upstream-commit: fb810d18bd27636097baec0eb8db85d1596cb0e5
Component: engine
2014-12-09 17:21:09 -08:00
1d39a69298
Forbid client piping to tty enabled container
...
Forbid `docker run -t` with a redirected stdin (such as `echo test |
docker run -ti busybox cat`). Forbid `docker exec -t` with a redirected
stdin. Forbid `docker attach` with a redirect stdin toward a tty enabled
container.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 67e3ddb75ff27b8de0022e330413b4308ec5b010
Component: engine
2014-12-09 14:30:49 -08:00
1e5e5cb310
Added description for 'docker run' command, -c/--cpu-shares flag
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 2597bffe9a6538c2db73e2ce380294547b738e2e
Component: engine
2014-12-09 09:55:56 -05:00
e7ab84e497
Merge pull request #9558 from philips/fixup-typo-in-systemd-article
...
docs: docker.service not services
Upstream-commit: c587a3faf65c94b50fa1b56ba2af3ae3c547933f
Component: engine
2014-12-09 23:10:17 +11:00
e3ad9c003c
Merge pull request #9559 from philips/use-dropins-in-systemd-article
...
docs: use systemd drop-ins instead of copying
Upstream-commit: 74b29e8b455ac37ad8b3c745b82033e9e7af9077
Component: engine
2014-12-09 23:09:52 +11:00
b99dd269f2
Merge pull request #9522 from SvenDowideit/add-some-cap-add-examples
...
Add some cap add examples
Upstream-commit: 03d1622ab82071bcfb10ac29d37a51aa5d77b5d5
Component: engine
2014-12-08 15:50:25 -08:00
be5e940362
Merge pull request #9489 from crosbymichael/info-root
...
Return docker's root dir in docker -D info
Upstream-commit: 12252e39a0abc188e1cd1fe9e921eef967308e1c
Component: engine
2014-12-08 09:05:00 -08:00
9938c679ed
docs: use systemd drop-ins instead of copying
...
Copying the entire docker service file isn't necessary to add an
environment variable, instead use a drop-in configuration file. The nice
side-effect is that the user gets any vendor updates to the
docker.service file.
Signed-off-by: Brandon Philips <brandon.philips@coreos.com >
Upstream-commit: 2d51d71561565987fc6a600234f2e2d15e0ecf31
Component: engine
2014-12-07 18:45:50 -08:00
3c2c492c7f
docs: remove a trailing whitespace
...
Signed-off-by: Brandon Philips <brandon.philips@coreos.com >
Upstream-commit: e0792e7ece7a71da83c902a03654bda4797ab054
Component: engine
2014-12-07 18:45:43 -08:00
a6561f311c
docs: docker.service not services
...
Minor but important typo in the new systemd guide introduced in #9347 .
Signed-off-by: Brandon Philips <brandon.philips@coreos.com >
Upstream-commit: 1ae7be716eadf6efdc7ee033c83127e975222a76
Component: engine
2014-12-07 18:35:37 -08:00
245df65b49
Fixes #9555 : sudo not needed with cert authn
...
Signed-off-by: Neal McBurnett <neal@mcburnett.org >
Upstream-commit: ee1ba252187a7e1a80e3773fe9748410d01a39b8
Component: engine
2014-12-07 14:31:35 -07:00
0703a67ce9
Return docker's root dir in docker -D info
...
This adds the docker daemon's root directory to docker info when running
in debug mode. This allows the user to view the root directory where
docker is writing and storing state.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 654da4e151c449725b6996d47b7ff33767e87da9
Component: engine
2014-12-05 12:13:25 -08:00
2aeb9859a8
Merge pull request #9493 from SvenDowideit/note-lxc-conf-pitfall
...
Note that using -lxc-conf to change things Docker manages has pitfalls
Upstream-commit: 2525a04594eed2ca4e13e9ded83f406529bad299
Component: engine
2014-12-05 11:16:19 -08:00
8953683264
I was talking to someone whom i listen to, and she noted that our docs don't mention the license
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 522e6310967bcb4fadd99d76dc3205991ecae1ad
Component: engine
2014-12-05 21:06:11 +10:00
85c2d97483
Add a fuse example, combining both SYS_ADMIN and --device
...
inspired by #9448 and #9487
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 5f2000944b0377f1e5ce86a887f495f1f295dd90
Component: engine
2014-12-05 16:42:48 +10:00
a6b462feda
add --cap-add=NET_ADMIN to make a new network device
...
inspired by #9452
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 48a596a804a24a5b4b3512a58a785b17781c49d0
Component: engine
2014-12-05 16:30:54 +10:00
996111b8d3
Merge pull request #9272 from SvenDowideit/pr_out_try_out_a_different_phrase_for_icc
...
Try out a different phrase for --icc
Upstream-commit: 8dfcbf62edb2853176eb3f5cf077dae68f2e85c3
Component: engine
2014-12-05 16:22:51 +10:00
49f85cd111
Merge pull request #9504 from davidmat/patch-1
...
Update Amazon EC2 Docker installation instructions
Upstream-commit: a10b0cd23f806944c7e5d6515cdbf07af49bad9b
Component: engine
2014-12-04 21:57:45 -08:00
d60bbfaec3
Merge pull request #9507 from jsternberg/docker-build-docs-formatting-fix
...
Fixing docs formatting for the forcerm flag on docker build
Upstream-commit: ebf89cf2198acd6953adabc24ffc44aaac5c0780
Component: engine
2014-12-04 21:54:14 -08:00
635b9dd208
Show image of the Build trigger screen, and add a little search engine fodder for it.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: b266ad9c607588e8541926dfca7e338148e904ff
Component: engine
2014-12-05 13:05:38 +10:00
822c213004
Add some extra details to webhook docs
...
Update the webhook JSON payloads to real ones,
and show there is a difference between an automated build webhook payload and a normal repo payload
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: b4b899264ed892818ef31c3626acad8fb110aabb
Component: engine
2014-12-05 12:13:22 +10:00
6a592dd8e6
Auto-update documentation from the output of the cli.
...
I've re-jigged the run man page so that each option's text begins with the
cli's help text for that flag, and then ay subsequent lines in the man page
are carried forward.
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: e01baa6be782320d3c0800697c882c2b919b202f
Component: engine
2014-12-05 10:43:38 +10:00
82038e31a9
Update Amazon EC2 Docker installation instructions
...
The installation guide for EC2 is outdated, as the current version of Amazon Linux (2014.09) is now Docker ready. No need to go through the manual route anymore. The official AMI has Docker packages in the repository now (this was the 'pre-release' option in the outdated instructions).
Docker-DCO-1.1-Signed-off-by: David Mat <david@davidmat.com > (github: davidmat)
Upstream-commit: da667581cffec4048d848454266b8d3cad55c859
Component: engine
2014-12-04 21:02:29 +01:00
25e75bf1f1
Fixing docs formatting for the forcerm flag on docker build
...
Signed-off-by: Jonathan A. Sternberg <jonathansternberg@gmail.com >
Upstream-commit: eb7d646a44d76c4a7f96fa6ef28de9fbbbaf17ca
Component: engine
2014-12-04 12:35:31 -05:00
f3226b6931
Note that using -lxc-conf to change things Docker manages has pitfalls
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: b91d330088958bca4e59285a55fdc5593d2a86ad
Component: engine
2014-12-04 11:49:06 +10:00
