0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18036 commits 14 branches 412 tags 338 MiB
Commit graph

18036 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jessie Frazelle
616950b030 Merge pull request #15687 from coolljt0725/add_blk_dev_throttling_to_check_config 
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
 2015-08-21 13:48:28 -07:00
Stefan J. Wernli
a456f20b44 Windows: Graphdriver should reject create of layer w/o parent 
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
 2015-08-21 13:23:04 -07:00
Jessie Frazelle
e6be51a0f9 Merge pull request #15758 from jfrazelle/EOL-fedora-20 
fedora 20 is EOL remove from rpm builder
 2015-08-21 13:15:58 -07:00
moxiegirl
1425b185db Merge pull request #15746 from Microsoft/libcontainer-spec-location 
Updated spec location for libcontainer
 2015-08-21 11:15:28 -07:00
Jessica Frazelle
c48ac77840 update hack/dind for 1.8 mounting of cgroups 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-21 11:13:33 -07:00
Jessica Frazelle
ee1304a35e fedora 20 is EOL remove from rpm builder 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-21 11:01:18 -07:00
Tonis Tiigi
0c08913d52 Remove nil contexts 
Causes daemon panic because loggers can’t be found.

Fixes #15724

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-08-21 10:31:27 -07:00
Shijiang Wei
fcf9daad91 fix a panic when the exec fails to start 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-08-22 00:01:44 +08:00
Brian Goff
eb7b2ed6bb Merge pull request #15748 from coolljt0725/fix_daemon_start_with_old_running_container 
Fix docker daemon start with old running container which use thirdparty volume plugin
 2015-08-21 11:07:02 -04:00
Brian Goff
85bef48bf5 Merge pull request #15754 from mountkin/fix-return 
modify a return value in graph/tags.go to increase readability
 2015-08-21 10:55:50 -04:00
Brian Goff
10c97a310a Merge pull request #15751 from nf/bcw 
Use a slice instead of a map of io.WriteClosers in broadcastwriter
 2015-08-21 10:51:07 -04:00
Shijiang Wei
f11b7acc73 modify a return value in graph/tags.go to increase readability 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-08-21 21:36:30 +08:00
Andrew Gerrand
31cbf76d0c Use a slice instead of a map of io.WriteClosers in broadcastwriter 
Maps rely on the keys being comparable.
Using an interface type as the map key is dangerous,
because some interface types are not comparable.
I talked about this in my "Stupid Gopher Tricks" talk:
	https://talks.golang.org/2015/tricks.slide

In this case, if the user-provided writer is backed by a slice
(such as io.MultiWriter) then the code will panic at run time.

Signed-off-by: Andrew Gerrand <adg@golang.org>
 2015-08-21 14:08:04 +01:00
Sebastiaan van Stijn
5ceff3f191 Merge pull request #15718 from ZJU-SEL/rm-volume-action 
specify `docker run --rm` action when it comes to volume
 2015-08-21 08:50:18 +02:00
Tonis Tiigi
2d1158790d Make graph.Register take in io.Reader 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-08-20 20:37:11 -07:00
Lei Jitang
c8a46cb0b2 Fix docker daemon start with old running container which user volume plugin. Fixes #15720 
Signed-off-by: Lei Jitang <leijitang@huawei>
 2015-08-21 11:29:53 +08:00
John Howard
011b4ca256 Updated spec location for libcontainer 
Signed-off-by: John Howard <John.Howard@microsoft.com>
 2015-08-20 20:04:04 -07:00
John Howard
faf9e34067 Update readme 
Signed-off-by: John Howard <John.Howard@microsoft.com>
 2015-08-20 19:55:32 -07:00
John Howard
98f60aef13 Add Microsoft Azure 
Signed-off-by: John Howard <john.howard@microsoft.com>
 2015-08-20 18:35:21 -07:00
He Simei
76a559ccb2 specify the docker run --rm action 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-08-21 08:52:06 +08:00
David Calavera
d760947b2e Merge pull request #15716 from calavera/release_checklist_docs 
Corrections in the release checklist.
 2015-08-20 22:29:42 +01:00
Sebastiaan van Stijn
9ed5cf08a3 Merge pull request #15732 from moxiegirl/15731-fixes 
Examples index has broken links
 2015-08-20 22:56:45 +02:00
Mary Anthony
15c24db9a5 Examples index has broken links 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-20 13:40:03 -07:00
Sebastiaan van Stijn
ec43113662 Merge pull request #15697 from sallyom/man-commit-fix 
fix format man-commit
 2015-08-20 21:33:46 +02:00
Sebastiaan van Stijn
ba9496ae48 Merge pull request #15688 from Evalle/15564-fix-windows-doc 
Fix a windows doc issue
 2015-08-20 20:39:16 +02:00
evalle
3c61ede074 Fix a windows doc issue 
Signed-off-by: evalle <shmarnev@gmail.com>
 2015-08-20 14:14:48 +02:00
