ec2b0c0889
Merge pull request #22682 from hqhq/hq_update_check
...
Update go-check
2016-05-12 12:09:36 +02:00
24a0f1f3e8
Merge pull request #22689 from thaJeztah/docs-update-menu-order
...
docs: update menu order in security section
2016-05-12 11:22:44 +02:00
067e54eeac
docs: update menu order in security section
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-12 11:19:53 +02:00
a14e85c40d
Merge pull request #22579 from jfrazelle/docs-add-security-non-events
...
docs: add security non-events
2016-05-12 11:17:47 +02:00
84a6818b11
Merge pull request #22622 from tkopczynski/20784-builder-intg2unit-tests
...
Reimplement some builder integration tests as unit tests
2016-05-12 10:29:39 +02:00
c273163e80
Merge pull request #22672 from kevinmeredith/correct_trapped_signals
...
Correct docs for a docker container's clean-up.
2016-05-12 14:15:39 +10:00
ed868a2e11
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>
2016-05-12 09:19:23 +08:00
f7c79cdeae
Merge pull request #22455 from Anvil/bash-completion-failglob
...
docker bash completions fails when failglob is enabled
2016-05-11 13:08:48 -10:00
b3a1ae02a9
Merge pull request #22353 from Microsoft/jjh/dockercp
...
Windows: docker cp platform semantically consistent paths
2016-05-11 13:08:24 -10:00
78e9f2e9e7
Merge pull request #22368 from tianon/wheezy-lts
...
Update contrib/mkimage/debootstrap to include wheezy-lts
2016-05-11 12:49:26 -10:00
bacce5ef4f
Merge pull request #22365 from dnephin/fix_selinux_for_dockerd
...
Update the binary name in docker-engine-selinux/docker.fc
2016-05-11 12:44:55 -10:00
28452ca783
Merge pull request #22356 from allencloud/close-http-response-body-when-attaching
...
close http response body when attaching
2016-05-11 12:44:35 -10:00
dc430944b9
Merge pull request #22262 from kencochrane/fix_release_deb
...
Create the correct directory structure for apt-ftparchive
2016-05-11 12:38:12 -10:00
18eeb39985
Reimplementing builder integration tests as unit tests
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-11 22:13:39 +02:00
ef7cd21766
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>
2016-05-11 14:58:23 -04:00
730b974c64
Merge pull request #22637 from LK4D4/simplify_tcp_proxy
...
pkg/proxy: remove unused 'transfered' variable
2016-05-11 20:56:31 +02:00
e421668b1b
Merge pull request #21708 from tianon/InRelease
...
Also generate "InRelease" files for newer APT clients
2016-05-11 13:21:15 -04:00
4c654eeea2
Merge pull request #22669 from thaJeztah/docs-update-seccomp-whitelist
...
docs: update seccomp whitelist
2016-05-11 18:59:53 +02:00
2cddd1cd1f
docs: update seccomp whitelist
...
the 'modify_ldt' was listed as "blocked by default",
but was whitelisted in 13a9d4e899
2016-05-11 18:45:27 +02:00
3710f9074e
Merge pull request #22666 from yongtang/05112016-update-deprecated-docs-cli-flags
...
Update deprecated docs for cli flags removal.
2016-05-11 18:05:52 +02:00
fd3a795a47
Merge pull request #22278 from runcom/fixies-dockerd
...
Fixies dockerd
2016-05-11 07:57:00 -07:00
da74f9653d
Merge pull request #22642 from amitkris/uprev_gozfs
...
update go-zfs to include Solaris support
2016-05-11 07:41:17 -07:00
0a4de93e13
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>
2016-05-11 06:48:07 -07:00
1ac1b78b3a
contrib: init: use dockerd
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-11 11:00:11 +02:00
af60a9e599
Merge pull request #22511 from crosbymichael/update-runc-containerd
...
Update runc and containerd deps
2016-05-10 15:06:23 -07:00
34175eb47e
pkg/proxy: remove unused 'transfered' variable
...
That simplified code a bit
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-05-10 14:33:21 -07:00
efb3946171
update go-zfs to include Solaris support
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-05-10 13:51:03 -07:00
a4bb2c7d7a
Merge pull request #22634 from thaJeztah/dj-jazzy-jess
...
Add Jess to alumni
2016-05-10 22:08:56 +02:00
59db39c5c8
Merge pull request #22619 from jterry75/master
...
Adds a correct error string for network validation
2016-05-10 10:02:54 -07:00
d14a1c30f2
Add Jess to alumni
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-10 17:58:18 +02:00
2f7c84120d
Merge pull request #22603 from runcom/fix-docker-build
...
pkg: chrootarchive: chroot_linux: fix docker build
2016-05-10 10:23:18 +02:00
47ef6d7969
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>
2016-05-09 16:37:14 -07:00
5248f5c3d1
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>
2016-05-10 00:42:49 +02:00
4e290986cd
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>
2016-05-09 15:21:41 -07:00
6889c3276c
Fix containerd proto for connection
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-09 15:17:10 -07:00
cfb9764386
Update runc and containerd deps
...
containerd: 57b7c3da915ebe943bd304c00890959b191e5264
runc: d49ece5a83da3dcb820121d6850e2b61bd0a5fbe
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-09 15:05:44 -07:00
e16753ce19
Merge pull request #22465 from allencloud/handle-error-when-getting-hostname-in-docker-info
...
handle error when getting hostname in info api
2016-05-09 14:57:36 -07:00
e8aac7de4c
Merge pull request #22611 from tonistiigi/attach-docs
...
docs: clarify docker attach
2016-05-09 22:59:07 +02:00
da1dbd2093
docs: clarify docker attach
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-05-09 13:35:34 -07:00
251b273fd2
Merge pull request #22609 from cyli/minor-docs-update
...
Minor tense correction for deprecated docs
2016-05-09 19:48:12 +02:00
d73589331d
Minor tense correction for deprecated docs
...
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-09 10:29:42 -07:00
c5e3644f03
Merge pull request #22562 from tonistiigi/fix-loopback-release
...
Clean loopbacks in TestDaemonNoSpaceLeftOnDeviceError
2016-05-09 13:28:08 -04:00
fad0305ee3
Merge pull request #22574 from yongtang/05072016-remove-deprecated-trust-env
...
Remove deprecated Docker Content Trust ENV passphrase variables
2016-05-09 10:10:27 -07:00
6f06e98f57
docs: add security non-events
...
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
Signed-off-by: Jess Frazelle <me@jessfraz.com>
2016-05-09 09:35:19 -07:00
9ffd2652e2
Merge pull request #22606 from mlaventure/allow-changing-wheezy-backport-mirror
...
Allow changing wheezy deb builder backport mirror
2016-05-09 12:23:58 -04:00
6a033e617f
Allow changing wheezy deb builder backport mirror
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-09 09:10:30 -07:00
20d5d10983
Merge pull request #21115 from wenchma/linkable
...
update link comments
2016-05-09 14:37:34 +02:00
3deb2d7280
Merge pull request #22572 from yongtang/05072016-add-missing-subtitle-in-deprecated-docs
...
Add the missing subtitle in deprecated docs for --security-opt
2016-05-09 12:18:11 +02:00
c52a373bc8
update link comments
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-05-09 14:12:28 +08:00
1e4068713b
Merge pull request #22589 from duglin/fixErr
...
Err was never being returned
2016-05-08 17:31:43 +02:00
Vincent Demeester
Sebastiaan van Stijn
Sebastiaan van Stijn
Sven Dowideit
Qiang Huang
Arnaud Porterie
Tomasz Kopczynski
kevinmeredith
Antonio Murdaca
Tibor Vass
Alexander Morozov
Yong Tang
Antonio Murdaca
Alexander Morozov
Amit Krishnan
John Howard
Justin Terry
Michael Crosby
Tonis Tiigi
cyli
Brian Goff
Jess Frazelle
Kenfe-Mickael Laventure
Wen Cheng Ma