Commit Graph

21131 Commits

Author SHA1 Message Date
unclejack 64e8fa9199 CONTRIBUTING: add guidelines regarding email
This adds guidelines around reaching the maintainers. Emails shouldn't
be sent to maintainers. GitHub mentions should be used instead.

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-01-08 16:49:17 +02:00
Vincent Demeester 3a8d694e01 Merge pull request #19180 from coolljt0725/fix_flaky_test
Fix flaky testTestStatsAllNewContainersAdded
2016-01-08 13:10:27 +01:00
Antonio Murdaca 018081d5a9 Merge pull request #19058 from dnephin/move_opts_to_runconfig_opts
Move some opts validators to runconfig/opts where they are used
2016-01-08 12:34:49 +01:00
Antonio Murdaca f4f848b7a5 Merge pull request #19131 from cpuguy83/fix_plugin_error_handling
Don't error out on plugin err with json
2016-01-08 12:22:45 +01:00
Antonio Murdaca 9e9d7dc884 Merge pull request #19179 from estesp/btrfs-userns-perms
Fix btrfs subvolume snapshot dir perms for user namespaces
2016-01-08 12:13:49 +01:00
Lei Jitang 71d6e71cff Fix flaky test TestStatsAllNewContainersAdded
Wait the new created container for running and then check if it
is in the docker stats to avoid flaky test.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-08 17:02:08 +08:00
Phil Estes 72e65e8793 Fix btrfs subvolume snapshot dir perms for user namespaces
Make sure btrfs mounted subvolumes are owned properly when a remapped
root exists (user namespaces are enabled, for example)

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-01-07 23:05:28 -05:00
Jess Frazelle 611d5e4eeb Merge pull request #19173 from calavera/vendor_engine_api_0_1_2
Vendor engine-api 0.1.3
2016-01-07 19:19:19 -08:00
David Calavera e73ab750ed Make sure docker api client implements engine-api client.
- Use the master interface in the new repo.
- Use new structures for container create, update and network connect.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-07 21:02:19 -05:00
David Calavera 1feeecf6e5 Vendor engine-api 0.1.3.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-07 21:02:19 -05:00
moxiegirl 6213cc9d04 Merge pull request #19165 from shishir-a412ed/man_page_fix
man page fix: remove -e/--exec-drive=native related description
2016-01-07 16:47:07 -08:00
moxiegirl b12ef0fe00 Merge pull request #18378 from tonistiigi/content-addressability-storage-docs
Update storage docs for content-addressability
2016-01-07 16:44:29 -08:00
Jess Frazelle d76640d78a Merge pull request #19145 from vdemeester/vendor-my-precious
Add a validate-vendor script
2016-01-07 13:53:01 -08:00
Shishir Mahajan 50305d66f5 man page fix: remove -e/--exec-drive=native related description
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-01-07 14:21:01 -05:00
Doug Davis ff3b551d2d Merge pull request #18768 from hqhq/hq_remove_dup_error
Remove redundant error messages
2016-01-07 14:13:50 -05:00
Arnaud Porterie cceac7da35 Merge pull request #19059 from jfrazelle/seccomp-docs
add syscalls we purposely block to docs
2016-01-07 11:13:07 -08:00
Vincent Demeester 4c22c566e2 Add a validate-vendor script
Makes sure that if ./hack/vendor.sh has been updated, it has been used
to update the vendor folder.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-07 19:57:50 +01:00
Jess Frazelle 938d28e772 Merge pull request #19144 from LK4D4/fix_parent_systemd
Choose default-cgroup parent by cgroup driver
2016-01-07 10:24:51 -08:00
Jessica Frazelle 52f32818df
add syscalls we purposely block to docs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-07 10:22:16 -08:00
moxiegirl 374a9596b2 Merge pull request #19156 from HackToday/19152-fix-voldoc
Remove the old reference link
2016-01-07 09:21:58 -08:00
Alexander Morozov c1cd45d547 Choose default-cgroup parent by cgroup driver
It's "/docker" for cgroupfs and "system.slice" for systemd.

Fix #19140

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-07 08:56:26 -08:00
Tibor Vass 131e2bf12b Merge pull request #19068 from calavera/vendor_engine_api
Introduce the new engine-api library.
2016-01-07 11:14:37 -05:00
Sebastiaan van Stijn 6aefa898cb Merge pull request #19160 from thaJeztah/carry-19020-groupadd-docs
(carry 19020) add documentation for groupadd for remote api
2016-01-07 12:41:08 +01:00
Oliver Neal ade71ace7d added documentation for groupadd within hostConfig that was added in remote api 1.20
Signed-off-by: Oliver Neal <ItsVeryWindy@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-07 12:30:27 +01:00
Kai Qiang Wu(Kennan) ca7b69016a Remove the old reference link
Fixes: #19152

