fe56b4ef22
add label support for build, networks and volumes
...
build: implement --label
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
network: allow adding labels on create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
volume: allow adding labels on create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
add tests for build, network, volume
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
vendor: libnetwork and engine-api bump
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: fc214b4408d915e3510f61c7584ca01c176d1373
Component: engine
2016-03-22 11:49:06 -04:00
50eb81fd53
Merge pull request #21342 from tonistiigi/cleanup-libcontainer
...
Convert libnetwork stats directly to api types
Upstream-commit: 2a4c970aeb23cace02963eb364474e6197388170
Component: engine
2016-03-21 08:54:03 -07:00
2d1c4a6369
Merge pull request #21313 from Microsoft/sjw/logs_fix
...
Fixing logs file handle leak.
Upstream-commit: be8459c24891648849cb6123b6f60c885e03a99f
Component: engine
2016-03-21 08:41:31 -07:00
e295486862
Merge pull request #21336 from Microsoft/jjh/fixunmount
...
Windows: Fix unmount for Hyper-V Containers
Upstream-commit: 336d585292cb2551b423c0dcd0646cf152f9a6a4
Component: engine
2016-03-21 08:40:52 -07:00
87ea70e1fd
Merge pull request #21362 from frenkel/engine-api-update-for-openbsd
...
Update vendored engine-api for OpenBSD support
Upstream-commit: c2550c4f7bf82b58e0f2e614cbae2d523282b432
Component: engine
2016-03-21 08:38:13 -07:00
5fe3bfd34f
Merge pull request #21333 from cpuguy83/sigpipe
...
Don't forward SIGPIPE from client to container
Upstream-commit: 5008a34072e55f7df87774a5e7beca979718c3c2
Component: engine
2016-03-21 15:09:13 +01:00
4d66f124fe
Merge pull request #21364 from thaJeztah/carry-21188-fix-docker-info-docs
...
docs: fix incorrect output for "/info" endpoint
Upstream-commit: c9488fe280682cbb66379136c4a181ed65cac665
Component: engine
2016-03-21 13:38:35 +01:00
7c22b437f4
Merge pull request #21246 from nerdalert/vlan_docs
...
Updates to macvlan/ipvlan experimental docs
Upstream-commit: fffa83353f5f133227dccdd4c652749c31b634d3
Component: engine
2016-03-21 13:16:52 +01:00
b9d40a7c24
docs: fix incorrect output for "/info" endpoint
...
OomScoreAjd is not part of `/info` output
Wrong field name `DiscoveryBackend` in API reference
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9014ac2d15b65559468ef0496061a38b919e1680
Component: engine
2016-03-21 12:55:45 +01:00
b2b2246770
Update vendored engine-api for OpenBSD support
...
Signed-off-by: Frank Groeneveld <frank@frankgroeneveld.nl >
Upstream-commit: 3cf8a9ede71081efbade168fa6ff6d65d2a0e4eb
Component: engine
2016-03-21 12:11:11 +01:00
42d4192417
Merge pull request #21353 from Microsoft/jjh/tidylibcontainerdmore
...
Windows: Tidy after libcontainerd
Upstream-commit: 722f06dae3fe18865978d0f7f531ceea15b4f51a
Component: engine
2016-03-21 11:06:54 +01:00
1b7ec52c5b
Merge pull request #21355 from yongtang/20188-plugins-docs
...
Update plugin docs for the covering of remote plugins (#20188 ).
Upstream-commit: 1a7afc075dbe948ea4016a2fcbfae3c37a69ab98
Component: engine
2016-03-21 10:28:25 +01:00
ab57f522eb
Merge pull request #21345 from duglin/BetterError
...
Add the name of the exe that's trying to be executed
Upstream-commit: 02a90d039946eff71ad116aafc2655050fde0dba
Component: engine
2016-03-21 10:17:10 +01:00
7d2c52081a
Update plugin docs for the covering of remote plugins ( #20188 ).
...
This fix updates the Plugin API docs to cover the case of remote
plugins which could be deployed on a host different from the
docker host, through spec or json files.
This fix closes #20188 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: c3ef69270ad397f9e43fc78c15b87ea19b011024
Component: engine
2016-03-21 02:42:10 +00:00
76875b2808
Add the name of the exe that's trying to be executed
...
so that the user knows what's not in the container but should be.
Its not always easy for the user to know what exact command is being run
when the 'docker run' is embedded deep in something else, like a Makefile.
Saw this while dealing with the containerd migration.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 79421606388169151c31d1c34079a98f53170ab8
Component: engine
2016-03-20 18:15:46 -07:00
01537880de
Windows: Tidy after libcontainerd
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3ca6ad5b9e6e37766d26c29f6a99bbd80961473c
Component: engine
2016-03-20 15:59:52 -07:00
893b5df1af
Merge pull request #21343 from pandrew/fix-debian-policy-rule
...
Fix debian policy rule
Upstream-commit: 9ea7e082ef833f1b4cd09e630cc18dbfe53f9f2b
Component: engine
2016-03-20 12:28:58 -07:00
179304ecf4
Reuse profiles/seccomp package
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 99b16b3523461551b03362305c36811372344af2
Component: engine
2016-03-19 14:15:39 -07:00
b86b204077
Remove unused libcontainer vendoring
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f25d9f0f236db5b3d8671c4e25016ca5a0f8535d
Component: engine
2016-03-19 13:04:37 -07:00
6c407f4849
Fix debian policy rule
...
Fix issue in debian policy by removeing double quotes.
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
Upstream-commit: f10c8e786b32ca4202702a57787830c2d0a9eef3
Component: engine
2016-03-19 20:58:19 +01:00
acf746a299
Convert libnetwork stats directly to api types
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: d36376f86c8944f6955f537a1a12f4072f8d7403
Component: engine
2016-03-19 12:56:45 -07:00
fa03957561
Windows: Fix unmount for Hyper-V Containers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4461bc45b6fafaabaf3a8158e2f785f836331bb5
Component: engine
2016-03-18 20:43:46 -07:00
c70fa5552d
Windows: libcontainerd cleanup
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e331df5aeefc1ebaa7a79ceb78350aba8cdabba1
Component: engine
2016-03-18 20:31:11 -07:00
20351391ce
Merge pull request #21274 from jfrazelle/fix-variables-that-werent-being-used
...
fix variables that werent being called
Upstream-commit: b77573f48e4022c7b8b829c4a33c6963fe08e18a
Component: engine
2016-03-18 18:03:15 -07:00
b070967d75
Merge pull request #21325 from frenkel/openbsd-support
...
Support OpenBSD build
Upstream-commit: 131c59193f16d1f752103f97302546ec819cb6f7
Component: engine
2016-03-18 20:53:17 -04:00
ba41c51be4
Merge pull request #20662 from tonistiigi/containerd-integration
...
Containerd integration
Upstream-commit: e5a3f86e447dd659da3c2e759f3c088a0bfcfe3d
Component: engine
2016-03-18 17:21:18 -07:00
ef4d935247
Merge pull request #21232 from calavera/consolidate_security_opts_format
...
Consolidate security options to use `=` as separator.
Upstream-commit: 06e98f0a5cf59c040e9f753d60f33ba22256d55c
Component: engine
2016-03-18 16:02:38 -07:00
9d333e528b
Updates to macvlan/ipvlan experimental docs
...
- Added a few more diagrams.
- Fixed typos and a few additional details.
- Moved experimental images to a new directory
in /experimental/images per @cpuguy83 suggestion.
Signed-off-by: Brent Salisbury <brent@docker.com >
Upstream-commit: 8926af95e4af4c3f8c6e28d1d054b9b6b7a13ff9
Component: engine
2016-03-18 18:46:46 -04:00
c955c9e289
Don't forward SIGPIPE from client to container
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 81707de23ff6d0b03bd8d5cda87efac7939d9d46
Component: engine
2016-03-18 16:50:18 -04:00
a76e16e99f
Windows libcontainerd implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Signed-off-by: John Starks <jostarks@microsoft.com >
Signed-off-by: Darren Stahl <darst@microsoft.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 94d70d835500bec3b171425271916d3e40f29635
Component: engine
2016-03-18 13:38:41 -07:00
9b20da1a3a
Remove execdriver package
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6eebe85290327ee9934ea996b6ef82c579789d97
Component: engine
2016-03-18 13:38:37 -07:00
8ba16d91c8
Replace execdrivers with containerd implementation
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 9c4570a958df42d1ad19364b1a8da55b891d850a
Component: engine
2016-03-18 13:38:32 -07:00
efaac80fee
Vendor containerd, specs, runc
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: cc83031ade5c4baed722c31603d56d54e4679681
Component: engine
2016-03-18 13:38:26 -07:00
5d6926e18b
Vendor updated grpc, protobuf
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 14299daacaf4e80735615ff9f42ba2479cf04486
Component: engine
2016-03-18 13:38:21 -07:00
7c520b0e93
change email
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: d3b650062faec3d1cc05eae8847d88d8227c1c4a
Component: engine
2016-03-18 13:17:28 -07:00
306477a8ef
Merge pull request #21269 from mlaventure/inspect-bind-mounts
...
Update inspect/ps to properly handle bind mounts
Upstream-commit: 6c6363c726ccfec97d577eff1cc60314f15dc841
Component: engine
2016-03-18 20:52:02 +01:00
0264a23a04
Fixing logs file handle leak.
...
Docker logs was only closing the logger when the HTTP response writer received a close notification, however in non-follow mode the writer never receives a close. This means that the daemon would leak the file handle to the log, preventing the container from being removed on Windows (file in use error). This change explicitly closes the log when the end of stream is hit.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 4570cfd3ba900253c18066a0299d64551dbf85cc
Component: engine
2016-03-18 11:00:15 -07:00
b021945636
Merge pull request #21299 from allencloud/handle-kernel-version-error-in-version-api
...
handle kernel version error in version api
Upstream-commit: ea0025a7e104dfcb53f331ece6b784d893011afd
Component: engine
2016-03-18 18:07:48 +01:00
d5c972ccf5
Merge pull request #21183 from thaJeztah/fix-flaky-TestUpdateRestartPolicy
...
Fix flaky TestUpdateRestartPolicy on Windows
Upstream-commit: a30332e705b3c75647859383e86d65a48fa5c412
Component: engine
2016-03-18 17:45:05 +01:00
709b902d70
Merge pull request #20200 from thockin/14282-hostname-domainname-v2
...
Don't smoosh hostname and domainname in API
Upstream-commit: ae75435dae9cb386eb213774f97fe35cdcafff49
Component: engine
2016-03-18 09:08:22 -07:00
6cb929cb7d
Merge pull request #21238 from yongtang/21211-TestRestartStoppedContainer
...
Fix flaky test of TestRestartStoppedContainer (#21211 ).
Upstream-commit: 6eaf4434eed297423133b79aa162a6b60165ad2d
Component: engine
2016-03-18 17:01:30 +01:00
4051a1b3e8
Merge pull request #21311 from nalind/journal-race
...
Fix a couple of races in the journald log reader
Upstream-commit: 8ef56e1f98377a10ae970db6b83bf7f269b73f7c
Component: engine
2016-03-18 08:53:21 -07:00
8d2c6b65a8
Cli binary can now be build on OpenBSD
...
Signed-off-by: Frank Groeneveld <frank@frankgroeneveld.nl >
Upstream-commit: 719a43ca3530c424c3875d8c066f7ab09195dfdc
Component: engine
2016-03-18 14:56:21 +01:00
ba90d2ea16
Merge pull request #21316 from estesp/daemon-dump-stack-note
...
Add documentation on the stack trace dump capability of the daemon
Upstream-commit: d2a8621b2002611a2c451540f69d0573ff5a055a
Component: engine
2016-03-18 14:29:55 +01:00
043ba80ee7
Add documentation on the dump-stack-traces capability of the daemon
...
Add a paragraph about how to force a stack trace dump to the daemon log.
This feature was added in Docker 1.9 I believe, but documentation was
never added.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: ae466aafcbd3e000ff9ec2e8bd354fc3cc3729e5
Component: engine
2016-03-18 09:25:18 -04:00
f457bb9949
Merge pull request #21302 from allencloud/fix-typos-in-several-files
...
fix typos in several files
Upstream-commit: 9f00b4b79c2625a689233fa993dbab2e47778ffd
Component: engine
2016-03-18 14:06:59 +01:00
d21fd46755
ISSUE-TRIAGE: fix shinny -> shiny typo
...
Signed-off-by: David Sheets <david.sheets@docker.com >
Upstream-commit: bd061b8df64b3015dc69b86a5c1de10ff37265cc
Component: engine
2016-03-18 09:42:49 +00:00
8298077028
Update the document error
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: edf0da968ca8d653a6e4c9333e55530305cb3625
Component: engine
2016-03-18 15:23:27 +08:00
4bffdb208b
Fix flaky test of TestRestartStoppedContainer ( #21211 ).
...
This fix addressed the issue of test TestRestartStoppedContainer
in #21211 . Inside the test, a `docker restart` command is
followed by a `docker logs` command. However, `docker restart`
returns immediately so there is no guarantee that `docker logs`
will wait until the restarted container completes the command
`echo foobar`.
This fix use the check of `{{.State.Running}} = false` to make
sure that the restarted container has already finished, before
invoking the `docker logs` command. The timeout is set to 20s
to make sure it passes WindowsTP4 check.
This fixes #21211 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 48ccdd46aea4bb16925d0a333f792a712f1c11dc
Component: engine
2016-03-18 05:50:23 +00:00
91649a03e2
fix typos in several files
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: f1d34ac2eb3611cde8c4a438f367595eb08a6fe8
Component: engine
2016-03-18 12:51:57 +08:00
