toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,107 Commits 3 Branches 295 Tags
a369a60b8b3907c29462b33a13e7489c47e6847e
Commit Graph
23107 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov a369a60b8b Merge pull request #21301 from cpuguy83/cleaner_file_log 
Fixes some issues with jsonfile write/read
Upstream-commit: 11b4c89087cb7d6014e6106521ebb92fa74d01ab
Component: engine
 2016-03-21 14:03:36 -07:00
Tibor Vass 8fe817f6cc Merge pull request #21106 from yongtang/20122-volume-one-character 
Fix one-character directory issue in the volume option (#20122).
Upstream-commit: 3ac32cd72e2cbb4201666a260ef8b2b740c6bc78
Component: engine
 2016-03-21 16:41:03 -04:00
Vincent Demeester 6d6fe29dc2 Merge pull request #21360 from WeiZhang555/clean 
Clean dead code
Upstream-commit: 7bbf58ed0d60e26a6514ac8219277ffb8ca63d17
Component: engine
 2016-03-21 18:42:10 +01:00
Vincent Demeester f1f7a4b7fc Merge pull request #19439 from pcarrier/pcarrier/19438-async-connections-to-fluentd 
fluentd logger: support all options besides Unix sockets
Upstream-commit: d82ad12df813824d9166478068536d7d78cf0b69
Component: engine
 2016-03-21 18:09:14 +01:00
Alexander Morozov 78405a5d4a Merge pull request #21283 from runcom/update-test 
vendor docker/distribution d06d6d3b093302c02a93153ac7b06ebc0ffd1793
Upstream-commit: a05fdd680662d36c6d79add46b07ad5dcee7f6d7
Component: engine
 2016-03-21 09:46:28 -07:00
Arnaud Porterie 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
David Calavera 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
David Calavera 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
David Calavera 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
Brian Goff d7a627364b Fixes some issues with jsonfile write/read 
This cleans up some of the use of the filepoller which makes reading
significantly more robust and gives fewer changes to fallback to the
polling based watcher.
In a lot of cases, if the file was being rotated while we were adding it
to the watcher, it would return an error that the file doesn't exist and
would fallback.
In some cases this fallback could be triggered multiple times even if we
were already on the fallback/poll-based watcher.

It also fixes an open file leak caused by not closing files properly on
rotate, as well as not closing files that were read via the `tail`
function until after the log reader is completed.

Prior to the above changes, it was relatively simple to cause the log
reader to error out by having quick rotations, for example:
```
$ docker run --name test --log-opt max-size=10b --log-opt max-files=10
-d busybox sh -c 'while true; do usleep 500000; echo hello; done'
$ docker logs -f test
```
After these changes I can run this forever without error.

Another fix removes 2 `os.Stat` calls when rotating files. The stat
calls are not needed since we are just calling `os.Rename` anyway, which
will in turn also just produce the same error that `Stat` would.
These `Stat` calls were also quite expensive.
Removing these stat calls also seemed to resolve an issue causing slow
memory growth on the daemon.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 1ae9dcf97dc6ccaf7a7977fe8ae1812b691ccba2
Component: engine
 2016-03-21 11:05:58 -04:00
Antonio Murdaca 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Arnaud Porterie 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
Frank Groeneveld 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
Sebastiaan van Stijn 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
Pierre Carrier 0f2d2de049 fluentd logger: support all options besides Unix sockets 
Mostly useful for docker/docker#19438.

Signed-off-by: Pierre Carrier <pierre@meteor.com>
Upstream-commit: 13086f387b28ceea5aff5924e430f41608884a9b
Component: engine
 2016-03-21 10:03:21 +00:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Zhang Wei 3a29a44573 Clean dead code 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: c9db9e4ff1ca2e563328c6c618184d9aa8393ac5
Component: engine
 2016-03-21 16:43:24 +08:00
Yong Tang cd3a202f52 Fix one-character directory issue in the volume option (#20122). 
The issue comes from the implementation of volumeSplitN() where a
driver letter (`[a-zA-Z]:`) was assumed to follow either `:`, `/`,
or `\\`.

In Windows driver letter appears in two situations:
a. `^[a-zA-Z]:` (A colon followed  by `^[a-zA-Z]:` is OK as colon is
the separator in volume option)
b. A string in the format like `\\?\C:\Windows\...` (UNC).
Therefore, a driver letter can only follow either a `:` or `\\`

This PR removes the condition of `/` before the driver letter so
that options like `-v /tmp/q:/foo` could be handled correctly. A
couple of tests has also been added.

This PR fixes #20122.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 800a7d513d3b80478a7996cb2c357b72f65e0b09
Component: engine
 2016-03-21 02:55:06 +00:00
Yong Tang 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
Doug Davis 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
John Howard 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
Jess Frazelle 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
Brian Goff afd8935428 Merge pull request #21344 from tonistiigi/fix-seccomp-profiles 
Reuse profiles/seccomp package
Upstream-commit: 09a69ed8b9907742db00190999341cb642352117
Component: engine
 2016-03-20 14:04:11 -04:00
Pierre Carrier 0d8ebbb32a bump fluent-logger-golang version 
This version supports async connections.

Signed-off-by: Pierre Carrier <pierre@meteor.com>
Upstream-commit: 9c2a0739fb9c5e3636425d669f0ab860ea1bfbae
Component: engine
 2016-03-20 16:22:21 +00:00
Pierre Carrier 35aa0cbae1 Revert "Added flag to ignore fluentd connect error on container start" 
This reverts commit 3cf82ff1ab14e1ddd2b629524e894ac359168388.

Signed-off-by: Pierre Carrier <pierre@meteor.com>
Upstream-commit: d89dae6e4becc16e80e3781ac68b9fbb855947b3
Component: engine
 2016-03-20 16:22:19 +00:00
Tonis Tiigi 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
Tonis Tiigi 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
Paul Liljenberg 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
Tonis Tiigi 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
Vincent Demeester f70a4e02ca Merge pull request #21338 from Microsoft/jjh/lcdcleanup 
Windows: libcontainerd cleanup
Upstream-commit: 9e530247e066ef7a32e35a1f0f818c1e4048ad54
Component: engine
 2016-03-19 15:14:10 +01:00
Antonio Murdaca 6ab75fcf92 distribution: errors: do not retry if no token in response 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 264b5b60832bf1f1342618d059c0ece3358de7e1
Component: engine
 2016-03-19 12:20:14 +01:00
Antonio Murdaca 2aaa69712c vendor docker/distribution d06d6d3b093302c02a93153ac7b06ebc0ffd1793 
- fix and add integration tests

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: c48439af7f33fccc17013ae7f9e64d4c107502f1
Component: engine
 2016-03-19 12:19:48 +01:00
John Howard 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
John Howard 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
Jess Frazelle 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
Brian Goff 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
Jess Frazelle ba41c51be4 Merge pull request #20662 from tonistiigi/containerd-integration 
Containerd integration
Upstream-commit: e5a3f86e447dd659da3c2e759f3c088a0bfcfe3d
Component: engine
 2016-03-18 17:21:18 -07:00
Jess Frazelle 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
Brent Salisbury 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
Brian Goff 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
John Howard 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
Tonis Tiigi 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
Tonis Tiigi 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
Tonis Tiigi 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
Tonis Tiigi 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
Brian Goff 60ab5793ac Merge pull request #21332 from jfrazelle/change-email 
change email
Upstream-commit: 03003619af04d62c9d02b79031bdd26d0254f3cb
Component: engine
 2016-03-18 16:28:51 -04:00
Jessica Frazelle 7c520b0e93 change email 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: d3b650062faec3d1cc05eae8847d88d8227c1c4a
Component: engine
 2016-03-18 13:17:28 -07:00