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
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
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
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
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
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
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
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
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
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
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
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
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
e0a2d2cb2d
Merge pull request #20730 from clnperez/sysinfo-match-ip-case
...
Match case for IP variables in sysinfo pkg
Upstream-commit: b7bc1ce1a4be4d309395303cdc573922a48bfd72
Component: engine
2016-03-03 08:48:57 -08:00
4dd14aa176
Merge pull request #20863 from thaJeztah/add-kernel-memory-warning
...
Add KernelMemory to "info" and show warning
Upstream-commit: 15e68dc8eefad6b5b125209438a04d1d443e5b26
Component: engine
2016-03-03 13:14:51 +01:00
0653c63489
Merge pull request #20882 from Microsoft/jstarks/new_windows_diff_format
...
Write Windows layer diffs to tar in standard format
Upstream-commit: b76a55308fffe89d5b2fe5930eaa6118d1d5bd9a
Component: engine
2016-03-03 10:51:35 +01:00
209e95dee8
Write Windows layer diffs to tar in standard format
...
Previously, Windows layer diffs were written using a Windows-internal
format based on the BackupRead/BackupWrite Win32 APIs. This caused
problems with tar-split and tarsum and led to performance problems
in implementing methods such as DiffPath. It also was just an
unnecessary differentiation point between Windows and Linux.
With this change, Windows layer diffs look much more like their
Linux counterparts. They use AUFS-style whiteout files for files
that have been removed, and they encode all metadata directly in
the tar file.
This change only affects Windows post-TP4, since changes to the Windows
container storage APIs were necessary to make this possible.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 5649030e25bd87b4b0bbd200515b8c7317ae8ce1
Component: engine
2016-03-02 16:13:40 -08:00
7f5a363deb
Add KernelMemory to "info" and show warning
...
This change adds "KernelMemory" to the /info endpoint and
shows a warning if KernelMemory is not supported by the kernel.
This makes it more consistent with the other memory-limit
options.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 747a486b4aac2ebbbb28bd713b9a4a929f89353b
Component: engine
2016-03-02 23:32:25 +01:00
576af48c09
Merge pull request #20388 from hqhq/hq_add_cgroup_driver_info
...
Add CgroupDriver to docker info
Upstream-commit: 508a17baba3c39496008fc5b5e3fe890b8a1b31b
Component: engine
2016-03-02 23:17:27 +01:00
3e986fd0f5
Merge pull request #20858 from mountkin/validate-log-opts-again
...
validate log-opt when creating containers AGAIN (fixing drunkard's code)
Upstream-commit: b65fd8e879545e8c9b859ea9b6b825ac50c79e46
Component: engine
2016-03-02 18:27:00 +01:00
2d730b8156
Merge pull request #20475 from Microsoft/jstarks/filegetter
...
graphdriver: Replace DiffPath with DiffGetter
Upstream-commit: 8f109829e294371cbae1eebfc771eda96d92187f
Component: engine
2016-03-02 08:36:36 -08:00
5c70b34f09
validate log-opt when creating containers AGAIN
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 068085005ef378f6320fdce90a67b104399b796d
Component: engine
2016-03-02 20:30:26 +08:00
17d0f2d01e
Add CgroupDriver to docker info
...
Fixes : #19539
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: ca89c329b9f0748da74d08d02a47bc494e7965e2
Component: engine
2016-03-02 20:07:06 +08:00
79fb33ace9
Merge pull request #18766 from mikedanese/gcplogs
...
Add logging driver for Google Cloud Logging
Upstream-commit: 3c4d093babb6f4f4f8343f5c364c5229a9d96ba3
Component: engine
2016-03-02 02:09:44 +01:00
ddba9dffe5
Do not relabel if user did not request it for non local volumes
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: 843a119d49d2b4ba0a15188843b28763b13e62c6
Component: engine
2016-03-01 17:09:42 -05:00
f87c5bb0dc
Merge pull request #20825 from LK4D4/unused
...
Remove some unused structs and fields
Upstream-commit: 106793dcbe49aedd96d74b0c4b0e32a972032d06
Component: engine
2016-03-01 12:58:35 -08:00
307185d18b
Merge pull request #20617 from nalind/journald-pkgconfig
...
Try to handle changing names for journal packages
Upstream-commit: 36401f20ceb8b689fb619df4f6c7219fe76b521c
Component: engine
2016-03-01 15:38:03 -05:00
395ec16335
graphdriver: Replace DiffPath with DiffGetter
...
This allows a graph driver to provide a custom FileGetter for tar-split
to use. Windows will use this to provide a more efficient implementation
in a follow-up change.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 58bec40d16265362fd4e41dbd652e6fba903794d
Component: engine
2016-03-01 10:25:33 -08:00
cf6760a787
Remove some unused structs and fields
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0a352e1a906fbf7592aa95d6327776236d13392a
Component: engine
2016-03-01 09:59:29 -08:00
6b9790d5b0
Merge pull request #20684 from yongtang/13840-follow-symlink
...
Follow symlink for --device argument.
Upstream-commit: d883002fac7778e70096584c3eed1693eb7cec17
Component: engine
2016-03-01 12:44:10 -05:00
9fe49cb009
Match case for variables in sysinfo pkg
...
I noticied an inconsistency when reviewing docker/pull/20692.
Changing Ip to IP and Nf to NF.
More info: The golang folks recommend that you keep the initials consistent:
https://github.com/golang/go/wiki/CodeReviewComments#initialisms .
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 5b3fc7aab25be908cab869dab5c0b2cb821d31dc
Component: engine
2016-03-01 10:37:05 -06:00
461ed7624b
daemon/logger: Add logging driver for Google Cloud Logging
...
Signed-off-by: Mike Danese <mikedanese@google.com >
Upstream-commit: ed1b9fa07a0b34315d2fa624b978d3f8627319c2
Component: engine
2016-03-01 08:06:10 -08:00
cfff83dc7e
Follow symlink for --device argument.
...
Fixes : #13840
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 7ed569efdc822811cdac3b398a16757a54fbe4c4
Component: engine
2016-03-01 07:16:19 +00:00
44ded729ad
folders->directories
...
Signed-off-by: hsinko <21551195@zju.edu.cn >
Upstream-commit: 772f5495b7bb03a8fb97f9ae5fb5fa97c98a87b3
Component: engine
2016-02-29 21:32:30 -08:00
7097a625ab
Merge pull request #20710 from Microsoft/sjw/tp4retry_fix
...
Fixing retry hack for TP4 to return errors in all failure cases.
Upstream-commit: 6a960069596a5d43a50b7675454169aad06972ca
Component: engine
2016-02-29 19:08:24 -05:00
e32705bbc7
Merge pull request #20480 from wenchma/20431-filter_since_before
...
Enhancement of docker ps before and since filters
Upstream-commit: 9eb4575f8cdb8f9afb0d53d6fd4a34b077cc08da
Component: engine
2016-02-29 20:57:43 +01:00
210548216a
Fixing retry hack for TP4 to return errors in all failure cases.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 0b82202fbbbeaad5d7ba404fb586cb4b3f37980e
Component: engine
2016-02-29 10:53:01 -08:00
6324c7793e
Merge pull request #20605 from mountkin/optimize-json-log-writer
...
make the json log writer much faster
Upstream-commit: ba5a282a83a603c3bb61cd40642af54d2088f747
Component: engine
2016-02-29 10:47:46 -08:00
70ddfe143d
Merge pull request #20749 from mountkin/validate-log-opts
...
validate log-opt when creating containers
Upstream-commit: 2391794d2695079f2dd19b10cd51aea6922b3ec9
Component: engine
2016-02-29 13:47:25 -05:00
66f153da0f
Merge pull request #20774 from hqhq/hq_vender_engine_api
...
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
Upstream-commit: b211e57f23848bd1990db84d2ccce0ce529e735a
Component: engine
2016-02-29 18:48:55 +01:00
98394b0b6e
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 53b0d62683ee798198c553353dc2106623a9259b
Component: engine
2016-02-29 19:28:37 +08:00
5f0c16d34d
Merge pull request #20604 from coolljt0725/fix_reload
...
Fix configuration reloading
Upstream-commit: 20a038eca68e4188e1cd812293aea8cb220cf08f
Component: engine
2016-02-29 07:14:15 +01:00
c3440ba69f
validate log-opt when creating containers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 7285c9a53a6a661e7ded4637d937f9d20dcf46c0
Component: engine
2016-02-28 01:51:46 +08:00
a63e28ad6f
fix double-lock
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e386dfc33fc1fd5ed06496bd19f01a37c3c46341
Component: engine
2016-02-27 09:49:21 -05:00
f76950a71a
Revert "Add finer-grained locking for aufs"
...
This reverts commit f31014197cbe9438cc956ed12c47093a0324c82d.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c2f7777603039b0e9b7e8fcdf517b1486dc14781
Component: engine
2016-02-27 08:01:19 -05:00
8135f8d68c
Merge pull request #20699 from calavera/remove_static_error_declarations
...
Remove static errors from errors package.
Upstream-commit: df2b74188ec51422e84ec1dbdc58abf08c215019
Component: engine
2016-02-26 16:30:12 -08:00
7c97092faa
Merge pull request #20275 from cpuguy83/finer_graph_locks
...
Finer graph locks
Upstream-commit: 2f797bb1d9826f1aba242965b611b71b81fd152e
Component: engine
2016-02-26 13:33:34 -08:00
e0b6d7e1f3
Merge pull request #20729 from estesp/pipework
...
Add synchronization and closure to IO pipes in userns path
Upstream-commit: 51302c29edf256276ba4ba9a20076866db522f66
Component: engine
2016-02-26 13:33:02 -08:00
