Commit Graph

2987 Commits

Author SHA1 Message Date
1dd04a954b Merge pull request #16579 from coolljt0725/fix_attach_paused_container
Add show error when attach to a paused container
Upstream-commit: 5719d010665377c0696e36b894e742399deb30ed
Component: engine
2015-10-31 07:43:22 -07:00
7f7650a345 Merge pull request #17537 from mountkin/fix-logger-race
fix a race in json logger reader
Upstream-commit: ed6e3cf7043e7454e10e390bc1a33343e3615c5d
Component: engine
2015-10-30 23:00:17 -07:00
7e5c1a1c97 Merge pull request #17545 from LK4D4/writehs_encode
Use json.Encoder for container.writeHostConfig
Upstream-commit: f87082f08e6b91a33e251215040350faa0d78d71
Component: engine
2015-10-30 21:11:15 -04:00
81f43f078c Merge pull request #17548 from mavenugo/ugr
Vendoring libnetwork to fix #17526 & #17527
Upstream-commit: 2e466bafda752c3f51adc6ad7e862d65f4c43deb
Component: engine
2015-10-30 17:13:40 -07:00
8ea851aea2 Merge pull request #17547 from LK4D4/unn_stat
Remove unnecessary Stat check from readHostConfig
Upstream-commit: 6d8aff07ac18f0a2469bf5ce3e47ddb7d0539f60
Component: engine
2015-10-30 16:56:11 -07:00
bf96bafac5 Merge pull request #17549 from donhcd/fixPre122Stats
fix pre-1.21 docker stats
Upstream-commit: 9bf20c68474c7f982100d2529f61eecc1732f4c5
Component: engine
2015-10-30 16:45:41 -07:00
c715fd640d fixing ungraceful daemon restart case where nw connect is not persisted
For graceful restart case it was done when the container was brought
down. But for ungraceful cases, the persistence is missing for nw
connect

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 401632c7568408ee9689adc1da855cfb1409e906
Component: engine
2015-10-30 16:24:02 -07:00
9be4647b0f Turn IPC unmount errors into warnings.
And do not try to unmount empty paths.

Because nobody should be woken up in the middle of the night for them.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: a54d5932e3a644317c77d59bc5aee562841d5c20
Component: engine
2015-10-30 19:13:52 -04:00
85edd54e9f Merge pull request #17538 from calavera/deprecated_bridge_interface
Fix network inspect for default networks.
Upstream-commit: 33f54297865984bba0a37cefb110af70cc0135b4
Component: engine
2015-10-30 16:03:51 -07:00
493276a67c fix pre-1.22 docker stats
This fixes a bug introduced in #15786:

* if a pre-v1.20 client requested docker stats, the daemon
would return both an API-compatible JSON blob *and* an API-incompatible JSON
blob: see https://gist.github.com/donhcd/338a5b3681cd6a071629

Signed-off-by: Donald Huang <don.hcd@gmail.com>
Upstream-commit: d2c04f844b8258d712da4b8feac25df7590b037c
Component: engine
2015-10-30 22:28:03 +00:00
7e8d2a05a2 Merge pull request #16779 from Microsoft/10662-execdrivercommand
Windows: Refactor execdriver.Command
Upstream-commit: 0c991f3d68227a57225552e0c5237a72e5177da2
Component: engine
2015-10-30 14:59:59 -07:00
2631995b0b Remove unnecessary Stat check from readHostConfig
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 36a69bbc6050c5916f7267679ff7d61b5dfc5b8e
Component: engine
2015-10-30 14:54:09 -07:00
7823447431 Use json.Encoder for container.writeHostConfig
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: cf1a6c08fa03aa7020f8f5b414bb9349a9c8371a
Component: engine
2015-10-30 14:45:35 -07:00
ed2cf39b31 Merge pull request #17539 from cpuguy83/cleaner_ipc_unmount_handling
Force IPC mount to unmount on daemon shutdown/init
Upstream-commit: 23a0fe9627e6056826c7c3bf55cb0c1bfdde52bc
Component: engine
2015-10-30 14:40:42 -07:00
08c7b5a9fb Merge pull request #17528 from LK4D4/todisk_encode
Use json.Encoder for container.toDisk
Upstream-commit: 85d7bbf7aab301026741693f034b799b01f58394
Component: engine
2015-10-30 14:36:42 -07:00
5d5868d289 Merge pull request #17531 from crosbymichael/no-set-reservation
Don't set mem soft limit if not specifiecd
Upstream-commit: 74362e8392bc60081c6083ab022ca5c6e6496134
Component: engine
2015-10-30 17:01:36 -04:00
057d34fa0f Fix network inspect for default networks.
- Keep old fields in NetworkSetting to respect the deprecation policy.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f301c5765a0d7f4b6866cedfdface6f87874ff53
Component: engine
2015-10-30 16:55:21 -04:00
80a227297f Windows: Refactor execdriver.Command
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9d14866d7173e974b9eff34e251b16083647f056
Component: engine
2015-10-30 13:53:00 -07:00
2f899d6841 Windows: Native ANSI console support
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 805dd0eeed1824c9f3dcdb3108ea15686ae15223
Component: engine
2015-10-30 13:44:04 -07:00
4bf986fcb9 Modify IPAMConfig structure json tags
- So that it complies with docker convention for inspect

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: d795bc7d53db4b9e9194d0570d65e22d39f58384
Component: engine
2015-10-30 12:57:49 -07:00
aaae8eab38 Force IPC mount to unmount on daemon shutdown/init
Instead of using `MNT_DETACH` to unmount the container's mqueue/shm
mounts, force it... but only on daemon init and shutdown.

