Commit Graph

24901 Commits

Author SHA1 Message Date
6c19b5ff61 Allow user to specify container's link-local addresses
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 1c4efb6aa05026efce99a7a5bb7e710c0f1b3002
Component: engine
2016-06-14 14:28:33 -07:00
f3176ba51f Merge pull request #23489 from thaJeztah/fix-indentation
API docs cleanup
Upstream-commit: c913dd5f575c877b93a812c8f57dcc212d566b87
Component: engine
2016-06-14 21:49:48 +10:00
b2d3f0c2e7 Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12
surfacing Learn by example topics to top level of Docker Engine docs
Upstream-commit: 2a96ac66ea41d206161a6ef022e10d53f99e86ec
Component: engine
2016-06-14 21:10:17 +10:00
d6f84e3953 Merge pull request #23506 from albers/completion-daemon---live-restore
bash completion for `docker daemon --live-restore`
Upstream-commit: 74873f192ad0b0cdced4a3fcc2170e5d69aabbb5
Component: engine
2016-06-14 17:24:00 +08:00
56c2250686 Merge pull request #23501 from dmcgowan/fix-overlay-diff-test
Remove failing overlay test
Upstream-commit: 31e48e85ef929f2b2b232f4c971f7c7966002539
Component: engine
2016-06-14 10:49:42 +02:00
9edd438677 Merge pull request #23484 from onlyjob/bash-completion
Fix syntax errors in bash-completion (Closes: #23483)
Upstream-commit: 1cb16a1b4130e7e83cbe033bff1daea861696915
Component: engine
2016-06-14 10:13:29 +02:00
0173891ba6 Merge pull request #23361 from docker/swarm
Add dependency to docker/swarmkit
Upstream-commit: a1e319e847f41e648ebede7f9d79999d75bd14c8
Component: engine
2016-06-14 00:55:55 -07:00
da7d2c47f4 bash completion for docker daemon --live-restore
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 73882e8f833f3b141c309d543cfe9e84efc00e62
Component: engine
2016-06-14 09:14:25 +02:00
9edf6c9627 Merge pull request #23490 from shishir-a412ed/dm_options_modularized
Modularize dm.use_deferred_removal and dm.use_deferred_deletion logic.
Upstream-commit: c69614deae7f20e0dbff8399ce3a8d11014b0f43
Component: engine
2016-06-14 08:47:43 +02:00
dc116784a5 Merge pull request #23093 from tkopczynski/20784-builder-dockerfile-outside-context
Builder integration tests for Dockerfile outside context as a unit test
Upstream-commit: 7d988a7aa6ae20020f0f96c6e2a47377e3567a3d
Component: engine
2016-06-14 08:44:24 +02:00
44db465ebc Remove failing overlay test
Diff apply is sometimes producing a different change list causing the tests to fail.
Overlay has a known issue calculating diffs of files which occur within the same second they were created.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 0e74aabbb9aa5cea0b6bf7342f9e325f989468fa
Component: engine
2016-06-13 22:34:57 -07:00
2f81321106 add tutorial
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: ea4fef2d875de39044ca7570c35365b75086e8a5
Component: engine
2016-06-13 22:17:15 -07:00
69f307bc8b CLI docs
Signed-off-by: Amit Shukla <amit.shukla@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 9acf97b72a4d5ff7b1bcad36fb19b53775f01596
Component: engine
2016-06-13 22:17:15 -07:00
e808aa4ed0 Add Swarm management CLI commands
As described in our ROADMAP.md, introduce new Swarm management commands
to call to the corresponding API endpoints.

This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 12a00e60177ca42bfb1dd9ebd5dce1c7039da6dd
Component: engine
2016-06-13 22:17:15 -07:00
2a2694e613 Merge pull request #23224 from mlaventure/dont-overwrite-existing-deb
Do not overwrite already published deb files when releasing
Upstream-commit: 494098534023096f016fa7f184b379929a3f8096
Component: engine
2016-06-13 22:16:53 -07:00
429bf7a983 Add swarm api reference docs
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: d4abe1d84a58461fea54d2046c24ae5d869fa41e
Component: engine
2016-06-13 22:16:18 -07:00
7a33d63cb2 Swarm integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0d88d5b64b69a451d374e322b2abe64140a6cd1c
Component: engine
2016-06-13 22:16:18 -07:00
be63983b3a Add Swarm management backend
As described in our ROADMAP.md, introduce new Swarm management API
endpoints relying on swarmkit to deploy services. It currently vendors
docker/engine-api changes.

This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 534a90a99367af6f6bba1ddcc7eb07506e41f774
Component: engine
2016-06-13 22:16:18 -07:00
230cf74120 Add dependency to docker/swarmkit
Add a dependency to `docker/swarmkit` in preparation for adding
first-class Swarm-wide service management inside the Docker Engine as
described in our ROADMAP.md.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 44793049ce1ad364720b4be915a92291d1f808c2
Component: engine
2016-06-13 22:16:18 -07:00
c5ea3eb7f3 Merge pull request #23373 from capkurmagati/23211-spf13-cobra-ps
Migrate ps command to cobra
Upstream-commit: c81c131a409a04ca11686c71798acf9df8ddfdbc
Component: engine
2016-06-13 22:12:20 -07:00
9ada0cfc5f Merge pull request #23213 from crosbymichael/restore-option
Add --live-restore flag
Upstream-commit: 3020081e94277410984c62d12f88de3d4f258681
Component: engine
2016-06-13 20:57:19 -07:00
b552616d65 Migrate ps command to cobra
Signed-off-by: Tianyi Wang <capkurmagati@gmail.com>
Upstream-commit: 5a0b53b5a3d779e26a51230dfbdbf53bdd6b18d4
Component: engine
2016-06-14 11:59:37 +09:00
7af900395b Add --live-restore flag
This flags enables full support of daemonless containers in docker.  It
ensures that docker does not stop containers on shutdown or restore and
properly reconnects to the container when restarted.

This is not the default because of backwards compat but should be the
desired outcome for people running containers in prod.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d705dab1b1bd0a946d647374325d61fac57736db
Component: engine
2016-06-13 19:16:26 -07:00
384a0525c9 Merge pull request #23447 from Microsoft/RemoveQosValidation
Removed QoS validation on Windows
Upstream-commit: bfed05be0b9bfc04bf922d79dd8dc420e1e579e2
Component: engine
2016-06-13 14:47:06 -07:00
abe6b8e4ec Merge pull request #23425 from runcom/authz-race
pkg: authorization: lock when lazy loading
Upstream-commit: 5338ae713347aa8c1139cbcfd8e07746eff52a51
Component: engine
2016-06-13 23:20:37 +02:00
7f718199ae Merge pull request #23256 from vdemeester/migrate-pull-push-to-cobra
Use spf13/cobra for docker push and docker pull
Upstream-commit: f0193e278c31fb568c4cbbdc046e84a0d1a3390b
Component: engine
2016-06-13 14:16:42 -07:00
b87258cf19 Merge pull request #23265 from vdemeester/migrate-login-logout-to-cobra
Use spf13/cobra for docker login and docker logout
Upstream-commit: a502158d8a9b3a3949eb0bc0b087138ef65efabb
Component: engine
2016-06-13 14:15:46 -07:00
8b68fb04f6 Merge pull request #23309 from yongtang/23211-spf13-cobra-commit
Use spf13/cobra for docker commit
Upstream-commit: e6c49bf71b44a2513c37c08f488bf05089ac1f76
Component: engine
2016-06-13 14:13:37 -07:00
ce19593c15 surfacing Learn by example topics to top level of Docker Engine docs
fixing links after moving surfacing tutorials

fixing more links for the newly located tutorials

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 8eca8089fa35f652060e86906166dabc42e556f8
Component: engine
2016-06-13 13:32:30 -07:00
7bec8a2e7d Merge pull request #22126 from dmcgowan/overlay-native-diff
Overlay multiple lower directory support
Upstream-commit: 8a2f9a249c28c0a80bac4b41eb318dfe68f63f0d
Component: engine
2016-06-13 13:15:39 -07:00
2fe8f9bbb3 Merge pull request #23195 from cyli/update-content-trust-docs
Update content trust docs to reflect latest notary compose file changes
Upstream-commit: 1842077541d1679c20932ed66c07081759c36c7f
Component: engine
2016-06-13 22:11:32 +02:00
b0a6df1b32 Update content trust docs to reflect latest notary compose file changes, and to simplify
the instructions by providing a single compose file that runs the notary server, registry,
and a docker-in-docker trust sandbox.

Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: ba115b0a91970f434e41e9f72caccc01493a9729
Component: engine
2016-06-13 12:57:06 -07:00
711259e403 Merge pull request #23261 from dimrozakis/23260
Escape brackets in hack/install.sh
Upstream-commit: f7600fc6413cc7dcc5a243c174ecb086870fb16f
Component: engine
2016-06-13 20:19:26 +02:00
5751f65265 Merge pull request #23473 from coolljt0725/fix_stop_crash
Fix shutdown daemon during daemon staring casue crash
Upstream-commit: d169f057d9007580aa7ddb3ca7fca8de1e481081
Component: engine
2016-06-13 20:08:12 +02:00
f38c785cc7 Merge pull request #23485 from sbose78/22514-run-image-using-digest
Fixes #22514 - Added example for using image digest in the docker run command
Upstream-commit: 3bb42723acf4a6ade3f9f1a1819ca6ef530c2032
Component: engine
2016-06-13 20:07:17 +02:00
f7c1d79a55 Add documentation for using overlay2
Add mention in dockerd command line and storage driver selection documentation.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a546042b91f655c7cf53484cdb0c5c8b3cf12d33
Component: engine
2016-06-13 11:06:47 -07:00
a8d0a6bea4 Added example for using image digest in the docker run command
Signed-off-by: Shoubhik Bose <sbose78@gmail.com>

Added explanation for the example with image's digest ( as per @thaJeztah 's comment

Signed-off-by: Shoubhik Bose <sbose78@gmail.com>

Wrapped to ~80 chars

Signed-off-by: Shoubhik Bose <sbose78@gmail.com>
Upstream-commit: e6e8c4d700c4510e463eb16fedba51b6e8a3ccd6
Component: engine
2016-06-13 18:00:41 +00:00
0a17038359 Merge pull request #23443 from swernli/servicing-async
Updating call sequence for servicing Windows containers
Upstream-commit: 50c7bcac1e22a6a3dd39bec4136aa96136f56eb2
Component: engine
2016-06-13 19:49:23 +02:00
9f139dff3a Merge pull request #22631 from runcom/fix-leak-mount
pkg: chrootarchive: chroot_linux: fix mount leak
Upstream-commit: 8eb1d89c1755150fef42799f284866ebe604b7dc
Component: engine
2016-06-13 09:29:46 -07:00
19552d6875 Modularize dm.use_deferred_removal and dm.use_deferred_deletion logic.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: cac6658da061f01b4abd5b4bd1a7aeb234e8401d
Component: engine
2016-06-13 12:05:46 -04:00
8efd4f5028 API docs cleanup
fix some formatting issues and consistency;

- Change capitalization (Query Parameters -> Query parameters, Json -> JSON)
- Make Query/JSON parameters and Status codes headings bold
- Fix indentation of some code blocks
- Fix headings (H2 -> H1), although all headings should be shifted the other way
  round ;-)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a4438ca606223f7c8ae5edb4101ff5eaae39fb05
