clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 17:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,762 Commits 9 Branches 112 Tags
b50e7809254c1d3cc9bd2b94be0c87b68576ed2a
Commit Graph
1496 Commits
Author SHA1 Message Date
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
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
Alexander Morozov de318d8c1d Merge pull request #13489 from cpuguy83/cleanup_rm_funcs 
Cleanup container rm funcs
 2015-05-26 14:24:02 -07:00
Jessica Frazelle 40b71adee3 Revert "Add docker exec run a command in privileged mode" 
This reverts commit 72a500e9e5.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
 2015-05-26 14:12:16 -07:00
Arnaud Porterie 47e727d1fc Merge pull request #13440 from LK4D4/fix_bridge_none 
Fix network with -b none
 2015-05-26 14:08:21 -07:00
Brian Goff f8628ba891 Cleanup container rm funcs 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-26 15:38:52 -04:00
David Calavera fc679bebb9 Merge pull request #13479 from Microsoft/10662-fixcontaineragain 
Windows: Fix up container again
 2015-05-26 10:49:48 -07:00
John Howard 1dc0499b64 Windows: Fix volume_windows compile 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-26 09:43:21 -07:00
John Howard 5d207de509 Windows: Fix up container again 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-26 09:33:55 -07:00
Antonio Murdaca 9e425d56d0 Add lock before accessing native driver active containers 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-26 13:55:02 +02:00
Antonio Murdaca 77280a87b7 Fix race in stats cli and native driver 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-26 13:55:02 +02:00
Darren Shepherd 59214a0737 Preinitialize MountPoints to avoid assigning to a nil map 
Fixes #13435

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-25 19:37:57 -07:00
Alexander Morozov 3cb14df68c Fix network with -b none 
* Don't AllocateNetwork when network is disabled
* Don't createNetwork in execdriver when network is disabled

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-24 08:26:59 -07:00
Arnaud Porterie f83073d3eb Merge pull request #13424 from mavenugo/vendorin 
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
 2015-05-23 21:08:58 -07:00
Arnaud Porterie bce3e761c0 Merge pull request #13161 from calavera/plugin_discovery 
Proposal: Volume refactor and external volume plugins
 2015-05-23 18:44:18 -07:00
Madhu Venugopal a3d22c764c Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201 
This version brings in upto-date important bug-fixes from libnetwork

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-05-23 18:42:34 -07:00
Alexander Morozov 89582f9781 Merge pull request #13403 from hqhq/hq_fix_ipcmode_check 
Don't check running container at create time
 2015-05-23 08:32:51 -07:00
David Calavera d592778f4a Propagate unmount events to the external volume drivers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-22 16:43:34 -07:00
Qiang Huang 84aae5a226 Don't check running container at create time 
We should let user create container even if the container he wants
join is not running, that check should be done at start time.

In this case, the running check is done by getIpcContainer() when
we start container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-23 07:15:14 +08:00
David Calavera 3bf0ca31cf Allow named volumes for external drivers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
Arnaud Porterie 2653c7c16c Make API volume-driver dependent on 'experimental' 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-21 20:34:17 -07:00
Arnaud Porterie 7da5a7eb66 Disable -v overloading 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
(cherry picked from commit ec5a362fb93358244305067419589f602fd33807)
 2015-05-21 20:34:17 -07:00
David Calavera 81fa9feb0c Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
Brian Goff 88275e94d6 Merge pull request #12766 from Microsoft/10662-graphdriverrefactor 
Windows: graphdriver refactor
 2015-05-21 21:28:24 -04:00
David Calavera 2be757f869 Merge pull request #12964 from Microsoft/10662-emptywindowsexecdriver 
Windows: Empty Windows Exec Driver
 2015-05-21 15:30:21 -07:00
Lei Jitang a9bc05a2f8 Add missing return error check 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-21 17:03:43 +08:00
Lei Jitang d0de2b1e2f Make docker ps --size show virtual size really work 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-21 08:57:11 +08:00
Jessie Frazelle 19790c46dc Merge pull request #13338 from icecrime/13023_experimental_env_var 
Add DOCKER_EXPERIMENTAL environment variable
 2015-05-20 13:04:28 -07:00
Arnaud Porterie ca6722f1c5 Add DOCKER_EXPERIMENTAL environment variable 
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-20 12:21:17 -07:00
John Howard 8db09ff629 Windows: Empty Windows Exec Driver 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-20 08:54:04 -07:00
John Howard 4e8b2509fd Windows: graphdriver refactor 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-20 08:51:27 -07:00
Jessie Frazelle d29dc0b608 Merge pull request #13325 from LK4D4/cleanup_mounts 
Fix Put without Get in overlay
 2015-05-20 03:11:58 +02:00
Jana Radhakrishnan f12f51b8b9 Removed dead code from docker after libnetwork integration 
As part of this some generic packages like iptables, etchosts and resolvconf
have also been moved to libnetwork. Even though they can still be
consumed in a generic fashion they will reside and be maintained
from within the libnetwork project.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-19 22:40:55 +00:00
Jana Radhakrishnan d18919e304 Docker integration with libnetwork 
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-19 22:40:19 +00:00
Arnaud Porterie 0cc5da0635 Merge pull request #12884 from Microsoft/10662-startcontainerrefactor 
Windows: Refactor container
 2015-05-19 10:44:23 -07:00
Alexander Morozov 3916561619 Fix Put without Get in overlay 
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-19 09:32:23 -07:00
Zhang Wei d91ae65280 clean some redundant else clauses 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-05-19 10:54:04 +08:00
Brian Goff 3b69ca5b97 Merge pull request #13277 from runcom/restartpolicy-methods 
RestartPolicy methods instead of strings checking
 2015-05-18 14:36:54 -04:00
Michael Crosby 70e9e4bf9f Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt 
Fix incorrect document storage-opt
 2015-05-18 11:35:01 -07:00
Ahmet Alp Balkan 8b11592d69 Pass -log-opts map to logdrivers 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-18 16:50:14 +00:00
Brian Goff 19ae59f910 Merge pull request #13283 from Microsoft/10662-fixbaselinenewdriver 
Windows: NewDriver() re-baseline parms
 2015-05-18 10:56:06 -04:00
John Howard b9e4b95788 Windows: Refactor container 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-16 12:38:20 -07:00
John Howard dfddfa6bb8 Windows: Simple import error on config_windows.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-16 12:18:55 -07:00
John Howard 50b4079b5f Windows: NewDriver() re-baseline parms 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-16 11:38:19 -07:00
Antonio Murdaca 624bf81fdb Add RestartPolicy methods instead of using strings checking 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-16 14:15:28 +02:00
Alexander Morozov 27b77464d8 Merge pull request #13232 from Microsoft/10662-zfs 
Windows: No ZFS graphdriver
 2015-05-15 11:51:48 -07:00