Sven Dowideit
272a3eef94 Merge pull request #15696 from sallyom/man-history-fixup 
add -H to SYNOPSIS man-history
 2015-08-20 22:11:50 +10:00
Brian Goff
44465098cb Merge pull request #15661 from coolljt0725/fix_docker_stats_show_read_blkio 
Fix docker stats show blkio when there are multiple block device
 2015-08-20 07:53:38 -04:00
David Calavera
1d0ee18d6b Corrections in the release checklist. 
- Add a note about creating the release in GitHub.
- Fix docs release process.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-08-20 11:52:56 +01:00
David Calavera
d959739125 Merge pull request #15715 from aanand/fix-compose-1.2-changelog-link 
Fix Compose 1.2 changelog link
 2015-08-20 11:42:14 +01:00
Doug Davis
90ebc3b455 Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver 
daemon/graphdriver fix lint errors/warnings
 2015-08-20 03:25:00 -07:00
Aanand Prasad
23d3e4bb03 Fix Compose 1.2 changelog link 
Hardcode the release tag, so that:

- it goes straight to the changes for 1.2, not whatever the current
  version is

- it still works now that we've renamed CHANGES.md to CHANGELOG.md

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-20 11:09:10 +01:00
Clinton Kitson
6b8129d1fe added check for bind on create to determine local volume driver 
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com>
 2015-08-20 01:40:04 -07:00
Lei Jitang
211449a1ca Fix docker stats show blkio when there are multiple block devices. 
Signed-off-by: Lei Jiang <leijitang@huawei.com>
 2015-08-20 11:46:21 +08:00
Ma Shimiao
a6ed990593 daemon/state: separate part of SetRestarting to setRestarting 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-08-20 11:14:28 +08:00
Brian Goff
8acd006fd9 Merge pull request #15707 from icaroseara/fix_typo 
Fix typo, "fil" -> "fill"
 2015-08-19 21:25:43 -04:00
Icaro Seara
997ba4b0da Fix typo, "fil" -> "fill" 
Signed-off-by: Icaro Seara <icaro.seara@gmail.com>
 2015-08-19 21:50:54 -03:00
Sebastiaan van Stijn
41ca7c0f13 Merge pull request #15675 from thaJeztah/carry-14625 
[Carry #14625] run.md: --expose does NOT override Dockerfile EXPOSE
 2015-08-20 00:49:16 +02:00
Sebastiaan van Stijn
35cbcc2fc1 Add gists provided by Mary 
This adds the example gists, provided by Mary Anthony,
also fixes a link to the old /terms/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-08-20 00:30:39 +02:00
Spencer Brown
6dd84ba2ab run.md: --expose does NOT override Dockerfile EXPOSE 
run.md states that the operator can override all defaults set in the Dockerfile, and explicitly says that `--expose` overrides the `EXPOSE` instruction. Neither of these are true. An `EXPOSE` instruction cannot be overridden, `--expose` can only add additional exposed ports.

This change fixes the instructions, and also takes the liberty of crisping up the grammar and phrasing in a place or two.

Signed-off-by: Spencer Brown <spencer@spencerbrown.org>
 2015-08-19 23:57:35 +02:00
moxiegirl
286afb9a77 Merge pull request #15682 from MHBauer/cliorder 
add weight to daemon page so it renders in order
 2015-08-19 14:24:51 -07:00
Morgan Bauer
2a84157352
add weight to daemon page so it renders in order 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-08-19 10:26:19 -07:00
Sebastiaan van Stijn
f848f34da2 Merge pull request #15694 from liubin/fixtypo 
add missing instruction
 2015-08-19 19:05:41 +02:00
Brian Goff
7f46dc03d5 Merge pull request #15684 from ibuildthecloud/dont-sync 
Don't globally lock on driver initialization
 2015-08-19 12:48:14 -04:00
Mrunal Patel
457aeaa2e1 Modify test to include /dev/shm sharing 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-08-19 12:36:57 -04:00
Mrunal Patel
d88fe447df Add support for sharing /dev/shm/ and /dev/mqueue between containers 
This changeset creates /dev/shm and /dev/mqueue mounts for each container under
/var/lib/containers/<id>/ and bind mounts them into the container. When --ipc:container<id/name>
is used, then the /dev/shm and /dev/mqueue of the ipc container are used instead of creating
new ones for the container.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-08-19 12:36:52 -04:00
Doug Davis
ca79576585 Merge pull request #15664 from skatsuta/fix-parse-null 
builder: avoid parsing null- string to nil slice (issue #15634)
 2015-08-19 09:06:20 -07:00
Qiang Huang
b6f1b4ad35 Add support for kernel memory limit 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-19 23:56:55 +08:00
Qiang Huang
87959dbfac Add CheckKernelVersion so we can check any specific version 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-19 23:49:52 +08:00
Sebastiaan van Stijn
7ec7173b76 Merge pull request #15482 from hqhq/hq_fix_run_doc 
Add format description in run doc
 2015-08-19 17:13:00 +02:00