Component: engine
2016-06-13 16:37:24 +02:00
1770a37dc6 Merge pull request #23416 from dnephin/fix-daemon-help
Support running 'docker help daemon' with split binaries
Upstream-commit: 0b879b993df3332814da3c2ae3ba470df84226d2
Component: engine
2016-06-13 15:46:12 +02:00
8058305668 Merge pull request #22575 from mountkin/fix-22536
fix LogConfig for containers created before docker 1.12 on daemon start
Upstream-commit: 6ba3d63a8ccd58423495c52b003cd01c7b0c7e10
Component: engine
2016-06-13 15:11:01 +02:00
f975e2aa92 Fix syntax errors in bash-completion (Closes: #23483)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
Upstream-commit: 546594eaaa47e367cef17a3acae2854fba125efe
Component: engine
2016-06-13 19:12:31 +10:00
5fe11026e0 Fix shutdown daemon during starting causes daemon crash
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3c25656efa812a4c969c833623f3b96f86116e77
Component: engine
2016-06-13 02:10:37 -04:00
4f9252d408 Merge pull request #23478 from cpuguy83/22833_optional_mountpoint_docs
Clarify volume plugin `Mountpoint` is optional
Upstream-commit: 9a8affb0ffdf6010fca6a1c8fb00c9e0a38845d6
Component: engine
2016-06-13 14:22:48 +10:00
5fb049a186 Merge pull request #23479 from thaJeztah/fix-typo
Fix typo in error message
Upstream-commit: 0d744de9abc868ae79d813a93ed571670dd97bd6
Component: engine
2016-06-13 00:49:44 +02:00
8478f2a319 Merge pull request #23444 from Microsoft/RevendorHcsshim
Update vendored hcsshim to v0.3.4
Upstream-commit: bf0e2cb1b632b46a070fd6141d8abf5de5f69231
Component: engine
2016-06-13 00:41:09 +02:00
4484af9ebf Fix typo in error message
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4ace1811b4a0c0a48f1aeeba996b8096a3a4bb2d
Component: engine
2016-06-12 23:22:26 +02:00
6103097f27 Note about mountpoint being optional
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: edd80498d5b1b7686f2179dc5c6602093295a21e
Component: engine
2016-06-12 16:34:09 -04:00