1d2d461e40
Fix service logs API to be able to specify stream
...
Before this change, doing service logs was just tossing the stream
selectors and always using the default (both streams). This change adds
a check for which streams the user wants and only includes those.
Fixes #31306
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: f63c62ce70d6ed4706dbde43feb22c6004c32061
Component: engine
2017-02-23 15:09:09 -08:00
e252f084ae
Merge pull request #31279 from aaronlehmann/shutdown-error-leakage
...
Shutdown leaks an error when the container was never started
Upstream-commit: 52ba250f7e1f504f2c984961fd7564cefec9c15e
Component: engine
2017-02-22 23:47:39 -08:00
3226daa36d
Shutdown leaks an error when the container was never started
...
I found that sometimes tasks would end up in a rejected state when
trying to update them quickly. The problem was that Shutdown could fail
if called before the container was started. Instead of returning an
error in this case, Shutdown should succeed. This allows tasks to
progress to the "shutdown" state as expected.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 37b492ae1b2ba5f84cd0b795dbc68804d7b2fec5
Component: engine
2017-02-22 19:12:07 -08:00
4fcd45b6de
Merge pull request #31263 from nalind/journal-doublefree
...
Synchronize the cursor returned by followJournal
Upstream-commit: b3e7f7013719be7d11d513335ff55802eaf543ce
Component: engine
2017-02-22 17:45:49 -08:00
398b1f8b67
Merge pull request #31231 from mlaventure/fix-journald-invalid-free
...
Prevent freeing a possible invalid pointer from journald
Upstream-commit: f67eb69fe365b38fbbe31dd0b3afc6588711dcd3
Component: engine
2017-02-22 15:36:36 -08:00
53075c0a1f
Synchronize the cursor returned by followJournal
...
Make sure that the cursor value returned by followJournal() is the last
of the values returned by its goroutine's calls to drainJournal() by
waiting for it, rather than returning a value that may be superceded by
another if we're singalling the goroutine that it should exit by closing
a pipe.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com >
Upstream-commit: d57c330617efb97cad736a3e4ede82bb46ebbbf2
Component: engine
2017-02-22 16:22:00 -05:00
73607300a9
Prevent freeing a possible invalid pointer from journald
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 81630df85439adab1836e83a7e645d67b1c0eb83
Component: engine
2017-02-22 07:54:10 -08:00
edc3a87209
Merge pull request #31211 from lixiaobing10051267/masterAttach
...
invalide detach keys provided
Upstream-commit: ffc70d2f0c2d8552d67e9af0e1a645abf04ca0e2
Component: engine
2017-02-22 11:28:15 +08:00
9e10267bf9
invalide detach keys provided
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 660ec32e8fbaf62c6ae9254377495a0674d858d6
Component: engine
2017-02-22 09:48:18 +08:00
b6a3bf40fb
Merge pull request #31136 from tonistiigi/more-locks
...
Add more locking to storage drivers
Upstream-commit: 1ad165dba151a76af30a8dee548d9e5689183227
Component: engine
2017-02-21 07:39:33 -08:00
86338aa9ad
Merge pull request #31159 from tonistiigi/fix-size-lock
...
Don’t hold container lock for size calculation
Upstream-commit: 91cffdbedb89e6164fe2ceca3d68ec039c1acc34
Component: engine
2017-02-19 16:31:21 +01:00
c000845b00
Don’t hold container lock for size calculation
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: bd33a99acfb0e2dd02f692242237d9060e359f4a
Component: engine
2017-02-18 18:11:48 -08:00
0cc00d1673
Merge pull request #31055 from Microsoft/jjh/fix30278
...
Windows: Retry workaround for RS1/RS2 compute system enumeration
Upstream-commit: 7761c69e239171c6b388d53d03619eacc49338a0
Component: engine
2017-02-17 16:53:16 -08:00
abadc8a614
Add more locking to storage drivers
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: fc1cf1911bb92def95f407364372992d57b11ca2
Component: engine
2017-02-17 15:50:25 -08:00
9d740761c3
Merge pull request #31075 from vieux/switch_to_new_versioning_scheme
...
Switch to new versioning scheme
Upstream-commit: cf5fe9ed0bbadc08512b485f7d1debd423fa3178
Component: engine
2017-02-17 15:43:28 -08:00
00a09015ca
Merge pull request #29984 from jmzwcn/issueNNP
...
[feature]: add daemon flag to set no_new_priv as default for unprivileged containers
Upstream-commit: 6dd2a82458016d15786b0bb12ba4cecde9b6bb90
Component: engine
2017-02-17 11:43:43 -08:00
7b79f78433
Merge pull request #30967 from adshmh/24631-service-without-labels-returns-empty-map
...
Inspect output on service without labels is an empty map instead of null, fixes #24631
Upstream-commit: 0de867b315ff5734530558319b1f20238c81ba0c
Component: engine
2017-02-17 08:49:32 -08:00
ba76fec59c
Merge pull request #31069 from tonistiigi/fix-overlay2-unmount
...
overlay2: fix unmounting layer without merge dir
Upstream-commit: 146bc072a9bc0c52509d55a96c4324e3cee3d557
Component: engine
2017-02-17 10:21:47 +01:00
5ecbd0e344
Merge pull request #31103 from tonistiigi/update-docs-link
...
Update storage driver options link
Upstream-commit: e1839ab95341fe8c40d8e8e0112fcfab38c92f3f
Component: engine
2017-02-17 09:45:31 +01:00
54df4712b6
Update storage driver options link
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e9864cc0ec53ae3be250cb184274ccc9349bec2d
Component: engine
2017-02-16 18:32:17 -08:00
48fc06e87e
Merge pull request #30618 from cpuguy83/fix_data_races
...
Fix some data races
Upstream-commit: 7978eef62337abc52912dd9a1901d8aa4aafa123
Component: engine
2017-02-16 21:15:21 -05:00
6b0b33830b
Merge pull request #31070 from cpuguy83/31060_fix_log_read_spin
...
Fix cpu spin waiting for log write events
Upstream-commit: 39851eac0c655d0c1911db58d4f630e2da233cac
Component: engine
2017-02-16 20:15:38 -05:00
19d262d100
Merge pull request #31054 from darrenstahlmsft/WaitOOBE
...
Windows: Wait for OOBE to prevent crashing during host update
Upstream-commit: 7f0b833621f61072d3176d224be02ea5089761f9
Component: engine
2017-02-16 11:18:25 -05:00
2f00829632
Merge pull request #31073 from aboch/naip
...
Release the network attachment on allocation failure
Upstream-commit: 55e2ed2a653f70c58206633710851ac75bc74e0b
Component: engine
2017-02-16 16:36:28 +01:00
6224d25ac6
Release the network attachment on allocation failure
...
- otherwise the attachment task will stay in store and
consume IP addresses and there is no way to remove it.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 91820b69412e2ec9e5b3201cd5c637ca1352fd39
Component: engine
2017-02-16 05:21:06 -08:00
3ba3328157
Add daemon flag to set no_new_priv as default for unprivileged containers.
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: d7fda019bb7e24f42f8ae1ddecb3fd52df3c48bf
Component: engine
2017-02-16 19:05:14 +08:00
b3ec6dace6
Switch to new versioning scheme
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 47396d637781ef131fc47995756efff65ca1ccac
Component: engine
2017-02-15 23:22:50 -08:00
ee71506629
Fix cpu spin waiting for log write events
...
This loop is not ever going to return since it's never actually setting
the `err` var except on the first iteration.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7a179972ff963706404f91671960b144dec98d65
Component: engine
2017-02-15 21:41:32 -05:00
b4b0a816d9
overlay2: fix unmounting layer without merge dir
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e1af6c8a5767e38957449a1d07e56104e317191b
Component: engine
2017-02-15 17:58:12 -08:00
d0f9d01ec6
Windows: Wait for OOBE to prevent crashing during host update
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: e128a65685dafd640e32118eb1903581489f7e31
Component: engine
2017-02-15 14:01:54 -08:00
8c67bb4bf9
Windows: Retry loop to fix HCS race condition enumerating containers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
This fixes https://github.com/docker/docker/issues/30278 where
there is a race condition in HCS for RS1 and RS2 builds, and enumeration
of compute systems can return access is denied if a silo is being
torn down in the kernel while HCS is attempting to enumerate them.
Upstream-commit: 83a2db20977ae41325a74cf871b9e3caa92a2b7b
Component: engine
2017-02-15 11:16:24 -08:00
3128024c49
rewrite reload code
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 75f5d63ec8414eb3d5f0a0707225b6fa7d485ce7
Component: engine
2017-02-15 21:57:27 +08:00
f78660f63c
Fixing #24631 , inspect output on swarm object types without labels is empty object {}
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 1b347cfc795407ced5eae60cb3ceadfdab8a8f4f
Component: engine
2017-02-15 01:25:55 -05:00
347c5e8518
fix docker daemon reload bug
...
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com >
Upstream-commit: 51870c7e920cef10ecb19a8d8662bcf32da4b7c5
Component: engine
2017-02-15 10:58:09 +08:00
d39118ab1f
Merge pull request #29702 from WeiZhang555/stats-all-format-name-panic
...
Send "Name" and "ID" when stating stopped containers
Upstream-commit: 22472c8be50ca0ddaf8207d46c6a9f5e792bd0af
Component: engine
2017-02-14 10:48:42 -08:00
6867302948
Merge pull request #30340 from ijrandom/master
...
Fix #30311 : dockerd leaks ExecIds on failed exec -i
Upstream-commit: eac68dbbbc7a58c20beb8d7cdcf80ade2ccebb34
Component: engine
2017-02-14 10:13:16 +09:00
55259ac6bb
Merge pull request #30834 from allencloud/refactor-daemon-cluster-handler-and-helper
...
refactor cluster/helper.go and split cluster.go into multiple files
Upstream-commit: b8a3595941bd9037e2470519aab142262a0e7c49
Component: engine
2017-02-13 11:31:30 -08:00
fe42bb3c56
create a new file swarm.go and move swarm part code from cluster.go into swarm.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 75a315d43e2577768ba5e0ef071ed9631e43ce8b
Component: engine
2017-02-12 02:54:07 +08:00
5257b3c3b3
create a new file networks.go and move network part codes from cluster.go into networks.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 4f4151bba4eac6b6e4b47a922346fbf66120a057
Component: engine
2017-02-12 02:50:17 +08:00
767050f4bc
create a new file task.go and move task part codes from cluster.go into tasks.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 6be675c752ac511c7397fef5928af7dfda13a234
Component: engine
2017-02-12 02:45:00 +08:00
b538436290
create a new file services.go and move service part codes from cluster.go into services.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 6ff14b48c789fa9cad050b039b08f52491955ce2
Component: engine
2017-02-12 02:43:23 +08:00
6c9be69cc1
create a new file nodes.go and move node part codes from cluster.go into nodes.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 7591e313a4799074cee45dab43f40b583a959abb
Component: engine
2017-02-12 02:36:09 +08:00
31a98bbb56
refactor helper.go and move getSecret to helper.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b6fb3a56dca43f33ddbb0b38a0fc0596c8c80b46
Component: engine
2017-02-12 02:30:53 +08:00
a02b030327
Fix #303111 : dockerd leaks ExecIds on failed exec -i
...
Signed-off-by: Dmitry Shyshkin <dmitry@shyshkin.org.ua >
Upstream-commit: 3cc0d6bb0475551687d89e7925b09f864c866a71
Component: engine
2017-02-10 21:13:00 +02:00
50715b9350
Send "Name" and "ID" when stating stopped containers
...
When `docker stats` stopped containers, client will get empty stats data,
this commit will gurantee client always get "Name" and "ID" field, so
that it can format with `ID` and `Name` fields successfully.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: eb3a7c232908377f4d4c0b0ec6fd35b0be138fdd
Component: engine
2017-02-09 09:46:59 +08:00
dd8010e320
Extract daemon configuration and discovery to their own package
...
This also moves some cli specific in `cmd/dockerd` as it does not
really belong to the `daemon/config` package.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: db63f9370e26d725357c703cbaf9ab63cc7b6d0a
Component: engine
2017-02-08 09:53:38 +01:00
7a04a9d5d0
Merge pull request #30474 from allencloud/sort-volume-drivers
...
sort volume drivers and auth plugins in info response
Upstream-commit: 41650df87e55c0d018c66d0d221920f87c343391
Component: engine
2017-02-07 21:13:21 -05:00
6b54bc16cf
Merge pull request #30694 from godefroi/26937-fix-rfc5424-log-format-1
...
Add NILVALUE for STRUCTURED-DATA in RFC5424 logs
Upstream-commit: 14790e4008c030626eeb8886c4578441af561cf0
Component: engine
2017-02-07 23:22:39 +01:00
c355cec53c
Merge pull request #30457 from dmcgowan/distribution-reference-update-2
...
reference: use distribution reference and remove fork
Upstream-commit: 254fc83cba90ed79c78f4cb0cb33aeeaff492798
Component: engine
2017-02-07 22:01:25 +01:00
6df9f2365c
Merge pull request #29552 from dnephin/fix-build-with-log-driver
...
Ignore the daemon log config when building images
Upstream-commit: 1b4e2b7c878fb69c1c96755e21a571e6d7b8e4bb
Component: engine
2017-02-07 15:47:41 -05:00
