9749c4b6ff
Merge pull request #13428 from duglin/niceHelp2
...
Nice help2
Upstream-commit: 617a0c2fde69f2954c2d8959e23e1459636f753e
Component: engine
2015-05-28 11:09:02 -07:00
0f1265a12c
Merge pull request #13539 from tianon/deb-ubuntu-wily
...
Add Ubuntu Wily (15.10) as a build-deb target
Upstream-commit: f99a96274254a8c861b654c1caf6062b7c23e1de
Component: engine
2015-05-28 11:01:27 -07:00
effc81b4da
Merge pull request #13551 from albers/pgp-over-http
...
Use http for PGP key download
Upstream-commit: 24a0800d879b97614b5d0f43aea8f7ce74c33809
Component: engine
2015-05-28 10:59:14 -07:00
2fdedbf13a
Merge pull request #13529 from hqhq/hq_skip_cgroup_test
...
Skip test if not have Cpu quota or Cpu period
Upstream-commit: 5bb6262d88356f12e280bdcaf400fdea3d46d525
Component: engine
2015-05-28 10:57:32 -07:00
11639a1786
Merge pull request #13512 from moysesb/progressreader_close_silently
...
Close progressreader silently when read is complete.
Upstream-commit: 85096cfd4fa52fa7dd66e7c2d797e4637fecd04b
Component: engine
2015-05-28 10:54:08 -07:00
0faed528d2
Merge pull request #13039 from stevenbrichards/13031-Upstart
...
Fix check for upstart not detecting properly
Upstream-commit: 0256bbdebbc2fa7911c6e12bfae488fab7b30301
Component: engine
2015-05-28 10:38:55 -07:00
6523739243
Merge pull request #13548 from kvasdopil/zfs_magicnum
...
ZFS filesystem magic number check is fixed on FreeBSD
Upstream-commit: b90732f801ac7bdd61f3515719d40cab818c88f3
Component: engine
2015-05-28 10:27:12 -07:00
d4294d6fd6
Modified progress reader to close silently when read is complete.
...
Closes #13432
Signed-off-by: Moysés Borges <moysesb@gmail.com >
Upstream-commit: 709fa2ad876968b1f9598da1dfe64c27ae5522ec
Component: engine
2015-05-28 14:09:30 -03:00
abc263e355
Merge pull request #13259 from Microsoft/10662-configbridge
...
Windows: factor out bridgeConfig from server+config
Upstream-commit: 45488f9dc0e2ad5087776445e2069a9ea2c8bf80
Component: engine
2015-05-28 12:59:57 -04:00
f9d5a53954
Merge pull request #13538 from tianon/rpm-fedora-22
...
Add fedora:22 to our rpm targets
Upstream-commit: 70bedc8ee5370eaf621bec3a936ee7d86a1d3f48
Component: engine
2015-05-28 09:55:09 -07:00
5dd5db33a8
Fixes #13031 - Check for upstart or init is not detecting properly
...
This will now properly check whether /etc/init.d/docker or service docker is
invoking the script and respond to the user accordingly.
Signed-off-by: Steven Richards <steven@axiomzen.co >
Upstream-commit: e5ff643aed78fb5dfb5e3fef518dfe56b82b3023
Component: engine
2015-05-28 09:52:05 -07:00
5e9b1d1a70
Merge pull request #13269 from Microsoft/10662-statsrefactor
...
Windows: refactor stats
Upstream-commit: 27919bab2d538961ecdcd06a095d1e9d310621c5
Component: engine
2015-05-28 12:46:34 -04:00
570b91cfd7
Merge pull request #13055 from Microsoft/10662-internalsfixperms
...
Windows: Fixup builder/internals.go
Upstream-commit: 33c7c01a62390d55c4433ad45dd4632cf7112f81
Component: engine
2015-05-28 12:31:45 -04:00
91648786e7
Merge pull request #13535 from coolljt0725/fix_automatically_publish_without_publish
...
Fix automatically publish ports without --publish-all or --publish
Upstream-commit: a364dd8fc66825a385e09fc1ef21338833c72ed0
Component: engine
2015-05-28 11:49:53 -04:00
ffcd5b22b0
zfs magicnumber check on freebsd is fixed
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
Upstream-commit: 36bf6e44402bc6a0fbf169a73579e47e3f97f1a3
Component: engine
2015-05-28 18:38:08 +03:00
d4bd5f0238
Use http for PGP key download
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c1c5d760a6dabdc73017402eee5109b81465d438
Component: engine
2015-05-28 16:43:36 +02:00
17288ec3a7
Merge pull request #13541 from coolljt0725/remove_reduntant_enter_create
...
Clean up: remove redundant '\n' in Create
Upstream-commit: ac7a33b45ce5061079226a254e1fe6173d3fbd81
Component: engine
2015-05-28 10:30:07 -04:00
c8cd83907a
Clean up: remove redundant '\n' in Create
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: bcd076b5fea51b37dd2a7523fdd02944a96fc265
Component: engine
2015-05-28 17:08:55 +08:00
3817bdd3ec
Add Ubuntu Wily (15.10) as a build-deb target
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 38c77ba876b64e9019091a1f089f90d341cd14ba
Component: engine
2015-05-28 01:06:11 -07:00
5a7a988cff
Add fedora:22 to our rpm targets
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 96903c837f25679faf67ffbcb9a9050c0cc2519a
Component: engine
2015-05-28 01:01:45 -07:00
390f1fbecf
Merge pull request #13515 from lloydde/doc-cli-lint
...
doc cli lint.
Upstream-commit: 7011d9ee8ac4990bfc3bfec422db3ab17abf46f1
Component: engine
2015-05-28 09:13:25 +02:00
781e46f9bc
Skip test if not have Cpu quota or Cpu period
...
Closes : #13522
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 34e5b6af19b916ec0debcc8bcb76313302b77a27
Component: engine
2015-05-28 14:59:58 +08:00
a3f2ea4982
fix release script
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 9f619282dba2f42ada6f7e92705a1c8979193214
Component: engine
2015-05-27 20:57:46 -07:00
553a8c069a
Merge pull request #13374 from RichardScothern/v2-mirror
...
V2 mirror support
Upstream-commit: 2daede5a9cc6cc171f2f1f3aebcae561a2421d18
Component: engine
2015-05-27 21:15:26 -04:00
32f8a6c6ff
Merge pull request #13518 from mrjana/clone
...
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
Upstream-commit: c2e8f07a052505c07c4fe38da8e2d5139ffa00a4
Component: engine
2015-05-27 17:42:10 -07:00
430d1ade67
Review feedback:
...
- Match verbiage with other output
- Remove dead code and clearer flow
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
Upstream-commit: e817e08481b91638037e55b8d4855f56814c81f5
Component: engine
2015-05-27 17:29:24 -07:00
9218287317
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: d429465b37b29f72109e373379580f020d3ff9ee
Component: engine
2015-05-28 00:04:01 +00:00
01b03d6fa4
Merge pull request #13477 from kvasdopil/freebsd-build
...
Make hack/make.sh work on FreeBSD
Upstream-commit: c9d3681a5d0cd2d275299146855283fa89c6cdd9
Component: engine
2015-05-27 17:42:49 -06:00
d364303d1d
Merge pull request #13496 from Microsoft/10662-windefaults
...
Windows: Set default exec driver to windows
Upstream-commit: 49e734c6e472fd9d6750e7666a19d489d5c28d70
Component: engine
2015-05-27 16:02:24 -07:00
f4eb0aeb64
Restore the stripped registry version number
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
Upstream-commit: f6f7d3524862563f8388e1382bb28ecbde8cf265
Component: engine
2015-05-27 15:15:47 -07:00
a4f1a75c45
doc cli lint.
...
- 79 char line length (non-command).
- Consistent single space between sentences.
- Replace start of line tabs with spaces.
- Remove trailing white space.
- Consistent "**Note:**" style.
https://docs.docker.com/project/doc-style/#notes
- Replace the ``` sections with indented code.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com >
Upstream-commit: b4a52fc4e9b8ed745eb012ba45628cdb3654ed70
Component: engine
2015-05-27 15:07:57 -07:00
1f5c180c11
Merge pull request #12572 from jfrazelle/selinux-labels-carry
...
Modify volume mounts SELinux labels on the fly based on :Z or :z
Upstream-commit: ec471a7c9b307eb656aeb69ef00910b2fb388e1c
Component: engine
2015-05-27 14:46:16 -07:00
c59e5318a9
Use SELinux labels for volumes
...
Fixes a regression from the volumes refactor where the vfs graphdriver
was setting labels for volumes to `s0` so that they can both be written
to by the container and shared with other containers.
When moving away from vfs this was never re-introduced.
Since this needs to happen regardless of volume driver, this is
implemented outside of the driver.
Fixes issue where `z` and `Z` labels are not set for bind-mounts.
Don't lock while creating volumes
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b2a43baf2e2cc68c83383a7524441f81bc4c4725
Component: engine
2015-05-27 13:43:38 -07:00
c6b125f030
Merge pull request #13449 from duglin/FixRaceInStop
...
Fix race condition on container stop
Upstream-commit: f5d33118394464e52eb29c781c1a8bb9345778c8
Component: engine
2015-05-27 13:05:53 -07:00
3a11c11495
apply selinux labels volume patch on volumes refactor
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: af7d17a6c906d348eb0929766a81fd04fc173c44
Component: engine
2015-05-27 12:50:16 -07:00
1adf295b9a
Modify volume mounts SELinux labels on the fly based on :Z or :z
...
This patch is extending the qualifiers on the -v command to allow
an admin to tell the system to relabel, content. There might be a
need for something similar for changing the DAC Permissions.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 160dc79db095767de74deb75b8e1ae86f213593c
Component: engine
2015-05-27 12:50:16 -07:00
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
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
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
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
