4895a887e2
Merge pull request #12937 from runcom/daemon-as-a-service
...
Refactor server to use daemon as the service layer in controllers
2015-05-04 13:03:28 -04:00
4f5272320c
Merge pull request #12958 from Mashimiao/cleanup-container-functions
...
Cleanup: move container's functions to its own file
2015-05-04 09:36:55 -07:00
ac324e5e52
Merge pull request #11034 from HuKeping/oom_kill_disable
...
enable cgroups memory.oom_control
2015-05-04 11:53:05 -04:00
2e49281bd0
Merge pull request #12903 from rhvgoyal/disable-discards
...
devmapper: Disable mount option "discard" by default
2015-05-04 18:35:25 +03:00
1be7a10b89
cleanup: move container's functions to its file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-04 21:37:44 +08:00
a4a924e1b6
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-04 21:11:29 +08:00
4aff563282
Remove unused error return
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-02 15:57:57 +02:00
c7cfdb65aa
Refactor server to use daemon as the service layer in controllers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-02 03:12:58 +02:00
04adaaf1ee
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>
2015-05-01 09:16:31 -04:00
79d086c47d
Merge pull request #12772 from Microsoft/10662-moveworkdirchecktoserver
...
Windows: Move workdir check daemon-side
2015-05-01 00:24:40 -04:00
66077a9d69
Merge pull request #12767 from Microsoft/10662-commitdefertarclose
...
Windows: Commit() rwTar defer close
2015-04-30 18:06:09 -07:00
e9c9682333
Merge pull request #12829 from Microsoft/10662-execdriver-driver-refactor
...
Windows: Start refactor execdriver/driver.go
2015-04-30 20:36:10 -04:00
10e2dbf375
Windows: Factor out LXC
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 14:28:35 -07:00
b255c565ca
Windows: Start refactor execdriver/driver.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 14:21:04 -07:00
03eb0d065d
Windows: Move workdir check daemon-side
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 14:16:45 -07:00
f9c7772b83
Windows: Commit() rwTar defer close
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-30 12:17:33 -07:00
531f4122bd
Remove engine mechanism
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-30 01:35:16 +02:00
2c4fe2aba3
Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term
...
Add error check before getting term
2015-04-29 17:57:01 -04:00
6c46c9c839
Merge pull request #11526 from mizzy/append-drop-rule-not-insert
...
Append DROP rule with --icc=false, not insert
2015-04-29 10:28:11 -07:00
53bef64804
Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups
...
Option to configure cgroup manager (adds --exec-opt)
2015-04-29 10:00:41 -07:00
d2f0b9ed97
Merge pull request #11190 from cyphar/expose-path-sanitisation-wrappers
...
Expose the getResourcePath and getRootResourcePath wrappers.
2015-04-28 18:45:36 -04:00
67da055ceb
Merge pull request #12826 from cpuguy83/12825_fix_leftover_container_json
...
Fix undead containers
2015-04-28 08:11:40 -04:00
2afcd10202
option to configure cgroups
...
Signed-off-by: Jessica Frazelle <jess@docker.com>
2015-04-27 17:50:39 -07:00
0153edcda1
Merge pull request #12828 from tdmackey/trivial-spelling
...
trivial: typo cleanup
2015-04-27 17:05:46 -04:00
c3c08f76be
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>
2015-04-27 16:45:51 -04:00
3941623fbc
trivial: typo cleanup
...
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
2015-04-27 13:35:08 -07:00
844538142d
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-27 21:50:33 +02:00
f9c27bda1e
Merge pull request #12819 from Microsoft/10662-volumesrefactor
...
Windows: Refactor volumes
2015-04-27 10:25:41 -07:00
4ddd448490
Merge pull request #12793 from runcom/bye-unmarshal
...
Replace json.Unmarshal() with json.Decoder().Decode()
2015-04-27 13:19:43 -04:00
97b35bab81
Merge pull request #12818 from Microsoft/10662-nocontainercheckonwindows
...
Windows: Info no containerized check
2015-04-27 12:56:28 -04:00
ba1725a94e
Windows: Refactor volumes
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-27 09:27:15 -07:00
6856c69c41
Merge pull request #12807 from jmzwcn/patch-2
...
Remove dead code from daemon/daemon.go
2015-04-27 12:10:30 -04:00
9f684c8592
Merge pull request #12714 from noxiouz/fix_race_stats_collector
...
statsCollector: fix data race in run()
2015-04-27 10:57:56 -05:00
ab97303cae
Windows: Info no containerized check
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-27 08:38:01 -07:00
f30d1c1835
Prevent deadlock on attempt to use own net
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-04-27 14:57:37 +01:00
accbbfeae4
Remove dead code from daemon/daemon.go
...
fix #12492
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
2015-04-27 15:50:47 +08:00
26543e0309
Replace json.Unmarshal with json.Decoder().Decode()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-26 15:02:01 +02:00
ae9905ef9c
Fixed typo 'configuring'
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-04-24 16:52:32 -07:00
11a5f1af01
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>
2015-04-24 21:07:48 +03:00
4377ebd6a7
*: 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)
2015-04-24 23:53:47 +10:00
c26695cf8a
Merge pull request #12659 from dqminh/exec-interactive-hang
...
reuse same code for setting pipes in run/exec
2015-04-23 16:37:49 -07:00
2ebfc7c874
Merge pull request #12710 from runcom/bye-engine-from-graph
...
Remove engine/job from graph
2015-04-23 15:42:50 -07:00
ade8146aa8
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>
2015-04-23 21:54:21 +00:00
fa2c68a89e
Remove engine/job from graph
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 23:36:29 +02:00
259effc6df
Merge pull request #9397 from jpopelka/9395-firewalld
...
Firewalld support
2015-04-23 16:58:08 -04:00
dde0cc78bd
Move setHostConfig to daemon file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-23 10:23:02 +08:00
3872272170
Merge pull request #12406 from runcom/remove-job-container-inspect
...
Remove job from container_inspect
2015-04-22 21:05:15 -04:00
3dc07162bd
Merge pull request #12557 from rhatdan/journald
...
Add journald as a supported logger for containers
2015-04-22 17:20:10 -07:00
f3680e7494
Cleanup daemon/volumes
...
- Mount struct now called volumeMount
- Merged volume creation for each volume type (volumes-from, binds, normal
volumes) so this only happens in once place
- Simplified container copy of volumes (for when `docker cp` is a
volume)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-04-22 19:32:10 -04:00
1d48cccc99
Merge pull request #10992 from cpuguy83/add_volume_mounting_for_cp
...
Make `docker cp` bind-mount volumes
2015-04-22 15:59:28 -07:00
Phil Estes
Alexander Morozov
Sebastiaan van Stijn
unclejack
Ma Shimiao
HuKeping
Antonio Murdaca
Vivek Goyal
Tibor Vass
Michael Crosby
John Howard
Jessie Frazelle
Brian Goff
Jessica Frazelle
David Mackey
David Calavera
Aidan Hobson Sayers
jmzwcn
Anton Tiurin
Aleksa Sarai
Daniel, Dao Quang Minh