p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,725 Commits 2 Branches 295 Tags
e783ada3bb4e75798fb3c32a9fecd1cb779c65a7
Commit Graph

1479 Commits

Author SHA1 Message Date
Arnaud Porterie
710f67f354 Merge pull request #13424 from mavenugo/vendorin 
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
Upstream-commit: f83073d3eb23a3f3c22bef9401090df5da53cc2f
Component: engine
 2015-05-23 21:08:58 -07:00
Arnaud Porterie
0d8ca6abd9 Merge pull request #13161 from calavera/plugin_discovery 
Proposal: Volume refactor and external volume plugins
Upstream-commit: bce3e761c0a78ca55cefa9c6d040c1bc9138c1fb
Component: engine
 2015-05-23 18:44:18 -07:00
Madhu Venugopal
2f63354a90 Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201 
This version brings in upto-date important bug-fixes from libnetwork

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: a3d22c764cfc3e175cdfb992f3b2314f23540236
Component: engine
 2015-05-23 18:42:34 -07:00
Alexander Morozov
98c6584c01 Merge pull request #13403 from hqhq/hq_fix_ipcmode_check 
Don't check running container at create time
Upstream-commit: 89582f978189e68a87b01574c4f0f09b61c8c0f6
Component: engine
 2015-05-23 08:32:51 -07:00
David Calavera
fd9e9a6b5b Propagate unmount events to the external volume drivers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d592778f4a75d36745aaffaf73c0775ecd420545
Component: engine
 2015-05-22 16:43:34 -07:00
Qiang Huang
4bdf86ad9b 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>
Upstream-commit: 84aae5a22605f8849e7335157afeca471b563a29
Component: engine
 2015-05-23 07:15:14 +08:00
David Calavera
39e76a661b Allow named volumes for external drivers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3bf0ca31cf61e445554326ba405cc32c7ef64189
Component: engine
 2015-05-21 20:34:17 -07:00
Arnaud Porterie
778241cd3a Make API volume-driver dependent on 'experimental' 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 2653c7c16cf87029c7e2e35427fbd1c83a0c96ba
Component: engine
 2015-05-21 20:34:17 -07:00
Arnaud Porterie
3dacf0ed87 Disable -v overloading 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
(cherry picked from commit ec5a362fb93358244305067419589f602fd33807)
Upstream-commit: 7da5a7eb6637222a313e9d6e7fbcd5dd472154e3
Component: engine
 2015-05-21 20:34:17 -07:00
David Calavera
89782c55eb 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>
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
 2015-05-21 20:34:17 -07:00
Brian Goff
ab1e39f7d4 Merge pull request #12766 from Microsoft/10662-graphdriverrefactor 
Windows: graphdriver refactor
Upstream-commit: 88275e94d62896383b54209b5a8691ed3cffe122
Component: engine
 2015-05-21 21:28:24 -04:00
David Calavera
a0524deeed Merge pull request #12964 from Microsoft/10662-emptywindowsexecdriver 
Windows: Empty Windows Exec Driver
Upstream-commit: 2be757f8696a2df6b02b153db15ea4f6d756c02a
Component: engine
 2015-05-21 15:30:21 -07:00
Lei Jitang
aee8d65658 Add missing return error check 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a9bc05a2f8e0978f47473b07b43d79692cf498bc
Component: engine
 2015-05-21 17:03:43 +08:00
Lei Jitang
986a53d09e Make docker ps --size show virtual size really work 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d0de2b1e2f0939b25c83183f450c71b8309d1d32
Component: engine
 2015-05-21 08:57:11 +08:00
Jessie Frazelle
0a8a3b1dc5 Merge pull request #13338 from icecrime/13023_experimental_env_var 
Add DOCKER_EXPERIMENTAL environment variable
Upstream-commit: 19790c46dc7fbd489bbd4ccd6f138663312e7579
Component: engine
 2015-05-20 13:04:28 -07:00
Arnaud Porterie
045dd55a7d 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>
Upstream-commit: ca6722f1c5e4e2017a71e33579d91ac0d9ea2a25
Component: engine
 2015-05-20 12:21:17 -07:00
