Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: docker/docker
base: v0.11.1
...
head fork: docker/docker
compare: master
This comparison is big! We’re only showing the most recent 250 commits
Commits on Aug 19, 2015
@moxiegirl moxiegirl Merge pull request #15671 from tonistiigi/fix-volume-userguide
Update volumes userguide
aacb47d
@hqhq hqhq Add format description in run doc
And only set false to --oom-kill-disable, we just need the default
value to show.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2a468ed
@skatsuta skatsuta integration-cli: add a integration test to avoid parsing null string …
…in ADD, COPY and VOLUME to nil slice

Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
d45fcc6
@skatsuta skatsuta integration-cli: modify %s to %d in formatting an int
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
5b870d7
@jfrazelle jfrazelle Merge pull request #15417 from icecrime/update_windows_registry_endpoint
Update Windows TP3 registry endpoints
3dc30d4
@ibuildthecloud ibuildthecloud Don't globally lock on driver initialization
This patch makes it such that plugin initialization is synchronized
based on the plugin name and not globally

Signed-off-by: Darren Shepherd <darren@rancher.com>
164208f
@skatsuta skatsuta integration-cli: use c.Assert(err, check.IsNil) instead of if err != nil
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
a41f431
@coolljt0725 coolljt0725 Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
Signed-off-by: Lei Jitang <leijitang@huawei.com>
cbb6953
@skatsuta skatsuta integration-cli: fix printf verbs of wrong types
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
5759b95
@hacfi hacfi Small fix in dev env docs
Signed-off-by: Philipp Wahala <philipp.wahala@gmail.com>
fbc0ea3
@liubin liubin add missing instruction
Signed-off-by: bin liu <liubin0329@gmail.com>
1988064
@lmesz lmesz deviceset.go: fixed link in warning about udex sync is not supported
Signed-off-by: Laszlo Meszaros <lacienator@gmail.com>
78676f1
@sallyom sallyom add -H to SYNOPSIS man-history
Signed-off-by: Sally O'Malley <somalley@redhat.com>
898114a
@sallyom sallyom fix format man-commit
Signed-off-by: Sally O'Malley <somalley@redhat.com>
ab9e71b
@cpuguy83 cpuguy83 Merge pull request #15683 from skatsuta/cli-exec-test-printf-int
integration-cli: modify %s to %d in formatting an int
b8c3199
@moxiegirl moxiegirl Merge pull request #15690 from hacfi/docs-status-fix
Small fix in dev env docs
4376380
@thaJeztah thaJeztah Merge pull request #12927 from lindenlab/custom-host-port-ranges
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
59e49e1
@estesp estesp Merge pull request #15695 from lmesz/deviceset_warn_fix
deviceset.go: fixed link in warning about udex sync is not supported
70c4b6e
@duglin duglin Merge pull request #15691 from skatsuta/fix-printf-wrong-type
integration-cli: fix printf verbs of wrong types
09cdd05
@thaJeztah thaJeztah Merge pull request #15482 from hqhq/hq_fix_run_doc
Add format description in run doc
7ec7173
@hqhq hqhq Add CheckKernelVersion so we can check any specific version
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
87959db
@hqhq hqhq Add support for kernel memory limit
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
b6f1b4a
@duglin duglin Merge pull request #15664 from skatsuta/fix-parse-null
builder: avoid parsing null- string to nil slice (issue #15634)
ca79576
@mrunalp mrunalp 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)
d88fe44
@mrunalp mrunalp Modify test to include /dev/shm sharing
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
457aeaa
@cpuguy83 cpuguy83 Merge pull request #15684 from ibuildthecloud/dont-sync
Don't globally lock on driver initialization
7f46dc0
@thaJeztah thaJeztah Merge pull request #15694 from liubin/fixtypo
add missing instruction
f848f34
@MHBauer MHBauer add weight to daemon page so it renders in order
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2a84157
@moxiegirl moxiegirl Merge pull request #15682 from MHBauer/cliorder
add weight to daemon page so it renders in order
286afb9
@SpencerBrown SpencerBrown 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>
6dd84ba
@thaJeztah thaJeztah 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>
35cbcc2
@thaJeztah thaJeztah Merge pull request #15675 from thaJeztah/carry-14625
[Carry #14625] run.md: --expose does NOT override Dockerfile EXPOSE
41ca7c0
Commits on Aug 20, 2015
@icaroseara icaroseara Fix typo, "fil" -> "fill"
Signed-off-by: Icaro Seara <icaro.seara@gmail.com>
997ba4b
@cpuguy83 cpuguy83 Merge pull request #15707 from icaroseara/fix_typo
Fix typo, "fil" -> "fill"
8acd006
@Mashimiao Mashimiao daemon/state: separate part of SetRestarting to setRestarting
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
a6ed990
@coolljt0725 coolljt0725 Fix docker stats show blkio when there are multiple block devices.
Signed-off-by: Lei Jiang <leijitang@huawei.com>
211449a
@clintonskitson clintonskitson added check for bind on create to determine local volume driver
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com>
6b8129d
@aanand aanand 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>
23d3e4b
@duglin duglin Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver
daemon/graphdriver fix lint errors/warnings
90ebc3b
@calavera calavera Merge pull request #15715 from aanand/fix-compose-1.2-changelog-link
Fix Compose 1.2 changelog link
d959739
@calavera calavera 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>
1d0ee18
@cpuguy83 cpuguy83 Merge pull request #15661 from coolljt0725/fix_docker_stats_show_read…
…_blkio

Fix docker stats show blkio when there are multiple block device
4446509
@SvenDowideit SvenDowideit Merge pull request #15696 from sallyom/man-history-fixup
add -H to SYNOPSIS man-history
272a3ee
@Evalle Evalle Fix a windows doc issue
Signed-off-by: evalle <shmarnev@gmail.com>
3c61ede
@thaJeztah thaJeztah Merge pull request #15688 from Evalle/15564-fix-windows-doc
Fix a windows doc issue
ba9496a
@thaJeztah thaJeztah Merge pull request #15697 from sallyom/man-commit-fix
fix format man-commit
ec43113
@moxiegirl moxiegirl Examples index has broken links
Signed-off-by: Mary Anthony <mary@docker.com>
15c24db
@thaJeztah thaJeztah Merge pull request #15732 from moxiegirl/15731-fixes
Examples index has broken links
9ed5cf0
@calavera calavera Merge pull request #15716 from calavera/release_checklist_docs
Corrections in the release checklist.
d760947
Commits on Aug 21, 2015
@dalanlan dalanlan specify the docker run --rm action
Signed-off-by: He Simei <hesimei@zju.edu.cn>
76a559c
@jhowardmsft jhowardmsft Add Microsoft Azure
Signed-off-by: John Howard <john.howard@microsoft.com>
98f60ae
@jhowardmsft jhowardmsft Update readme
Signed-off-by: John Howard <John.Howard@microsoft.com>
faf9e34
@jhowardmsft jhowardmsft Updated spec location for libcontainer
Signed-off-by: John Howard <John.Howard@microsoft.com>
011b4ca
@coolljt0725 coolljt0725 Fix docker daemon start with old running container which user volume …
…plugin. Fixes #15720

Signed-off-by: Lei Jitang <leijitang@huawei>
c8a46cb
@tonistiigi tonistiigi Make graph.Register take in io.Reader
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2d11587
@thaJeztah thaJeztah Merge pull request #15718 from ZJU-SEL/rm-volume-action
specify `docker run --rm` action when it comes to volume
5ceff3f
@adg adg 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>
31cbf76
@mountkin mountkin modify a return value in graph/tags.go to increase readability
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
f11b7ac
@cpuguy83 cpuguy83 Merge pull request #15751 from nf/bcw
Use a slice instead of a map of io.WriteClosers in broadcastwriter
10c97a3
@cpuguy83 cpuguy83 Merge pull request #15754 from mountkin/fix-return
modify a return value in graph/tags.go to increase readability
85bef48
@cpuguy83 cpuguy83 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
eb7b2ed
@mountkin mountkin fix a panic when the exec fails to start
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
fcf9daa
@tonistiigi tonistiigi Remove nil contexts
Causes daemon panic because loggers can’t be found.

Fixes #15724

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
0c08913
@jfrazelle jfrazelle fedora 20 is EOL remove from rpm builder
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
ee1304a
@jfrazelle jfrazelle update hack/dind for 1.8 mounting of cgroups
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
c48ac77
@moxiegirl moxiegirl Merge pull request #15746 from Microsoft/libcontainer-spec-location
Updated spec location for libcontainer
1425b18
@jfrazelle jfrazelle Merge pull request #15758 from jfrazelle/EOL-fedora-20
fedora 20 is EOL remove from rpm builder
e6be51a
@swernli swernli Windows: Graphdriver should reject create of layer w/o parent
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
a456f20
@jfrazelle jfrazelle Merge pull request #15687 from coolljt0725/add_blk_dev_throttling_to_…
…check_config

Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
616950b
@jfrazelle jfrazelle Merge pull request #15596 from jfrazelle/hack-dind-its-been-fun
docker 1.8+ no longer needs dind
9d22c7a
@jfrazelle jfrazelle Merge pull request #15709 from Mashimiao/state-separate-part-of-SetRe…
…starting

daemon/state: separate part of SetRestarting to setRestarting
9b8cfb6
@jfrazelle jfrazelle Merge pull request #15507 from clintonskitson/patch_issue_15467
added check for bind on create to determine local volume driver
19f7bfc
@jfrazelle jfrazelle Merge pull request #15218 from calavera/gender_unbiased_names
Add more amazing women to the names generator.
008a8ff
@jfrazelle jfrazelle Merge pull request #15125 from WeiZhang555/golint-stdcopy-system
fix golint warnings/errors on pkg/system and pkg/stdcopy
ecff4ba
@jfrazelle jfrazelle Merge pull request #14006 from hqhq/hq_add_kmem_limit
Add support for kernel memory limit
9bd8a9b
@thaJeztah thaJeztah Merge pull request #15742 from Microsoft/addazure
Add Microsoft Azure
9415db7
@jfrazelle jfrazelle Merge pull request #15492 from vbatts/update-tar-split
vendor: update tar-split to v0.9.6
e5e6eaa
@jfrazelle jfrazelle Merge pull request #15366 from rvesse/sysvinit-redhat-silent-fail
Fix silent failure in RedHat sysvinit script
c5733e6
@tianon tianon Update dind "/tmp" mounting to be optional
This allows someone running the image to use `-v` to mount a non-tmpfs `/tmp` into their image if they so require/desire.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
b8bed88
@jfrazelle jfrazelle Merge pull request #15750 from mountkin/fix-exec-panic
fix a panic when the exec fails to start
fefc9a3
@jfrazelle jfrazelle Merge pull request #15708 from Microsoft/sjw/graphdriver_missing_parent
Windows: Graphdriver should reject create of layer w/o parent
90801ab
Commits on Aug 22, 2015
@cpuguy83 cpuguy83 Merge pull request #15412 from vdemeester/dont-sleep-too-much
time.Sleep in integration tests — comment and waitRun/waitInspect
5929502
@coolljt0725 coolljt0725 Docs: remove networkdriver from README.md in daemon
Signed-off-by: Lei Jitang <leijitang@huawei.com>
ce5bbed
@tianon tianon Merge pull request #15763 from tianon/dind-tmp
Update dind "/tmp" mounting to be optional
5fd15da
@hqhq hqhq Change all optional unit to [unit]
As suggested before, we should change every signal one.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
76a5fdc
@thaJeztah thaJeztah Merge pull request #15764 from coolljt0725/docs_update_readme_in_daemon
Docs: remove networkdriver from README.md in daemon
efabc8e
@charleswhchan charleswhchan Revise Windows Docker instructions
* Fix Windows 7 (not 7.1 ;p)
* Clarify virtualization technology section, add link to wiki
* Fix heading level for various ways of starting Docker container
* Clarify `default` VM
* Various minor changes

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
3faba5f
@charleswhchan charleswhchan Revise Mac Docker instructions
* Clarify `default` VM
* Various minor changes

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
9572edc
@mattrobenolt mattrobenolt opts/envfile: trim all leading whitespace in a line
Signed-off-by: Matt Robenolt <matt@ydekproductions.com>
f1988f0
@duglin duglin Add some builder getEnv tests
In particular I want to make sure that calling getEnv() when the same
var name appears more than once in the env list that we only pick up
the first one.  PR #15182 counts on this

Signed-off-by: Doug Davis <dug@us.ibm.com>
eeeae2c
Commits on Aug 23, 2015
@SvenDowideit SvenDowideit Merge pull request #15769 from charleswhchan/patch-1
Revise Windows Docker instructions
819166c
@thaJeztah thaJeztah Merge pull request #15774 from charleswhchan/patch-4
Revise Mac Docker instructions
7ead74d
@mountkin mountkin split build API tests to a separate file
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
96e37f6
@thieman thieman Use image ID if tag has been updated
Fixes #12595

Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
2167f40
Commits on Aug 24, 2015
@coolljt0725 coolljt0725 Add some missing cgroup test require and refactor the require check.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
c340ca4
@calavera calavera Merge pull request #15332 from pugnascotia/master
Make run and rmi bash completions configurable
cb00396
@calavera calavera Merge pull request #15571 from ewindisch/apparmor_denywproc
AppArmor: Deny w to /proc/* files
9bac520
@hqhq hqhq Change return value for ValidateMountMode
1. rename it from ValidateMountMode to ValidMountMode
Because it's a function simply check mount mode is valid or not.
2. remove the rw check return value
It's not supposed to be combined into this function, and we already
have a function for that check.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
c99ed5a
@agonzalezro agonzalezro Fix broken links at plugins documentation
Signed-off-by: Álex González <agonzalezro@gmail.com>
354147d
@calavera calavera Merge pull request #15787 from agonzalezro/patch-1
Fix broken links at plugins documentation
888d1d0
@hqhq hqhq Add mode check for device
This fixes two problems:
1. docker run --device /dev/sda:rw ubuntu bash doesn't work
2. --device /dev/zero:/dev/noro:ro doesn't show clear error message,
but fail when writing to cgroup file.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
4294236
@calavera calavera Allow HEAD requests to container archives via CORS.
Add HEAD to Access-Control-Allow-Methods.

Signed-off-by: David Calavera <david.calavera@gmail.com>
354a2e1
@agonzalezro agonzalezro Revert "Fix broken links at plugins documentation"
This reverts commit 354147d.

Signed-off-by: Álex González <agonzalezro@gmail.com>
62ce5b6
@cpuguy83 cpuguy83 Merge pull request #15779 from mountkin/split-build-test
split build API tests to a separate file
1ee53d4
@cpuguy83 cpuguy83 Merge pull request #15444 from coolljt0725/add_test_require_for_test_…
…blkio

Add test require for TestRunWithBlkioInvalidWeight and TestRunWithBlkio
2b174d3
@cpuguy83 cpuguy83 Merge pull request #15776 from duglin/buildEnvTest
Add some builder getEnv tests
e4147bc
@moxiegirl moxiegirl Merge pull request #15745 from Microsoft/readme
Update readme
02683df
@thaJeztah thaJeztah Merge pull request #15791 from agonzalezro/broken-links-revert
Revert "Fix broken links at plugins documentation"
32053b9
@calavera calavera Merge pull request #15767 from hqhq/hq_fix_optional_comments
Change all optional unit to [unit]
88cacbf
@thaJeztah thaJeztah Merge pull request #14564 from docteurklein/master
[experimental compose/swarm] explain how to make it work on awazon ec2.
37f58d2
@cpuguy83 cpuguy83 Merge pull request #12918 from thieman/tnt-issue-12595
Use image ID in ps if tag has been updated
e14eaba
@cpuguy83 cpuguy83 Merge pull request #15762 from mattrobenolt/trim
opts/envfile: trim all leading whitespace in a line
c0a48a6
@LK4D4 LK4D4 Make events test more deterministic in go1.5
Now scheduler makes order of events pretty random, so I added little
sleeps to make order intact. Also I renamed to test so name better
describes its nature.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
386aefb
@jfrazelle jfrazelle Merge pull request #15789 from calavera/add_cors_head_option
Allow HEAD requests to container archives via CORS.
654b555
@LK4D4 LK4D4 Merge pull request #15735 from tonistiigi/graph-register-readcloser
Make graph.Register take in io.Reader
1544c5e
@cpuguy83 cpuguy83 Merge pull request #15348 from tonistiigi/11008-always-unless-stopped…
…-restart-policy

Add always-unless-stopped restart policy
fd8b25c
@LK4D4 LK4D4 Merge pull request #15766 from hqhq/hq_fix_device
Add mode check for device
6b21e98
@LK4D4 LK4D4 Merge pull request #15389 from aidanhs/aphs-simpler-pull-codepath
Remove unnecessary function parameter, add mirror endpoint test
137df30
@tonistiigi tonistiigi Mitigate parallel pull issues
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
b779bc3
@LK4D4 LK4D4 Merge pull request #15728 from tonistiigi/parallel-pulls
Mitigate parallel pull issues
1269dd3
@misterbisson misterbisson Closes PR #14503 with this carry
- Refer to Joyent's blogs and docs rather than following from our end
- All of this information exists on Joyent's site
Updating with thaJeztah's comments

Signed-off-by: Mary Anthony <mary@docker.com>
831747d
@moxiegirl moxiegirl Merge pull request #15800 from moxiegirl/carry-14503
Closes PR #14503 with this carry
0ce3733
@jfrazelle jfrazelle Merge pull request #14868 from jeffminard-ck/rhel-init-detect-failure
Allow RHEL init script to detect daemon start pid failure
ebe27cb
@jfrazelle jfrazelle Merge pull request #15756 from tonistiigi/15724-remove-nil-contexts
Remove nil contexts
25f4f55
@jfrazelle jfrazelle Merge pull request #15393 from azurezk/exportImage-toplevel
change exportImage to top-level func
82e2dec
@Mashimiao Mashimiao fix 9939: docker does not remove btrfs subvolumes when destroying con…
…tainer

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
dea78fc
Commits on Aug 25, 2015
@cpuguy83 cpuguy83 Merge pull request #15702 from LK4D4/fix_events_tests_15
Make events test more deterministic in go1.5
562cc62
@jfrazelle jfrazelle Merge pull request #12159 from mrunalp/feature/ipc_share_dev
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
903cd2b
@stevvooe stevvooe Avoid buffering to tempfile when pushing with V2
The practice of buffering to a tempfile during a pushing contributes massively
to slow V2 push performance perception. The protocol was actually designed to
avoid precalculation, supporting cut-through data push. This means we can
assemble the layer, calculate its digest and push to the remote endpoint, all
at the same time.

This should increase performance massively on systems with slow disks or IO
bottlenecks.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
349aef0
@coolljt0725 coolljt0725 Fix docker daemon restart with paused container.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
9a9724a
@monitorjbl monitorjbl adding message option to the import subcommand
Signed-off-by: Taylor Jones <monitorjbl@gmail.com>
936b2c6
@epc epc Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
cefb720
@thaJeztah thaJeztah Merge pull request #15804 from epc/epc-2015236
Copy edits for typos
ee2c476
@calavera calavera Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit
Fix build with resource limit which system not support.
6f8c448
@calavera calavera Fix json examples in the api reference.
Signed-off-by: David Calavera <david.calavera@gmail.com>
7296c84
@brahmaroutu brahmaroutu Allow vendoring netns change to build Docker on s390x
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
eecf6cd
@LK4D4 LK4D4 Merge pull request #15818 from calavera/fix_api_json_examples
Fix json examples in the api reference.
7869885
@jhowardmsft jhowardmsft Windows: Minor doc clarification
Signed-off-by: John Howard <jhoward@microsoft.com>
759ed64
@cpuguy83 cpuguy83 Merge pull request #14978 from gesellix/websocket-disable-check-origin
skip checkOrigin during websocket handshake
e134cca
@williamh williamh Drop execute bit from openrc init script
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
1c0c68b
@williamh williamh Fix OpenRC init script
The shebang for OpenRC init scripts is now #!/sbin/openrc-run, and we
can also use the default start and stop functions built into OpenRC.

Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
e377253
@jamtur01 jamtur01 Merge pull request #15824 from Microsoft/10662-moredocs
Windows: Minor doc clarification
7dbb5fa
@yasker yasker Update plugins.md
Add Convoy to Docker plugin list.

Signed-off-by: Sheng Yang <sheng.yang@rancher.com>
5f156d8
@jfrazelle jfrazelle cleanup and fix btrfs subvolume recursion deletion
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
bd06432
@vbatts vbatts tarsum: add a big fat warning
Signed-off-by: Vincent Batts <vbatts@redhat.com>
459451d
@thaJeztah thaJeztah Merge pull request #15821 from vbatts/tarsum_warning
tarsum: add a big fat warning
bdba406
@rsmitty rsmitty Resolves link to introduction to Docker
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>
9a71dd2
@rsmitty rsmitty Updates link to the understanding-docker section
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>
90be489
Commits on Aug 26, 2015
@SvenDowideit SvenDowideit Merge pull request #15838 from rsmitty/issue-15837
Updates link to the understanding-docker section
a0f6ff7
@SvenDowideit SvenDowideit Merge pull request #15831 from yasker/master
Update plugins.md
3bc375c
@SvenDowideit SvenDowideit Merge pull request #15836 from rsmitty/issue-15835
Resolves link to introduction to Docker
8720f71
@charleswhchan charleswhchan Fix #14572: Improve explaination for usng `RUN` and `apt-get` inside …
…Dockerfil.

Based on example provided by @thaJeztah and @moxiegirl:
  #15773

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
b6621a1
@calavera calavera Revert "Modify test to include /dev/shm sharing"
This reverts commit 457aeaa.

Signed-off-by: David Calavera <david.calavera@gmail.com>
a9378a0
@calavera calavera Revert "Add support for sharing /dev/shm/ and /dev/mqueue between con…
…tainers"

This reverts commit d88fe44.

Signed-off-by: David Calavera <david.calavera@gmail.com>
688dd84
@calavera calavera Merge pull request #15711 from monitorjbl/import-commit-message
adding message option to the import subcommand
b857dad
@choleraehyq choleraehyq api/client/restart.go:Fix a typo in comment
Signed-off-by: Yingqian Hu <choleraehyq@gmail.com>
d30990d
@cpuguy83 cpuguy83 Merge pull request #13304 from coolljt0725/restart_daemon_with_paused…
…_containers

Fix restart docker daemon with paused containers
2cec06f
@calavera calavera Merge pull request #15850 from choleraehyq/15849-fixtypo
api/client/restart.go:Fix a typo in comment
7ef08f3
@jhowardmsft jhowardmsft Builder counts from 1
Signed-off-by: John Howard <jhoward@microsoft.com>
17d6c6c
@jfrazelle jfrazelle Merge pull request #15848 from calavera/revert_ipc_mounts
DO NOT MERGE: Check if these commits broke the builds.
5dadfa8
@cpuguy83 cpuguy83 Add volume API/CLI
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
b3b7eb2
@jhowardmsft jhowardmsft Windows: Fix use of IsAbs check
Signed-off-by: John Howard <jhoward@microsoft.com>
f11ba31
@thaJeztah thaJeztah Merge pull request #14242 from cpuguy83/add_volume_api
Add volume api
fa13f7c
@LK4D4 LK4D4 Merge pull request #15865 from Microsoft/10662-isabs
Windows: Fix use of IsAbs check
47cdae2
@MHBauer MHBauer reweight api doc for v1.21 to correct the order.
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
31a52a3
@moxiegirl moxiegirl Merge pull request #15843 from MHBauer/version-order
reweight api doc for v1.21 to correct the order.
ea65c38
@LK4D4 LK4D4 Merge pull request #15493 from stevvooe/no-buffer-on-push
Avoid buffering to tempfile when pushing with V2
70a814c
@LK4D4 LK4D4 Merge pull request #15826 from Microsoft/start-from-one
Builder counts from 1
7a74422
@vdemeester vdemeester Add 'ancestor' ps filter for image
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
c1af0ac
@LK4D4 LK4D4 Merge pull request #15801 from jfrazelle/btrfs-rm-subvolume-recursion
remove btrfs subvolumes when destroying containers (recursive)
459c2c6
@moxiegirl moxiegirl Merge pull request #15773 from charleswhchan/patch-3
Fix #14572: Improve explaination for using `RUN` command inside Docke…
5e8038d
@mikebrow mikebrow improvement to documentation
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
5caccd2
@thaJeztah thaJeztah Merge pull request #15760 from mikebrow/9235-improve-documentation
Improvement to userguide/dockerrepos/ documentation
44ea7e9
Commits on Aug 27, 2015
@dharmit dharmit Added note about process interaction with container in detached mode
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>

Added note about process interaction with container in detached mode

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
9f8891a
@vdemeester vdemeester Update filtering chapters on ps/images references
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
61de442
@calavera calavera Merge pull request #15878 from brahmaroutu/vendor_netns
Allow vendoring netns changes to build Docker on s390x
4579d5a
@tombee tombee Updated to use correct cgroup paths
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
b582977
@sevki sevki Opts lint issues, ip and ulimit
Signed-off-by: Sevki Hasirci <s@sevki.org>
6eb03c5
@sevki sevki golint: trust
contributes to #14756

Signed-off-by: Sevki Hasirci <s@sevki.org>
5572148
@cpuguy83 cpuguy83 Fix `docker volume invalid` so it displays usage
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
38da431
@vdemeester vdemeester Finish linting opts and trust package.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
0bd016b
@calavera calavera Merge pull request #15646 from tonistiigi/15589-pull-cancellation
Fix pull on client disconnect
0634c65
@moxiegirl moxiegirl Merge pull request #15822 from vdemeester/docs-update-filtering-ps-an…
…d-images

Update filtering chapters on ps/images references
04b0fb6
Sam Abed Show pull progress in terminal for inflight pull requests
Based on #12874 from Sam Abed <sam.abed@gmail.com>. His original commit
was brought up to date by manually porting the changes in pull.go into
the new code in pull_v1.go and pull_v2.go.

Fixes #8385

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
572f008
@aaronlehmann aaronlehmann Change poolAdd to return a boolean instead of an error
Previously, its other return value was used even when it returned an
error. This is awkward and goes against the convention. It also could
have resulted in a nil pointer dereference when an error was returned
because of an unknown pool type. This changes the unknown pool type
error to a panic (since the pool types are hardcoded at call sites and
must always be "push" or "pull"), and returns a "found" boolean instead
of an error.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
80513d8
@tonistiigi tonistiigi Use DockerSuite for PullClientDisconnect test
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
9dd6c88
@LK4D4 LK4D4 Merge pull request #15893 from tonistiigi/fix-testsuite
Use DockerSuite for PullClientDisconnect test
0ca2c3a
@cpuguy83 cpuguy83 Merge pull request #15882 from vdemeester/14756-lint-opts-trust
Carry #14813 on linting package opts and trust
ba019dc
@aaronlehmann aaronlehmann Clean up ProgressStatus
- Rename to Broadcaster

- Document exported types

- Change Wait function to just wait. Writing a message to the writer and
  adding the writer to the observers list are now handled by separate
  function calls.

- Avoid importing logrus (the condition where it was used should never
  happen, anyway).

- Make writes non-blocking

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
26c9b58
@aaronlehmann aaronlehmann Remove "...already being pulled" messages
These don't get seen, so they are unnecessary.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
9b9d70a
@thaJeztah thaJeztah Merge pull request #15778 from dharmit/13595-update-docs-process-inte…
…raction-container

Added note about process interaction with container in detached mode
fdc73cc
@lyndaoleary lyndaoleary Style updates to find an issue page
* Fixed exp/beginner label colour background
* Added thead element to label table
* Updated issue list screenshot (old one referenced old whitebelt label)
* Content tweaks as per style guide

Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com>
6f22cc9
@jhowardmsft jhowardmsft Windows: Revendor HCSShim with godoc
Signed-off-by: John Howard <John.Howard@microsoft.com>
5a5f9e9
Commits on Aug 28, 2015
@MHBauer MHBauer golint fixes for daemon/ package
 - some method names were changed to have a 'Locking' suffix, as the
 downcased versions already existed, and the existing functions simply
 had locks around the already downcased version.
 - deleting unused functions
 - package comment
 - magic numbers replaced by golang constants
 - comments all over

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
abd72d4
@SvenDowideit SvenDowideit Exploring the code using unit tests - these 2 functions do not work c…
…onsistently

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
e48a222
@Triara Triara Increased test coverage of httputils to 70 %
Signed-off-by: Kristina Zabunova <triara.xiii@gmail.com>
(cherry picked from commit d718174)
b3f999e
@Triara Triara unit test refactor in pkg/httputils as suggested by vdemeester; using…
… pattern if x := …; x == nil {}

Signed-off-by: Kristina Zabunova <triara.xiii@gmail.com>
(cherry picked from commit c3f1b2a)
f753f6d
@calavera calavera Fix server header parsing.
Signed-off-by: David Calavera <david.calavera@gmail.com>
243f98f
@LK4D4 LK4D4 Merge pull request #15023 from hqhq/hq_add_status_in_inspect
Add status string to State field for inspect
6caaa8a
@calavera calavera Merge pull request #15310 from MHBauer/demon-lint-squash
golint fixes for daemon/ package
433956c
@mimoralea mimoralea Typo fix then -> than
Signed-off-by: Miguel Morales <mimoralea@hp.com>
95e3a4c
@LK4D4 LK4D4 Merge pull request #15911 from calavera/carry_14296
[Carry 14296] Increased test coverage of pkg/httputils
2a66bee
@calavera calavera Merge pull request #15910 from mimoralea/patch-1
Typo fix then -> than
e6e2101
@LK4D4 LK4D4 Merge pull request #15902 from SvenDowideit/add-more-tests-for-parsehost
Exploring the parsehost using unit tests
50bcf17
@aaronlehmann aaronlehmann Make the broadcaster write messages to the observers in the same unit…
…s they were written to the broadcaster

This means the writing to a WriteFlusher will flush in the same places
as it would if the broadcaster wasn't sitting in front of it.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
317a546
@thaJeztah thaJeztah Merge pull request #15872 from lyndaoleary/find-an-issue-style-updates
Style updates to find an issue page
279bbbe
@thaJeztah thaJeztah Merge pull request #14570 from vdemeester/13365-ps-image-filter
Add docker ps ancestor filter for image
b1cb1b1
@jlhawn jlhawn [daemon] Refactor image_delete.go
This file was not well documented and had very high cyclomatic complexity.
This patch completely rearranges this file and the ImageDelete method to
be easier to follow and more maintainable in the future.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
111d2f3
@vdemeester vdemeester Update shell completion on docker ps for ancestor
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
672bae2
@duglin duglin More httputil tests for the docker header
follow-on to #15911

Signed-off-by: Doug Davis <dug@us.ibm.com>
5e540bd
@unclejack unclejack pkg/ioutils: lower bufReader reset timeout
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
f9df813
@srust srust Don't hold lock around volume driver for volume create.
Signed-off-by: Stephen Rust <srust@blockbridge.com>
0ef740a
@cpuguy83 cpuguy83 Merge pull request #15917 from srust/volume_create_dont_lock_around_v…
…olume_driver

Don't hold lock around volume driver for volume create.
0b2cff3
@dmcgowan dmcgowan Fix sanitize URL bug on layer upload
Update the distribution version to include sanitize URL fix

Fixes #15875

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
b1c1f42
Commits on Aug 29, 2015
@jfrazelle jfrazelle update spec file to require docker-engine-selinux policy
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
df6d928
@jfrazelle jfrazelle add build deps for selinux-policy/selinux-policy-devel
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
42d8fe6
@jfrazelle jfrazelle add selinux-policy and docker-engine-selinux rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
8fe675d
@jjn2009 jjn2009 ubuntu-14-10-x64 is not a valid image on digital ocean
Signed-off-by: Jordan Jennings <jjn2009@gmail.com>
24c4594
@icecrime icecrime Merge pull request #15832 from jfrazelle/add-docker-seliux-policy-for…
…-rpm

Add docker seliux policy for rpm
626c050
@moxiegirl moxiegirl Closes #14234 and updates text
Updating with Seb's comments
Entering Sven's comment

Signed-off-by: Mary Anthony <mary@docker.com>
2920550
@moxiegirl moxiegirl Merge pull request #15885 from tombee/7866-10463-runmetrics-doc-updates
Updated runmetrics article to use up-to-date cgroup paths
fd1b21b
@lyndaoleary lyndaoleary Removed deprecated -d flag from docs
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com>
55468e2
@thaJeztah thaJeztah Merge pull request #15925 from moxiegirl/carry-14234
Closes #14234 and updates text
bace515
Commits on Aug 30, 2015
@thaJeztah thaJeztah Merge pull request #15929 from jjn2009/patch-1
ubuntu-14-10-x64 is not a valid image on digital ocean
ad91d2e
@jamtur01 jamtur01 Merge pull request #15932 from lyndaoleary/15909-daemon-flag
Removed deprecated -d flag from docs
e137f2d
@coolljt0725 coolljt0725 Minor fix: remove redundant tag name in error message of create failed.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
16220e0
Commits on Aug 31, 2015
@calavera calavera Merge pull request #15914 from dmcgowan/fix-upload-sanitize
Fix sanitize URL bug on layer upload
9703c3a
@calavera calavera Merge pull request #15919 from vdemeester/14570-contrib-completion
Update shell completion on docker ps for ancestor
d6a94fb
@calavera calavera Merge pull request #15901 from Microsoft/10662-revendorhcs
Windows: Revendor HCSShim with godoc
9986993
@calavera calavera Merge pull request #15873 from cpuguy83/no_args_for_volume_subcmd
Fix `docker volume invalidarg` so it displays usage
754d81b
@shishir-a412ed shishir-a412ed Warning message for lvm devmapper running on top of loopback devices
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
4870fb3
@thaJeztah thaJeztah Merge pull request #13266 from shishir-a412ed/docker_lvm_devmapper_lo…
…opbackdevices

Warning message for lvm devmapper running on top of loopback devices
81d6f35
@jfrazelle jfrazelle we dont need the tty in the install script
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
80c3216
@mikebrow mikebrow Adding additional instructions to the Docker Engine installation/inde…
…x page per discussions with @moxiegirl.

Removed the "Other Linux" heading; Changed the "Next Steps" heading to "Where to go After Installing"

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
e9eaef6
@cpuguy83 cpuguy83 Merge pull request #15807 from coolljt0725/remove_remove_redundant_ta…
…g_name

Minor fix: remove redundant tag name in error message of create failed.
754c104
@jfrazelle jfrazelle Merge pull request #15954 from jfrazelle/no-t-install-script
we dont need the tty in the install script
3272b3d
@LK4D4 LK4D4 Merge pull request #15918 from duglin/HttpHeaderTests
More httputil tests for the docker header
4ae81e1
@calavera calavera Merge pull request #15606 from jlhawn/img_delete
[daemon] Refactor image_delete.go
9697417
@lzlarryli lzlarryli add: best practice for security when sharing host directories.
Closes and carries PR #15210
Updating with Seb's comment

Signed-off-by: Mary Anthony <mary@docker.com>
b0fd4f8
@moxiegirl moxiegirl Merge pull request #15920 from mikebrow/docker-engine-update-to-index
Adding additional instructions to the Docker Engine installation/inde…
38ac1f9
@icecrime icecrime Merge pull request #15489 from aaronlehmann/pull-updates
Show pull progress in terminal for inflight pull requests
84614fd
@calavera calavera Merge pull request #15922 from unclejack/lower_reset_timeout_bufreader
pkg/ioutils: lower bufReader reset timeout
3bd8016
@moxiegirl moxiegirl Updating with SEb's comments
Signed-off-by: Mary Anthony <mary@docker.com>
95495d2
@moxiegirl moxiegirl updating again.
Signed-off-by: Mary Anthony <mary@docker.com>
7271dca
@thaJeztah thaJeztah Merge pull request #15926 from moxiegirl/carry-15210
add: best practice for security when sharing host directories.
c844eff
@calavera calavera Merge pull request #15827 from williamh/fix-openrc-script
Fix openrc script
166412e
@jhowardmsft jhowardmsft Move TestPort out of _unix
Signed-off-by: John Howard <jhoward@microsoft.com>
68c7d24
@jhowardmsft jhowardmsft Fix typo in test title
Signed-off-by: John Howard <jhoward@microsoft.com>
3c2b128
@duglin duglin Merge pull request #15966 from Microsoft/test-typo
Fix typo in test title
0f878cf
Commits on Sep 01, 2015
@LK4D4 LK4D4 Merge pull request #15963 from Microsoft/fix-unixtestport
Move TestPort out of _unix
84bc41a