msabansal
e8026d8a98
Windows libnetwork integration
...
Signed-off-by: msabansal <sabansal@microsoft.com >
2016-03-09 20:33:21 -08:00
Brian Goff
d99be399c3
Merge pull request #21019 from aboch/se
...
Add port configs to Sandbox and libnetwork vendoring
2016-03-09 22:27:37 -05:00
Alessandro Boch
b8a5fb76ea
Add Exposed ports and port-mapping configs to Sandbox
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2016-03-09 14:07:23 -08:00
Tõnis Tiigi
f97ab358cb
Merge pull request #21013 from calavera/events_since_nano
...
Compare event nanoseconds properly to filter since a specific date.
2016-03-09 09:30:54 -08:00
Antonio Murdaca
3d09842713
Merge pull request #21033 from estesp/workdir-perms-userns
...
Ensure WORKDIR is created with remapped root ownership
2016-03-09 07:22:08 +01:00
David Calavera
a9f2006f10
Compare event nanoseconds properly to filter since a specific date.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-03-08 17:07:58 -05:00
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
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
Phil Estes
799a6b94ee
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)
2016-03-08 11:58:55 -05: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
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
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
2af84d8875
Merge pull request #20934 from icecrime/20543_debugging
...
Fix race condition on daemon shutdown (#20543 )
2016-03-04 11:08:50 -08: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
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
Tatsushi Inagaki
e8513675a2
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 >
2016-03-04 11:39:59 +09:00
David Calavera
b7bc1ce1a4
Merge pull request #20730 from clnperez/sysinfo-match-ip-case
...
Match case for IP variables in sysinfo pkg
2016-03-03 08:48:57 -08:00
Sebastiaan van Stijn
15e68dc8ee
Merge pull request #20863 from thaJeztah/add-kernel-memory-warning
...
Add KernelMemory to "info" and show warning
2016-03-03 13:14:51 +01:00
Sebastiaan van Stijn
b76a55308f
Merge pull request #20882 from Microsoft/jstarks/new_windows_diff_format
...
Write Windows layer diffs to tar in standard format
2016-03-03 10:51:35 +01:00
John Starks
5649030e25
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 >
2016-03-02 16:13:40 -08:00
Sebastiaan van Stijn
747a486b4a
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 >
2016-03-02 23:32:25 +01:00
Vincent Demeester
508a17baba
Merge pull request #20388 from hqhq/hq_add_cgroup_driver_info
...
Add CgroupDriver to docker info
2016-03-02 23:17:27 +01:00
Vincent Demeester
b65fd8e879
Merge pull request #20858 from mountkin/validate-log-opts-again
...
validate log-opt when creating containers AGAIN (fixing drunkard's code)
2016-03-02 18:27:00 +01:00
David Calavera
8f109829e2
Merge pull request #20475 from Microsoft/jstarks/filegetter
...
graphdriver: Replace DiffPath with DiffGetter
2016-03-02 08:36:36 -08:00
Shijiang Wei
068085005e
validate log-opt when creating containers AGAIN
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2016-03-02 20:30:26 +08:00
Qiang Huang
ca89c329b9
Add CgroupDriver to docker info
...
Fixes : #19539
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2016-03-02 20:07:06 +08:00
Sebastiaan van Stijn
3c4d093bab
Merge pull request #18766 from mikedanese/gcplogs
...
Add logging driver for Google Cloud Logging
2016-03-02 02:09:44 +01:00
Dan Walsh
843a119d49
Do not relabel if user did not request it for non local volumes
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
2016-03-01 17:09:42 -05:00
Arnaud Porterie
106793dcbe
Merge pull request #20825 from LK4D4/unused
...
Remove some unused structs and fields
2016-03-01 12:58:35 -08:00
Tibor Vass
36401f20ce
Merge pull request #20617 from nalind/journald-pkgconfig
...
Try to handle changing names for journal packages
2016-03-01 15:38:03 -05:00
John Starks
58bec40d16
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 >
2016-03-01 10:25:33 -08:00
Alexander Morozov
0a352e1a90
Remove some unused structs and fields
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2016-03-01 09:59:29 -08:00
Brian Goff
d883002fac
Merge pull request #20684 from yongtang/13840-follow-symlink
...
Follow symlink for --device argument.
2016-03-01 12:44:10 -05:00
Christy Perez
5b3fc7aab2
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 >
2016-03-01 10:37:05 -06:00
Mike Danese
ed1b9fa07a
daemon/logger: Add logging driver for Google Cloud Logging
...
Signed-off-by: Mike Danese <mikedanese@google.com >
2016-03-01 08:06:10 -08:00
Yong Tang
7ed569efdc
Follow symlink for --device argument.
...
Fixes : #13840
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
2016-03-01 07:16:19 +00:00
hsinko
772f5495b7
folders->directories
...
Signed-off-by: hsinko <21551195@zju.edu.cn >
2016-02-29 21:32:30 -08:00
Brian Goff
6a96006959
Merge pull request #20710 from Microsoft/sjw/tp4retry_fix
...
Fixing retry hack for TP4 to return errors in all failure cases.
2016-02-29 19:08:24 -05:00
Vincent Demeester
9eb4575f8c
Merge pull request #20480 from wenchma/20431-filter_since_before
...
Enhancement of docker ps before and since filters
2016-02-29 20:57:43 +01:00
Stefan J. Wernli
0b82202fbb
Fixing retry hack for TP4 to return errors in all failure cases.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2016-02-29 10:53:01 -08:00
David Calavera
ba5a282a83
Merge pull request #20605 from mountkin/optimize-json-log-writer
...
make the json log writer much faster
2016-02-29 10:47:46 -08:00
Brian Goff
2391794d26
Merge pull request #20749 from mountkin/validate-log-opts
...
validate log-opt when creating containers
2016-02-29 13:47:25 -05:00
Sebastiaan van Stijn
b211e57f23
Merge pull request #20774 from hqhq/hq_vender_engine_api
...
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
2016-02-29 18:48:55 +01:00
Qiang Huang
53b0d62683
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2016-02-29 19:28:37 +08:00
Vincent Demeester
20a038eca6
Merge pull request #20604 from coolljt0725/fix_reload
...
Fix configuration reloading
2016-02-29 07:14:15 +01:00
Shijiang Wei
7285c9a53a
validate log-opt when creating containers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2016-02-28 01:51:46 +08:00
Brian Goff
e386dfc33f
fix double-lock
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-02-27 09:49:21 -05:00
Brian Goff
c2f7777603
Revert "Add finer-grained locking for aufs"
...
This reverts commit f31014197c .
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-02-27 08:01:19 -05:00
David Calavera
df2b74188e
Merge pull request #20699 from calavera/remove_static_error_declarations
...
Remove static errors from errors package.
2016-02-26 16:30:12 -08:00
Alexander Morozov
2f797bb1d9
Merge pull request #20275 from cpuguy83/finer_graph_locks
...
Finer graph locks
2016-02-26 13:33:34 -08:00