centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-04 10:18:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
20,092 Commits 56 Branches 28 Tags
692bfdaee3b48f4e5174bb80098692a0ded1aecf
Commit Graph

20092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TAGOMORI Satoshi
361a582ba0 Add new logging driver: fluentd 
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
 2015-06-26 11:03:11 +09:00
Tibor Vass
dd408891ba Merge pull request #14139 from jlhawn/fix_build_with_auth 
[api, builder] Fix build auth config
 2015-06-25 17:39:36 -07:00
moxiegirl
2e078b24b8 Merge pull request #14187 from Microsoft/docs-version 
Fix docs for #14047
 2015-06-25 16:07:27 -07:00
Vivek Goyal
67473c6d06 overlay: Export metadata for container and image in docker-inspect 
Export metadata for container and image in docker-inspect when overlay
graphdriver is in use. Right now it is done only for devicemapper graph
driver.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
 2015-06-25 17:33:20 -04:00
John Howard
857e0ba32e Fix docs for #14047 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-25 13:39:12 -07:00
moxiegirl
50a1d0f0ef Merge pull request #14142 from fl0yd/patch-1 
Update plugins_volume.md
 2015-06-25 13:17:02 -07:00
moxiegirl
be33d13f67 Merge pull request #14183 from ChanderG/master 
Fix minor typo in CONTRIBUTING.md
 2015-06-25 13:16:04 -07:00
moxiegirl
de9c5473f7 Merge pull request #14178 from csarrazi/patch-1 
[Easy-Pick] [Documentation] Fix broken links for Fedora
 2015-06-25 13:15:26 -07:00
moxiegirl
15d8e7bc6b Merge pull request #14161 from laijs/man_pages 
man: convert `docker/docs/man` to `docker/man`
 2015-06-25 13:12:46 -07:00
moxiegirl
8c8e8d624f Merge pull request #14156 from HuKeping/master 
Docs: fix wrong example of API Exec
 2015-06-25 13:09:36 -07:00
moxiegirl
7201127cfb Merge pull request #14189 from moxiegirl/carry-14079 
Splitting out the cli command into parts.
 2015-06-25 12:05:56 -07:00
Mary Anthony
561bfb268d Splitting out the cli command into parts. 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-25 12:02:41 -07:00
Alexander Morozov
c281549610 Merge pull request #14030 from estesp/init-memory-swappiness 
Initialize swappiness in libcontainer cgroups template
 2015-06-25 11:36:54 -07:00
Phil Estes
e8b87cfce1 Merge pull request #13907 from chenchun/exitcode 
Set exit code of old running container as 137
 2015-06-25 10:57:48 -07:00
moxiegirl
81d6f60935 Merge pull request #14182 from moxiegirl/fix-logging 
Breaking logging driver material out of run
 2015-06-25 10:28:36 -07:00
Alexander Morozov
e0cfe36b8e Merge pull request #14163 from mrjana/cnm_integ 
Fix endpoint leave failure for --net=host mode
 2015-06-25 10:17:03 -07:00
Damien Nozay
e9ac7d24a7 Update utils.go 
make error message when running commands while daemon is down more user-friendly.

```
docker@54.175.201.239 ~: sudo service docker stop
docker stop/waiting
docker@54.175.201.239 ~: docker images
Get http:///var/run/docker.sock/v1.19/images/json: dial unix /var/run/docker.sock: no such file or directory. Are you trying to connect to a TLS-enabled daemon without TLS?
```

Signed-off-by: Damien Nozay <damien.nozay@gmail.com>
 2015-06-25 10:15:52 -07:00
Chun Chen
b0b2f979c7 Set exit code of old running container as 137 
Signed-off-by: Chun Chen <chenchun.feed@gmail.com>
 2015-06-25 22:30:09 +08:00
ChanderG
e594a2fb54 Fix minor typo in CONTRIBUTING.md 
Signed-off-by: ChanderG <chandergovind@gmail.com>
 2015-06-25 18:23:38 +05:30
Mary Anthony
31dd97f4ad 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>
 2015-06-25 05:00:49 -07:00
Charles Sarrazin
62213219dc Fix broken fedora documentation 
The documentation is currently broken for the fedora page. This PR fixes missing the markup.

Signed-off-by: Charles Sarrazin <charles@sarraz.in>
 2015-06-25 10:16:46 +02:00
moxiegirl
4ab8b88286 Merge pull request #13973 from calavera/fix_zfs_options_doc_location 
Move zfs options doc to the storage section.
 2015-06-24 15:52:13 -07:00
Jana Radhakrishnan
9bb69f9726 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>
 2015-06-24 12:33:52 -07:00
Hu Keping
221fa4c3d1 Docs: fix wrong example of API Exec 
The last "," should not shown up, otherwise you will get the error
back as below:
- invalid character '}' looking for beginning of object key string.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-06-25 02:03:27 +08:00
Sebastiaan van Stijn
afd4d544cf Merge pull request #14119 from moxiegirl/fix-heading-blanks 
Fix heading blanks
 2015-06-24 08:35:42 -07:00
Lai Jiangshan
85e2957409 man: convert docker/docs/man to docker/man 
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
 2015-06-24 23:31:12 +08: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
Eric Sage
4466d00534 Typo 
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
 2015-06-23 19:41:55 -07:00
fl0yd
0835b20ace Update plugins_volume.md 
Signed-off-by: Mark Oates <fl0yd@me.com>
 2015-06-23 15:30:36 -07:00
Josh Hawn
02c7bbefb8 [api, builder] Fix build auth config 
With the 1.7 release, we introduced a change to how we store registry
credentials, but the build API endpoint did not expect a change in the format
of that file. This patch fixes this problem so that you can again pull private
images during `docker build`.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-06-23 12:58:17 -07: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
Lai Jiangshan
f23698bb14 docs: fix file's permissions 
The README.md and the *.png should not have the executable
permissions, remove them.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
 2015-06-24 00:09:27 +08: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
root
41f69883d2 tempDir (in the root dir), must be created after the root dir. 
Signed-off-by: mikael.davranche <mikael.davranche@corp.ovh.net>
 2015-06-23 14:53:18 +02: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
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