David Calavera
dd32445ecc
Merge pull request #18697 from jfrazelle/pids-cgroup
...
Add PIDs cgroup support to Docker
2016-03-08 14:03:36 -08:00
David Calavera
76a5ab3b43
Merge pull request #21035 from LK4D4/exec_ids
...
make TestExecInspectIDs less racy
2016-03-08 13:02:01 -08:00
Sebastiaan van Stijn
95bc1f1ccd
Merge pull request #21032 from trishnaguha/docker-group
...
Creates docker group for non-root access
2016-03-08 21:50:44 +01:00
Brian Goff
6d6919ed79
Merge pull request #20995 from wenchma/ping_timeout
...
Update ping command timeout to 4 sec
2016-03-08 15:35:00 -05:00
Tibor Vass
471e434400
Merge pull request #21036 from jfrazelle/fix-release-generation
...
only add the suites that exist we dont need the script for this
2016-03-08 15:11:49 -05:00
Brian Goff
dc702b6c6b
Merge pull request #20727 from mrunalp/no_new_priv
...
Add support for NoNewPrivileges in docker
2016-03-08 14:26:15 -05:00
David Calavera
38e1cd1dc1
Merge pull request #20975 from runcom/secretservice-creds-store
...
cliconfig: credentials: set default for unix
2016-03-08 11:17:12 -08:00
Jessica Frazelle
0ab5805c08
only add the suites that exist we dont need the script for this
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-03-08 11:08:00 -08:00
Alexander Morozov
8dd8ec137e
make TestExecInspectIDs less racy
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-08 09:51:39 -08:00
Jessica Frazelle
69cf03700f
pids limit support
...
update bash commpletion for pids limit
update check config for kernel
add docs for pids limit
add pids stats
add stats to docker client
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-03-08 07:55:01 -08:00
trishnaguha
cdd8d3999f
Creates docker group for non-root access
...
Signed-off-by: trishnaguha <trishnaguha17@gmail.com>
2016-03-08 21:03:14 +05:30
Antonio Murdaca
fe8fa85074
cliconfig: credentials: set default for unix
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-08 09:21:36 +01:00
Wen Cheng Ma
c7a340e2be
Update ping command timeout to 4 sec
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-03-08 15:06:58 +08:00
Brian Goff
9e2c4de0de
Merge pull request #20961 from Microsoft/FlakeyTestFix
...
Reenabled TestPsListContainers* tests and increased sleep time
2016-03-07 22:05:58 -05:00
Brian Goff
5ded3a212b
Merge pull request #20852 from wenchma/net-alias
...
Add tests of unsupported network-scoped alias on default networks
2016-03-07 13:37:12 -05:00
Sebastiaan van Stijn
dc82c2dda9
Merge pull request #20998 from Ralle/Ralle-fix-json
...
Update dockervolumes.md
2016-03-07 19:35:28 +01:00
Ralle
086d06dce1
Update dockervolumes.md
...
Fix JSON highlighting
Signed-off-by: Rasmus Abrahamsen <spam@rasmusa.net>
2016-03-07 18:47:45 +01:00
Mrunal Patel
74bb1ce9e9
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>
2016-03-07 09:47:02 -08:00
Brian Goff
bc730f3d99
Merge pull request #20982 from Microsoft/jstarks/fix_tp5_commit
...
Windows: Revendor github.com/Microsoft/hcsshim
2016-03-07 11:20:14 -05:00
Vincent Demeester
64a4a7a191
Merge pull request #20994 from runcom/fix-debugf
...
api: server: server: remove redunant debugf
2016-03-07 13:32:10 +01:00
Antonio Murdaca
526ddd3512
api: server: server: remove redunant debugf
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-07 09:03:29 +01:00
Vincent Demeester
86ba0e29f5
Merge pull request #20866 from suiyuan2009/20801-add-ubuntu-notice
...
add ubuntu arch note
2016-03-06 11:50:18 +01:00
Antonio Murdaca
11b9d7f1ad
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.
2016-03-06 11:37:59 +01:00
Ziming Dong
b2f1f7ee00
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>
2016-03-06 14:19:58 +08:00
John Starks
53b8b8f058
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>
2016-03-05 19:10:32 -08:00
Jess Frazelle
91cafaadac
Merge pull request #20981 from justincormack/seccomp_ipc
...
Add ipc syscall to default seccomp profile
2016-03-05 15:29:19 -08:00
Justin Cormack
31410a6d79
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>
2016-03-05 22:12:23 +00:00
Doug Davis
beb17c096d
Merge pull request #20978 from allencloud/fix-typo
...
fix typos
2016-03-05 12:41:37 -05:00
allencloud
2736f77a94
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-06 00:59:11 +08:00
Brian Goff
160abfbeea
Merge pull request #20803 from WeiZhang555/empty-stats-no-stream
...
Bug fix: stats --no-stream always print zero values
2016-03-05 08:47:41 -05:00
Zhang Wei
ea86c30a4a
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>
2016-03-05 13:22:26 +08:00
Sebastiaan van Stijn
44fb8fa588
Merge pull request #20946 from thaJeztah/update-registry-links
...
Update links to Docker Hub
2016-03-04 22:37:57 +01:00
Doug Davis
45865bc4f5
Merge pull request #20963 from tophj-ibm/properly-close-test-file
...
Properly close and remove file in daemon test
2016-03-04 16:27:07 -05:00
David Calavera
1a729c3dd8
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>
2016-03-04 16:00:58 -05:00
David Calavera
e7cbae9fd6
Merge pull request #20959 from Microsoft/jjh/bumptimeout
...
Windows CI: Bump timeout for tests
2016-03-04 11:44:25 -08:00
Christopher Jones
66e558c16c
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>
2016-03-04 14:22:30 -05:00
David Calavera
2af84d8875
Merge pull request #20934 from icecrime/20543_debugging
...
Fix race condition on daemon shutdown (#20543 )
2016-03-04 11:08:50 -08:00
Vincent Demeester
ea738c633f
Merge pull request #20903 from wenchma/TestDockerNetworkInternalMode
...
Enhancement of TestDockerNetworkInternalMode
2016-03-04 20:00:35 +01:00
Darren Stahl
ad7398e664
Reenabled TestPsListContainers* tests and increased sleep time
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-03-04 10:53:04 -08:00
John Howard
6a1ae187d0
Windows CI: Bump timeout for tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-03-04 09:36:46 -08:00
Brian Goff
c08b674d56
Merge pull request #20843 from calavera/plugin_any_transport
...
Call plugins with custom transports.
2016-03-04 11:59:32 -05:00
Antonio Murdaca
44b56341d9
Merge pull request #20943 from vdemeester/20942-fix-containerPsContext
...
Fix #20942 TestContainerPsContext unit test
2016-03-04 16:49:47 +01:00
Sebastiaan van Stijn
69004ff67e
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>
2016-03-04 15:48:52 +01:00
Sebastiaan van Stijn
29bade2cd0
Merge pull request #20938 from runcom/split-daemon
...
integration-cli: move daemon stuff to its own file
2016-03-04 15:09:35 +01:00
Vincent Demeester
2787072a65
Try to fix #20942 TestContainerPsContext unit test
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-03-04 14:20:41 +01:00
Antonio Murdaca
8142ebb0be
Merge pull request #20834 from rhatdan/relabelvolume
...
Do not relabel if user did not request it for non local volumes
2016-03-04 13:17:54 +01:00
Vincent Demeester
5f7941e412
Merge pull request #20929 from yongtang/19425-DockerSuite.TestBuildDockerignoringWildDirs
...
Optimize slow bottleneck test of DockerSuite.TestBuildDockerignoringWildDirs.
2016-03-04 09:47:56 +01:00
Vincent Demeester
9bc62e6031
Merge pull request #20872 from duglin/Issue20470
...
Optimize .dockerignore when there are exclusions
2016-03-04 09:45:19 +01:00
Antonio Murdaca
9a9e2bb61d
integration-cli: move daemon stuff to its own file
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-04 09:29:24 +01:00
Arnaud Porterie
ad2fa39459
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>
2016-03-03 20:25:03 -08:00