This makes sure that these IPC mounts are cleaned up even when the
daemon is killed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 78bd17e805b7514505455b10f2fd90962505a3ff
Component: engine
2015-10-30 15:41:48 -04:00
3e20fd363b fix a race in json logger reader
The json decoder starts to decode immediately an inotify event is
received.
But at the time the inotify event is trigged, the json log
entry might haven't been fully written to the disk.
In this case the decoder will return an "io.UnexpectedEOF" error, but
there is still data remaining in the decoder's buffer. And the data
should be passed to the decoder when the next inotify event is
triggered.

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: e41eae8b42052d07432405cca113ffcf8cf49c06
Component: engine
2015-10-31 02:28:23 +08:00
03bd2aa8e5 Merge pull request #17530 from Microsoft/jjh/windowsmasterbuild
Build broken on master (awslogs)
Upstream-commit: 0aa3bff482bc5a1f330667fb1174dbae5490af34
Component: engine
2015-10-30 10:39:48 -07:00
d73613b841 Merge pull request #17514 from mavenugo/ugr
Fixing a case of dangling endpoint during ungraceful daemon restart
Upstream-commit: 17a8fbeaebf1991fa8d97adb3f217edbecd651ea
Component: engine
2015-10-30 13:38:27 -04:00
73a0603e8b Don't set mem soft limit if not specifiecd
You cannot do this for individual cgroups for all the containers.  Only
set the reservation if the user requested it.  The error you will
receive is an EINTVAL when you try to set a large limit like we were in
the memory limit.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ecb87ed0a5128a3d9ab3b0a620463b7b56e82bab
Component: engine
2015-10-30 10:34:01 -07:00
2e804d8f73 Windows build broken on master (awslogs)
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2716e3964d7e30e924e7f5da3d7923c9f286cff2
Component: engine
2015-10-30 10:02:32 -07:00
9514b66cfb Merge pull request #16640 from samuelkarp/awslogs-logging-driver
[awslogs] Auto-detect region and set user-agent
Upstream-commit: c545dce004a4b833994478a2fc993ee8e2b3b2cd
Component: engine
2015-10-30 12:38:40 -04:00
828e7e6368 Merge pull request #16412 from Microsoft/10662-hyper-v-containers
Windows [TP4]: Adds support for Hyper-V Containers
Upstream-commit: aadae4b503fbf21db788e12785cdc8844679bebc
Component: engine
2015-10-30 09:34:16 -07:00
f17dd37fef Use json.Encoder for container.toDisk
* for simmetry with fromDisk
* it might be slightly better for GC because of internal sync.Pool

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: cf02b369e077022335f01b2f78ebd759129de82a
Component: engine
2015-10-30 09:29:53 -07:00
8365d94d5b Merge pull request #17510 from LK4D4/refactor_shutdown
Refactor Shutdown a little to reduce indentation
Upstream-commit: e990eca1e5b73c4e87f2e3b18f52f3d9630a988b
Component: engine
2015-10-30 12:24:03 +01:00
c4945bb6f2 Merge pull request #17498 from LK4D4/fix_graph_comment
Fix Graph() docstring
Upstream-commit: 6b9de7342ff79d9dbf889dd2d66a9b7dc6523c28
Component: engine
2015-10-30 09:48:16 +01:00
fbb8ea7720 Merge pull request #17492 from aidanhs/aphs-remove-dead-code
Remove dead code
Upstream-commit: 81c5b1ce4a5db623b04b5cce254b4e2ef7ef2c5b
Component: engine
2015-10-30 08:50:54 +01:00
f1bdbbe92a Fixes a case of dangling endpoint during ungraceful daemon restart
When a container restarts after a ungraceful daemon restart, first
cleanup any unclean sandbox before trying to allocate network resources.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 0c07096b7da6dc28df10df21283fc21b3b052e1a
Component: engine
2015-10-29 18:56:56 -07:00
9e7bc2e568 Refactor Shutdown a little to reduce indentation
Also make daemon.netController.Stop() regardless of container existance.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ace5854f654d58e821bb3d47c4e3255ae49619e5
Component: engine
2015-10-29 17:20:32 -07:00
631571fcc6 Merge pull request #17497 from LK4D4/put_err
Do not ignore errors from graphdriver.Put
Upstream-commit: 82203d06ebbd7e205cf620c2e8555914f3c86d8f
Component: engine
2015-10-29 19:37:10 -04:00
2bf3bcdc0a Windows: Adds support for Hyper-V Containers
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 15e35c447058851850155f90292e51decb482956
Component: engine
2015-10-29 16:18:52 -07:00
f8757c11b0 Merge pull request #17490 from aboch/pm
Libnetwork vendoring & overlay networking fixes
Upstream-commit: 7f7950aa187e551bdc4d6128523207c2b8343250
Component: engine
2015-10-29 13:45:19 -07:00
27424c56e7 Merge pull request #17460 from dmcgowan/fix-rmi-force-tag
Fix rmi -f removing multiple tags
Upstream-commit: cdfd9846f480b54dc6207b578c29ecfe2cdeed34
Component: engine
2015-10-29 13:01:06 -07:00
a94cd37485 Execute buildPortMapInfo after Endpoint.Join()
- As the retrieved info may not be available at
  Endpoint creation time for certain network drivers
