4610cc7a2b
Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown
...
Ensure all the running containers are killed on daemon shutdown
Upstream-commit: 04c6f09fbdf60c7765cc4cb78883faaa9d971fa5
Component: engine
2015-05-29 16:45:57 -07:00
6226136075
Remove PortSpecs from Config
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 15134a3320fbacee36e86a0342e7ffb49285f297
Component: engine
2015-05-29 22:38:09 +02:00
744dbdd6f9
Mount bind volumes coming from the old volumes configuration.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 53d9609de472f2fc9e6aaef2b713f526605f4ab8
Component: engine
2015-05-28 14:06:17 -07:00
c59e5318a9
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 >
Upstream-commit: b2a43baf2e2cc68c83383a7524441f81bc4c4725
Component: engine
2015-05-27 13:43:38 -07:00
6aa7cf16be
Ensure all the running containers are killed on daemon shutdown
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: bdb77078b5b93c3075aa258e1c04a5a5c893430f
Component: engine
2015-05-27 09:09:25 +08:00
c2098b0ab5
Preinitialize MountPoints to avoid assigning to a nil map
...
Fixes #13435
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 59214a0737560a8a2386884dc438b4b003d407ba
Component: engine
2015-05-25 19:37:57 -07:00
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
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
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
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
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
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
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
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
b1b57c9cd4
daemon: Logging drivers refactoring
...
- noplog driver pkg for '--log-driver=none' (null object pattern)
- centralized factory for log drivers (instead of case/switch)
- logging drivers registers themselves to factory upon import
(easy plug/unplug of drivers in daemon/logdrivers.go)
- daemon now doesn't start with an invalid log driver
- Name() method of loggers is actually now their cli names (made it useful)
- generalized Read() logic, made it unsupported except json-file (preserves
existing behavior)
Spotted some duplication code around processing of legacy json-file
format, didn't touch that and refactored in both places.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 3a8728b431df07249ad913ea9a12e27dc39b8956
Component: engine
2015-05-12 19:11:52 +00:00
c0e7d1e48e
Add SIGUSR1 handler for dumping stack/goroutine traces
...
Add handler for SIGUSR1 based on feedback regarding when to dump
goroutine stacks. This will also dump goroutine stack traces on SIGQUIT
followed by a hard-exit from the daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 95fcf76cc64a4acf95c168e8d8607e3acf405c13
Component: engine
2015-05-12 10:09:23 +10:00
84543fc3ec
Merge pull request #13074 from runcom/11824-short-link-if-equals-alias
...
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
2015-05-11 13:18:29 -07:00
60d5f903de
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
2015-05-11 21:50:47 +02:00
ceedb9d4b8
Merge pull request #13101 from bharaththiruveedula/13092-remove-unwanted-locks
...
Removing extra locks for Pause and Unpause functions
Upstream-commit: 5e063326a345349b406791a6822f6423e17c353d
Component: engine
2015-05-11 10:54:39 -07:00
abc1b2f1ff
Fix oom kill disable issue
...
It should not be hard limit, we should only check oom kill disable
when user using it.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a2f39e7754c5ca1245cc268472ecb92147ba21fa
Component: engine
2015-05-10 14:55:00 +08:00
fc89bcb4ca
Removing extra locks for Pause and Unpause functions
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com >
Upstream-commit: 8c1ef5ceafcba2476693db7f5db39300ad2e7f88
Component: engine
2015-05-10 00:16:54 +05:30
560ba9b809
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
2015-05-09 10:02:46 +08:00
5c2686119c
Merge pull request #11802 from hqhq/hq_add_blkio_weight
...
add blkio.weight support
Upstream-commit: de32f5c431bbdb56d6a446af0e5660fae9539bd8
Component: engine
2015-05-07 17:10:39 -07:00
78169f4021
Merge pull request #13041 from hqhq/hq_fix_checkkernel
...
update recommended kernel in checkKernel
Upstream-commit: 1efecc4c41804e6019b4d4eac17f8f386e9ee658
Component: engine
2015-05-07 16:15:12 -07:00
4f3515319b
add blkio.weight support
...
We can use this to control block IO weight of a container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f133f11a7d25e6262558dd733afaa95ddd1c7aee
Component: engine
2015-05-07 11:55:58 +08:00
f36df344d5
Cleanup container reg for lxc special case
...
The lxc code here is doing the exact same thing on calling
execdriver.Terminate, so let's just use that.
Also removes some dead comments originally introduced
50144aeb42283848db730b936d6b5b6332ec6565 but no longer relevant since we
have restart policies.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 44cd599e29451647492b3a5341ba23252a69ca27
Component: engine
2015-05-06 23:01:46 -04:00
fcf8de1fe6
update recommended kernel in checkKernel
...
We already changed docs: https://github.com/docker/docker/pull/10652
Should change code as well.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: ceae5f54b3abe805b3323476dafb00595b064ed2
Component: engine
2015-05-07 10:11:02 +08:00
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
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
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
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
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
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
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
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
fdf9a8d629
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4b9fe9c298c8778855c1d14e978c791496dd7c42
Component: engine
2015-04-23 00:58:13 +02:00
f089bf1e0a
remove execCreate & execStart from job
...
Also removed the function ExecConfigFromJob
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 24425021d26f29a475702064181e6c99fb6bd1c5
Component: engine
2015-04-22 13:51:57 -07:00
b6c443e015
Merge pull request #12564 from LK4D4/remove_jobs_trust
...
Remove engine from trust
Upstream-commit: b098a42559f8f70a56a587a06608ee00641ebdaf
Component: engine
2015-04-21 16:49:01 -04:00
7c675b1db2
Remove not needed call to container.readHostConfig()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: a3c4801c9291c0db78c5cc0748d5d2dd5e44a98f
Component: engine
2015-04-21 22:00:33 +02:00
cff18dc122
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
2015-04-20 17:55:01 -07:00
e0b5db7169
Merge pull request #12450 from brahmaroutu/integration_test3_12255
...
Port test from integration tests - test low memory on create
Upstream-commit: 435643545c4b2c90e2a0a264527f6cc190d925cb
Component: engine
2015-04-20 17:27:17 -04:00
0790d1610c
Remove engine from trust
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9e50bf6270f426f6ef6649b1985036988b207407
Component: engine
2015-04-20 12:48:33 -07:00
97fb2745d9
Port test from integration tests
...
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 1a35b16b08ef5a8b0764e5a383f36d5572f20dfe
Component: engine
2015-04-20 17:57:53 +00:00
f8f4bcdb38
Add support cpu cfs quota
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
2015-04-20 08:16:47 -07:00
2f9e9a0229
Remove redundant '\n' in daemon.go and correct the warning messages for memory swap
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2d5ede67c098dd11803d502865ab546388f2a553
Component: engine
2015-04-20 22:00:03 +08:00
899b777d56
Remove Job from Info API
...
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: f4942ed864f00a31591ef0257a971ef41ddd4c70
Component: engine
2015-04-20 18:14:06 +08:00
9e36d6f575
Merge pull request #12432 from Mashimiao/optimize-code-to-clarify-loagic
...
change code to clarify logic
Upstream-commit: 89092252f07604b7bc1f24fcf3314ed0d43916de
Component: engine
2015-04-19 07:39:24 -04:00
105ea026b0
Remove job from restart
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e41192a3f8cbfbbfecde03f58a3b2be2b1afd836
Component: engine
2015-04-16 18:50:24 +02:00
00001e0281
optimize code to clarify logic
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 93cdb0071be29cde5e9f5574926ae628ef4cfc41
Component: engine
2015-04-16 19:56:25 +08:00
586b88bb0d
Merge pull request #12423 from crosbymichael/idkbutitworks
...
Ensure state is destroyed on daemont restart
Upstream-commit: 1899b2f41a73a6596ba167c9c710affde3dae550
Component: engine
2015-04-15 21:19:38 -07:00
David Calavera
Antonio Murdaca
Brian Goff
Lei Jitang
Darren Shepherd
Arnaud Porterie
Jana Radhakrishnan
John Howard
Shishir Mahajan
Ahmet Alp Balkan
Phil Estes
Jessie Frazelle
Alexander Morozov
Qiang Huang
Bharath Thiruveedula
Ma Shimiao
Jessica Frazelle
Phil Estes
David Mackey
jmzwcn
jianbosun
Alexander Morozov
Srini Brahmaroutu
Hu Keping