35425a4320
Merge pull request #21613 from wzyboy/support-unixgram-syslog-address
...
Support unixgram syslog address
Upstream-commit: dbee44c9e0d9f8afbbb86efd2c0bcbd66440cbbc
Component: engine
2016-04-28 11:06:17 -04:00
1bab3fd622
Merge pull request #22396 from sbellem/docs-typo-fix
...
Fix typo
Upstream-commit: 0bb4c902e091762e88d54699ba7677c9e62a3cbd
Component: engine
2016-04-28 15:27:28 +02:00
507bf1ac80
Fix typo
...
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io >
Upstream-commit: 63aa03ce0a9d2390f684da3403c1cd0e004592d1
Component: engine
2016-04-28 15:15:08 +02:00
459ceabfe5
Merge pull request #22391 from thaJeztah/update-changelog-in-master
...
merge changelog for v1.11.1 into master
Upstream-commit: feb8f0e10ea151608ed793ec0a88c1a3749f896d
Component: engine
2016-04-28 09:11:25 -04:00
dd728e39c9
Merge pull request #22320 from thaJeztah/docs-remove-duplicate-sentence
...
docs: remove duplicate line in "Understand the architecture"
Upstream-commit: d37e22b6237ba99adacf200e823d50aade38c551
Component: engine
2016-04-28 12:45:08 +02:00
d722206339
Merge pull request #22344 from cpuguy83/seccomp_for_centos
...
centos:7/oraclelinux:7 now includes libseccomp 2.2.1
Upstream-commit: 09021d6841b825dbaab901a34617358b03ae17ac
Component: engine
2016-04-28 12:26:22 +02:00
122b55086b
Add changelog for v1.11.1
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
(cherry picked from commit 4146b8b69b4fcc5a6ddbbac63f316695c2dbbb8f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ca0c1becea921300599b44dc5b4f2d6e463309ec
Component: engine
2016-04-28 12:15:17 +02:00
da56d24b50
Merge pull request #22269 from coolljt0725/skip
...
Skip TestBuildNotVerboseFailure if no network
Upstream-commit: bf7307558e42e0ad9f41316f397d880e6d4981b6
Component: engine
2016-04-28 11:19:56 +02:00
3cf7d71fdb
Merge pull request #21641 from yongtang/21595-discrepancy-on-hostname-validation
...
API/CLI discrepancy on hostname validation (#21595 ).
Upstream-commit: 78eb8a5fb932c2b11df47e7a22c05fe485e03adb
Component: engine
2016-04-28 09:25:13 +02:00
48a9de5e52
Support unixgram syslog address
...
- Consider unixgram:// as a valid URL prefix
- Parse unixgram:// addresses
- Update docs
Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org >
Upstream-commit: 57fad95e4352c72c852d740e54fd693a446c552f
Component: engine
2016-04-28 11:04:50 +08:00
600e267c7f
Skip TestBuildNotVerboseFailure if no network
...
TestBuildNotVerboseFailure use a non-exist image busybox1,
it requires network connection to access to Dockerhub, skip
this test if there is no network.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 9ab0aa43365cd648d7681a58b60e91f791bc920a
Component: engine
2016-04-27 21:29:05 -04:00
9074d644d1
Merge pull request #22362 from ZJU-SEL/update-doc
...
update cgroup link in doc of run
Upstream-commit: deb6ea4702924ff390e4a57414f735b18e4d7185
Component: engine
2016-04-28 00:48:47 +02:00
8e3735bee6
Merge pull request #22361 from duglin/removeCR
...
Remain extra \n on INFO log msg
Upstream-commit: 1158c921ab49793d87fc35e15eff23434822d6ab
Component: engine
2016-04-27 12:05:10 -07:00
7b8da9de87
Merge pull request #22229 from riyazdf/notary-doc-update
...
Update DCT docs with 1.11 info, fix typos
Upstream-commit: 861815a3252b88a118a91a164246401fa24fa549
Component: engine
2016-04-27 09:59:30 -07:00
e27d461e96
Update DCT docs with 1.11 info, fix typos
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 77da3bcb72ba4f936c428cb2b912c007a94cb87a
Component: engine
2016-04-27 09:57:54 -07:00
661a968ea5
update cgroup link in doc of run
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn >
Upstream-commit: 8fec7c26d4e831481674bcab7a0539affc91da29
Component: engine
2016-04-27 08:50:46 -04:00
f770cdfb66
Remain extra \n on INFO log msg
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 1e44bba4af6c417e10cbf7aa459a8225dfb89d6c
Component: engine
2016-04-27 05:19:40 -07:00
ff027b364b
Add load/save image event support
...
For every docker load and save operations, it would log related
image events.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 06561057103441fe176910e12674d998b8561b75
Component: engine
2016-04-27 01:11:03 +00:00
ad49d67f49
centos:7/OL:7 now includes libseccomp 2.2.1
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 1521a41fc578958d0238f95b43c49edab9a65a47
Component: engine
2016-04-26 20:48:26 -04:00
8a812459dd
Merge pull request #22329 from runcom/fix-tmpfs-order
...
daemon: reorder mounts before setting them
Upstream-commit: 0147164cfd0645849f2464edb2c64c601a3ab492
Component: engine
2016-04-26 20:23:13 -04:00
7cba2b7aed
Merge pull request #22181 from Microsoft/jjh/workdir
...
Windows: Consistent build workdir handling
Upstream-commit: 2b97201e0cd8301484fde379d2bf7f0ad3f36f10
Component: engine
2016-04-26 16:51:09 -07:00
b630bbc615
Merge pull request #21384 from Microsoft/10662-IOResourceControls
...
Add IO Resource Controls for Windows
Upstream-commit: a8c5ba75172686a2be2119a3b46c6acda02f0a36
Component: engine
2016-04-26 15:54:52 -07:00
51ef85c587
Windows: Consistent build workdir handling
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 0433801093f1988db0e210e28352f4af71a0ac81
Component: engine
2016-04-26 15:32:52 -07:00
421a9caea1
Merge pull request #22324 from WeiZhang555/fix-test-case
...
Fix test case
Upstream-commit: 4925fcbe2e5db8e44d48af0ec12b2badb7af1752
Component: engine
2016-04-26 15:01:02 -04:00
a7df8827dc
Merge pull request #22276 from Microsoft/jjh/dockerd
...
Move docker and dockerd main packages in directories with same name, under `cmd/`
Upstream-commit: d3d591c5365d22037cb884bae4ac269dd4da28b2
Component: engine
2016-04-26 11:24:01 -07:00
470595a333
Merge pull request #22291 from thaJeztah/update-template-for-changelog
...
pull-request template: ask for changelog description
Upstream-commit: 1f72e46095cca6850d00af0bca736fdf26176a03
Component: engine
2016-04-26 18:51:31 +02:00
7882678c17
Make dockerd debuggable
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 0c7eab31577d65f0d33766af533144e358ffe651
Component: engine
2016-04-26 09:35:22 -07:00
3d056fb569
Merge pull request #22308 from tianon/dockerd-consistency
...
Tweak hack/make/*-{client,daemon} to be consistent
Upstream-commit: dc7664d62e4e758ba1a532dca578f53880faa388
Component: engine
2016-04-26 15:32:06 +02:00
c44b17ce8b
Fix test case
...
"TestRestartContainerwithRestartPolicy" contains some codes that could be
flaky, it's supposed to be fixed in #22256 .
This commit removes unnecessary code, make the test case cleaner.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: a7eecd2b61296825f9a0f739dbc06ad65a3d2c5d
Component: engine
2016-04-26 19:22:48 +08:00
97d052a355
Merge pull request #22328 from HackToday/fixcomment
...
Fix wrong comment
Upstream-commit: 6b91fd1a91bbb3148c505be9fa72d201f2ef56c9
Component: engine
2016-04-26 13:00:38 +02:00
470f56b334
Merge pull request #22331 from SvenDowideit/minor-api-formating-change
...
Small API formating fix.
Upstream-commit: 3f7b6754ca11cbb5a34bc54c8878df04719e5aee
Component: engine
2016-04-26 12:46:25 +02:00
21117de54d
Small API formating fix.
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 204a52c689204a4d9506d500955673f7b5361d1d
Component: engine
2016-04-26 10:29:31 +00:00
b8a4ac98f2
pull-request template: ask for changelog description
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: eb59238d17ac63dcc598980044033f79052b5fa7
Component: engine
2016-04-26 12:26:14 +02:00
64c17a1eca
daemon: reorder mounts before setting them
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 6a8ea46c67c3594118c7da41b1cebe062aff3f6a
Component: engine
2016-04-26 11:03:25 +02:00
37c9f27500
Fix wrong comment
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 718eba88363c14065b3a2a2dfbc9f270fc7cf63e
Component: engine
2016-04-26 07:36:14 +00:00
7239ebb0f7
Merge pull request #22321 from Microsoft/jstarks/revendor_ansiterm
...
Windows: revendor Azure/go-ansiterm
Upstream-commit: dc98cb534e1ac2375112db56f5c98dd08010c4dc
Component: engine
2016-04-26 08:19:47 +02:00
b0763649ac
Merge pull request #22275 from Microsoft/jstarks/no_rsrc
...
Windows: Add file version information
Upstream-commit: 78895c92c2baab420ae73322cc3d15009efa221e
Component: engine
2016-04-25 20:53:19 -07:00
3500c1d298
Merge pull request #22318 from mrunalp/mount_label_fix
...
Fix mount label
Upstream-commit: e2c40555f76c0fddff8e17f7930ad90d4cf375b8
Component: engine
2016-04-25 19:54:32 -04:00
db3db29c9f
Windows: revendor Azure/go-ansiterm
...
go-ansiterm was previously pulling the testing package into the docker
binaries.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: fab67ab677e14c908f879e362f8805c8e91570c6
Component: engine
2016-04-25 15:57:59 -07:00
313ee5d51f
Merge pull request #22055 from Microsoft/sjw/servicing
...
Adding servicing update to postRunProcessing for Windows containers.
Upstream-commit: 66ebc34235f32fdb37dcc9b859037944f3790bbd
Component: engine
2016-04-25 15:20:23 -07:00
3ee9fe57f8
Update runc and spec dependencies for mount label
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Set up the mount label in the spec for a container
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: e0f98c698b49e3790fe63bff611eeda6f5b46055
Component: engine
2016-04-25 14:26:49 -07:00
dee3200111
docs: remove duplicate line in "Understand the architecture"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 00e84ca4d20ef35ab1bdc83889afbf3374ee9745
Component: engine
2016-04-25 23:16:49 +02:00
b26c916d3b
Merge pull request #22306 from thaJeztah/update-integration-test-network-only
...
skip TestAuthApi if no network is available
Upstream-commit: 1b4286f40de1237ef96f9e953a6a8c2f050b8421
Component: engine
2016-04-25 14:02:26 -07:00
87afb49f07
Add IO Resource Controls for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 8df2066341931d9b7ba552afa902e2ef12e5eed5
Component: engine
2016-04-25 13:07:29 -07:00
452a7d0ba9
Adding servicing update to postRunProcessing for Windows containers.
...
This change enables the workflow of finishing installing Windows OS updates in the container after it has completed running, via a special servicing container.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: da92dad59f76421a22a955d2aed25bfeb4562385
Component: engine
2016-04-25 12:16:26 -07:00
d2c52f7016
Tweak hack/make/*-{client,daemon} to be consistent
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 626d25a7d94aa05427ecb85ba73bad1e8738c57b
Component: engine
2016-04-25 11:40:36 -07:00
bdb0102fb8
Merge pull request #22303 from kencochrane/fix_integration_daemon_start
...
Fixing the PATH in .integration-daemon-start to find dyn docker binary
Upstream-commit: e974eadd949c5d7cb91a7d4406c2e0da8b1db677
Component: engine
2016-04-25 14:39:45 -04:00
390a620078
Merge pull request #22301 from kencochrane/dynbinary-fix
...
Change name from docker-client to docker in dynbinary-client
Upstream-commit: 5611424d82c6cebd134c83ba99bb4ccb72703317
Component: engine
2016-04-25 14:38:13 -04:00
4428336660
Merge pull request #22230 from justincormack/seccomp_dropcalls
...
Remove mlock and vhangup from the default seccomp profile
Upstream-commit: 48f25161be64b98d9d38f3dbe1fe7873e7149b78
Component: engine
2016-04-25 11:27:42 -07:00
6ee8d84c70
skip TestAuthApi if no network is available
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2fae3d2693648d1c0f5cc079f37aaba5116ba5f9
Component: engine
2016-04-25 20:12:36 +02:00
