Commit Graph

23228 Commits

Author SHA1 Message Date
David Calavera 3df99b7fd2 Merge pull request #21295 from rhvgoyal/fix-variable-assignment
Fix the assignment to wrong variable
2016-03-17 10:39:15 -07:00
David Calavera cb9aeb0413 Consolidate security options to use `=` as separator.
All other options we have use `=` as separator, labels,
log configurations, graph configurations and so on.
We should be consistent and use `=` for the security
options too.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-17 13:34:42 -04:00
Michael Crosby 2b9ceea896 Merge pull request #21293 from cpuguy83/wtf_gcp
Do not call out to Google on init
2016-03-17 10:32:21 -07:00
David Calavera b4da157846 Merge pull request #21286 from rhatdan/seccomp-man
Fix documentation on --security-opt seccomp
2016-03-17 10:29:33 -07:00
Arnaud Porterie 9d62c11ab5 Merge pull request #21276 from nerdalert/mcvlan-v6-ci
Remove v6 IT test for experimental macvlan driver
2016-03-17 09:50:02 -07:00
allencloud 73046cb8d8 handle kernel version error in version api
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-18 00:31:50 +08:00
Alexander Morozov 04c7d94c71 Merge pull request #21273 from jfrazelle/remove-dead-code
remove dead code
2016-03-17 09:16:02 -07:00
Arnaud Porterie 441907e2cd Add @programmerq to docker/docker curators
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-03-17 09:08:19 -07:00
Vincent Demeester 8d742bbe2f Merge pull request #21294 from samoht/fix-typo
Fix typo in the triaging guidelines
2016-03-17 16:46:19 +01:00
David Calavera 553ffa7fd7 Merge pull request #21279 from WeiZhang555/typo
Fix typo
2016-03-17 08:20:26 -07:00
Vivek Goyal 4141a00921 Fix the assignment to wrong variable
We should be assigning value to minFreeMetadata instead of minFreeData. This
is copy/paste error.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2016-03-17 15:19:08 +00:00
Thomas Gazagnaire 2d2d1bb2c6 Fix a typo in the triaging guidelines
Spotted by @dgageot

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2016-03-17 15:09:13 +00:00
Thomas Gazagnaire f906ca52ea Remove trailing whitespaces
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2016-03-17 15:07:23 +00:00
Brian Goff 24710fd3e2 Do not call out to Google on init
The GCP logging driver is calling out to GCP cloud service on package
init.
This is regardless if you are using GCP logging or not.

This change makes this happen on the first invocation of a new GCP
logging driver instance instead.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-17 11:06:21 -04:00
Antonio Murdaca ae1002219b pkg: truncindex: provide more info in error
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-17 15:53:12 +01:00
Brent Salisbury 6d43dc99e5 Remove v6 IT test for experimental macvlan driver
-Temporary until we find the source of CI/v6 issue with driver

