centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-30 07:48:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
16,344 Commits 54 Branches 28 Tags
afd4d544cfabce9d2d8890e2c4a4e6f2f0a00a46
Commit Graph

16344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
afd4d544cf Merge pull request #14119 from moxiegirl/fix-heading-blanks 
Fix heading blanks
 2015-06-24 08:35:42 -07:00
unclejack
0a9c580fad Merge pull request #14153 from feixueliantian1/typo 
Fix Typo in stdcopy.go
 2015-06-24 16:11:20 +03:00
yuchengxia
16be453e0f Fix Typo in stdcopy.go 
Signed-off-by: Yu Chengxia <yuchengxia@huawei.com>
 2015-06-24 15:00:14 +08:00
Alexander Morozov
4dd1d1bfa5 Merge pull request #13810 from d23/syslog-facility 
Add syslog-facility option
 2015-06-23 12:05:15 -07:00
Alexander Morozov
d5721f0385 Merge pull request #13833 from Microsoft/10662-dockerbuild 
Windows: Start docker build working
 2015-06-23 11:46:56 -07:00
David Calavera
aa4f495cae Merge pull request #13966 from mountkin/fix-stats-goroutine-leak 
fix the goroutine leak in the stats API if the container is not running
 2015-06-23 10:06:35 -07:00
Vincent Batts
5c93c265f6 Merge pull request #14047 from Microsoft/10662-versionadd 
Add build time to version and tidy output
 2015-06-23 09:57:31 -07:00
Alexander Morozov
9b5875eb9d Merge pull request #14114 from HuKeping/master 
Remove useless conversion
 2015-06-23 08:10:34 -07:00
Hu Keping
250ce20fee Remove useless conversion 
It is already type float.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-06-24 00:47:08 +08:00
Mary Anthony
960cbd2c8d Fixes #14117 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-23 05:17:20 -07:00
Mary Anthony
e81861ea54 Closes #14055 for anchal 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-23 05:14:53 -07:00
Dennis Docter
609e7b0a55 Add --log-opt to specify facility for syslog driver 
Signed-off-by: Dennis Docter <dennis@d23.nl>
 2015-06-23 14:04:25 +02:00
Shijiang Wei
1cbf5a54da fix the goroutine leak in the stats API if the container is not running 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-06-23 19:38:15 +08:00
Antonio Murdaca
cb6ca19b53 Merge pull request #14110 from webwurst/patch-2 
Typo
 2015-06-23 12:34:16 +02:00
moxiegirl
51264fa63c Merge pull request #14111 from bfirsh/update-compose-swarm-docs 
Fix compose/swarm/network docs
 2015-06-22 17:23:57 -07:00
Ben Firshman
fe1f210c42 Update documentation for compose/swarm/network 
Thanks to @aanand for help debugging

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-06-22 16:45:22 -07:00
Tobias Bradtke
1797f03760 Typo 
Signed-off-by: Tobias Bradtke <webwurst@gmail.com>
 2015-06-23 00:52:16 +02:00
David Calavera
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
John Howard
87eae0d659 Add branch and build time to version 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-22 13:00:27 -07:00
Ben Firshman
e02947b236 Add link to compose/swarm/network to readme 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-06-22 11:38:46 -07:00
moxiegirl
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
David Calavera
f39b9a0b0f Merge pull request #14071 from mavenugo/mhnet 
Vendoring libnetwork 83743db8ceb2bdbfa0960d9a54ed2f98df4ea846
 2015-06-22 08:35:18 -07:00
Aanand Prasad
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
Madhu Venugopal
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
Madhu Venugopal
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
Madhu Venugopal
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
Madhu Venugopal
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
Sujith Haridasan
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
moxiegirl
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
Mary Anthony
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
Alexander Morozov
c782be0e2a Merge pull request #14062 from runcom/cleanup-dead-code 
Remove dead code
 2015-06-21 16:01:19 -07:00
Arnaud Porterie
4548d3fb77 Merge pull request #14074 from sdurrheimer/master 
Update the zsh completion
 2015-06-21 15:43:09 -07:00
Brian Goff
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
Steve Durrheimer
b2cc6f1b47 Update the zsh completion 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-06-21 17:33:07 +02:00
Arnaud Porterie
fef0e84b2d Merge pull request #14051 from mavenugo/services 
experimental services ui
 2015-06-20 18:24:37 -07:00
Sebastiaan van Stijn
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
Dave Tucker
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
Madhu Venugopal
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
Antonio Murdaca
927d13bc3c Remove dead code 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-06-20 19:14:15 +02:00
Jessie Frazelle
a93a5ee50a Merge pull request #14054 from konstruktoid/issue_14045 
rpm name and location
 2015-06-20 07:14:22 -07:00
Gildas Cuisinier
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
Brian Goff
c3997daeb5 Merge pull request #14052 from Microsoft/10662-fixcgroupcheck 
Windows: Fix cgroup regression
 2015-06-19 21:17:39 -04:00
Alexander Morozov
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
Thomas Sjögren
a0a010e2e3 rpm name and location 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-06-20 01:14:58 +02:00
John Howard
9d0ed1dea0 Windows: Fix cgroup regression 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-19 15:29:47 -07:00
David Calavera
7313a9ae9c Merge pull request #14044 from duglin/MakeDocs 
Add back top-level "make docs"
 2015-06-19 12:42:11 -07:00
Moysés Borges
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
David Calavera
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
David Calavera
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
Alexander Morozov
3ee67caf3b Merge pull request #14032 from lizf-os/fix-sysinfo-regression 
Fix sysinfo regression
 2015-06-19 11:00:13 -07:00