toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
15,294 Commits 3 Branches 295 Tags
50a36ca638e615b5a3536c08066f2e0219a2fdae
Commit Graph
1354 Commits
Author SHA1 Message Date
Vincent Batts 11e5be135f Merge pull request #12190 from rhvgoyal/deferred-removal 
Devicemapper: Provide deferred device removal capability
Upstream-commit: 56c991781564e8cc292166d3b3e27e304c240468
Component: engine
 2015-05-04 14:22:52 -07:00
Jessie Frazelle 366be0f240 Merge pull request #12865 from larsks/bug/12864 
journald log driver: use CONTAINER_ID field for container id
Upstream-commit: 0c1c2726876bdffad4e600456f07e256bc1361a1
Component: engine
 2015-05-04 10:53:58 -07:00
Phil Estes a4975c3e58 Merge pull request #12937 from runcom/daemon-as-a-service 
Refactor server to use daemon as the service layer in controllers
Upstream-commit: 4895a887e2e88699a07ab6fea9113a5ff13d2450
Component: engine
 2015-05-04 13:03:28 -04:00
Alexander Morozov 5221178681 Merge pull request #12958 from Mashimiao/cleanup-container-functions 
Cleanup: move container's functions to its own file
Upstream-commit: 4f5272320cef76dd33a3895f228e2080d9d3a13b
Component: engine
 2015-05-04 09:36:55 -07:00
Sebastiaan van Stijn 9eba4b1b6c Merge pull request #11034 from HuKeping/oom_kill_disable 
enable cgroups memory.oom_control
Upstream-commit: ac324e5e52af1f2489320f3bdb7e2ebbd83ee869
Component: engine
 2015-05-04 11:53:05 -04:00
unclejack a580a2dfa9 Merge pull request #12903 from rhvgoyal/disable-discards 
devmapper: Disable mount option "discard" by default
Upstream-commit: 2e49281bd085d84babe8b3243de1e97c2d12dac1
Component: engine
 2015-05-04 18:35:25 +03:00
Ma Shimiao 5306450032 cleanup: move container's functions to its file 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 1be7a10b89506afdcb80f109f323b6e47d2e466c
Component: engine
 2015-05-04 21:37:44 +08:00
HuKeping ad3d66108b Feature: option for disable OOM killer 
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: a4a924e1b6c50f0f02460489259d73468a6c282e
Component: engine
 2015-05-04 21:11:29 +08:00
Antonio Murdaca 809dae68ab Remove unused error return 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 4aff563282c4d467575aed006642a22d673d4cb7
Component: engine
 2015-05-02 15:57:57 +02:00
Antonio Murdaca d6d6bba166 Refactor server to use daemon as the service layer in controllers 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c7cfdb65aa43a4561adb919d170bba5e86d69bee
Component: engine
 2015-05-02 03:12:58 +02:00
Vivek Goyal 63fe58e0de devmapper: Disable mount option "discard" by default 
Right now devicemapper mounts thin device using online discards by default
and passes mount option "discard". Generally people discourage usage of
online discards as they can be a drain on performance. Instead it is 
recommended to use fstrim once in a while to reclaim the space.

In case of  containers, we recommend to keep data volumes separate. So
there might not be lot of rm, unlink operations going on and there might
not be lot of space being freed by containers. So it might not matter
much if we don't reclaim that free space in pool.

User can still pass mount option explicitly using dm.mountopt=discard to
enable discards if they would like to.

So this is more like setting the containers by default for better performance
instead of better space efficiency in pool. And user can change the behavior
if they don't like default behavior.

Reported-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 04adaaf1ee1688ff48cb8f541dcb80e965f45080
Component: engine
 2015-05-01 09:16:31 -04:00
Tibor Vass 964532d377 Merge pull request #12772 from Microsoft/10662-moveworkdirchecktoserver 
Windows: Move workdir check daemon-side
Upstream-commit: 79d086c47d61f6da522a0e586005a02dae9b5ede
Component: engine
 2015-05-01 00:24:40 -04:00
Michael Crosby 46a5d01a59 Merge pull request #12767 from Microsoft/10662-commitdefertarclose 
Windows: Commit() rwTar defer close
Upstream-commit: 66077a9d692d8f5b5dd71bc848c359d3df092998
Component: engine
 2015-04-30 18:06:09 -07:00
Tibor Vass bdf088b5fb Merge pull request #12829 from Microsoft/10662-execdriver-driver-refactor 
Windows: Start refactor execdriver/driver.go
Upstream-commit: e9c9682333499f6a063404ad9df5db1385e75bbf
Component: engine
 2015-04-30 20:36:10 -04:00
John Howard 74df4d944e Windows: Factor out LXC 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 10e2dbf375b1aebe33bce0646a3a95d34c48d4f8
Component: engine
 2015-04-30 14:28:35 -07:00
