c4d8b40978
Splitting out the cli command into parts.
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 561bfb268de3c674b04d48895b7e46ae890ef795
Component: engine
2015-06-25 12:02:41 -07:00
f74cf65168
Merge pull request #14030 from estesp/init-memory-swappiness
...
Initialize swappiness in libcontainer cgroups template
Upstream-commit: c2815496101e7523c8bc2e459026f8c5e84cdb08
Component: engine
2015-06-25 11:36:54 -07:00
a6a8015e93
Merge pull request #13907 from chenchun/exitcode
...
Set exit code of old running container as 137
Upstream-commit: e8b87cfce10551ec132b470036c26374f1971fe1
Component: engine
2015-06-25 10:57:48 -07:00
55a285c243
Merge pull request #14182 from moxiegirl/fix-logging
...
Breaking logging driver material out of run
Upstream-commit: 81d6f6093597a0f37aba5f2c127a8476c8183053
Component: engine
2015-06-25 10:28:36 -07:00
ed7a281af0
Merge pull request #14163 from mrjana/cnm_integ
...
Fix endpoint leave failure for --net=host mode
Upstream-commit: e0cfe36b8e0ffbbfd611166bc509cfe2c5e6ee8f
Component: engine
2015-06-25 10:17:03 -07:00
92372b77d4
Set exit code of old running container as 137
...
Signed-off-by: Chun Chen <chenchun.feed@gmail.com >
Upstream-commit: b0b2f979c7c43e2975d5e39340c168da2da42d1d
Component: engine
2015-06-25 22:30:09 +08:00
dbd2bb096f
Breaking logging driver material out of run
...
- creating index which is overview of configuring logs
- linking to individual journald/fluent material
- leaving behind table and link to index in run
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 31dd97f4adb215b23504f72e7a17464bc6428419
Component: engine
2015-06-25 05:00:49 -07:00
0a0ed52f4f
Merge pull request #13973 from calavera/fix_zfs_options_doc_location
...
Move zfs options doc to the storage section.
Upstream-commit: 4ab8b8828666c8d0651e96d61b5c616d26c5e229
Component: engine
2015-06-24 15:52:13 -07:00
5ec67f98b1
Fix endpoint leave failure for --net=host mode
...
When a container is started with `--net=host` with
a particular name and it is subsequently destroyed,
then all subsequent creations of the container with
the same name will fail. This is because in `--net=host`
the namespace is shared i.e the host namespace so
trying to destroy the host namespace by calling
`LeaveAll` will fail and the endpoint is left with
the dangling state. So the fix is, for this mode, do
not attempt to destroy the namespace but just cleanup
the endpoint state and return.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 9bb69f9726e7f8cba0cdf681e5060e47b9c45298
Component: engine
2015-06-24 12:33:52 -07:00
798580eff0
Merge pull request #14119 from moxiegirl/fix-heading-blanks
...
Fix heading blanks
Upstream-commit: afd4d544cfabce9d2d8890e2c4a4e6f2f0a00a46
Component: engine
2015-06-24 08:35:42 -07:00
decc5d5340
Fix Typo in stdcopy.go
...
Signed-off-by: Yu Chengxia <yuchengxia@huawei.com >
Upstream-commit: 16be453e0f3827278427f33bbec110e0fabbc17f
Component: engine
2015-06-24 15:00:14 +08:00
892d0c95d1
Merge pull request #13810 from d23/syslog-facility
...
Add syslog-facility option
Upstream-commit: 4dd1d1bfa5ddb7295d001c5df35865da34ac048b
Component: engine
2015-06-23 12:05:15 -07:00
9a58f60656
Merge pull request #13833 from Microsoft/10662-dockerbuild
...
Windows: Start docker build working
Upstream-commit: d5721f03854f33300f84186554321c3371a28319
Component: engine
2015-06-23 11:46:56 -07:00
587b3d159c
Merge pull request #13966 from mountkin/fix-stats-goroutine-leak
...
fix the goroutine leak in the stats API if the container is not running
Upstream-commit: aa4f495caee6ba66ce33a8ef4db0d4067c17195b
Component: engine
2015-06-23 10:06:35 -07:00
e5b3b3d23c
Merge pull request #14047 from Microsoft/10662-versionadd
...
Add build time to version and tidy output
Upstream-commit: 5c93c265f69198509d405862127ad9b11be2e269
Component: engine
2015-06-23 09:57:31 -07:00
f60afe1d2b
Merge pull request #14114 from HuKeping/master
...
Remove useless conversion
Upstream-commit: 9b5875eb9dfa55ca299a3bbc3817997e7167221f
Component: engine
2015-06-23 08:10:34 -07:00
1656b9dd4e
Remove useless conversion
...
It is already type float.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 250ce20feef6e052025b124dc4e1bc844a9cf9a9
Component: engine
2015-06-24 00:47:08 +08:00
1547f31ef8
Fixes #14117
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 960cbd2c8dd7dfa794c11087babed46bea5d792e
Component: engine
2015-06-23 05:17:20 -07:00
f157cc3d55
Closes #14055 for anchal
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e81861ea5419068e7919db892c8c9db53ae5bbe6
Component: engine
2015-06-23 05:14:53 -07:00
f157b240b8
Add --log-opt to specify facility for syslog driver
...
Signed-off-by: Dennis Docter <dennis@d23.nl >
Upstream-commit: 609e7b0a55d4082fce40eabae3a06ca57c188ba5
Component: engine
2015-06-23 14:04:25 +02:00
eb72177bf2
fix the goroutine leak in the stats API if the container is not running
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 1cbf5a54dae86e34d8e65508c5640b17cda0eed8
Component: engine
2015-06-23 19:38:15 +08:00
d1849214e2
Merge pull request #14110 from webwurst/patch-2
...
Typo
Upstream-commit: cb6ca19b5311d1d42a7c00ff6e5ba2728f4e013e
Component: engine
2015-06-23 12:34:16 +02:00
144b1ee01b
Merge pull request #14111 from bfirsh/update-compose-swarm-docs
...
Fix compose/swarm/network docs
Upstream-commit: 51264fa63c03833dec93d05b1f8ca3984e794eab
Component: engine
2015-06-22 17:23:57 -07:00
e373c5e5eb
Update documentation for compose/swarm/network
...
Thanks to @aanand for help debugging
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: fe1f210c42ba2978bd00450d2e91b23f040b8e5e
Component: engine
2015-06-22 16:45:22 -07:00
0cd6c3e80b
Typo
...
Signed-off-by: Tobias Bradtke <webwurst@gmail.com >
Upstream-commit: 1797f0376033ab12cd114dc671b4dca43a410cb1
Component: engine
2015-06-23 00:52:16 +02:00
359585c9ee
Merge pull request #12812 from sharidas/8373-display-docker-ps-host
...
Display when a container is in --net=host in docker ps
Upstream-commit: 74be85500acb7ebbca166a2ef82e09dddf83b424
Component: engine
2015-06-22 14:06:07 -07:00
888e384d70
Add branch and build time to version
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 87eae0d659d6e4bb75942455f3f73a74f54ed3b9
Component: engine
2015-06-22 13:00:27 -07:00
d9f49b3c90
Add link to compose/swarm/network to readme
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: e02947b236d8051820834c80b4d7988877de2533
Component: engine
2015-06-22 11:38:46 -07:00
953bda29a7
Merge pull request #14101 from aanand/compose-swarm-networking-guide
...
Add experimental Compose/Swarm/multi-host networking guide
Upstream-commit: a7116c5e2b6d1b3bfcb5b09c6ee1ed91e9281ee6
Component: engine
2015-06-22 09:47:33 -07:00
4992f31e42
Merge pull request #14071 from mavenugo/mhnet
...
Vendoring libnetwork 83743db8ceb2bdbfa0960d9a54ed2f98df4ea846
Upstream-commit: f39b9a0b0f77c528a6fb8bf14be5cdea11ce338d
Component: engine
2015-06-22 08:35:18 -07:00
4a203df0a8
Add experimental Compose/Swarm/multi-host networking guide
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
Upstream-commit: a5f6407c5b9a609ada36180c247279a8e6c6e763
Component: engine
2015-06-22 08:33:20 -07:00
058521db69
Adding container to secondary network to support port mapping
...
With publish-service and default-network support, a container could be
connected to a user-defined network that is backed by any driver/plugin.
But if the user uses port mapping or expose commands, the expectation
for that container is to behave like existing bridge network.
Thanks to the Libnetwork's CNM model, containers can be connected
to the bridge network as a secondary network in addition to the
user-specified network.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 739996c1d78976f7435c7274300b3e8f2e598b17
Component: engine
2015-06-22 04:15:57 -07:00
ef111c5452
Reworked ReleaseNetwork to make use of libnetwork's new LeaveAll API
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 1e59169509449e2e9e4c7cd6aec7e29c1673123f
Component: engine
2015-06-22 04:15:57 -07:00
aa388c828f
Removed the default "bridge" in builder
...
Now that the default network mode is "default" and this mode is chosen
even if the mode is empty string, it is not correct to have builder
still pointing to "bridge" as default (though this is daemon default).
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 53b0f686f7ee338819e568413fd9daf9c3811d68
Component: engine
2015-06-22 04:15:56 -07:00
4a5258148d
Vendoring in libnetwork for native multihost networking
...
- brings in vxlan based native multihost networking
- added a daemon flag required by libkv for dist kv operations
- moved the daemon flags to experimental
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 508065a7adc84e5e63f47b00c379dad6a79d3c5e
Component: engine
2015-06-22 04:15:41 -07:00
8939422a27
Display when a container is in --net=host in docker ps
...
Display */tcp, */udp when a container is in --net=host in docker ps
Signed-off-by: Sujith Haridasan <sujith.h@gmail.com >
Upstream-commit: 8a9ed097469ad64a3ed593a77505f605f284cfb6
Component: engine
2015-06-22 11:44:33 +05:30
42eb9b230f
Commenting out the release-notes for 1.6
...
Original text
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: efef353a297078a6036e071980e344e1534449e9
Component: engine
2015-06-21 20:41:43 -07:00
05447c46c6
Merge pull request #14062 from runcom/cleanup-dead-code
...
Remove dead code
Upstream-commit: c782be0e2a5c45bc31e1f3351e62679a4af3175a
Component: engine
2015-06-21 16:01:19 -07:00
0f1ff3d688
Merge pull request #14074 from sdurrheimer/master
...
Update the zsh completion
Upstream-commit: 4548d3fb776835bf39402d946c4d90836124d5e1
Component: engine
2015-06-21 15:43:09 -07:00
22bde0c0c1
Merge pull request #12099 from moysesb/12078-binary_remote_context
...
Handle binary remote contexts when creating builder jobs.
Upstream-commit: 7491f9a9c11ad3fd3b587fa6f7e53b297b3b88c7
Component: engine
2015-06-21 13:59:26 -07:00
c59f116283
Update the zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b2cc6f1b478f05c21ecd0c52ac6435480e53f472
Component: engine
2015-06-21 17:33:07 +02:00
3f04cb0ed2
Merge pull request #14051 from mavenugo/services
...
experimental services ui
Upstream-commit: fef0e84b2df31ba12fa46984e3564f9daa6f576d
Component: engine
2015-06-20 18:24:37 -07:00
36a670da43
Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2
...
fix #11094 - Allow 'docker import' to load from local files
Upstream-commit: 67f9bbcbd4d741e22e61b21a411cd904dcd4329c
Component: engine
2015-06-20 12:17:58 -07:00
f2307d3d6b
Initial Services docs
...
Signed-off-by: Dave Tucker <dt@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 4736b17315fdf9091e0d0a2f3ab9151227e0625a
Component: engine
2015-06-20 11:04:25 -07:00
cb3c5d7cf6
Support for --publish-service flag in docker run
...
This commit makes use of the CNM model supported by LibNetwork and
provides an ability to let a container to publish a specified service.
Behind the scenes, if a service with the given name doesnt exist, it is
automatically created on appropriate network and attach the container.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 1ac350a0ecfe9d28c82d6dff6a763a378ff9c472
Component: engine
2015-06-20 11:03:38 -07:00
35e8f92672
Remove dead code
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 927d13bc3c2030bb0e0429dbc500f13d72e7ccf6
Component: engine
2015-06-20 19:14:15 +02:00
c383ca49eb
Merge pull request #14054 from konstruktoid/issue_14045
...
rpm name and location
Upstream-commit: a93a5ee50a72c7a8bec60c362e98fb3af74d800c
Component: engine
2015-06-20 07:14:22 -07:00
8b52aa6697
work on #11094 allow import from local file
...
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net >
Upstream-commit: 3f64b76d4c66127466ce5b2ee0e8827eea7440b3
Component: engine
2015-06-20 09:04:43 +02:00
a48d868c8f
Merge pull request #14052 from Microsoft/10662-fixcgroupcheck
...
Windows: Fix cgroup regression
Upstream-commit: c3997daeb5db24fb1bd131d00cf3e7b87c2fe512
Component: engine
2015-06-19 21:17:39 -04:00
3ed8856a88
Merge pull request #13997 from runcom/drop-old-client
...
Error out if client API version is too old
Upstream-commit: e5ded9c378f4efdece8ed6e8d166198124956459
Component: engine
2015-06-19 17:05:39 -07:00