- Also retrieve the MAC address from Endpoint.Info().Iface()

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: e03daebb48221bae84bfc48b0f9b652ced6d93f3
Component: engine
2015-10-29 11:47:30 -07:00
35f2f24931 Fix Graph() docstring
It's not true anymore, it used in builder for example.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 134772f91ec40616d974e61388638495c8a126fb
Component: engine
2015-10-29 11:41:42 -07:00
b276a5731c Do not ignore errors from graphdriver.Put
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ac4b2905528457d9dba252c1590b9ac143372d0b
Component: engine
2015-10-29 11:25:53 -07:00
0b3d47d91e Remove dead code
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 164d0bca63b74e6e0deeceee17b55c044f8d274e
Component: engine
2015-10-29 16:56:29 +00:00
8ca5c39620 Add show error when attach to a paused container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: de1d611990a80cf4a38ec501469c08c1aeee2d60
Component: engine
2015-10-28 21:00:09 -04:00
b0c9467783 Merge pull request #17437 from LK4D4/put_error
Do not ignore error from driver.Put
Upstream-commit: 0e1618db194388e7fe54332a7e192eb41ad9df89
Component: engine
2015-10-28 17:32:03 -07:00
4cf9c8be78 Fix rmi -f removing multiple tags
When an image has multiple tags and rmi is called with force on a tag, only the single tag should be removed.
The current behavior is broken and removes all tags and the image.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 48e7f7963e142a0a45b583c5e65015d896c59433
Component: engine
2015-10-28 16:07:02 -07:00
a0d60ea3e8 Remove unnecessary error returns
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 990655448dec63ef8add376becb1a20ae184a162
Component: engine
2015-10-28 15:15:22 -07:00
b5b91966d7 Merge pull request #17424 from coolljt0725/fix_inspect_gateway_value
Fix docker inspect display odd gateway value for none network mode
Upstream-commit: 54d42f4a107641c2755ea1d6e55ca41d8945f4f8
Component: engine
2015-10-28 13:39:59 -07:00
552e02ae16 Do not ignore error from driver.Put
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bc09eceaf401893275b6ec5508d523ec39357d78
Component: engine
2015-10-28 06:54:09 -07:00
62616f762f Fix docker inspect display odd gateway value for none network mode
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7fa601adc7858606630dec5b037e60b8955e716d
Component: engine
2015-10-27 21:47:12 -04:00
238006044d Merge pull request #17423 from cpuguy83/so_sensitive
Revert "dockerversion placeholder for library-import"
Upstream-commit: b227d19cae34d6d0ce92b72a53f02330b0be5992
Component: engine
2015-10-27 18:32:18 -07:00