b9135646d6
Update the binary name in docker-engine-selinux/docker.fc.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-27 11:41:21 -04:00
d6176bb03a
Merge pull request #22137 from HackToday/addevents
...
Add load/save image event support
2016-04-27 12:58:49 +02:00
0656105710
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>
2016-04-27 01:11:03 +00:00
0147164cfd
Merge pull request #22329 from runcom/fix-tmpfs-order
...
daemon: reorder mounts before setting them
2016-04-26 20:23:13 -04:00
2b97201e0c
Merge pull request #22181 from Microsoft/jjh/workdir
...
Windows: Consistent build workdir handling
2016-04-26 16:51:09 -07:00
a8c5ba7517
Merge pull request #21384 from Microsoft/10662-IOResourceControls
...
Add IO Resource Controls for Windows
2016-04-26 15:54:52 -07:00
0433801093
Windows: Consistent build workdir handling
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 15:32:52 -07:00
4925fcbe2e
Merge pull request #22324 from WeiZhang555/fix-test-case
...
Fix test case
2016-04-26 15:01:02 -04:00
d3d591c536
Merge pull request #22276 from Microsoft/jjh/dockerd
...
Move docker and dockerd main packages in directories with same name, under `cmd/`
2016-04-26 11:24:01 -07:00
1f72e46095
Merge pull request #22291 from thaJeztah/update-template-for-changelog
...
pull-request template: ask for changelog description
2016-04-26 18:51:31 +02:00
0c7eab3157
Make dockerd debuggable
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 09:35:22 -07:00
dc7664d62e
Merge pull request #22308 from tianon/dockerd-consistency
...
Tweak hack/make/*-{client,daemon} to be consistent
2016-04-26 15:32:06 +02:00
a7eecd2b61
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>
2016-04-26 19:22:48 +08:00
6b91fd1a91
Merge pull request #22328 from HackToday/fixcomment
...
Fix wrong comment
2016-04-26 13:00:38 +02:00
3f7b6754ca
Merge pull request #22331 from SvenDowideit/minor-api-formating-change
...
Small API formating fix.
2016-04-26 12:46:25 +02:00
204a52c689
Small API formating fix.
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-04-26 10:29:31 +00:00
eb59238d17
pull-request template: ask for changelog description
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-26 12:26:14 +02:00
6a8ea46c67
daemon: reorder mounts before setting them
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-04-26 11:03:25 +02:00
718eba8836
Fix wrong comment
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-26 07:36:14 +00:00
dc98cb534e
Merge pull request #22321 from Microsoft/jstarks/revendor_ansiterm
...
Windows: revendor Azure/go-ansiterm
2016-04-26 08:19:47 +02:00
78895c92c2
Merge pull request #22275 from Microsoft/jstarks/no_rsrc
...
Windows: Add file version information
2016-04-25 20:53:19 -07:00
e2c40555f7
Merge pull request #22318 from mrunalp/mount_label_fix
...
Fix mount label
2016-04-25 19:54:32 -04:00
fab67ab677
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>
2016-04-25 15:57:59 -07:00
66ebc34235
Merge pull request #22055 from Microsoft/sjw/servicing
...
Adding servicing update to postRunProcessing for Windows containers.
2016-04-25 15:20:23 -07:00
e0f98c698b
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>
2016-04-25 14:26:49 -07:00
1b4286f40d
Merge pull request #22306 from thaJeztah/update-integration-test-network-only
...
skip TestAuthApi if no network is available
2016-04-25 14:02:26 -07:00
8df2066341
Add IO Resource Controls for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-04-25 13:07:29 -07:00
da92dad59f
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>
2016-04-25 12:16:26 -07:00
626d25a7d9
Tweak hack/make/*-{client,daemon} to be consistent
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-04-25 11:40:36 -07:00
e974eadd94
Merge pull request #22303 from kencochrane/fix_integration_daemon_start
...
Fixing the PATH in .integration-daemon-start to find dyn docker binary
2016-04-25 14:39:45 -04:00
5611424d82
Merge pull request #22301 from kencochrane/dynbinary-fix
...
Change name from docker-client to docker in dynbinary-client
2016-04-25 14:38:13 -04:00
48f25161be
Merge pull request #22230 from justincormack/seccomp_dropcalls
...
Remove mlock and vhangup from the default seccomp profile
2016-04-25 11:27:42 -07:00
2fae3d2693
skip TestAuthApi if no network is available
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-25 20:12:36 +02:00
17d5c97c90
Merge pull request #22125 from crosbymichael/restart-timeout
...
Reset restart timeout if execution longer than 10s
2016-04-25 19:15:32 +02:00
e6df098390
Merge pull request #22254 from yongtang/22244-remote-api-auth-behavior
...
Add default `serveraddress` value in remote API `/auth`
2016-04-25 10:15:08 -07:00
88d1ae148c
Merge pull request #22272 from yongtang/22271-relative-symlinks
...
Relative symlinks don't work with --device argument
2016-04-25 18:10:04 +02:00
28b7dc51ae
Merge pull request #21583 from allencloud/move-cors-into-common-config
...
move cors into common config
2016-04-25 09:08:38 -07:00
bee093802d
Merge pull request #22299 from thaJeztah/fix-label-reload
...
fix reloading of daemon labels from config
2016-04-25 12:06:57 -04:00
0843527e86
Merge pull request #22265 from thaJeztah/ohman-ohman
...
OHMAN! Move vbatts to alumni
2016-04-25 09:05:09 -07:00
d03ba27b76
Merge pull request #22118 from michael-holzheu/22007-s390x-fix-notary-build-for-gcc-v2
...
Create "src" symlink for building notary with gcc 5
2016-04-25 11:50:00 -04:00
5ee737c70c
Fixing the PATH in .integration-daemon-start to find dynamic docker binary
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-25 11:18:34 -04:00
f9e03d52e9
Change name from docker-client to docker in dynbinary-client
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-25 10:44:37 -04:00
632b314b23
Relative symlinks don't work with --device argument
...
This fix tries to address the issue raised in #22271 where
relative symlinks don't work with --device argument.
Previously, the symlinks in --device was implemneted (#20684 )
with `os.Readlink()` which does not resolve if the linked
target is a relative path. In this fix, `filepath.EvalSymlinks()`
has been used which will reolve correctly with relative
paths.
An additional test case has been added to the existing
`TestRunDeviceSymlink` to cover changes in this fix.
This fix is related to #13840 and #20684 , #22271 .
This fix fixes #22271 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-04-25 07:22:56 -07:00
e8708f3049
Merge pull request #22294 from allencloud/fix-Insecure-registries-uppercase-in-docker-info
...
Fix insecure registries upppercase in docker info
2016-04-25 16:21:04 +02:00
455858fc70
fix reloading of daemon labels from config
...
commit 20a038eca6
2016-04-25 15:57:28 +02:00
66eb91463a
Merge pull request #22287 from hqhq/hq_add_blk_check
...
Add CONFIG_CFQ_GROUP_IOSCHED check
2016-04-25 20:15:31 +08:00
e78884dafd
make Insecure registries uppercase like other keys in docker info
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-04-25 18:44:34 +08:00
192387198d
Add CONFIG_CFQ_GROUP_IOSCHED check
...
blkio.weight depends on this config.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-04-25 14:08:29 +08:00
2feb88cbd3
1.move cors into common config
...
2.windows can use cors, too
3.remove function setPlatformServerConfig
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-04-25 10:52:13 +08:00
4677f8036e
Windows: Add file version information
...
This change adds file version information to docker.exe and dockerd.exe by
adding a Windows version resource with the windres tool.
This change adds a dependency to binutils-mingw-w64 on Linux, but removes
a dependency on rsrc. Most Windows build environments should already have
windres if they have gcc (which is necessary to build dockerd).
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-24 10:55:51 -07:00
Daniel Nephin
Vincent Demeester
Kai Qiang Wu(Kennan)
Brian Goff
Michael Crosby
John Howard
John Howard
Alexander Morozov
Sebastiaan van Stijn
Zhang Wei
Sven Dowideit
Sebastiaan van Stijn
Antonio Murdaca
John Starks
Mrunal Patel
Darren Stahl
Stefan J. Wernli
Tianon Gravi
Tibor Vass
Aaron Lehmann
David Calavera
Doug Davis
Ken Cochrane
Yong Tang
Lei Jitang
allencloud
Qiang Huang