John Howard 17b585ec32 Windows: Start refactor execdriver/driver.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b255c565ca66b778e87ccf1f8d46963feaee94a0
Component: engine
 2015-04-30 14:21:04 -07:00
John Howard 045d2db914 Windows: Move workdir check daemon-side 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 03eb0d065db006ac1df1bca62436a844674f4d2b
Component: engine
 2015-04-30 14:16:45 -07:00
John Howard fc1f799f60 Windows: Commit() rwTar defer close 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f9c7772b83e2382f1c3f0539180e9e6f5644fbbc
Component: engine
 2015-04-30 12:17:33 -07:00
Lars Kellogg-Stedman 72fc3b7751 journald log driver: use CONTAINER_ID field for container id 
This patch modifies the journald log driver to store the container ID in
a field named CONTAINER_ID, rather than (ab)using the MESSAGE_ID field.
Additionally, this adds the CONTAINER_ID_FULL field containing the
complete container ID and CONTAINER_NAME, containing the container name.

When using the journald log driver, this permits you to see log messages
from a particular container like this:

    # journalctl CONTAINER_ID=a9238443e193

Example output from "journalctl -o verbose" includes the following:

    CONTAINER_ID=27aae7361e67
    CONTAINER_ID_FULL=27aae7361e67e2b4d3864280acd2b80e78daf8ec73786d8b68f3afeeaabbd4c4
    CONTAINER_NAME=web

Closes: #12864
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: 869ecba652294e069874c83591d6f1b469d7cc32
Component: engine
 2015-04-30 10:42:27 -04:00
Antonio Murdaca 016ac4bf61 Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 531f4122bdcd4de289f613a5ef010f4c1989f098
Component: engine
 2015-04-30 01:35:16 +02:00
Phil Estes 99358033cc Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term 
Add error check before getting term
Upstream-commit: 2c4fe2aba3adc4416d09e76e669341e2217ae894
Component: engine
 2015-04-29 17:57:01 -04:00
Alexander Morozov 031175bb41 Merge pull request #11526 from mizzy/append-drop-rule-not-insert 
Append DROP rule with --icc=false, not insert
Upstream-commit: 6c46c9c83936689937701b3259d969255bcf4ca6
Component: engine
 2015-04-29 10:28:11 -07:00
Jessie Frazelle ce3a344378 Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups 
Option to configure cgroup manager (adds --exec-opt)
Upstream-commit: 53bef64804c6dae6662a7d55c3bb3e48b3e5dfdf
Component: engine
 2015-04-29 10:00:41 -07:00
Brian Goff 12da32d151 Merge pull request #11190 from cyphar/expose-path-sanitisation-wrappers 
Expose the getResourcePath and getRootResourcePath wrappers.
Upstream-commit: d2f0b9ed976987576483387bc919cb7ffbfa38e8
Component: engine
 2015-04-28 18:45:36 -04:00
Phil Estes 14fa064d31 Merge pull request #12826 from cpuguy83/12825_fix_leftover_container_json 
Fix undead containers
Upstream-commit: 67da055cebcaccd059daec88080a339b4c9e6b2c
Component: engine
 2015-04-28 08:11:40 -04:00
Jessica Frazelle 1a116000d5 option to configure cgroups 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 2afcd10202283478cbafb21e8c5f90f1236acccc
Component: engine
 2015-04-27 17:50:39 -07:00
Phil Estes 0b5b481a6d Merge pull request #12828 from tdmackey/trivial-spelling 
trivial: typo cleanup
Upstream-commit: 0153edcda1527cd19f5952046b51c4e8358d01ed
Component: engine
 2015-04-27 17:05:46 -04:00
Brian Goff e4ed8d93e4 Fix undead containers 
When a container has errors on removal, it gets flagged as dead.
If you `docker rm -f` a dead container the container is dereffed from
the daemon and doesn't show up on `docker ps` anymore... except that the
container JSON file may still be lingering around and becomes undead
when you restart the daemon.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c3c08f76bec023218b632e4c688ff9fcda11fcef
Component: engine
 2015-04-27 16:45:51 -04:00
David Mackey ae74d9f34f trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
Upstream-commit: 3941623fbc3fa724d61f53121513ffd87d03b61c
Component: engine
 2015-04-27 13:35:08 -07:00
Antonio Murdaca 954f940156 Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
 2015-04-27 21:50:33 +02:00
David Calavera a8e7d51077 Merge pull request #12819 from Microsoft/10662-volumesrefactor 
Windows: Refactor volumes
Upstream-commit: f9c27bda1ec9be667520900e1baa0e996f46f80e
Component: engine
 2015-04-27 10:25:41 -07:00
Tibor Vass b2c23588b8 Merge pull request #12793 from runcom/bye-unmarshal 
Replace json.Unmarshal() with json.Decoder().Decode()
Upstream-commit: 4ddd448490ba2a98a158bd3339e958b568fdc804
Component: engine
 2015-04-27 13:19:43 -04:00
