Commit Graph
24311 Commits
Author SHA1 Message Date
Hao Shu Wei f4d78f4d50 Fixing security.md
Signed-off-by: Hao Shu Wei <haoshuwei1989@163.com>
Upstream-commit: 73d96a6b17b1fb8af71dc68d78e50f88b89f4167
Component: engine
2016-05-12 16:52:03 +08:00
Vincent Demeester e20fdf0d4f Merge pull request #22622 from tkopczynski/20784-builder-intg2unit-tests
Reimplement some builder integration tests as unit tests
Upstream-commit: 84a6818b11e6bf74d13222d0df2fe7d1ae811bb6
Component: engine
2016-05-12 10:29:39 +02:00
cyli f15ebde7e0 Bump notary version up to 0.3.0 and re-vendor.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 6094be63ac3d29c23024daa2152719b653c78092
Component: engine
2016-05-11 22:57:51 -07:00
Yi EungJun da9495f14d docs: Remove RequestStatusCode
The requests doesn't include RequestStatusCode field.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: aed525384a8c1db1b3b9960ead49586836536785
Component: engine
2016-05-12 14:27:22 +09:00
Sven Dowideit 7c39596909 Merge pull request #22672 from kevinmeredith/correct_trapped_signals
Correct docs for a docker container's clean-up.
Upstream-commit: c273163e80da5f5895db1dc1102a470ec45e0a69
Component: engine
2016-05-12 14:15:39 +10:00
Yong Tang be88ed49c5 Docker pull/push with max concurrency limits.
This fix tries to address issues raised in #20936 and #22443
where `docker pull` or `docker push` fails because of the
concurrent connection failing.
Currently, the number of maximum concurrent connections is
controlled by `maxDownloadConcurrency` and `maxUploadConcurrency`
which are hardcoded to 3 and 5 respectively. Therefore, in
situations where network connections don't support multiple
downloads/uploads, failures may encounter for `docker push`
or `docker pull`.

This fix tries changes `maxDownloadConcurrency` and
`maxUploadConcurrency` to adjustable by passing
`--max-concurrent-uploads` and `--max-concurrent-downloads` to
`docker daemon` command.

The documentation related to docker daemon has been updated.

Additional test case have been added to cover the changes in this fix.

