clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 15:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,814 Commits 9 Branches 112 Tags
0256bbdebbc2fa7911c6e12bfae488fab7b30301
Commit Graph
15814 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Calavera 0256bbdebb Merge pull request #13039 from stevenbrichards/13031-Upstart 
Fix check for upstart not detecting properly
 2015-05-28 10:38:55 -07:00
Alexander Morozov b90732f801 Merge pull request #13548 from kvasdopil/zfs_magicnum 
ZFS filesystem magic number check is fixed on FreeBSD
 2015-05-28 10:27:12 -07:00
Brian Goff 45488f9dc0 Merge pull request #13259 from Microsoft/10662-configbridge 
Windows: factor out bridgeConfig from server+config
 2015-05-28 12:59:57 -04:00
David Calavera 70bedc8ee5 Merge pull request #13538 from tianon/rpm-fedora-22 
Add fedora:22 to our rpm targets
 2015-05-28 09:55:09 -07:00
Steven Richards e5ff643aed 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>
 2015-05-28 09:52:05 -07:00
Brian Goff 27919bab2d Merge pull request #13269 from Microsoft/10662-statsrefactor 
Windows: refactor stats
 2015-05-28 12:46:34 -04:00
Brian Goff 33c7c01a62 Merge pull request #13055 from Microsoft/10662-internalsfixperms 
Windows: Fixup builder/internals.go
 2015-05-28 12:31:45 -04:00
Brian Goff a364dd8fc6 Merge pull request #13535 from coolljt0725/fix_automatically_publish_without_publish 
Fix automatically publish ports without --publish-all or --publish
 2015-05-28 11:49:53 -04:00
Alexey Guskov 36bf6e4440 zfs magicnumber check on freebsd is fixed 
Signed-off-by: Alexey Guskov <lexag@mail.ru>
 2015-05-28 18:38:08 +03:00
Brian Goff ac7a33b45c Merge pull request #13541 from coolljt0725/remove_reduntant_enter_create 
Clean up: remove redundant '\n' in Create
 2015-05-28 10:30:07 -04:00
Lei Jitang bcd076b5fe Clean up: remove redundant '\n' in Create 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-28 17:08:55 +08:00
Tianon Gravi 96903c837f Add fedora:22 to our rpm targets 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-05-28 01:01:45 -07:00
Sebastiaan van Stijn 7011d9ee8a Merge pull request #13515 from lloydde/doc-cli-lint 
doc cli lint.
 2015-05-28 09:13:25 +02:00
Tianon Gravi 15b45113eb Merge pull request #13532 from jfrazelle/fix-fix-release-script 
fix release script
 2015-05-27 23:17:45 -06:00
Jessica Frazelle 9f619282db fix release script 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-27 20:57:46 -07:00
Tibor Vass 2daede5a9c Merge pull request #13374 from RichardScothern/v2-mirror 
V2 mirror support
 2015-05-27 21:15:26 -04:00
Arnaud Porterie c2e8f07a05 Merge pull request #13518 from mrjana/clone 
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
 2015-05-27 17:42:10 -07:00
Richard e817e08481 Review feedback: 
- Match verbiage with other output
    - Remove dead code and clearer flow

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
 2015-05-27 17:29:24 -07:00
Jana Radhakrishnan d429465b37 Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-28 00:04:01 +00:00
Tianon Gravi c9d3681a5d Merge pull request #13477 from kvasdopil/freebsd-build 
Make hack/make.sh work on FreeBSD
 2015-05-27 17:42:49 -06:00
David Calavera 49e734c6e4 Merge pull request #13496 from Microsoft/10662-windefaults 
Windows: Set default exec driver to windows
 2015-05-27 16:02:24 -07:00
Richard f6f7d35248 Restore the stripped registry version number 
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
 2015-05-27 15:15:47 -07:00
Lloyd Dewolf b4a52fc4e9 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>
 2015-05-27 15:07:57 -07:00
Arnaud Porterie ec471a7c9b Merge pull request #12572 from jfrazelle/selinux-labels-carry 
Modify volume mounts SELinux labels on the fly based on :Z or :z
 2015-05-27 14:46:16 -07:00
