9ef58d92bf
Merge pull request #21032 from trishnaguha/docker-group
...
Creates docker group for non-root access
Upstream-commit: 95bc1f1ccdf7c1172481d7ed663bfe5d71b10352
Component: engine
2016-03-08 21:50:44 +01:00
a0833fa844
Merge pull request #20995 from wenchma/ping_timeout
...
Update ping command timeout to 4 sec
Upstream-commit: 6d6919ed79083b3339889911853589a6502afc5c
Component: engine
2016-03-08 15:35:00 -05:00
36c16b54a0
Merge pull request #21036 from jfrazelle/fix-release-generation
...
only add the suites that exist we dont need the script for this
Upstream-commit: 471e434400620f60e434bee4f6040783449c7e5e
Component: engine
2016-03-08 15:11:49 -05:00
3d1795a330
Merge pull request #20727 from mrunalp/no_new_priv
...
Add support for NoNewPrivileges in docker
Upstream-commit: dc702b6c6bda5cd2d530e86804627c1a5a155e3c
Component: engine
2016-03-08 14:26:15 -05:00
e7bc876d2b
Merge pull request #20975 from runcom/secretservice-creds-store
...
cliconfig: credentials: set default for unix
Upstream-commit: 38e1cd1dc17918c9ac8ff5d50cbfb44aa9a84830
Component: engine
2016-03-08 11:17:12 -08:00
34c6a97598
only add the suites that exist we dont need the script for this
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 0ab5805c0850d055c92f29fbadd4b7a90fc4f76a
Component: engine
2016-03-08 11:08:00 -08:00
7cabfb9016
Creates docker group for non-root access
...
Signed-off-by: trishnaguha <trishnaguha17@gmail.com >
Upstream-commit: cdd8d3999ffd9f7eeb764f52e21577e0900d7b5c
Component: engine
2016-03-08 21:03:14 +05:30
189d1f74b1
cliconfig: credentials: set default for unix
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: fe8fa85074a62241640e5c2d9d2501c354517efc
Component: engine
2016-03-08 09:21:36 +01:00
8912d208d9
Update ping command timeout to 4 sec
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: c7a340e2be351e24c3be7aba8fa2032fa6f01e52
Component: engine
2016-03-08 15:06:58 +08:00
0319ce7abf
Merge pull request #20961 from Microsoft/FlakeyTestFix
...
Reenabled TestPsListContainers* tests and increased sleep time
Upstream-commit: 9e2c4de0dea695411f8df2efd116594eaf4602aa
Component: engine
2016-03-07 22:05:58 -05:00
a41eec344b
Merge pull request #20852 from wenchma/net-alias
...
Add tests of unsupported network-scoped alias on default networks
Upstream-commit: 5ded3a212b16087f836622e7dbfb584944e6e145
Component: engine
2016-03-07 13:37:12 -05:00
0f9c123368
Merge pull request #20998 from Ralle/Ralle-fix-json
...
Update dockervolumes.md
Upstream-commit: dc82c2dda94efaa04abb1356935b918cb51995c6
Component: engine
2016-03-07 19:35:28 +01:00
fa5fd5c52c
Update dockervolumes.md
...
Fix JSON highlighting
Signed-off-by: Rasmus Abrahamsen <spam@rasmusa.net >
Upstream-commit: 086d06dce1056521d3980e07373fad2070daffb1
Component: engine
2016-03-07 18:47:45 +01:00
3e9b68d581
Add support for NoNewPrivileges in docker
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Add tests for no-new-privileges
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Update documentation for no-new-privileges
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 74bb1ce9e9dbfa9dd866e84f891e865fca906d9a
Component: engine
2016-03-07 09:47:02 -08:00
00a6cb83e9
Merge pull request #20982 from Microsoft/jstarks/fix_tp5_commit
...
Windows: Revendor github.com/Microsoft/hcsshim
Upstream-commit: bc730f3d997ee4b2d53f7362c1d9f40f4074584a
Component: engine
2016-03-07 11:20:14 -05:00
7b8ba5b2bb
Merge pull request #20994 from runcom/fix-debugf
...
api: server: server: remove redunant debugf
Upstream-commit: 64a4a7a191d82cf40893753fe677c0fe0ef1bff7
Component: engine
2016-03-07 13:32:10 +01:00
91e55e2d5c
api: server: server: remove redunant debugf
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 526ddd351218798199b6221fad67e1c335ad8542
Component: engine
2016-03-07 09:03:29 +01:00
b77905ebcf
Merge pull request #20866 from suiyuan2009/20801-add-ubuntu-notice
...
add ubuntu arch note
Upstream-commit: 86ba0e29f508e4a72ada73124c1e019f1de434a1
Component: engine
2016-03-06 11:50:18 +01:00
7abd70a432
Merge pull request #20967 from calavera/fix_stop_hanging_on_dead_process
...
Do not wait for container on stop if the process doesn't exist.
Upstream-commit: 11b9d7f1addde0cbb8199179a8d3f2a4dd17f798
Component: engine
2016-03-06 11:37:59 +01:00
128898860a
add ubuntu arch note
...
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
fix ubuntu installation guide url
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
fix ubuntu installation guide url
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
fix ubuntu installation guide url
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
Upstream-commit: b2f1f7ee00070aa5ae0265296baee2a268aa3cbc
Component: engine
2016-03-06 14:19:58 +08:00
a7b2a00b04
Windows: Revendor github.com/Microsoft/hcsshim
...
This fixes commit on Windows post-TP4 due to a small change
in behavior in the ExportLayer API.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 53b8b8f0581b4ecb04a2aa4a195fd805f81bfa8c
Component: engine
2016-03-05 19:10:32 -08:00
3a4d758625
Merge pull request #20981 from justincormack/seccomp_ipc
...
Add ipc syscall to default seccomp profile
Upstream-commit: 91cafaadaca29896082b6e8dc5866be0b46b3929
Component: engine
2016-03-05 15:29:19 -08:00
288ebd11a3
Add ipc syscall to default seccomp profile
...
On 32 bit x86 this is a multiplexing syscall for the system V
ipc syscalls such as shmget, and so needs to be allowed for
shared memory access for 32 bit binaries.
Fixes #20733
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 31410a6d79fc4ea6fa496636015bf9f53c1c8b14
Component: engine
2016-03-05 22:12:23 +00:00
c271dabe06
Merge pull request #20978 from allencloud/fix-typo
...
fix typos
Upstream-commit: beb17c096d3181c65d83961e9d13235d896511c1
Component: engine
2016-03-05 12:41:37 -05:00
b8f6e912b7
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 2736f77a94f57ddde5de1e5dc66c168290b91da2
Component: engine
2016-03-06 00:59:11 +08:00
dfd9e32dcf
Merge pull request #20803 from WeiZhang555/empty-stats-no-stream
...
Bug fix: stats --no-stream always print zero values
Upstream-commit: 160abfbeeaa20314d5d971061d3bad7aaf87e66c
Component: engine
2016-03-05 08:47:41 -05:00
b9d5da8192
Bug fix: stats --no-stream always print zero values
...
`docker stats --no-stream` always print zero values.
```
$ docker stats --no-stream
CONTAINER CPU % MEM USAGE / LIMIT MEM %
NET I/O BLOCK I/O
7f4ef234ca8c 0.00% 0 B / 0 B 0.00%
0 B / 0 B 0 B / 0 B
f05bd18819aa 0.00% 0 B / 0 B 0.00%
0 B / 0 B 0 B / 0 B
```
This commit will let docker client wait until it gets correct stat
data before print it on screen.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: ea86c30a4acd53ef626d4c53aaf8f91134173948
Component: engine
2016-03-05 13:22:26 +08:00
687a8bf3a0
Merge pull request #20946 from thaJeztah/update-registry-links
...
Update links to Docker Hub
Upstream-commit: 44fb8fa588282e2227f2f75841ab6ada1c68da0b
Component: engine
2016-03-04 22:37:57 +01:00
457f1ae82b
Merge pull request #20963 from tophj-ibm/properly-close-test-file
...
Properly close and remove file in daemon test
Upstream-commit: 45865bc4f5e21b2208859c62985a9c4f85660b42
Component: engine
2016-03-04 16:27:07 -05:00
c78c25ea17
Do not wait for container on stop if the process doesn't exist.
...
This fixes an issue that caused the client to hang forever if the
process died before the code arrived to exit the `Kill` function.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1a729c3dd8e84eef0a0b10cab24e88b768557482
Component: engine
2016-03-04 16:00:58 -05:00
9268540964
Merge pull request #20959 from Microsoft/jjh/bumptimeout
...
Windows CI: Bump timeout for tests
Upstream-commit: e7cbae9fd6d6d140902bf68e7c9e4c57bbb9f5ad
Component: engine
2016-03-04 11:44:25 -08:00
4e7a6032dd
Properly close and remove file in daemon test
...
Fixes a bug where a file would be created and not deleted in
DockerSuite.TestDaemonDiscoveryBackendConfigReload
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 66e558c16c7505750dc4941980521fc382dbe454
Component: engine
2016-03-04 14:22:30 -05:00
6c9a39a756
Merge pull request #20934 from icecrime/20543_debugging
...
Fix race condition on daemon shutdown (#20543 )
Upstream-commit: 2af84d8875045f853210dcdab2548daaad70856f
Component: engine
2016-03-04 11:08:50 -08:00
b8e42a46b7
Merge pull request #20903 from wenchma/TestDockerNetworkInternalMode
...
Enhancement of TestDockerNetworkInternalMode
Upstream-commit: ea738c633f2da6041f03703ee294a024db21328b
Component: engine
2016-03-04 20:00:35 +01:00
9f546a0928
Reenabled TestPsListContainers* tests and increased sleep time
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ad7398e664512e2015ea00907d0862dc1b6c73b2
Component: engine
2016-03-04 10:53:04 -08:00
d4eaa45a84
Windows CI: Bump timeout for tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6a1ae187d081a5023493ab20fe41ba8a768d62bf
Component: engine
2016-03-04 09:36:46 -08:00
a3ffabb772
Merge pull request #20843 from calavera/plugin_any_transport
...
Call plugins with custom transports.
Upstream-commit: c08b674d56c37782fc26382f4b756e0518e394cf
Component: engine
2016-03-04 11:59:32 -05:00
41c1b3cb5a
Merge pull request #20943 from vdemeester/20942-fix-containerPsContext
...
Fix #20942 TestContainerPsContext unit test
Upstream-commit: 44b56341d9d40a53ad8d5c2cc87e3c5b2b0f28f3
Component: engine
2016-03-04 16:49:47 +01:00
3276f20bd0
Update links to Docker Hub
...
Updates links to Docker Hub with their new
URLs to prevent redirects.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 69004ff67eed6525d56a92fdc69466c41606151a
Component: engine
2016-03-04 15:48:52 +01:00
e182a6dd7e
Merge pull request #20938 from runcom/split-daemon
...
integration-cli: move daemon stuff to its own file
Upstream-commit: 29bade2cd0a09191279f04ebc6aeedaa70c772a0
Component: engine
2016-03-04 15:09:35 +01:00
9892cd5446
Try to fix #20942 TestContainerPsContext unit test
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2787072a65efac3dee0b5299322e4a7cfba51f04
Component: engine
2016-03-04 14:20:41 +01:00
1b65b96bab
Merge pull request #20834 from rhatdan/relabelvolume
...
Do not relabel if user did not request it for non local volumes
Upstream-commit: 8142ebb0be765e6a1ac718d292bb66f7acb145de
Component: engine
2016-03-04 13:17:54 +01:00
63ee158ab3
Merge pull request #20929 from yongtang/19425-DockerSuite.TestBuildDockerignoringWildDirs
...
Optimize slow bottleneck test of DockerSuite.TestBuildDockerignoringWildDirs.
Upstream-commit: 5f7941e412f36aa6ca7be5b2a3bf18060df051da
Component: engine
2016-03-04 09:47:56 +01:00
684bf382b9
Merge pull request #20872 from duglin/Issue20470
...
Optimize .dockerignore when there are exclusions
Upstream-commit: 9bc62e6031350d1db24e37cfa4983f719ab5e33b
Component: engine
2016-03-04 09:45:19 +01:00
b84fcf00c1
integration-cli: move daemon stuff to its own file
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 9a9e2bb61d2c0a5bda75ea5679919162f53f3297
Component: engine
2016-03-04 09:29:24 +01:00
c66cb2a6ce
Fix race in container creation
...
Only register a container once it's successfully started. This avoids a
race condition where the daemon is killed while in the process of
calling `libcontainer.Container.Start`, and ends up killing -1.
There is a time window where the container `initProcess` is not set, and
its PID unknown. This commit fixes the race Engine side.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: ad2fa3945997905760a4c7ef0444580ffb4b939a
Component: engine
2016-03-03 20:25:03 -08:00
272f2b442a
Merge pull request #20854 from inatatsu/reduce-parsing-mountinfo
...
Eliminate redundant parsing of mountinfo
Upstream-commit: ea5acb08fa429b1d1833aa855793e8cbfabe25d8
Component: engine
2016-03-03 19:48:32 -08:00
c06c593d4a
Enhancement of TestDockerNetworkInternalMode
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 312e20bf6ce7bb396cbc9d05114a66b41f23e3ab
Component: engine
2016-03-04 10:56:10 +08:00
9af5c681c5
Aufs: reduce redundant parsing of mountinfo
...
Check whether or not the file system type of a mountpoint is aufs
by calling statfs() instead of parsing mountinfo. This assumes
that aufs graph driver does not allow aufs as a backing file
system.
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com >
Upstream-commit: e8513675a20e2756e6c2915604605236d1a94d65
Component: engine
2016-03-04 11:39:59 +09:00
e1bfcc33fd
Merge pull request #20927 from Zoltu/patch-1
...
Adds clarification to behavior of missing directories.
Upstream-commit: cb6cdb416c405c59c7365f261446705d8593bdff
Component: engine
2016-03-04 01:55:27 +01:00