Brian Goff ac15f3e4a0 Merge pull request #12818 from Microsoft/10662-nocontainercheckonwindows 
Windows: Info no containerized check
Upstream-commit: 97b35bab8172408550397bef94cd618c7e9a120e
Component: engine
 2015-04-27 12:56:28 -04:00
John Howard ca495f5d0d Windows: Refactor volumes 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ba1725a94ee75603d3a21e0580be3954fc689137
Component: engine
 2015-04-27 09:27:15 -07:00
Brian Goff b3b10cf345 Merge pull request #12807 from jmzwcn/patch-2 
Remove dead code from daemon/daemon.go
Upstream-commit: 6856c69c41880946125357ae11be00ac07de08b8
Component: engine
 2015-04-27 12:10:30 -04:00
Jessie Frazelle 3458282944 Merge pull request #12714 from noxiouz/fix_race_stats_collector 
statsCollector: fix data race in run()
Upstream-commit: 9f684c85926fd5280e0bc604507d5b5f80353d48
Component: engine
 2015-04-27 10:57:56 -05:00
John Howard 513af8ec95 Windows: Info no containerized check 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ab97303caed2a7be474e2c4ff7a55af9d6c8c3cc
Component: engine
 2015-04-27 08:38:01 -07:00
Aidan Hobson Sayers 270e43ec62 Prevent deadlock on attempt to use own net 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: f30d1c1835618eadea5d0a68d1301dffd9f09b22
Component: engine
 2015-04-27 14:57:37 +01:00
jmzwcn ad85faa2ca Remove dead code from daemon/daemon.go 
fix #12492
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Upstream-commit: accbbfeae4c2f3ceb68060e08e46e382cdefc975
Component: engine
 2015-04-27 15:50:47 +08:00
Antonio Murdaca e5f7f8da6f Replace json.Unmarshal with json.Decoder().Decode() 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 26543e03095eaa45d9afc12c029f07539323fee5
Component: engine
 2015-04-26 15:02:01 +02:00
John Howard aac3868541 Fixed typo 'configuring' 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ae9905ef9c5e8fe793e6a6269bb720618f4fcaed
Component: engine
 2015-04-24 16:52:32 -07:00
Anton Tiurin ffb16a8d52 statsCollector: fix data race in run() 
statsCollector.publishers must be protected to prevent
modifications during the iteration in run().
Being locked for a long time is bad, so pairs of containers &
publishers (pointers) are copied to release the lock fast.

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
Upstream-commit: 11a5f1af01842acf9a25ccebb59f36472ae51170
Component: engine
 2015-04-24 21:07:48 +03:00
Aleksa Sarai 0e89e62feb *: expose getResourcePath and getRootResourcePath wrappers 
Due to the importance of path safety, the internal sanitisation wrappers
for volumes and containers should be exposed so other parts of Docker
can benefit from proper path sanitisation.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 4377ebd6a758278c1766006c7eb8b777fa175719
Component: engine
 2015-04-24 23:53:47 +10:00
Michael Crosby 558ffb7c99 Merge pull request #12659 from dqminh/exec-interactive-hang 
reuse same code for setting pipes in run/exec
Upstream-commit: c26695cf8a220bf33ba0efe729e2ab4b05089ea8
Component: engine
 2015-04-23 16:37:49 -07:00
Jessie Frazelle 34f1a568b5 Merge pull request #12710 from runcom/bye-engine-from-graph 
Remove engine/job from graph
Upstream-commit: 2ebfc7c874c26ab46fb93a2fca6fdcc9d2d808b1
Component: engine
 2015-04-23 15:42:50 -07:00
Daniel, Dao Quang Minh 0bd2f00743 reuse same code for setting pipes in run/exec 
This also moves `exec -i` test to _unix_test.go because it seems to need a
pty to reliably reproduce the behavior.

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Upstream-commit: ade8146aa82baa88bacdcf2d9c2559e8f47d71e4
Component: engine
 2015-04-23 21:54:21 +00:00
Antonio Murdaca 41061500b4 Remove engine/job from graph 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: fa2c68a89e153cfc82c5af7cbb6d7f15b06e0a8c
Component: engine
 2015-04-23 23:36:29 +02:00
Tibor Vass 249f3df46c Merge pull request #9397 from jpopelka/9395-firewalld 
Firewalld support
Upstream-commit: 259effc6dfd901130ca6d2926090bddfe35f7cdc
Component: engine
 2015-04-23 16:58:08 -04:00
Ma Shimiao 75c324a9e3 Move setHostConfig to daemon file 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: dde0cc78bdec31be1ecbd7def6a83111224ccc55
Component: engine
 2015-04-23 10:23:02 +08:00
Brian Goff 078d379cc0 Merge pull request #12406 from runcom/remove-job-container-inspect 
Remove job from container_inspect
Upstream-commit: 387227217004d4ea54e2d2405aaef761752e3bdc
Component: engine
 2015-04-22 21:05:15 -04:00