As issue #14214 closed, so this old link is not needed.
We can remove it now.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-07 10:23:36 +00:00
Sebastiaan van Stijn 3442339b98 Merge pull request #19090 from thaJeztah/fix-api-markdown
fix markdown and typos in API docs
2016-01-07 08:32:01 +01:00
moxiegirl af6c6dbf87 Merge pull request #19115 from cpuguy83/volume_plugin_docs_change.md
Add docs for volume plugin ls/get
2016-01-06 20:04:09 -08:00
moxiegirl dd2981c26d Merge pull request #19127 from thaJeztah/use-the-f-luke
Add -f flag to cURL install instructions
2016-01-06 20:02:53 -08:00
David Calavera c7d811c816 Remove types and lib packages from the engine.
They live in github.com/docker/engine-api now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-06 19:49:00 -05:00
David Calavera 907407d0b2 Modify import paths to point to the new engine-api package.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-06 19:48:59 -05:00
David Calavera 9927e712c0 Vendor engine-api project.
Use latest tag for both, engine-api and go-connections.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-06 19:46:06 -05:00
Tibor Vass 7fab93175d Merge pull request #19099 from calavera/replace_docker_only_trust_enabled
Do not perform build context switch when content trust is not enabled.
2016-01-06 18:09:30 -05:00
David Calavera 4ee3048fa8 Merge pull request #19110 from brahmaroutu/update_openc
update runc to the latest code base to fix gccgo builds
2016-01-06 15:09:11 -08:00
Alexander Morozov d2b8160513 Merge pull request #19141 from duglin/FixVendor
Update src with latest vendor.sh stuff
2016-01-06 14:45:58 -08:00
Doug Davis 18fdbdb07b Merge pull request #19143 from duglin/AddMorgan
Add Morgan Bauer to docker/docker/MAINTAINERS
2016-01-06 16:44:29 -05:00
Doug Davis 1698d49abc Update src with latest vendor.sh stuff
I **think** someone forgot to run vendor.sh after it was updated so
this just syncs things up.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-01-06 13:26:49 -08:00
Antonio Murdaca 60e577c3b9 Merge pull request #19142 from thaJeztah/update-runcom-email
Update antonio's e-mail address
2016-01-06 22:21:56 +01:00
Doug Davis af0117cc8f Add Morgan Bauer to docker/docker/MAINTAINERS
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-01-06 13:19:04 -08:00
Sebastiaan van Stijn bdce7dd5c8 Update antonio's e-mail address
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-06 22:18:47 +01:00
David Calavera f2036d1108 Merge pull request #19039 from duglin/Issue19012
Add default PATH to 'scratch' images
2016-01-06 11:19:39 -08:00
Arnaud Porterie 837de95717 Merge pull request #16704 from manchoz/16695_manchoz_archarm
Add support for Arch Linux ARM base images generation (#16695).
2016-01-06 11:16:40 -08:00
Jess Frazelle 7104f58ac2 Merge pull request #19136 from albers/completion-update
bash completion for `docker update`
2016-01-06 10:36:15 -08:00
Harald Albers 97f84b5dc1 bash completion for `docker update`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-06 10:20:33 -08:00
Doug Davis d3ea7e80e8 Add default PATH to 'scratch' images
Closes #19012

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-01-06 09:50:35 -08:00
Tõnis Tiigi fe550a1f17 Merge pull request #19093 from estesp/userns-root-rework
Allow root non-userns metadata backwards compatibility
2016-01-06 09:48:37 -08:00
Brian Goff 5d1dd8069b Add docs for volume plugin ls/get
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-06 12:42:44 -05:00
Tõnis Tiigi 8420366e7c Merge pull request #19132 from icecrime/maintainer_add_tonis
Add Tõnis Tiigi to MAINTAINERS
2016-01-06 09:34:38 -08:00
David Calavera 4b1872f1ef Merge pull request #18979 from jfrazelle/make-whitelist
Change seccomp blacklist to a whitelist
2016-01-06 09:15:25 -08:00
Arnaud Porterie 178806d2b8 Add Tõnis Tiigi to MAINTAINERS
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-01-06 08:51:52 -08:00
Brian Goff 279dd092b6 Don't error out on plugin err with json
We don't want to error out when there is a json unmarshal error since
the `old way` will cause this to error.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-06 11:34:14 -05:00