This fix fixes #20936. This fix fixes #22443.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7368e41c07c21a1e2c6a49abecd1c2fc76404e49
Component: engine
2016-05-11 19:44:54 -07:00
Qiang Huang ac0ab24166 Update go-check
It includes a small improvement, we hit test timeout sometimes
for some reason, print out the timed out case would be very
helpful.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: ed868a2e119ded10cdc794e2d109210c8a6b0546
Component: engine
2016-05-12 09:19:23 +08:00
Arnaud Porterie 99e89dfbb3 Merge pull request #22455 from Anvil/bash-completion-failglob
docker bash completions fails when failglob is enabled
Upstream-commit: f7c79cdeae67cec70c5257e808cb51eb7a90d35c
Component: engine
2016-05-11 13:08:48 -10:00
Arnaud Porterie 13d28f3181 Merge pull request #22353 from Microsoft/jjh/dockercp
Windows: docker cp platform semantically consistent paths
Upstream-commit: b3a1ae02a91d93efdface95ce7ed131dc397dedd
Component: engine
2016-05-11 13:08:24 -10:00
Arnaud Porterie b47a34c25a Merge pull request #22368 from tianon/wheezy-lts
Update contrib/mkimage/debootstrap to include wheezy-lts
Upstream-commit: 78e9f2e9e74a0c25318054ed21c539acfb44e235
Component: engine
2016-05-11 12:49:26 -10:00
Arnaud Porterie fee867dae4 Merge pull request #22365 from dnephin/fix_selinux_for_dockerd
Update the binary name in docker-engine-selinux/docker.fc
Upstream-commit: bacce5ef4f77acc9450e46bc7a4ca8ad3330b134
Component: engine
2016-05-11 12:44:55 -10:00
Arnaud Porterie e4da61ff20 Merge pull request #22356 from allencloud/close-http-response-body-when-attaching
close http response body when attaching
Upstream-commit: 28452ca78346cf8824ea71be35b4773f96405b1a
Component: engine
2016-05-11 12:44:35 -10:00
Arnaud Porterie 3f6678c440 Merge pull request #22262 from kencochrane/fix_release_deb
Create the correct directory structure for apt-ftparchive
Upstream-commit: dc430944b9682b0f46806dcb7bd733d25e2b6f31
Component: engine
2016-05-11 12:38:12 -10:00
Tomasz Kopczynski af05fef951 Reimplementing builder integration tests as unit tests
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 18eeb399852b7efe9459a1d77b0a5032a6b88bba
Component: engine
2016-05-11 22:13:39 +02:00
kevinmeredith 7bad1decfe Correct docs for a docker container's clean-up.
The 'Unix Signals' (https://en.wikipedia.org/wiki/Unix_signal#Handling_signals) wiki explains that:
> 'There are two signals which cannot be intercepted and handled: SIGKILL and SIGSTOP.'

Signed-off-by: kevinmeredith <kevin.m.meredith@gmail.com>
Upstream-commit: ef7cd217663c7f6bff5f1d49461c004e86fed867
Component: engine
2016-05-11 14:58:23 -04:00
Antonio Murdaca db5abbb3ee Merge pull request #22637 from LK4D4/simplify_tcp_proxy
pkg/proxy: remove unused 'transfered' variable
Upstream-commit: 730b974c641242cedd96d5982495261aa7ba5c81
Component: engine
2016-05-11 20:56:31 +02:00
Tibor Vass 624bb38952 Merge pull request #21708 from tianon/InRelease
Also generate "InRelease" files for newer APT clients
Upstream-commit: e421668b1bdd611e49cd268341e75d9f5e8801c2
Component: engine
2016-05-11 13:21:15 -04:00
Vincent Demeester db8ad55d48 Merge pull request #22669 from thaJeztah/docs-update-seccomp-whitelist
docs: update seccomp whitelist
Upstream-commit: 4c654eeea209b9770071fe190d27976622298cdd
Component: engine
2016-05-11 18:59:53 +02:00
Sebastiaan van Stijn d537ac63ac docs: update seccomp whitelist
the 'modify_ldt' was listed as "blocked by default",
but was whitelisted in 13a9d4e8993997b2bf9be7e96a8d7978a73d0b9b

this updates the documentation to reflect this

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2cddd1cd1f3135f36f6afcc84ddfda904aeee3b5
Component: engine
2016-05-11 18:45:27 +02:00
Sebastiaan van Stijn eb47def058 Merge pull request #22666 from yongtang/05112016-update-deprecated-docs-cli-flags
Update deprecated docs for cli flags removal.
Upstream-commit: 3710f9074e7cb752def69b1b80e4af3e6ed87daf
Component: engine
2016-05-11 18:05:52 +02:00
Alexander Morozov 906e7550b5 Merge pull request #22278 from runcom/fixies-dockerd
Fixies dockerd
Upstream-commit: fd3a795a478cec71d2c9fd2178c67482f04ef029
Component: engine
2016-05-11 07:57:00 -07:00
Alexander Morozov 958502d650 Merge pull request #22642 from amitkris/uprev_gozfs
update go-zfs to include Solaris support
Upstream-commit: da74f9653dc11c28e0b70267a2882628945051e9
Component: engine
2016-05-11 07:41:17 -07:00
Brian Goff 411eec057a Wait for discovery on container start error
This gives discovery a chance to initialize, particularly if the K/V
store being used is in a container.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2dce79e05ab8f8fd22ca7b2f73121b2d7723f7cf
Component: engine
2016-05-11 09:49:51 -04:00
Yong Tang 50921875d5 Update deprecated docs for cli flags removal.
The old command line options have been deprecated in 1.8.0 and
eventually removed in 1.10.0 through PR #17724, though the
deprecated.md still shows `Target For Removal In Release`.

This fix updates the deprecated.md and changes
`Target For Removal In Release` to `Removed In Release`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0a4de93e1371a0d62ca6f3a5121368d7ecfde3fe
Component: engine
2016-05-11 06:48:07 -07:00
Antonio Murdaca 97e6cef981 contrib: init: use dockerd
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1ac1b78b3a771c562d9cfa91c14f8a494c3723c1
Component: engine
2016-05-11 11:00:11 +02:00
Justin Cormack c571f88b8d Align default seccomp profile with selected capabilities
Currently the default seccomp profile is fixed. This changes it
so that it varies depending on the Linux capabilities selected with
the --cap-add and --cap-drop options. Without this, if a user adds
privileges, eg to allow ptrace with --cap-add sys_ptrace then still
cannot actually use ptrace as it is still blocked by seccomp, so
they will probably disable seccomp or use --privileged. With this
change the syscalls that are needed for the capability are also
allowed by the seccomp profile based on the selected capabilities.

While this patch makes it easier to do things with for example
cap_sys_admin enabled, as it will now allow creating new namespaces
and use of mount, it still allows less than --cap-add cap_sys_admin
--security-opt seccomp:unconfined would have previously. It is not
recommended that users run containers with cap_sys_admin as this does
give full access to the host machine.

It also cleans up some architecture specific system calls to be
only selected when needed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: a01c4dc8f85827f32d88522e5153dddc02f11806
Component: engine
2016-05-11 09:30:23 +01:00
Alexander Morozov d3b9fbad27 Merge pull request #22511 from crosbymichael/update-runc-containerd
Update runc and containerd deps
Upstream-commit: af60a9e599543daa70da6d5d3b07343aa780c3ad
Component: engine
2016-05-10 15:06:23 -07:00
Alexander Morozov a24c6ed1b5 pkg/proxy: remove unused 'transfered' variable
That simplified code a bit

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 34175eb47ef5de023b68cef5af529b74c68b3ab3
Component: engine
2016-05-10 14:33:21 -07:00
Amit Krishnan 3314e541a1 update go-zfs to include Solaris support
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: efb3946171ffa30b716a0614e8037c6b0e699771
Component: engine
2016-05-10 13:51:03 -07:00
Sebastiaan van Stijn 1a0db3e886 Merge pull request #22634 from thaJeztah/dj-jazzy-jess
Add Jess to alumni
Upstream-commit: a4bb2c7d7a1da18c26626467f124d5532a9f927e
Component: engine
2016-05-10 22:08:56 +02:00
Sean Christopherson 3ff3d68824 Add the swapMemorySupport requirement to OOM tests
Add the swapMemorySupport requirement to all tests related to the OOM killer.  The --memory option has the subtle side effect of defaulting --memory-swap to double the value of --memory.  The OOM killer doesn't kick in until the container exhausts memory+swap, and so without the memory swap cgroup the tests will timeout due to swap being effectively unlimited.

Document the default behavior of --memory-swap in the docker run man page.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Upstream-commit: adabb51311ecac031bd72378c5ed1669d1835d40
Component: engine
2016-05-10 11:28:00 -07:00
John Howard 3f5fe19aa9 Windows: Terminate on failed shutdown
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: feacb1205b2cf9166e75e707d7b5fa2d09e80e03
Component: engine
2016-05-10 10:09:50 -07:00
John Howard 7f34b3bcd4 Merge pull request #22619 from jterry75/master
Adds a correct error string for network validation
Upstream-commit: 59db39c5c86d89e16654fdd0dc6cf6492b42fbea
Component: engine
2016-05-10 10:02:54 -07:00
Sebastiaan van Stijn 1a17a9a9ba refactor overlay storage driver compatibility check
use a consistent approach for checking if the
backing filesystem is compatible with the
storage driver.

also add an error-message for the AUFS driver if
an incompatible combination is found.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1fc0acc9ae77752858057d1f6f8487ccd82372be
Component: engine
2016-05-10 18:22:36 +02:00
Sebastiaan van Stijn 2b1d6ba44a Add Jess to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d14a1c30f259ba5dfce5183105a2ccab81dcc64c
Component: engine
2016-05-10 17:58:18 +02:00
Yong Tang 979a878be3 Remove deprecated driver specific log tags
Since 1.9, driver specific log tag options
`syslog-tag`
`gelf-tag`
`fluentd-tag`
have been deprecated in favor of the generic tag
option which is standard across different logging
drivers.

This fix removed the deprecated driver specific
log tag options of `syslog-tag`, `gelf-tag`,
`fluentd-tag` for 1.12 and updated the docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a20b02b9158c283402d174926c84e657e53b17a1
Component: engine
2016-05-10 07:43:44 -07:00
Sebastiaan van Stijn ff7a73e938 Merge pull request #22603 from runcom/fix-docker-build
pkg: chrootarchive: chroot_linux: fix docker build
Upstream-commit: 2f7c84120dbe918fc6c7201764765d5beb448021
Component: engine
2016-05-10 10:23:18 +02:00
Justin Terry bf84b3cfbf Adds a correct error string for network validation
Fixes the negative networking test to include the new error string
from recent Windows builds.

Signed-off-by: Justin Terry <juterry@microsoft.com>
Upstream-commit: 47ef6d7969a3396f6ecc3bb27aac425b1a65b344
Component: engine
2016-05-09 16:37:14 -07:00
Antonio Murdaca 0bc559ba8a pkg: chrootarchive: chroot_linux: fix docker build
The path we're trying to remove doesn't exist after a successful
chroot+chdir because a / is only appended after pivot_root is
successful and so we can't cleanup anymore with the old path.
Also fix leaking .pivot_root dirs under /var/lib/docker/tmp/docker-builder*
on error.

Fix https://github.com/docker/docker/issues/22587
Introduced by https://github.com/docker/docker/pull/22506

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 5248f5c3d1d91ea4235ffe57962e38293af18f34
Component: engine
2016-05-10 00:42:49 +02:00
Michael Crosby 820ddc1c92 Update protobufs to 8d92cf5fc15a4382f8964b08e1f42a
This syncs the protobuf version with the one that is used with
containerd.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4e290986cdf08a34ad508473bab702793503fa6b
Component: engine
2016-05-09 15:21:41 -07:00
Michael Crosby dbf25e32d6 Fix containerd proto for connection
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6889c3276c6895a8440dc8883b8cd608793199f3
Component: engine
2016-05-09 15:17:10 -07:00
Michael Crosby 783763f84c Update runc and containerd deps
containerd:     57b7c3da915ebe943bd304c00890959b191e5264
runc:           d49ece5a83da3dcb820121d6850e2b61bd0a5fbe

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cfb976438677b15ec023b2ad4822bf1b2f63cc8f
Component: engine
2016-05-09 15:05:44 -07:00
Alexander Morozov e078dcd609 Merge pull request #22465 from allencloud/handle-error-when-getting-hostname-in-docker-info
handle error when getting hostname in info api
Upstream-commit: e16753ce192cc80d3e207d7b3063a9dab36983cb
Component: engine
2016-05-09 14:57:36 -07:00
Sebastiaan van Stijn b258c5f0d3 Merge pull request #22611 from tonistiigi/attach-docs
docs: clarify docker attach
Upstream-commit: e8aac7de4c2491cf7d9ba5233269602e6f5c54d3
Component: engine
2016-05-09 22:59:07 +02:00
Tonis Tiigi e256c77fe9 docs: clarify docker attach
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: da1dbd2093ec040f05f4daf9fc8ca28dc8262ec8
Component: engine
2016-05-09 13:35:34 -07:00
Sebastiaan van Stijn 271dfa3943 Merge pull request #22609 from cyli/minor-docs-update
Minor tense correction for deprecated docs
Upstream-commit: 251b273fd23711ef187b05c13dbabb480bac86b0
Component: engine
2016-05-09 19:48:12 +02:00
cyli cb9d2ba5ea Minor tense correction for deprecated docs
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: d73589331df4288aa6211fb3733598bbad67b73b
Component: engine
2016-05-09 10:29:42 -07:00
Brian Goff 496d63e99d Merge pull request #22562 from tonistiigi/fix-loopback-release
Clean loopbacks in TestDaemonNoSpaceLeftOnDeviceError
Upstream-commit: c5e3644f03acb71473a1c19437891f6903aca738
Component: engine
2016-05-09 13:28:08 -04:00
Alexander Morozov 91eda97012 Merge pull request #22574 from yongtang/05072016-remove-deprecated-trust-env
Remove deprecated Docker Content Trust ENV passphrase variables
Upstream-commit: fad0305ee3f697c70654e4ade7dfdd92483eb3e1
Component: engine
2016-05-09 10:10:27 -07:00
Jess Frazelle a21f04a60f docs: add security non-events
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
Signed-off-by: Jess Frazelle <me@jessfraz.com>
Upstream-commit: 6f06e98f57fe4564003d5b2adbe4ef2fcfbe8df8
Component: engine
2016-05-09 09:35:19 -07:00