923b4bd8ef
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: 950073aabb305db6156709ea8509b1f72ff06f3b
Component: engine
2016-06-21 15:29:25 +08:00
b2b2e47716
Add some tests for bundlefile and improve the error messages for LoadFile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c0ea589c1b27f8b68e84cfe6692a7639da52ce6d
Component: engine
2016-06-16 18:18:25 -04:00
848e510213
plugins: experimental support for new plugin management
...
This patch introduces a new experimental engine-level plugin management
with a new API and command line. Plugins can be distributed via a Docker
registry, and their lifecycle is managed by the engine.
This makes plugins a first-class construct.
For more background, have a look at issue #20363 .
Documentation is in a separate commit. If you want to understand how the
new plugin system works, you can start by reading the documentation.
Note: backwards compatibility with existing plugins is maintained,
albeit they won't benefit from the advantages of the new system.
Signed-off-by: Tibor Vass <tibor@docker.com >
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: f37117045c5398fd3dca8016ea8ca0cb47e7312b
Component: engine
2016-06-14 14:20:27 -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
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
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
87c4c2885f
authz: cleanups
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: d1b7e8373bde77819a25fce94bdfa9725608215e
Component: engine
2016-06-12 17:23:19 +02:00
a734e84285
pkg: authorization: lock when lazy loading
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: ceb9c5a88b5fa7d0b6c0901fa6b44ec89e81c2dc
Component: engine
2016-06-12 17:19:43 +02:00
04ae4edf2f
Fix logrus formatting
...
This fix tries to fix logrus formatting by removing `f` from
`logrus.[Error|Warn|Debug|Fatal|Panic|Info]f` when formatting string
is not present.
This fix fixes #23459 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: a72b45dbec3caeb3237d1af5aedd04adeb083571
Component: engine
2016-06-11 13:16:55 -07:00
b3cd08e4c9
Merge pull request #23458 from runcom/warnf
...
*: fix logrus.Warn[f]
Upstream-commit: ec1790d7f110366a438202c61985d377c4e2b43a
Component: engine
2016-06-11 21:42:12 +02:00
763e6c326e
*: fix logrus.Warn[f]
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 44ccbb317c2ca67fd8a88147b1ff80ce83d453cc
Component: engine
2016-06-11 19:42:38 +02:00
2454579907
pkg: proxy: fix TCPEchoServer.Close() in unit test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 809207fc7432b59257d4026b98467ba7414014be
Component: engine
2016-06-11 15:27:56 +02:00
6a3cd56f2e
pkg: chrootarchive: chroot_linux: fix mount leak
...
When pivot_root fails we need to unmount the bind mounted path we
previously mounted in preparation for pivot_root.
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 7d22887b2c8f4de99c3da7c3a0394ca53fb1c4eb
Component: engine
2016-06-11 00:07:41 +02:00
df727cdb81
update peaceful zen
...
Signed-off-by: fortinux <info@fortinux.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cd7ca2a1c761886ba937efef2ea5fbd90d371c1b
Component: engine
2016-06-10 16:39:05 +02:00
a37552bd58
pkg: archive: only ignore ENOTSUP when xattr fails
...
There might be other (valid) reasons for setxattr(2) to fail, so only
ignore it when it's a not supported error (ENOTSUP). Otherwise, bail.
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: e6d856df43ac2877ebbcff26e9f3ee755f52bce9
Component: engine
2016-06-10 00:56:40 +10:00
2f84275837
Update archive package to support overlay whiteouts
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 8222c86360b3f63174e1dbd9b35e27a3d01298bc
Component: engine
2016-06-08 00:10:16 -07:00
5798927ced
aufs compatibility
...
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com >
Upstream-commit: b03d3232d19db476077b845cbfc796f4ae3ec7b6
Component: engine
2016-06-08 00:10:16 -07:00
545244368d
Cleanup
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: ccaea227e0e9356ab293610784b635c643e9a15e
Component: engine
2016-06-06 15:57:51 -07:00
9cd9d4349d
ioutils: fix race in access closeErr in bytespipe
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: b32478488ce6d373e44bb8a6c9cb986c773ad48e
Component: engine
2016-06-06 11:29:47 -07:00
da4d783e80
Add support for volume scopes
...
This is similar to network scopes where a volume can either be `local`
or `global`. A `global` volume is one that exists across the entire
cluster where as a `local` volume exists on a single engine.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2f40b1b281a3be8f34d82a5170988ee46ea1f442
Component: engine
2016-06-05 15:37:15 -04:00
6e1304c58a
Enhance pluginrpc-gen parser
...
Now handles `package.Type` and `*package.Type`
Fixes parsing issues with slice and map types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 79ff6eaf21dfebad0f8131a1ede235249cd6638f
Component: engine
2016-06-05 15:37:15 -04:00
5578aba972
Merge pull request #23193 from allencloud/fix-typos
...
use grep to find all a/an typos
Upstream-commit: 98c245c9e63793cf8ca03c5500e0820447c1861c
Component: engine
2016-06-02 18:45:08 -07:00
f525106e1c
pkg/parser/kernel: remove unused var block
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6e5894b5511846b1be64f6fcae73a8b4ddd0ef24
Component: engine
2016-06-02 10:50:36 -07:00
53602a37d4
Merge pull request #22549 from allencloud/make-pkg-parsers-support-darwin
...
add darwin support in package docker/pkg/parsers
Upstream-commit: 34f54b3a11291b70b4316c2b4e047d8aafa95bed
Component: engine
2016-06-02 10:48:19 -07:00
eaf6e81896
Merge pull request #23153 from AkihiroSuda/fix23152PkgGitutils
...
Fix gitconfig dependency in pkg/gitutils.TestCheckoutGit
Upstream-commit: f69353a364e0ec6ddb0cff3991ee0b44d87285c1
Component: engine
2016-06-02 17:21:38 +02:00
bd8dbcc1e8
Merge pull request #22460 from jwhonce/wip/sigpipe
...
Ignore SIGPIPE events
Upstream-commit: 171af5493121bada5c0e8167ade44da52648d0e2
Component: engine
2016-06-02 16:05:22 +02:00
35c5774373
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: c1be45fa38e82054dcad606d71446a662524f2d5
Component: engine
2016-06-02 17:17:22 +08:00
c39a2ca771
Fix gitconfig dependency in pkg/gitutils.TestCheckoutGit
...
Fix #23152
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: efc250bc6b1c252a5884011402b9e4dc4a1632d7
Component: engine
2016-06-02 17:44:09 +09:00
e42445eaa3
make pkg/parsers support darwin and solaris
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: a7f551359ad187a37663b39afdfe33122addea30
Component: engine
2016-06-02 11:47:27 +08:00
86a406432b
Merge pull request #23151 from AkihiroSuda/fix23012PkgAuth
...
Fix racy tests in pkg/authorization
Upstream-commit: 7e5561a438bebd8bd2096231e3d2848b016a162b
Component: engine
2016-06-01 20:45:54 -04:00
ec0b8580b4
Fix racy tests in pkg/authorization
...
Fix #23012
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: f437e2d1485bfb64ac0ecc85ac3b14975e9f51f6
Component: engine
2016-06-01 03:25:56 +00:00
bfacd3cf40
Fix pkg/streamformatter.TestJSONFormatProgress
...
The test was failing if the terminal column width is <= 110.
Addendum to #23113
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: da7edb5f3cd2200b57149aa5096f8aa70f951ed8
Component: engine
2016-05-31 09:09:06 +00:00
1e94dac61d
Merge pull request #23113 from AkihiroSuda/fixTIOCGWINSZ23112
...
Fix pkg/jsonmessage.TestProgress panic
Upstream-commit: ba372df79c410438cd39d7c7c2b02e4ebc76bc5f
Component: engine
2016-05-31 14:58:55 +08:00
f88f2ccec9
Merge pull request #23038 from AkihiroSuda/fixPkgDirectoryFilepathWalk
...
Fix filepath.Walk misusage in pkg/directory
Upstream-commit: a1f1e9c6d9b47a51e7ddc1c123ebd8b50605e230
Component: engine
2016-05-30 22:18:56 -07:00
04dff50af9
Fix pkg/jsonmessage.TestProgress panic
...
Fix #23112
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 709478c8a3bfaf935dcb37b4f4e0085832868eb7
Component: engine
2016-05-31 04:19:00 +00:00
84622fbef7
Fix filepath.Walk misusage in pkg/directory
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: cd53ec524410020db312089f2623b1a50f30121e
Component: engine
2016-05-30 07:40:46 +00:00
c93effc149
Change insane to infallible
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: cc5024225a37d8e804a9b797299f92084423091a
Component: engine
2016-05-28 09:49:34 -07:00
e813bd3871
Merge pull request #23041 from AkihiroSuda/fixPkgDiscoveryKvTestTooShortSleep
...
Fix too short time.Sleep() in pkg/discovery/kv/kv_test.go
Upstream-commit: 936945760314801b99b471227937fc5a302f72e7
Component: engine
2016-05-27 21:11:33 -04:00
b822217717
Merge pull request #22912 from duglin/FixImportTest
...
Fix docker import test
Upstream-commit: fd7ec4b9e58fe5ba4abab4f60b63552e11246f3c
Component: engine
2016-05-27 14:03:44 -07:00
3b66dda032
Fix too short time.Sleep() in pkg/discovery/kv/kv_test.go
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 937851580c91a5129a0a2f236e315b8b090a91fd
Component: engine
2016-05-27 04:08:55 +00:00
0e099055bb
Inconsistent --tmpfs behavior
...
This fix tries to address the issue raised in #22420 . When
`--tmpfs` is specified with `/tmp`, the default value is
`rw,nosuid,nodev,noexec,relatime,size=65536k`. When `--tmpfs`
is specified with `/tmp:rw`, then the value changed to
`rw,nosuid,nodev,noexec,relatime`.
The reason for such an inconsistency is because docker tries
to add `size=65536k` option only when user provides no option.
This fix tries to address this issue by always pre-progating
`size=65536k` along with `rw,nosuid,nodev,noexec,relatime`.
If user provides a different value (e.g., `size=8192k`), it
will override the `size=65536k` anyway since the combined
options will be parsed and merged to remove any duplicates.
Additional test cases have been added to cover the changes
in this fix.
This fix fixes #22420 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 397a6fefadf9ac91a5c9de2447f4dea607296470
Component: engine
2016-05-26 19:28:18 -07:00
a3e048ef64
make package docker/pkg/platform support darwin
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: e18296f4f06595c4becc90bf6db4f3d2b8a625c5
Component: engine
2016-05-26 11:10:29 +08:00
2b4f5fa2df
Merge pull request #22951 from Microsoft/jjh/ise2
...
Windows: run -it not crash in PowerShell ISE
Upstream-commit: e010610828456fcb9ccce46723894c4dff238daf
Component: engine
2016-05-25 16:50:06 -07:00
3f005ffe52
Windows: run -it not crash in ISE
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 486a1a03d86a679740d79c2ef5e2a9574342f8c3
Component: engine
2016-05-25 09:50:18 -07:00
558c1d058e
Merge pull request #22973 from AkihiroSuda/fix22965IntegrationRace
...
Fix a race in pkg/integration.TestChannelBufferTimeout
Upstream-commit: 53e2deb1590c8d0b6bf7c700c630dc432ea772d4
Component: engine
2016-05-25 11:35:23 -04:00
a4084df811
Fix a race in pkg/integration.TestChannelBufferTimeout
...
Update #22965
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: d0d828e292733fa1d5e2d09d7f184be69129e757
Component: engine
2016-05-25 07:09:38 +00:00
3b8abc6850
Fix a race in pkg/discovery/memory
...
Fix #22964
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 1f8fbbc0d830ad9a887d04a25152ea344688903b
Component: engine
2016-05-25 04:01:43 +00:00
6373766983
Merge pull request #22925 from jstarks/fix_integration_test
...
pkg/integration: Port tests to Windows
Upstream-commit: 29dbcbad878483d9239d6a432c85620aced895c4
Component: engine
2016-05-24 17:31:43 -04:00
866c631581
pkg/integration: Port tests to Windows
...
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 8fc825364ac60848d4278c00429838c3f28f2cd7
Component: engine
2016-05-24 12:12:48 -07:00
3a35464d9d
Get the Docker Engine to build clean on Solaris
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com >
Upstream-commit: 86d8758e2bb5e9d21d454ceda90b33feb8e74771
Component: engine
2016-05-23 16:37:12 -07:00
