74be85500a
Merge pull request #12812 from sharidas/8373-display-docker-ps-host
...
Display when a container is in --net=host in docker ps
2015-06-22 14:06:07 -07:00
a7116c5e2b
Merge pull request #14101 from aanand/compose-swarm-networking-guide
...
Add experimental Compose/Swarm/multi-host networking guide
2015-06-22 09:47:33 -07:00
f39b9a0b0f
Merge pull request #14071 from mavenugo/mhnet
...
Vendoring libnetwork 83743db8ceb2bdbfa0960d9a54ed2f98df4ea846
2015-06-22 08:35:18 -07:00
a5f6407c5b
Add experimental Compose/Swarm/multi-host networking guide
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-22 08:33:20 -07:00
739996c1d7
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>
2015-06-22 04:15:57 -07:00
1e59169509
Reworked ReleaseNetwork to make use of libnetwork's new LeaveAll API
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-22 04:15:57 -07:00
53b0f686f7
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>
2015-06-22 04:15:56 -07:00
508065a7ad
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>
2015-06-22 04:15:41 -07:00
8a9ed09746
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>
2015-06-22 11:44:33 +05:30
abb85f822d
Merge pull request #14085 from moxiegirl/1.7-release-notes
...
Commenting out the release-notes for 1.6
2015-06-21 20:46:45 -07:00
efef353a29
Commenting out the release-notes for 1.6
...
Original text
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-21 20:41:43 -07:00
c782be0e2a
Merge pull request #14062 from runcom/cleanup-dead-code
...
Remove dead code
2015-06-21 16:01:19 -07:00
4548d3fb77
Merge pull request #14074 from sdurrheimer/master
...
Update the zsh completion
2015-06-21 15:43:09 -07:00
7491f9a9c1
Merge pull request #12099 from moysesb/12078-binary_remote_context
...
Handle binary remote contexts when creating builder jobs.
2015-06-21 13:59:26 -07:00
b2cc6f1b47
Update the zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-06-21 17:33:07 +02:00
fef0e84b2d
Merge pull request #14051 from mavenugo/services
...
experimental services ui
2015-06-20 18:24:37 -07:00
67f9bbcbd4
Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2
...
fix #11094 - Allow 'docker import' to load from local files
2015-06-20 12:17:58 -07:00
4736b17315
Initial Services docs
...
Signed-off-by: Dave Tucker <dt@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-20 11:04:25 -07:00
1ac350a0ec
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>
2015-06-20 11:03:38 -07:00
927d13bc3c
Remove dead code
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-06-20 19:14:15 +02:00
a93a5ee50a
Merge pull request #14054 from konstruktoid/issue_14045
...
rpm name and location
2015-06-20 07:14:22 -07:00
3f64b76d4c
work on #11094 allow import from local file
...
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
2015-06-20 09:04:43 +02:00
c3997daeb5
Merge pull request #14052 from Microsoft/10662-fixcgroupcheck
...
Windows: Fix cgroup regression
2015-06-19 21:17:39 -04:00
e5ded9c378
Merge pull request #13997 from runcom/drop-old-client
...
Error out if client API version is too old
2015-06-19 17:05:39 -07:00
a0a010e2e3
rpm name and location
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2015-06-20 01:14:58 +02:00
9d0ed1dea0
Windows: Fix cgroup regression
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-06-19 15:29:47 -07:00
7313a9ae9c
Merge pull request #14044 from duglin/MakeDocs
...
Add back top-level "make docs"
2015-06-19 12:42:11 -07:00
d48bface59
Support downloading remote tarball contexts in builder jobs.
...
Signed-off-by: Moysés Borges <moysesb@gmail.com>
2015-06-19 16:35:00 -03:00
7ce20fad99
Merge pull request #13780 from LK4D4/use_checkv
...
Remove timer and use -check.v for tests formatting
2015-06-19 11:34:31 -07:00
de6d2603f9
Merge pull request #13848 from estesp/tls-server-client-cipher-cleanup
...
Split client and server cipher suite list in TLS defaults
2015-06-19 11:08:19 -07:00
3ee67caf3b
Merge pull request #14032 from lizf-os/fix-sysinfo-regression
...
Fix sysinfo regression
2015-06-19 11:00:13 -07:00
2bc0d2bf51
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>
2015-06-19 09:42:39 -07:00
df73d5e0cd
Merge pull request #14023 from mavenugo/net_ui
...
experimental network ui
2015-06-19 09:26:05 -07:00
742db1737c
attaching services api and UI chain to docker parent
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-19 09:19:09 -07:00
4398693201
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>
2015-06-19 09:44:23 +08:00
b3254dab49
Merge pull request #14031 from tianon/update-frozen-images
...
Update frozen busybox and hello-world images
2015-06-18 18:15:45 -07:00
4d171281bf
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>
2015-06-18 17:09:57 -07:00
1334a2fc39
Merge pull request #14028 from jfrazelle/fix-index-generation-experimental
...
fix s3_url for release script for experimental
2015-06-18 15:22:26 -07:00
0f0f5ecd57
fix s3_url for release script for experimental
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-18 14:54:40 -07:00
4253a1f87e
Remove timer and use -check.v for tests formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-18 14:22:40 -07:00
d7544217dd
Merge pull request #13978 from cpuguy83/cleanup_sysinfo
...
cleanup sysinfo package
2015-06-18 22:27:32 +02:00
b1143f4cb0
Merge pull request #13218 from brahmaroutu/decoder_issue_gccgo
...
Decoder does not work properly with nested pointers using gcc
2015-06-18 13:22:28 -07:00
1487350b85
Merge pull request #14016 from vizv/patch-1
...
fix the url in article "Best practices for writing Dockerfiles"
2015-06-18 13:05:26 -07:00
ebef527b39
Merge pull request #13976 from icecrime/12934_carry
...
LXC execdriver compatibility with recent LXC versions
2015-06-18 15:08:55 -04:00
cca990c67a
Network UI / API docs
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-18 12:07:58 -07:00
da5a3e6dee
register libnetwork API and UI with docker parent chain
...
This commit also brings in the ability to specify a default network and its
corresponding driver as daemon flags. This helps in existing clients to
make use of newer networking features provided by libnetwork.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-18 12:07:58 -07:00
8ea1b54065
Merge pull request #14019 from jfrazelle/bump-version
...
Bump version
2015-06-18 11:25:19 -07:00
53f5f5b7f4
bump version to 1.8.0-dev
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-18 10:47:53 -07:00
2e0e038fb2
Bump version to v1.7.0
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
(cherry picked from commit 0baf60984522744eed290348f33f396c046b2f3a)
2015-06-18 10:47:25 -07:00
3dd134ceca
Fix the url in comparison of "COPY" and "RUN curl"
...
From context on next line,`tar -xJC` implies
the file is `big.tar.xz` instead of `big.tar.gz`.
Signed-off-by: Wenxuan Zhao <viz@linux.com>
2015-06-18 12:33:46 -04:00
David Calavera
moxiegirl
Aanand Prasad
Madhu Venugopal
Sujith Haridasan
Alexander Morozov
Arnaud Porterie
Brian Goff
Steve Durrheimer
Sebastiaan van Stijn
Dave Tucker
Antonio Murdaca
Jessie Frazelle
Gildas Cuisinier
Thomas Sjögren
John Howard
Moysés Borges
Doug Davis
Zefan Li
Tianon Gravi
Jessica Frazelle
Alexander Morozov
Antonio Murdaca
James Turnbull
Wenxuan Zhao