773a1624ef
Merge pull request #13507 from hqhq/hq_remove_redundant_set_header
...
Remove redundant set header
Upstream-commit: 7b57fae04668cc4841f0d31f8ce16ac8d044b446
Component: engine
2015-05-27 10:44:57 -07:00
a7ae3fbbff
Merge pull request #13483 from jfrazelle/lxc-we-meet-again
...
fix lxc tests unshare, they dont use our apparmor profile
Upstream-commit: 26650e2cccc72bcc7d62e3208e3a69316272e883
Component: engine
2015-05-27 10:22:31 -07:00
810a7285de
Merge pull request #13506 from hqhq/hq_fix_wrong_return_nil
...
Return err if we got err on parseForm
Upstream-commit: b29f3bb1c306e3fa52ec24e9011cafed89eef9c9
Component: engine
2015-05-27 12:38:53 -04:00
d177b20750
Merge pull request #13493 from jlhawn/volume_unmount_fix
...
Fix container unmount networkMounts
Upstream-commit: 2029257e3cfd524b5fec0288eef039f182e460f7
Component: engine
2015-05-27 08:44:11 -07:00
81ebc3c70c
Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe
...
Fix unregister stats on when rm running container
Upstream-commit: f3e56420a311378de030f7e3240fbdf6295c0b7e
Component: engine
2015-05-27 11:10:36 -04:00
3c23cb903e
Merge branch 'master' of github.com:docker/docker into kill
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 66121d1b45253eb7292ee39fa50b2564dec85803
Component: engine
2015-05-27 11:00:12 -04:00
b97117116a
Merge pull request #13500 from HuKeping/cleanup
...
Remove unused code
Upstream-commit: 3f66f6f2f066d46f554deec55284377ee726a028
Component: engine
2015-05-27 13:59:40 +02:00
0767c7dcb9
Remove unused code
...
As far as I see, it's a dead code.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: a34cb321865c16ac42a12fe32fa3c8c4a5ffd263
Component: engine
2015-05-27 22:39:02 +08:00
a7e8383688
Remove redundant set header
...
Which is already done in writeJSON.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 94d604357ff9cf7a5fcc4d98ffe58f804adf0ae6
Component: engine
2015-05-27 18:25:57 +08:00
d3998344e0
Return err if we got err on parseForm
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 7c7aebfcfef46337aa4e20f9d024916f71650545
Component: engine
2015-05-27 18:16:28 +08:00
d1589d564f
Add --net=container with --publish --publish-all --expose error out
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 13f2aa70687e21159eb8ef13eb5dddb785f0e1ee
Component: engine
2015-05-27 15:31:06 +08:00
af2789e761
script cleaned up
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
Upstream-commit: f228fb09acffde575c704d501739ad547baf4e24
Component: engine
2015-05-27 10:21:09 +03:00
49dc08b2f2
Fix unregister stats on when rm running container
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b3e8ab3021d2021202e14b912e7fdbfede4c7c20
Component: engine
2015-05-26 22:22:03 -04:00
af47afb0d1
Merge pull request #13406 from moxiegirl/experimental-work
...
Placeholder Part II: For commenting about install
Upstream-commit: e580734149c646adf1c939cc292bebc4950afde4
Component: engine
2015-05-26 18:19:26 -07:00
6aa7cf16be
Ensure all the running containers are killed on daemon shutdown
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: bdb77078b5b93c3075aa258e1c04a5a5c893430f
Component: engine
2015-05-27 09:09:25 +08:00
aee141571b
Fix container unmount networkMounts
...
UnmountVolumes used to also unmount 'specialMounts' but it no longer does after
a recent refactor of volumes. This patch corrects this behavior to include
unmounting of `networkMounts` which replaces `specialMounts` (now dead code).
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 04f99a6ca8232e43169b9a0706e435c551c798a3
Component: engine
2015-05-26 17:38:26 -07:00
d9b5b5714d
Merge pull request #13491 from jfrazelle/revert-exec-privileged
...
Revert "Add docker exec run a command in privileged mode"
Upstream-commit: b50e7809254c1d3cc9bd2b94be0c87b68576ed2a
Component: engine
2015-05-26 16:41:50 -07:00
46ea5fe0ee
Merge pull request #13487 from calavera/volume_load_regression_test
...
Add regression test to make sure we can load old containers with volumes.
Upstream-commit: 838e1a89472bac5c8307431de477d511dc78b95b
Component: engine
2015-05-26 19:40:08 -04:00
b58daceb88
Merge pull request #12881 from nakedible/patch-1
...
Prevent fallback to v1 registry for digest pulls
Upstream-commit: 54b514735c592de77f3d79ec80c2d37bd589da6c
Component: engine
2015-05-26 19:24:37 -04:00
4abb12acf6
Windows: Set default exec driver to windows
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 041ba90dbb713656440fb5eadbd5aba892645350
Component: engine
2015-05-26 16:17:33 -07:00
0c3a03c749
Fixes title, line wrap, and Adds install area
...
Tibor's comment
Updating with the new plugins
Entering comments from Seb
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 1ba1a0550ff3fa98397cd93195cc33b8c2f6473a
Component: engine
2015-05-26 15:37:38 -07:00
dc2caf8054
Merge pull request #13444 from runcom/fix-race-stats
...
Fix race in stats cli and native driver
Upstream-commit: 0d445685b8d628a938790e50517f3fb949b300e0
Component: engine
2015-05-26 15:34:50 -07:00
ef63a3dd48
Add regression test to make sure we can load old containers with volumes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ea0e15ba6244a539db646d947aaf9cafe88603f6
Component: engine
2015-05-26 15:28:58 -07:00
cd81890817
Merge pull request #13492 from calavera/donot_force_syscall_unmount_on_cleanup
...
Do not force `syscall.Unmount` on container cleanup.
Upstream-commit: bd18d8625090c62605fa34fb8ccf703c6f59ec9e
Component: engine
2015-05-26 15:23:16 -07:00
f26677f4cf
Do not force syscall.Unmount on container cleanup.
...
This is not necessary and it's a regression from the old behavior.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: f78dce152c3c67bf262648028ff7932ca461b6fd
Component: engine
2015-05-26 14:28:26 -07:00
96fc5c8d8e
Merge pull request #13489 from cpuguy83/cleanup_rm_funcs
...
Cleanup container rm funcs
Upstream-commit: de318d8c1d980066db8e94825d0529698095536c
Component: engine
2015-05-26 14:24:02 -07:00
d89704cf56
Revert "Add docker exec run a command in privileged mode"
...
This reverts commit 72a500e9e5929b038816d8bd18d462a19e571c99.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Conflicts:
daemon/execdriver/native/exec.go
integration-cli/docker_cli_exec_test.go
runconfig/exec.go
Upstream-commit: 40b71adee390e9c06471b89ed845132b4ec80177
Component: engine
2015-05-26 14:12:16 -07:00
5066df6b7c
Merge pull request #13440 from LK4D4/fix_bridge_none
...
Fix network with -b none
Upstream-commit: 47e727d1fcef00c270851ecc3e5efa7d7b65240d
Component: engine
2015-05-26 14:08:21 -07:00
966f3309f6
Merge pull request #13409 from LK4D4/add_opts_to_checkconfig
...
Add some opts to checkconfig
Upstream-commit: 3b795e035ba39fc31f5df184301994a3dcdced43
Component: engine
2015-05-26 13:54:23 -06:00
9181b59d85
Update vendored libcontainer to v2.1
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com > (github: boucher)
Upstream-commit: 4509f91b26869500dd0d7ea6858e03b1b00eef5d
Component: engine
2015-05-26 12:47:57 -07:00
2b42c2c199
Cleanup container rm funcs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f8628ba89104385071e811d0b21293d7cd2e8e01
Component: engine
2015-05-26 15:38:52 -04:00
416a489d28
Allow mirroring only for the official index
...
Strip authconfig from session to keep credentials from being sent to the mirror.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: c19962ade10619e5edd8057249566c494d4719bb
Component: engine
2015-05-26 11:08:19 -07:00
521590a1df
Registry v2 mirror support.
...
The v2 registry will act as a pull-through cache, and needs to be
handled differently by the client to the v1 registry mirror.
See docker/distribution#459 for details
Configuration
Only one v2 registry can be configured as a mirror. Acceptable configurations
in this chanage are: 0...n v1 mirrors or 1 v2 mirror. A mixture of v1 and v2
mirrors is considered an error.
Pull
If a v2 mirror is configured, all pulls are redirected to that mirror. The
mirror will serve the content locally or attempt a pull from the upstream mirror,
cache it locally, and then serve to the client.
Push
If an image is tagged to a mirror, it will be pushed to the mirror and be
stored locally there. Otherwise, images are pushed to the hub. This is
unchanged behavior.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
Upstream-commit: 13deed380127d4a0e7982bb0d4f6529d0962116b
Component: engine
2015-05-26 11:08:19 -07:00
7991258f62
Merge pull request #13479 from Microsoft/10662-fixcontaineragain
...
Windows: Fix up container again
Upstream-commit: fc679bebb9546a10c0f0a5b134f63cd58cd38b26
Component: engine
2015-05-26 10:49:48 -07:00
d1e801b441
Merge pull request #13480 from Microsoft/10662-fixvolumecompile
...
Windows: Fix volume_windows compile
Upstream-commit: 7853bd29ec941fe8ee9ff176f0349177d1d54edd
Component: engine
2015-05-26 10:32:44 -07:00
f13e674ff0
fix lxc tests unshare, they dont use our apparmor profile
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: a08fb73f9387e22b222d90e638b9f512c3295bdb
Component: engine
2015-05-26 10:31:21 -07:00
aff149351d
Windows: Fix volume_windows compile
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1dc0499b64179e18b902e34d5c97ff72327d9d59
Component: engine
2015-05-26 09:43:21 -07:00
a749f0fc90
Windows: Fix up container again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5d207de5092f4532a1696939fdb64a85d370fb01
Component: engine
2015-05-26 09:33:55 -07:00
86ef32192a
Merge pull request #13471 from ibuildthecloud/no-nil
...
Preinitialize MountPoints to avoid assigning to a nil map
Upstream-commit: 0fccc40307c239e421dde825fc9f7adfadeaff61
Component: engine
2015-05-26 12:26:49 -04:00
828fa4725f
Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test
...
add unshare apparmor profile test
Upstream-commit: aee9ac302d06ebcc56713142245aa19584c8b99f
Component: engine
2015-05-26 17:32:45 +02:00
d913f69b1f
Make hack/make.sh work on FreeBSD
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
Upstream-commit: 9e00e34092ca1f2f2e7919430f5756f94e484cdb
Component: engine
2015-05-26 15:59:36 +03:00
e0098fdbb0
Add lock before accessing native driver active containers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 9e425d56d0ec7d3343dd309500a7fe6e36648f2b
Component: engine
2015-05-26 13:55:02 +02:00
722bcfc109
Fix race in stats cli and native driver
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 77280a87b70d3b2b629cd30ea93464287f346fa1
Component: engine
2015-05-26 13:55:02 +02:00
c2098b0ab5
Preinitialize MountPoints to avoid assigning to a nil map
...
Fixes #13435
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 59214a0737560a8a2386884dc438b4b003d407ba
Component: engine
2015-05-25 19:37:57 -07:00
6497871310
Merge pull request #13467 from epc/epc-2015145
...
Documentation Copy edits for typos
Upstream-commit: 628c3965554484c4585b9ff67c9e64f541414057
Component: engine
2015-05-25 14:32:17 -04:00
08e38fdc3f
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
Upstream-commit: 7d75c5be95cb51a0d61862988bf263d3f8525d3e
Component: engine
2015-05-25 13:39:56 -04:00
69ad999592
Merge pull request #13447 from justone/mention-dockviz-alternative
...
mention dockviz alternative
Upstream-commit: 8efd87f5a2606f309c1eecb12efd05579f9b9429
Component: engine
2015-05-25 19:26:19 +02:00
9ac01175a5
Merge pull request #13418 from donkirkby/patch-1
...
small formatting and grammar fixes
Upstream-commit: 187362414d32f19dbe472a8eaf595f97f00a47ed
Component: engine
2015-05-25 19:15:47 +02:00
23b19da74f
mention dockviz alternative
...
closes #13431
Signed-off-by: Nate Jones <nate@endot.org >
Upstream-commit: 453c0abf1c08e71c14ae6809a6e4b0d08a31e245
Component: engine
2015-05-25 09:43:25 -07:00
c5e7666b15
Merge pull request #13461 from moxiegirl/add-glossary-back
...
Adding back in Glossary
Upstream-commit: c12081987adda9c143c265737b7180c9c7744864
Component: engine
2015-05-25 18:32:15 +02:00
