8e654cb58d
fix typo.
...
Signed-off-by: mapk0y <mapk0y@gmail.com >
Upstream-commit: 416e855e9b33464c81e86ff47ed19c93a781e604
Component: engine
2015-06-10 06:26:07 +09:00
58ce17869e
daemon: cleanup getting container logic
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 73bc885b23fb06b6d9d6cb554fde93fe0e6bcb98
Component: engine
2015-06-09 14:47:07 +08:00
bd6a18d14c
Windows: Don't build Linux graph drivers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9a9dc5ba96d2661f5dc2037db44d0984d2129946
Component: engine
2015-06-08 15:09:33 -07:00
93011f5563
Windows: Fix PR13278 compile break
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 71eadd4176a968399671e5cb4c8de52c40992b01
Component: engine
2015-06-08 13:47:09 -07:00
2ee4e129d1
libnetwork: Add garbage collection trigger
...
When the daemon is going down trigger immediate
garbage collection of libnetwork resources deleted
like namespace path since there will be no way to
remove them when the daemon restarts.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: c68e7f96f9636a9b2ab0c2c0dbf753161fa73fc2
Component: engine
2015-06-07 21:33:51 -07:00
4d366ead20
Cleanup: remove some useless code and change verifyHostConfig to verifyContainerSetting
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 67552fb22d254ba5e515aa899b1da3173f474a14
Component: engine
2015-06-08 09:06:58 +08:00
8eb50c9051
Merge pull request #13787 from runcom/check-nil-Config
...
Avoid nil pointer dereference while creating a container with an empty Config
Upstream-commit: 07b22fcf50f0156a5a15d5392a7dcb340b493f34
Component: engine
2015-06-07 12:28:41 -04:00
34bcda9fbc
Merge pull request #13757 from eolamey/13755-we-would-like-default-gateway-back-please
...
Restore --default-gateway{,-v6} daemon options.
Upstream-commit: 3d10540bc330ec0a99229e2a943ae04a0f8b38c9
Component: engine
2015-06-06 16:02:59 -07:00
6aab6b5654
Avoid nil pointer dereference while creating a container with an empty Config
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 4ce817796e639391f6bc3e338f5a88985daacaca
Component: engine
2015-06-06 20:07:32 +02:00
6c407af390
Update graph walkhistory to pass by value
...
Remove unused graph history function
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: bb50a4159bda8e6f2d47b69ddd476ab32ac6be14
Component: engine
2015-06-05 18:06:09 -07:00
6825ac1c62
Separate graph from image
...
Move graph related functions in image to graph package.
Consolidating graph functionality is the first step in refactoring graph into an image store model.
Subsequent refactors will involve breaking up graph into multiple types with a strongly defined interface.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 2b58b677a54950bc78c13760ef79fe6284154847
Component: engine
2015-06-05 18:06:09 -07:00
bc7977060e
Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh
...
fix lxc build
Upstream-commit: 078b8e54e4429f838ff26ddace34854167fe0b42
Component: engine
2015-06-05 10:27:58 -07:00
9eb2d545d0
fix lxc build
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 0adfb908a682e679b54f511fe89e668d6e676dda
Component: engine
2015-06-05 09:50:30 -07:00
130b3e7cb1
Merge pull request #13751 from cpuguy83/use_closenotifier_for_logs
...
Fix goroutine leak on logs -f with no output
Upstream-commit: edb7e84ddbe8df4767e7249c76551ce69d68e8f4
Component: engine
2015-06-05 11:43:47 -04:00
9644714f56
Restore --default-gateway{,-v6} daemon options.
...
This was added before the libnetwork merge, and then lost. Fixes #13755 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
Upstream-commit: 5fa60149e27a8d8e50e6fc6210a2d2bea93c8ab2
Component: engine
2015-06-05 06:21:22 +00:00
02d7f238fb
Merge pull request #13684 from lizf-os/cleanup-verify-volumes-info
...
Cleanup Daemon.verifyVolumesInfo() a bit
Upstream-commit: a2602c617d0afcf829983c46abd9cc95f2003078
Component: engine
2015-06-04 15:39:31 -07:00
3ebd8c1a62
Fix goroutine leak on logs -f with no output
...
Also noticed potential hang when only stdout or stderr are used with
follow=1
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 0c84604f5458bc38b793e5bcdf86624eef3e3184
Component: engine
2015-06-04 13:56:40 -07:00
de132e9aef
Merge pull request #13734 from aboch/master
...
Fix for #13720 . Unpublished ports missing in docker ps
Upstream-commit: b63ec6e4b1f6f5c77a6a74a52fcea9564538c575
Component: engine
2015-06-04 12:05:47 -07:00
6f075808ca
Merge pull request #13728 from calavera/copy_old_volume_content
...
Migrate data from old vfs paths to new local volumes path.
Upstream-commit: b26428257f211f21f0f93d27d0ea74531cda9047
Component: engine
2015-06-04 11:14:34 -07:00
148ef92617
Migrate data from old vfs paths to new local volumes path.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 16a5590c5be4be555a1ebe52d031d4e9e0e6da23
Component: engine
2015-06-04 10:16:19 -07:00
3ff75591ad
Merge pull request #13586 from kvasdopil/zfs-88chars
...
Avoid 88-chars mountpoint length limit on freebsd
Upstream-commit: 9069cded5761de31b786d70f269fa47732e3e5ed
Component: engine
2015-06-04 10:05:01 -07:00
bda4b578b4
Fix for #13720
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ea180a73bc00491915d620c14877318cc33b2a73
Component: engine
2015-06-03 23:39:27 -07:00
8b93ea90be
Using container NetworkDisabled to fix #13725
...
container.config.NetworkDisabled is set for both daemon's
DisableNetwork and --networking=false case. Hence using
this flag instead to fix #13725 .
There is an existing integration-test to catch this issue,
but it is working for the wrong reasons.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 83208a531d1824ea7b0a55f9419e915e446c780a
Component: engine
2015-06-03 17:31:22 -07:00
d61059b14c
Merge pull request #13672 from LK4D4/syslog_tag
...
Add syslog-tag option
Upstream-commit: 0636bb7b73f49979f8def3d950c5e1d43a602695
Component: engine
2015-06-03 17:04:59 +02:00
3cf411b6db
Cleanup Daemon.verifyVolumesInfo() a bit
...
vols.VolumesRW has been initialized so it can't be nil. Furthermore
it's ok to read a nil map.
Signed-off-by: Zefan Li <lizefan@huawei.com >
Upstream-commit: 8b4c0decfc6a3ef748a70c2f53d1351d5aa8ab64
Component: engine
2015-06-03 09:19:16 +08:00
5276323624
Expose old config field for api < 1.19
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6deaa58ba5f051039643cedceee97c8695e2af74
Component: engine
2015-06-02 23:37:59 +02:00
f8248bbabf
Add syslog-tag option for syslog log-driver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a81af2e26a19cca0ffb8cbfa619169d55d604789
Component: engine
2015-06-02 12:43:00 -07:00
e369cfae8c
Merge pull request #13664 from runcom/dead-code
...
Remove old struct
Upstream-commit: 9f098cabfc92db90ff66d9a1b318c0b5872edcbd
Component: engine
2015-06-02 09:37:55 -07:00
495ecb3fef
Remove old struct
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com >
Upstream-commit: da1a77defd765b5caf3336825292e1ecd8a7d320
Component: engine
2015-06-02 16:10:39 +02:00
07eda82273
Merge pull request #13536 from Mic92/master
...
remove redundant mount/unmount calls on commit
Upstream-commit: 1f472c37687fd1f66e574df3ba773fde5be57e2d
Component: engine
2015-06-01 15:57:14 -07:00
85e6643580
Merge pull request #13443 from duglin/CleanupEvents
...
Cleanup container LogEvent calls
Upstream-commit: cd80a61cc1dd6868eef77852b898f1d25c06641b
Component: engine
2015-06-01 14:04:33 -07:00
4f79291859
Cleanup container LogEvent calls
...
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.
Added testcases for new events: commit, copy, resize, attach, rename, top
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 8232312c1e705753d3db82dca3d9bb23e59c3b52
Component: engine
2015-06-01 12:39:28 -07:00
16cea00893
Merge pull request #13560 from Microsoft/10662-statscollector
...
Windows: Factor out stat collector
Upstream-commit: 24fbcffeac39280292fe57a8564423332e975b96
Component: engine
2015-06-01 11:39:19 -07:00
817ca1be2f
Merge pull request #13637 from LK4D4/remove_debug
...
Remove useless debug message
Upstream-commit: d156bc9dd44e6a3beacafce8be4f809c1b980998
Component: engine
2015-06-01 11:38:05 -07:00
8354ab7272
Remove useless debug message
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f1b59d64d21d5a0f54536b26161a31441697ca61
Component: engine
2015-06-01 11:15:15 -07:00
c86ef1ca0b
Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage
...
Add docker stats --no-stream show cpu usage
Upstream-commit: a7005c44b5ddfd44c2a54c6d60af52e3fecfaf72
Component: engine
2015-06-01 09:40:04 -07:00
f9a83491c5
Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices
...
Fixes issue #10184 .
Upstream-commit: 6fb454b9f08249449a343ca56348b02ae41ac9c5
Component: engine
2015-06-01 09:30:04 -07:00
c0aec76e55
Windows: Factor out stat collector
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 68c879406bffe772c83643a97a3b1a6e4fba967d
Component: engine
2015-06-01 09:11:03 -07:00
d27d17578c
Merge pull request #13390 from mrjana/cnm_integ
...
Do not attempt releasing network when not attached to any network
Upstream-commit: b4450043641ffbe8d8b0b5255de99ae0e78141b2
Component: engine
2015-06-01 08:25:20 -07:00
5fcdacd7a5
Correct the error message of pause and unpause non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 20927ffbe7cf1f6bdc2f7eb17db2a443abacf4c0
Component: engine
2015-05-31 03:32:29 +08:00
adc8e86b26
Add docker stats --no-stream show cpu usage
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 96123a1fd5c2779ccd7dd722a1fa4196e91dd716
Component: engine
2015-05-31 01:25:51 +08:00
cc848c594e
Add a "Created" state for new containers that haven't been run yet
...
Closes #13353
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: dc697b1c9f2bf77b5b78aa871e3f365e333fd253
Component: engine
2015-05-30 07:48:46 -07:00
64ffe806a7
Fix issue #10184 .
...
Merge user specified devices correctly with default devices.
Otherwise the user specified devices end up without permissions.
Signed-off-by: David R. Jenni <david.r.jenni@gmail.com >
Upstream-commit: c913c9921b7caa11e8500d2ebb4fa97303c876be
Component: engine
2015-05-30 11:09:47 +02:00
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
a03d351804
Merge pull request #13596 from jfrazelle/11414-fix-once-and-for-all
...
fix bug with rmi multiple tag
Upstream-commit: eaa9c1b97e3b28c6e2a16c7e593238bb43e1f9dc
Component: engine
2015-05-29 15:10:22 -07:00
277284056b
Merge pull request #13446 from runcom/remove-PortSpecs
...
Remove PortSpecs from Config
Upstream-commit: ec167972bf15db8861eed8912b791a4aa9bb9efa
Component: engine
2015-05-29 14:31:48 -07:00
7d3e38efca
Merge pull request #13527 from duglin/FixImagesPrefixNotFound
...
Fix error when trying to delete an image due to a bad container
Upstream-commit: a39de418719dc6189025a760ca6b5c024a177b24
Component: engine
2015-05-29 14:09:26 -07:00
9712652e10
fix bug with rmi multiple tag
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 185f392691c40fc4cb6ea16373a92a03f3d0b0f2
Component: engine
2015-05-29 14:04:06 -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
24139366a7
Merge pull request #13564 from burke/fix-memory-leak
...
Use bufio.Reader instead of bufio.Scanner for logger.Copier
Upstream-commit: c42810fe9981c07e7de55aa65af44d618dd4e6ce
Component: engine
2015-05-29 13:37:15 -07:00
mapk0y
Ma Shimiao
John Howard
Jana Radhakrishnan
Lei Jitang
Doug Davis
Alexander Morozov
Antonio Murdaca
Derek McGowan
Jessica Frazelle
Phil Estes
Eric-Olivier Lamey
Brian Goff
Arnaud Porterie
Michael Crosby
David Calavera
Alessandro Boch
Madhu Venugopal
Sebastiaan van Stijn
Zefan Li
Antonio Murdaca
Alexander Morozov
Antonio Murdaca
Jessie Frazelle
Doug Davis
David R. Jenni