John Howard
f301559fd5 Windows: Empty Windows Exec Driver 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8db09ff6290fb2d4aea121c2850940b9bc480ce9
Component: engine
 2015-05-20 08:54:04 -07:00
John Howard
e6982a9c9b Windows: graphdriver refactor 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4e8b2509fd60bf1ab771db618301650b988b549b
Component: engine
 2015-05-20 08:51:27 -07:00
Jessie Frazelle
03f7a130a4 Merge pull request #13325 from LK4D4/cleanup_mounts 
Fix Put without Get in overlay
Upstream-commit: d29dc0b608f106ed589d25117abbbba3f5157bfe
Component: engine
 2015-05-20 03:11:58 +02:00
Jana Radhakrishnan
6f37ffc9e3 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>
Upstream-commit: f12f51b8b934c21621c17590f1d526377a297a0d
Component: engine
 2015-05-19 22:40:55 +00:00
Jana Radhakrishnan
13426de5e6 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>
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
 2015-05-19 22:40:19 +00:00
Arnaud Porterie
249d122d71 Merge pull request #12884 from Microsoft/10662-startcontainerrefactor 
Windows: Refactor container
Upstream-commit: 0cc5da0635880245420333d6ec43cea75f2f3afd
Component: engine
 2015-05-19 10:44:23 -07:00
Alexander Morozov
8911352f54 Fix Put without Get in overlay 
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3916561619d45a3d8ca17dfa467149824111023a
Component: engine
 2015-05-19 09:32:23 -07:00
Zhang Wei
6da53b0de7 clean some redundant else clauses 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: d91ae65280c789307ec67fff7e2d268afe3aeba7
Component: engine
 2015-05-19 10:54:04 +08:00
Brian Goff
7113b757dc Merge pull request #13277 from runcom/restartpolicy-methods 
RestartPolicy methods instead of strings checking
Upstream-commit: 3b69ca5b97a937c904b8af91210af86de58f6893
Component: engine
 2015-05-18 14:36:54 -04:00
Michael Crosby
edeb4ed190 Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt 
Fix incorrect document storage-opt
Upstream-commit: 70e9e4bf9f7901137483fb4c9635d8d3cf686328
Component: engine
 2015-05-18 11:35:01 -07:00
Ahmet Alp Balkan
bcf5956dfc Pass -log-opts map to logdrivers 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 8b11592d699df669b529e34658ef2d870c8a75f8
Component: engine
 2015-05-18 16:50:14 +00:00
Brian Goff
ce99abf239 Merge pull request #13283 from Microsoft/10662-fixbaselinenewdriver 
Windows: NewDriver() re-baseline parms
Upstream-commit: 19ae59f9109d08452e37bdd6252fe8a053dd2839
Component: engine
 2015-05-18 10:56:06 -04:00
John Howard
c4f071bd48 Windows: Refactor container 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b9e4b95788e0d8eae5363b82f301dafb9ea687f7
Component: engine
 2015-05-16 12:38:20 -07:00
John Howard
5e6717ae3b Windows: Simple import error on config_windows.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dfddfa6bb8560e8a75aa67abd3b34cf82e98311c
Component: engine
 2015-05-16 12:18:55 -07:00
John Howard
4e71899e7f Windows: NewDriver() re-baseline parms 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 50b4079b5fdb9d966f49946c8db36c81648c1dee
Component: engine
 2015-05-16 11:38:19 -07:00
Antonio Murdaca
0dbe0e42c5 Add RestartPolicy methods instead of using strings checking 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 624bf81fdb980638c422d746bfb82623e9d8bbd1
Component: engine
 2015-05-16 14:15:28 +02:00
Alexander Morozov
7bcf0fc7df Merge pull request #13232 from Microsoft/10662-zfs 
Windows: No ZFS graphdriver
Upstream-commit: 27b77464d8ad883a28c0936a8b33affb6168647e
Component: engine
 2015-05-15 11:51:48 -07:00
David Calavera
82bce49b9c Merge pull request #13086 from shishir-a412ed/docker_root_execdriver 
root dir for execdriver (/var/run/docker) should be configurable
Upstream-commit: b785e5091ff35b3fe74ad1d16f77fe611049ae44
Component: engine
 2015-05-15 11:16:12 -07:00