Signed-off-by: Brent Salisbury <brent@docker.com>
2016-03-17 08:57:52 -04:00
Vincent Demeester cf9d0c8ae2 Merge pull request #21257 from yongtang/21247-TestRunAttachFailedNoLeak
Fix flaky test TestRunAttachFailedNoLeak in #21247.
2016-03-17 13:47:40 +01:00
Dan Walsh 450fa7536e Fix documentation on --security-opt seccomp
Missing documentation and man pages on seccomp options.
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-03-17 08:04:02 -04:00
Antonio Murdaca 8bbe3de4b3 Merge pull request #21262 from justincormack/newsyscalls
Add new syscalls in libseccomp 2.3.0 to seccomp default profile
2016-03-17 09:37:36 +01:00
Zhang Wei ca64269165 Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-03-17 16:13:51 +08:00
Andrew Guenther 3b6ffc8022 Ensure --hostname is valid
Validates whether the given hostname is RFC 1123
(https://tools.ietf.org/html/rfc1123) compliant.

Fixes #20371

Signed-off-by: Andrew Guenther <guenther.andrew.j@gmail.com>
2016-03-17 00:23:23 -07:00
Arnaud Porterie 9c20d920a6 Merge pull request #21275 from tonistiigi/fix-vendor-vagrantfile
Remove vagrantfiles from vendor
2016-03-16 20:55:28 -07:00
Tonis Tiigi 46da04388f Remove vagrant files from vendor
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-16 20:30:47 -07:00
Yong Tang 1a9f5f4c69 Fix flaky test TestRunAttachFailedNoLeak in #21247.
The issue of the flaky test is because when the second container
starts, the first container in the detached mode may have only
been created and not yet entering the running state. So the
port 8000 might be used by the second container first.

This fix added a check to make sure the first container is already
in running state, before the second container is invoked.

This fix fixes #21247.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-03-17 03:14:59 +00:00
David Calavera b1e9a5eaf1 Merge pull request #21258 from runcom/res.body.leaks
*: fix response body leaks
2016-03-16 19:20:10 -07:00
Jessica Frazelle 8dd88afb5b
remove dead code
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-03-16 19:15:14 -07:00
David Calavera 93e02efa90 Remove dockerfile dependency from the API.
Move context parsing to the backend.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-16 22:06:29 -04:00
Tõnis Tiigi 4227119588 Merge pull request #21261 from aboch/vnd
Vendoring libnetwork v0.7.0-dev.8
2016-03-16 18:56:49 -07:00
Sebastiaan van Stijn f3acca2fc8 Merge pull request #20962 from lyndaoleary/docs-engine-edits
Edited content in the Hello World section
2016-03-16 23:48:59 +00:00
Phil Estes c18e7f3a04 Change subordinate range-owning user to be a system user
Change user/group creation to use flags to adduser/useradd to enforce it
being a system user. Use system user defaults that auto-create a
matching group. These changes allow us to remove all group creation
code, and in doing so we also removed the code that finds available uid,
gid integers and use post-creation query to gather the system-generated
uid and gid.

The only added complexity is that today distros don't auto-create
subordinate ID ranges for a new ID if it is a system ID, so we now need
to handle finding a free range and then calling the `usermod` tool to
add the ranges for that ID. Note that this requires the distro supports
the `-v` and `-w` flags on `usermod` for subordinate ID range additions.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-03-16 18:44:10 -04:00
Justin Cormack 96896f2d0b Add new syscalls in libseccomp 2.3.0 to seccomp default profile
This adds the following new syscalls that are supported in libseccomp 2.3.0,
including calls added up to kernel 4.5-rc4:
mlock2 - same as mlock but with a flag
copy_file_range - copy file contents, like splice but with reflink support.

The following are not added, and mentioned in docs:
userfaultfd - userspace page fault handling, mainly designed for process migration

The following are not added, only apply to less common architectures:
switch_endian
membarrier
breakpoint
set_tls
I plan to review the other architectures, some of which can now have seccomp
enabled in the build as they are now supported.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-16 21:17:32 +00:00
Alexander Morozov 581fc536a6 Merge pull request #21219 from vdemeester/update-engine-api
Update engine api to use net/context.Context all accross the client API
2016-03-16 14:10:59 -07:00
Alessandro Boch 6223291965 Vendoring libnetwork v0.7.0-dev.8
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-16 13:45:34 -07:00
David Calavera f2b1b44de8 Merge pull request #21212 from runcom/wip-token-service-tests
distribution: errors: do not access the errors slice if it's empty
2016-03-16 13:44:18 -07:00
Vincent Demeester 8567286ed6 Update api/client file to use context
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-03-16 20:25:09 +01:00
Vincent Demeester 48339017db Vendor engine-api to fba5dc8
It plumbs net/context.Context through entire API, see docker/engine-api#140

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-03-16 20:25:09 +01:00
Vincent Demeester 02476b23a7 Clean Vagrantfile from vendoring
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-03-16 20:25:04 +01:00
David Calavera f81754811f Merge pull request #21112 from allencloud/validate-configs-from-file
add validating configs from configuration file
2016-03-16 10:42:25 -07:00
Riyaz Faizullabhoy f7fa83c910 Improve messaging and binary generation for pkcs11
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-16 09:43:06 -07:00
Antonio Murdaca f0d83c4cdb *: fix response body leaks
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-16 17:15:42 +01:00
Phil Estes 45b2a57d1c Merge pull request #21242 from cyphar/fix-userns-permissions
daemon: use 0711 for /var/lib/docker
2016-03-16 08:49:17 -07:00
David Calavera eff27d2b77 Merge pull request #21217 from LK4D4/cleanup_gitignore
gitignore: cleanup some not needed entries
2016-03-16 08:24:31 -07:00
David Calavera 3221c7a3c6 Merge pull request #21235 from Microsoft/jstarks/add_npipe_close_write
Windows: fix various npipe bugs
2016-03-16 08:23:39 -07:00
David Calavera 72e39d58b7 Merge pull request #21256 from albers/completion-gelf-compression
bash completion for gelf-compression log driver settings
2016-03-16 08:22:29 -07:00
Harald Albers 854ceaaa9e bash completion for gelf-compression log driver settings
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-16 15:58:58 +01:00
Vincent Demeester 5f8a0ceeda Merge pull request #21250 from runcom/comment-fix
registry: endpoint_v1: fix outdated comment
2016-03-16 14:35:14 +01:00
Vincent Demeester bd97e4f95a Merge pull request #21203 from HackToday/fixfilter
Add check about filter name for containers
2016-03-16 14:30:04 +01:00
Antonio Murdaca 137c8601a8 registry: endpoint_v1: fix outdated comment
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-16 12:53:11 +01:00
Aleksa Sarai e91ca0e239 daemon: use 0711 for /var/lib/docker
This fixes problems encountered when running with a remapped root (the
syscalls related to the metadata directory will fail under user
namespaces). Using 0711 rather than 0701 (which solved the problem
previously) fixes the issue.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-03-16 19:24:03 +11:00
Antonio Murdaca 1b5c2e1d72 distribution: errors: do not access the errors slice if it's empty
- cherry-pick from 1.10.3 branch: 0186f4d4223a094a050d06f456355da3ae431468
- add token service test suite
- add integration test (missing in 1.10.3 branch)

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-16 09:00:39 +01:00