docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-14 04:50:52 +03:00
Code Activity
47,845 Commits 124 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent Batts
8861d65e97 pkg/devicemapper: external device activation 
Reported-by: Sheng Yang <shend.yang@rancher.com>
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-06-22 20:28:15 -04: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
Marius Gundersen
2e7399a52b spelling 
Signed-off-by: Marius Gundersen <me@mariusgundersen.net>
 2015-06-22 20:04:06 +02:00
Tim Wraight
182d2668a1 Clarify .dockerignore example for Markdown files 
The current documentation correctly states that dockerignore pattern
searches are non-recursive. However, the example given for Markdown
files seems to contradict this by saying that `*.md` will exclude *all*
Markdown files. This commit clarifies the situation by explicitly
specifying that `*.md` will only exclude files in the root directory of
the project.

Signed-off-by: Tim Wraight <tim.wraight@tangentlabs.co.uk>
 2015-06-22 17:53:05 +01: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
Aanand Prasad
104568b27b Merge branch 'compose-swarm-networking-guide' 2015-06-22 08:44:52 -07:00
Aanand Prasad
52975eca6f Fixes 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-22 08:44:41 -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
Aanand Prasad
cd47829f3d Merge pull request #1588 from aanand/bump-1.3.1 
Bump 1.3.1
 2015-06-22 08:01:13 -07:00
Aanand Prasad
4647875408 Merge pull request #1589 from aanand/compose-swarm-networking-guide 
Add experimental Compose/Swarm/multi-host networking guide
 2015-06-22 07:59:17 -07:00
Aanand Prasad
16213dd493 Add experimental Compose/Swarm/multi-host networking guide 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-22 07:58:08 -07:00
VinayRaghavanKS
1a28fb7583 Added entries for aryabhata, bhaskara, brahmagupta, mahavira, panini and varahamihira - ancient Indian mathematicians 
Signed-off-by: VinayRaghavanKS <raghavan.vinay@gmail.com>
 2015-06-22 19:50:07 +05:30
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
moxiegirl
03ea9b2b4f Merge pull request #986 from moxiegirl/1.7-release-notes 
Comment out the old release notes
 2015-06-21 20:42:54 -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
Fred Lifton
01e9a72498 Adds new Hub 2 integration 
Revises the DTR acquisition and install process for Hub 2 integration.

Signed-off-by: Fred Lifton <fred.lifton@docker.com>

Conflicts:
	docs/adminguide.md
	docs/index.md
	docs/install.md
 2015-06-21 18:18:21 -07:00
Diogo Mónica
29497f473d Merge pull request #18 from docker/delete 
adding delete to server
 2015-06-21 20:42:16 -04:00
Aanand Prasad
4d4ef4e0b3 Bump 1.3.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-21 17:32:36 -07:00
Aanand Prasad
882ef2ccd8 Merge pull request #1578 from aanand/fix-migrate-help 
Fix 'docker-compose help migrate-to-labels'
(cherry picked from commit c8751980f9)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-21 17:28:18 -07:00
Aanand Prasad
d6cd76c3c1 Merge pull request #1570 from aanand/fix-build-pull 
Explicitly set pull=False when building
(cherry picked from commit 4f83a18912)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-21 17:28:09 -07:00
Ben Firshman
bd0be2cdc7 Merge pull request #1580 from aanand/dont-set-network-mode-when-none-is-specified 
Don't set network mode when none is specified
(cherry picked from commit 911cd60360)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-21 17:27:59 -07:00
Aanand Prasad
c8751980f9 Merge pull request #1578 from aanand/fix-migrate-help 
Fix 'docker-compose help migrate-to-labels'
 2015-06-21 17:25:52 -07:00
Aanand Prasad
4f83a18912 Merge pull request #1570 from aanand/fix-build-pull 
Explicitly set pull=False when building
 2015-06-21 17:25:46 -07:00
Mary Anthony
b2ddf537a3 Comment out the old releas notes 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-21 16:49:45 -07:00
David Lawrence
0f1e8b0134 adding delete to server 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-06-21 16:37:30 -07:00
David Lawrence
913e2669c9 Merge pull request #16 from docker/mccauley/notary-readme 
Initial cut of notary client README
 2015-06-21 16:19:44 -07:00
Nathan McCauley
ccfa3f44fd Initial cut of notary client README 
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
 2015-06-21 16:18:39 -07:00
David Lawrence
b0ee6f0c4e putting the same warning at the top of all the readmes. 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-06-21 16:13:16 -07:00
David Lawrence
779d3b687e refactoring verify and switching os.Stderr to use logrus which is set to output on stderr 2015-06-21 16:07:29 -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
David Lawrence
5efc8c0549 Merge pull request #12 from docker/filestore-refactor 
Major refactor the the FileStore
 2015-06-21 15:45:24 -07:00
Arnaud Porterie
4548d3fb77 Merge pull request #14074 from sdurrheimer/master 
Update the zsh completion
 2015-06-21 15:43:09 -07:00
Diogo Monica
2e96f13ded Addressing all Comments; Renaming ID to CertID 2015-06-21 18:23:43 -04:00
Diogo Monica
ac881bb381 Making ListGUN and List DRY 2015-06-21 18:07:52 -04:00
David Lawrence
d7955d6b7a adding a little more to notary server readme 2015-06-21 14:54:27 -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