Alexander Morozov
581cc188ef Merge pull request #13246 from unclejack/refactor_statscollector 
daemon/stats_collector: refactor getSystemCpuUsage
Upstream-commit: 88127ce475ead0cf491ea64a0b4ec4074a25b173
Component: engine
 2015-05-15 11:06:47 -07:00
Shishir Mahajan
7f98a41593 root dir for execdriver (/var/run/docker) should be configurable 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 8b2c6cb0729eadb09d688241e0f5debf1d5ccb0b
Component: engine
 2015-05-15 09:30:36 -04:00
Lei Jitang
55843a6210 Fix incorrect document storage-opt 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0204ecdf707bdbb3caa76548e576f4ff0706fc46
Component: engine
 2015-05-15 19:13:07 +08:00
unclejack
091bd3b25b daemon/stats_collector: refactor getSystemCpuUsage 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 25f776451e88a52c2677d5c56383f03a1a4c539f
Component: engine
 2015-05-15 12:22:50 +03:00
Victor Vieux
56ea157723 Revert "Fix inconsistent date formats in API" 
This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
 2015-05-14 17:31:45 -07:00
John Howard
4a6cf355cf Windows: No ZFS graphdriver 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 35cdcbb323bc76a0874962c08de627221bf4880d
Component: engine
 2015-05-14 15:57:45 -07:00
Tibor Vass
b0f3ea455f Merge pull request #12770 from Microsoft/10662-daemonconfigrefactor 
Windows: Start of daemon config refactor
Upstream-commit: c5240d79e391a7ce499fd59abab69f5504615f21
Component: engine
 2015-05-14 14:55:22 -07:00
John Howard
38fd09288b Windows: Factor out syslog and journald 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 655a58e27bfcfd2494bb5d46f95cb49d655ad17a
Component: engine
 2015-05-14 10:34:09 -07:00
Sebastiaan van Stijn
34f1d71bf5 Merge pull request #11706 from HuKeping/time 
Fix inconsistent date formats in API
Upstream-commit: 1d57642906ced778e826f655aed5a0eaab30fe71
Component: engine
 2015-05-13 20:23:19 -07:00
Hu Keping
2e9a18b752 Fix inconsistent date formats in API 
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history

display the Created Time as UNIX format which doesn't make sense.

These should be more readable as CLI command `docker inspect` shows.

Due to the case that an older client with a newer version daemon, we
need the version check for now.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 945fc9d882324ac87505e34bb74e6ebe30be1309
Component: engine
 2015-05-14 18:58:55 +08:00
Sebastiaan van Stijn
ab675e423e Merge pull request #12667 from ibuildthecloud/host-uts 
Add --uts=host to allow sharing the UTS namespace
Upstream-commit: ed257420025772acc38c51b0f018de3ee5564d0f
Component: engine
 2015-05-13 18:30:32 -07:00
Darren Shepherd
dc9bbf77b5 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: f2e5207fc989288ad136d48222df8e7754eb0e9b
Component: engine
 2015-05-13 17:56:32 -07:00
Brian Goff
19c710821b Merge pull request #13201 from Microsoft/10662-fixdebugtrap 
Fix package on debugtrap_unsupported.go
Upstream-commit: f2bc54f7962e415d9aaf77ac57a6dca1ce08e7bd
Component: engine
 2015-05-13 20:44:13 -04:00
Brian Goff
2fa30dbf79 Merge pull request #13112 from hqhq/hq_fix_oonkilldisable 
Fix oom kill disable issue
Upstream-commit: feb0fa8dbf9d14894d65943325c9e64a19cd2ae2
Component: engine
 2015-05-13 20:03:33 -04:00
John Howard
2d29921e20 Fix package on debugtrap_unsupported.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1e78eec8261d93bcf3eeb7aad123032d81fcbb83
Component: engine
 2015-05-13 16:38:59 -07:00
David Calavera
076e804d9c Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring 
daemon: Logging drivers architectural refactoring
Upstream-commit: 951c2ef2c94b10ed49f18ca38353c6507c5231fa
Component: engine
 2015-05-13 11:00:50 -07:00