Граф коммитов

24130 Коммитов

Автор SHA1 Сообщение Дата
cyli 6094be63ac Bump notary version up to 0.3.0 and re-vendor.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-11 22:57:51 -07:00
Antonio Murdaca 730b974c64 Merge pull request #22637 from LK4D4/simplify_tcp_proxy
pkg/proxy: remove unused 'transfered' variable
2016-05-11 20:56:31 +02:00
Tibor Vass e421668b1b Merge pull request #21708 from tianon/InRelease
Also generate "InRelease" files for newer APT clients
2016-05-11 13:21:15 -04:00
Vincent Demeester 4c654eeea2 Merge pull request #22669 from thaJeztah/docs-update-seccomp-whitelist
docs: update seccomp whitelist
2016-05-11 18:59:53 +02:00
Sebastiaan van Stijn 2cddd1cd1f
docs: update seccomp whitelist
the 'modify_ldt' was listed as "blocked by default",
but was whitelisted in 13a9d4e899

this updates the documentation to reflect this

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-11 18:45:27 +02:00
Sebastiaan van Stijn 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
Alexander Morozov fd3a795a47 Merge pull request #22278 from runcom/fixies-dockerd
Fixies dockerd
2016-05-11 07:57:00 -07:00
Alexander Morozov da74f9653d Merge pull request #22642 from amitkris/uprev_gozfs
update go-zfs to include Solaris support
2016-05-11 07:41:17 -07:00
Yong Tang 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
Antonio Murdaca 1ac1b78b3a contrib: init: use dockerd
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-11 11:00:11 +02:00
Alexander Morozov af60a9e599 Merge pull request #22511 from crosbymichael/update-runc-containerd
Update runc and containerd deps
2016-05-10 15:06:23 -07:00
Alexander Morozov 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
Amit Krishnan 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
Sebastiaan van Stijn a4bb2c7d7a Merge pull request #22634 from thaJeztah/dj-jazzy-jess
Add Jess to alumni
2016-05-10 22:08:56 +02:00
John Howard 59db39c5c8 Merge pull request #22619 from jterry75/master
Adds a correct error string for network validation
2016-05-10 10:02:54 -07:00
Sebastiaan van Stijn d14a1c30f2
Add Jess to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-10 17:58:18 +02:00
Sebastiaan van Stijn 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
Justin Terry 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
Antonio Murdaca 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
Michael Crosby 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
Michael Crosby 6889c3276c Fix containerd proto for connection
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-09 15:17:10 -07:00
Michael Crosby 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
Alexander Morozov 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
Sebastiaan van Stijn e8aac7de4c Merge pull request #22611 from tonistiigi/attach-docs
docs: clarify docker attach
2016-05-09 22:59:07 +02:00
Tonis Tiigi da1dbd2093 docs: clarify docker attach
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-05-09 13:35:34 -07:00
Sebastiaan van Stijn 251b273fd2 Merge pull request #22609 from cyli/minor-docs-update
Minor tense correction for deprecated docs
2016-05-09 19:48:12 +02:00
cyli d73589331d Minor tense correction for deprecated docs
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-09 10:29:42 -07:00
Brian Goff c5e3644f03 Merge pull request #22562 from tonistiigi/fix-loopback-release
Clean loopbacks in TestDaemonNoSpaceLeftOnDeviceError
2016-05-09 13:28:08 -04:00
Alexander Morozov 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
Tibor Vass 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
Kenfe-Mickael Laventure 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
Vincent Demeester 20d5d10983 Merge pull request #21115 from wenchma/linkable
update link comments
2016-05-09 14:37:34 +02:00
Sebastiaan van Stijn 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
Wen Cheng Ma c52a373bc8 update link comments
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-05-09 14:12:28 +08:00
Vincent Demeester 1e4068713b Merge pull request #22589 from duglin/fixErr
Err was never being returned
2016-05-08 17:31:43 +02:00
Doug Davis 0687d76ab1 Err was never being returned
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-05-08 05:51:59 -07:00
Vincent Demeester ac2f4dd71b Merge pull request #22400 from runcom/fix-git-branch-name
Makefile: clean git branch before building
2016-05-08 13:50:43 +02:00
Antonio Murdaca a4192471cd Makefile: clean git branch before building
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-08 11:52:38 +02:00
Yong Tang 1f0d5aba50 Remove deprecated Docker Content Trust ENV passphrase variables
Since 1.9, Docker Content Trust Offline key has been renamed to
Root key and the Tagging key has been renamed to Repository key.
The corresponding environment variables
`DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE`
`DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE`
have also been deprecated and renamed to
`DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE`
`DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE`

This fix removed the deprecated ENV passphrase variables for
1.12 and updated the docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-07 14:25:28 -07:00
Vincent Demeester 08ec3606f1 Merge pull request #21889 from cpuguy83/logscmd_add_attrs
Add support for reading logs extra attrs
2016-05-07 20:26:33 +02:00
Yong Tang 018c22880d Add the missing subtitle in deprecated docs for --security-opt.
The colon separator(`:`) of `--security-opt` flag was deprecated
in 1.11.0. However, the subtitle in deprecated docs is missing
so it is placed under the same subtitle as the deprecated `-e` and
`--email` flags.

This fix adds the missing subtitle in deprecated docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-07 08:46:15 -07:00
Sebastiaan van Stijn 2301052d74 Merge pull request #22569 from sunyuan3/inherit
from inheritted to inherited
2016-05-07 11:31:25 +02:00
Sebastiaan van Stijn e8b00316b2 Merge pull request #22565 from tophj-ibm/ppc64le-remove-seccomp-buildtags
ppc64le: remove seccomp from docker buildtags
2016-05-07 11:21:18 +02:00
Yuan Sun fe1130b7ba from inheritted to inherited
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2016-05-07 17:15:02 +08:00
Alexander Morozov 0b59ea60b2 Merge pull request #22094 from thaJeztah/autocreate-on-windows
Enable auto-creation of host-path on Windows
2016-05-06 23:19:26 -07:00
Vincent Demeester 3b7a2f5816 Merge pull request #22559 from larsks/bug/clarity-on-systemd-dropins
docs: note requirements for systemd drop-in filenames
2016-05-07 07:58:46 +02:00
allencloud a1c950913f handle error when getting hostname in info api
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-07 08:51:52 +08:00
Brian Goff bd9d14a07b Add support for reading logs extra attrs
The jsonlog logger currently allows specifying envs and labels that
should be propagated to the log message, however there has been no way
to read that back.

This adds a new API option to enable inserting these attrs back to the
log reader.

With timestamps, this looks like so:
```
92016-04-08T15:28:09.835913720Z foo=bar,hello=world hello
```

The extra attrs are comma separated before the log message but after
timestamps.

Without timestaps it looks like so:
```
foo=bar,hello=world hello
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-06 20:42:20 -04:00
Sebastiaan van Stijn 4e080347af Enable auto-creation of host-path on Windows
Auto-creation of host-paths has been un-deprecated,
so to have feature-parity between Linux and Windows,
this feature should also be present on Windows.

This enables auto-creation on Windows.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-07 00:55:16 +02:00
Sebastiaan van Stijn 926725b470 Merge pull request #22433 from rhatdan/labels
We should always return the MountLabel
2016-05-07 00:24:27 +02:00