3fff146dfd
Merge pull request #21073 from moxiegirl/close-carry-20377
...
Add missing fields for NetworkSettings
Upstream-commit: f70f570641b8e7cec5767f26cc7fc9f31f6294e7
Component: engine
2016-03-10 10:59:15 +01:00
e44c6b6aca
Merge pull request #21063 from allencloud/fix-typos
...
fix some typos.
Upstream-commit: 49485b769cdcc220418a36cfd3c1e50fd03b130d
Component: engine
2016-03-09 20:24:56 -08:00
f60019e64d
Merge pull request #21019 from aboch/se
...
Add port configs to Sandbox and libnetwork vendoring
Upstream-commit: d99be399c35df921970bb8bebf4b4bdf774849b3
Component: engine
2016-03-09 22:27:37 -05:00
16d6520e91
fix some typos.
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 34b82a69b94ef9c7913e2809ae918e6f4331201e
Component: engine
2016-03-10 10:09:27 +08:00
200e6acd5b
Merge pull request #21074 from mlaventure/test-userns-centos
...
Update UserNamespaceInKernel test requirement to handle redhat
Upstream-commit: bd7c95e306c747e21e0dea48d068adc1c7b59132
Component: engine
2016-03-09 17:53:13 -08:00
80ec175db5
Add Exposed ports and port-mapping configs to Sandbox
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: b8a5fb76ea3d2ba3168380757cb5a746350ea451
Component: engine
2016-03-09 14:07:23 -08:00
f21d466c67
Merge pull request #21067 from LK4D4/remove_comment
...
Remove obsolete comment
Upstream-commit: fcff343cb49f37d7c5b59c121b0cd1900e44c542
Component: engine
2016-03-09 13:27:12 -08:00
8fd7f3b992
Add missing fields for NetworkSettings
...
Dump from 1.10.1 has this fields.
Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com >
Close and carry #20377
Include David's request
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 205844875cb848b04fef401d3e7fcc3a8959bba0
Component: engine
2016-03-09 12:43:48 -08:00
f3e1cfee9f
Update UserNamespaceInKernel test requirement to handle redhat
...
On redhat based distribution, checking that USER_NS is compiled in the
kernel is not sufficient, we also have to check that the feature as
been enabled.
With this commit, it is now done by checking the content of
`/sys/module/user_namespace/parameters/enable`.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 6cbff9505c992bd1e61ea7943737dac04ba665ea
Component: engine
2016-03-09 12:42:59 -08:00
0cf9fc3f62
Merge pull request #21053 from WeiZhang555/vendor-engine-api
...
Vendor docker/engine-api
Upstream-commit: 9bfdb93e3aaedf5c050def582d6c820cec00f300
Component: engine
2016-03-09 15:19:26 -05:00
57871b45b1
Remove obsolete comment
...
There is no more race
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 8706c5124a09ba4ad49ca2eb009bdcaec98b7637
Component: engine
2016-03-09 09:38:39 -08:00
03dcde6cf7
Merge pull request #21013 from calavera/events_since_nano
...
Compare event nanoseconds properly to filter since a specific date.
Upstream-commit: f97ab358cb9443816ff436aac410ef75ca385530
Component: engine
2016-03-09 09:30:54 -08:00
895ccf6abc
Merge pull request #21056 from askb/optimize-TestBuildUsersAndGroups
...
Optimized integration test case DockerSuite.TestBuildUsersAndGroups fixes #19425
Upstream-commit: 016be532368ac45d425b770e0b02aa12de7d5620
Component: engine
2016-03-09 09:15:01 -08:00
eb5f497921
Merge pull request #20965 from yongtang/19425-DockerSuite.TestRunUnshareProc
...
Optimize slow bottleneck test of DockerSuite.TestRunUnshareProc.
Upstream-commit: 5d3ae7f98999e3f01125c5dd9ac73757dbb849ef
Component: engine
2016-03-09 10:32:09 -05:00
2109e80f1b
Merge pull request #20930 from cloojure/patch-3
...
Update dockernetworks.md
Upstream-commit: faacbcf53e8c702c211d9be549d06c1aff6fb100
Component: engine
2016-03-09 15:58:38 +01:00
578f7ee12a
Optimized integration test case DockerSuite.TestBuildUsersAndGroups for #19425
...
Removed unnecessary RUN statements and combined some of the RUN statement into a single line.
The runtime performance is seen as follows:
pre-change:
PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups
63.074s
post-change:
PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups
49.698s
Signed-off-by: Anil Belur <askb23@gmail.com >
Upstream-commit: deeb5c95e2eaa58d4490cb126839b8bc41e5ba08
Component: engine
2016-03-09 18:00:56 +05:30
2793bc287f
Vendor docker/engine-api
...
Vendor docker/engine-api 9bab0d5b73872e53dfadfa055dcc519e57b09439
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: f446771f0b20330523d014656427a95000540735
Component: engine
2016-03-09 15:52:44 +08:00
e7ce25846b
Merge pull request #21033 from estesp/workdir-perms-userns
...
Ensure WORKDIR is created with remapped root ownership
Upstream-commit: 3d09842713b98dc59a0833c0fc110c14c5778d70
Component: engine
2016-03-09 07:22:08 +01:00
d91c7046be
Vendoring libnetwork v0.7.0-dev.5
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 5a654089416762da484ca9929fcd216076b591ab
Component: engine
2016-03-08 18:47:02 -08:00
a2e5fd5fd7
Merge pull request #20342 from vijaykilari/fix_20325
...
#20325 : arm64: Use gccgo as bootstrap for compiling golang
Upstream-commit: 0771230daac8aa2d66edddecd935d2c182850077
Component: engine
2016-03-08 16:11:42 -08:00
40f2f9ab61
Merge pull request #20940 from HackToday/fixsave
...
Refine error message when save non-exist image
Upstream-commit: 6b0119aefbc4b839d702cdc374c7d4d5cf988c37
Component: engine
2016-03-09 00:59:43 +01:00
775d953faa
Compare event nanoseconds properly to filter since a specific date.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a9f2006f105340890787799a5686b9760ab6be42
Component: engine
2016-03-08 17:07:58 -05:00
356157b64b
Merge pull request #18697 from jfrazelle/pids-cgroup
...
Add PIDs cgroup support to Docker
Upstream-commit: dd32445ecc6b706e8681dcc9d80c42c9b6cbf6cd
Component: engine
2016-03-08 14:03:36 -08:00
5b6f8bb922
Merge pull request #21035 from LK4D4/exec_ids
...
make TestExecInspectIDs less racy
Upstream-commit: 76a5ab3b43c93352e46c6a5c236f85d3281380fe
Component: engine
2016-03-08 13:02:01 -08:00
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
0cf2a141a6
make TestExecInspectIDs less racy
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 8dd8ec137eb02519091d9361af566d7f9cd9a11f
Component: engine
2016-03-08 09:51:39 -08:00
98685a6505
Ensure WORKDIR is created with remapped root ownership
...
Correct creation of a non-existing WORKDIR during docker build to use
remapped root uid/gid on mkdir
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 799a6b94ee661022d66f88a009ff58f08eb5a2c3
Component: engine
2016-03-08 11:58:55 -05:00
de84e87a00
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 >
Upstream-commit: 69cf03700fed7bf5eb7fe00c9214737e21478e49
Component: engine
2016-03-08 07:55:01 -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
5ab9ec7f3a
Refine error message when save non-exist image
...
Fixes : #20709
As discussed in the issue, we need refine the message to
help user more understood, what happened for non-exist image.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: ed231d409501d1e496fbe2b2e31a279eb2998cf2
Component: engine
2016-03-08 01:45:19 +00:00
727ed3e381
Optimize slow bottleneck test of DockerSuite.TestRunUnshareProc.
...
This fix tries to improve the time to run TestRunUnshareProc
in #19425 .
In this fix goroutines are used to run test cases in parallel to
prevent the test from taking a long time to run.
As the majority of the execution time in the tests is from
multiple executions of 'docker run' and each of which takes
several seconds, parallel executions improve the test time.
Since each 'docker run' is independent, the purpose of the
test is not altered in this fix.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 526c2fe942107908fe324db2ecceee14b69cb191
Component: engine
2016-03-07 23:43:16 +00: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
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
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