Brian Goff b2a43baf2e 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>
 2015-05-27 13:43:38 -07:00
David Calavera f5d3311839 Merge pull request #13449 from duglin/FixRaceInStop 
Fix race condition on container stop
 2015-05-27 13:05:53 -07:00
Jessica Frazelle af7d17a6c9 apply selinux labels volume patch on volumes refactor 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-27 12:50:16 -07:00
Dan Walsh 160dc79db0 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>
 2015-05-27 12:50:16 -07:00
Alexander Morozov 7b57fae046 Merge pull request #13507 from hqhq/hq_remove_redundant_set_header 
Remove redundant set header
 2015-05-27 10:44:57 -07:00
David Calavera 26650e2ccc Merge pull request #13483 from jfrazelle/lxc-we-meet-again 
fix lxc tests unshare, they dont use our apparmor profile
 2015-05-27 10:22:31 -07:00
Doug Davis b29f3bb1c3 Merge pull request #13506 from hqhq/hq_fix_wrong_return_nil 
Return err if we got err on parseForm
 2015-05-27 12:38:53 -04:00
Alexander Morozov 2029257e3c Merge pull request #13493 from jlhawn/volume_unmount_fix 
Fix container unmount networkMounts
 2015-05-27 08:44:11 -07:00
Phil Estes f3e56420a3 Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe 
Fix unregister stats on when rm running container
 2015-05-27 11:10:36 -04:00
Antonio Murdaca 3f66f6f2f0 Merge pull request #13500 from HuKeping/cleanup 
Remove unused code
 2015-05-27 13:59:40 +02:00
Hu Keping a34cb32186 Remove unused code 
As far as I see, it's a dead code.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-27 22:39:02 +08:00
Qiang Huang 94d604357f Remove redundant set header 
Which is already done in writeJSON.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-27 18:25:57 +08:00
Qiang Huang 7c7aebfcfe Return err if we got err on parseForm 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-27 18:16:28 +08:00
Alexey Guskov f228fb09ac script cleaned up 
Signed-off-by: Alexey Guskov <lexag@mail.ru>
 2015-05-27 10:21:09 +03:00
Brian Goff b3e8ab3021 Fix unregister stats on when rm running container 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-26 22:22:03 -04:00
moxiegirl e580734149 Merge pull request #13406 from moxiegirl/experimental-work 
Placeholder Part II: For commenting about install
 2015-05-26 18:19:26 -07:00
Josh Hawn 04f99a6ca8 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)
 2015-05-26 17:38:26 -07:00
Arnaud Porterie b50e780925 Merge pull request #13491 from jfrazelle/revert-exec-privileged 
Revert "Add docker exec run a command in privileged mode"
 2015-05-26 16:41:50 -07:00
Brian Goff 838e1a8947 Merge pull request #13487 from calavera/volume_load_regression_test 
Add regression test to make sure we can load old containers with volumes.
 2015-05-26 19:40:08 -04:00
Tibor Vass 54b514735c Merge pull request #12881 from nakedible/patch-1 
Prevent fallback to v1 registry for digest pulls
 2015-05-26 19:24:37 -04:00
John Howard 041ba90dbb Windows: Set default exec driver to windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-26 16:17:33 -07:00
Mary Anthony 1ba1a0550f 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>
 2015-05-26 15:37:38 -07:00
Alexander Morozov 0d445685b8 Merge pull request #13444 from runcom/fix-race-stats 
Fix race in stats cli and native driver
 2015-05-26 15:34:50 -07:00
David Calavera ea0e15ba62 Add regression test to make sure we can load old containers with volumes. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-26 15:28:58 -07:00
Arnaud Porterie bd18d86250 Merge pull request #13492 from calavera/donot_force_syscall_unmount_on_cleanup 
Do not force `syscall.Unmount` on container cleanup.
 2015-05-26 15:23:16 -07:00
David Calavera f78dce152c 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>
 2015-05-26 14:28:26 -07:00