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
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
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
5efe5e37f1
Merge pull request #14085 from moxiegirl/1.7-release-notes
...
Commenting out the release-notes for 1.6
Upstream-commit: abb85f822d057791afe0f5f883b267fb8bfe2691
Component: engine
2015-06-21 20:46:45 -07:00
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
8bf35a9b77
rpm name and location
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com >
Upstream-commit: a0a010e2e3977f6f9e6271d3bb9e7abed783d47a
Component: engine
2015-06-20 01:14:58 +02:00
e0f70657f2
Windows: Fix cgroup regression
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9d0ed1dea076219115a6dc34a8c7e906cacf1e1a
Component: engine
2015-06-19 15:29:47 -07:00
445190b9a2
Merge pull request #14044 from duglin/MakeDocs
...
Add back top-level "make docs"
Upstream-commit: 7313a9ae9cbb8e4a289212d500095b63add237eb
Component: engine
2015-06-19 12:42:11 -07:00
265055473c
Support downloading remote tarball contexts in builder jobs.
...
Signed-off-by: Moysés Borges <moysesb@gmail.com >
Upstream-commit: d48bface59ef28aedc692c1f7c51a7ddde94a7fe
Component: engine
2015-06-19 16:35:00 -03:00
7ee7a352dd
Merge pull request #13780 from LK4D4/use_checkv
...
Remove timer and use -check.v for tests formatting
Upstream-commit: 7ce20fad9901f862be9bb7ca3081000e87f766ec
Component: engine
2015-06-19 11:34:31 -07:00
b743fc3790
Merge pull request #13848 from estesp/tls-server-client-cipher-cleanup
...
Split client and server cipher suite list in TLS defaults
Upstream-commit: de6d2603f9e10c1b192fa23d22e4b3f54116808a
Component: engine
2015-06-19 11:08:19 -07:00
f8a5e3177d
Merge pull request #14032 from lizf-os/fix-sysinfo-regression
...
Fix sysinfo regression
Upstream-commit: 3ee67caf3b97f3df37960063c675ebadfe41adb3
Component: engine
2015-06-19 11:00:13 -07:00
d5807c20a4
Add back top-level "make docs"
...
Just to make life easier on devs so they don't need to 'cd' into
the docs dir just to test their docs edits. This doesn't do anything
more than "cd docs && make docs" so that all of the smarts are still
in the docs's Makefile and not in docker's.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 2bc0d2bf511fdea831817ab9aaff1b5aab7c86a2
Component: engine
2015-06-19 09:42:39 -07:00
c903006e39
Merge pull request #14023 from mavenugo/net_ui
...
experimental network ui
Upstream-commit: df73d5e0cda8cbcbb938b72b83c39a7222643dce
Component: engine
2015-06-19 09:26:05 -07:00
4d14f9391a
attaching services api and UI chain to docker parent
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 742db1737c26b07fb08f46ce7391586aec674dd1
Component: engine
2015-06-19 09:19:09 -07:00
46e26ed16e
Fix sysinfo regression
...
The cleanup to sysinfo package introduced a regression.
If memory cgroup isn't supported and --memory is specified when
starting a container, we should return info instead of nil in
checkCgroupMem(), otherwise we'll access a nil pointer.
Signed-off-by: Zefan Li <lizefan@huawei.com >
Upstream-commit: 439869320177f56a559ef189f5ce29f24cf99e12
Component: engine
2015-06-19 09:44:23 +08:00
3dcbe20722
Merge pull request #14031 from tianon/update-frozen-images
...
Update frozen busybox and hello-world images
Upstream-commit: b3254dab494a76f99f6e22cb54f3de571e9436c8
Component: engine
2015-06-18 18:15:45 -07:00
65d0d94a98
Update frozen busybox and hello-world images
...
These have both been updated to no longer include the empty "scratch" layer, and `hello-world` has a fix for http->https.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 4d171281bf88b07a9dc2096a86091cf5d3b11270
Component: engine
2015-06-18 17:09:57 -07:00
767f006e91
Merge pull request #14028 from jfrazelle/fix-index-generation-experimental
...
fix s3_url for release script for experimental
Upstream-commit: 1334a2fc391a0c3b4ae314e8122b1a10ea4de4a5
Component: engine
2015-06-18 15:22:26 -07:00
2323aa861a
fix s3_url for release script for experimental
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 0f0f5ecd578d5d351b63b4d1799168ba5b3eef0c
Component: engine
2015-06-18 14:54:40 -07:00
9e396973a1
Remove timer and use -check.v for tests formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 4253a1f87ee90e3827090dc380bfda2332e23ff3
Component: engine
2015-06-18 14:22:40 -07:00
5736bb1274
Merge pull request #13978 from cpuguy83/cleanup_sysinfo
...
cleanup sysinfo package
Upstream-commit: d7544217dd5acf327944398811337b6994117618
Component: engine
2015-06-18 22:27:32 +02:00
15774a14e5
Merge pull request #13218 from brahmaroutu/decoder_issue_gccgo
...
Decoder does not work properly with nested pointers using gcc
Upstream-commit: b1143f4cb097461760ccde1499069c806f8f94af
Component: engine
2015-06-18 13:22:28 -07:00
b5397731fd
Merge pull request #14016 from vizv/patch-1
...
fix the url in article "Best practices for writing Dockerfiles"
Upstream-commit: 1487350b85321cef1bc0d194b81f07428dab4b27
Component: engine
2015-06-18 13:05:26 -07:00
48c6fd9201
Merge pull request #13976 from icecrime/12934_carry
...
LXC execdriver compatibility with recent LXC versions
Upstream-commit: ebef527b39ccfeed3a179a1f8afbccd7f12c748f
Component: engine
2015-06-18 15:08:55 -04:00
