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
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
2301052d74
Merge pull request #22569 from sunyuan3/inherit
...
from inheritted to inherited
2016-05-07 11:31:25 +02:00
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
fe1130b7ba
from inheritted to inherited
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2016-05-07 17:15:02 +08:00
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
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
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
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
926725b470
Merge pull request #22433 from rhatdan/labels
...
We should always return the MountLabel
2016-05-07 00:24:27 +02:00
31cc7dc135
ppc64le: remove seccomp from docker buildtags
...
Removes seccomp from ppc64le as a buildtag
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-05-06 17:24:50 -04:00
eb52730570
Merge pull request #22506 from cpuguy83/no_chroot
...
Use pivot_root instead of chroot for chrootarchive
2016-05-06 14:21:23 -07:00
987b03054a
docs: note requirements for systemd drop-in filenames
...
the documentations says that you can drop "a file" into the
`docker.service.d` directory, but does not note that the file must end
with `.conf` in order to be recognized by systemd. This can lead to
some [confusion][] if readers are not previously familiar with
systemd.
[confusion]: https://botbot.me/freenode/docker/2016-05-06/?msg=65605541&page=11
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
2016-05-06 16:25:34 -04:00
16d0a89593
Merge pull request #22485 from tkopczynski/test-utils
...
Builder unit tests refactoring
2016-05-06 22:05:02 +02:00
a603fa33d5
Merge pull request #22317 from cyli/bump-notary-version
...
Bump notary version to v0.3.0-RC1
2016-05-06 12:54:53 -07:00
b16fac959b
Merge pull request #22316 from brettdh/registry-socks-proxy
...
Respect ALL_PROXY during registry operations
2016-05-06 11:29:01 -07:00
ebc5a61593
Merge pull request #22076 from thtanaka/rpmbuild-error
...
DWZ problem with multiple golang binary caused OL7 RPM build to fail
2016-05-06 11:22:27 -07:00
4531c01509
Merge pull request #22236 from kencochrane/remove_git_from_rpm
...
Exclude .git directories from the source RPMS and debian packages
2016-05-06 11:16:12 -07:00
d869d2b0a0
Update trust.go to reflect NotaryRepository API changes:
...
- Update now returns only an error
- NewNotaryRepository now takes a trustpinning configuration - we will provide an empty one for now.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-06 10:59:28 -07:00
4710ed6304
Remove the pkcs11 build tag from the s390x Dockerfile, since it is using GCCGo 5.3, which
...
is still on the Go 1.4 library, whereas the Notary Yubikey library needs interfaces from
Go 1.5
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-06 10:59:28 -07:00
88c6675ed2
Bump notary version to v0.3.0-RC1
...
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-06 10:59:26 -07:00
cf319e295a
Merge pull request #22537 from tophj-ibm/test-seccomp
...
ppc64le: build seccomp in dockerfile
2016-05-06 10:05:55 -07:00
83a6508af9
Merge pull request #22542 from thaJeztah/fix-outdated-supervisor-example
...
docs: update supervisord example
2016-05-06 14:58:13 +02:00
cc01017bcf
Merge pull request #22550 from allencloud/fix-typos
...
fix typos in comments
2016-05-06 08:56:33 -04:00
3f77baf2ce
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-06 18:23:11 +08:00
9a9ebc7f85
Merge pull request #22046 from cpuguy83/containerd_stdio
...
Set containerd pdeathsig
2016-05-06 09:26:16 +02:00
f65f4dc761
Merge pull request #22501 from michael-holzheu/22477-TestApiStatsContainerGetMemoryLimit-add-mem-cgroup-test
...
TestApiStatsContainerGetMemoryLimit: Add cgroup memory test
2016-05-06 09:12:27 +02:00
a7d6a6c8a8
Merge pull request #22538 from mrunalp/update_engine_api
...
Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
2016-05-06 09:06:51 +02:00
e9bef66021
Merge pull request #21961 from yongtang/21956-docker-inspect-log-default-options
...
Docker inspect gave default log options even when the option is emtpy.
2016-05-05 21:02:39 -04:00
e38678e660
docs: update supervisord example
...
This updates the supervisor example documentation
to use an up-to-date version of Ubuntu.
Also reduced the use of "royal We", and tweaked some
language.
Finally, added some language hints for code-highlighting.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-06 01:52:51 +02:00
97d95604e0
Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-05-05 18:36:09 -04:00
68ba274d22
Merge pull request #22535 from mlaventure/fix-oraclelinux-6-rpm
...
Fix rpm generation on oraclelinux-6
2016-05-05 14:56:41 -07:00
107db89b6e
ppc64le: build seccomp in dockerfile
...
This pr adds in building seccomp to ppc64le.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-05-05 16:33:09 -04:00
05dec0b032
Fix rpm generation on oraclelinux-6
...
The uek kernel needs to be install first in order to get the correct
btrfs tools version.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-05 12:12:49 -07:00
bb125650c9
Merge pull request #21015 from cpuguy83/add_opaque_mount_id
...
When calling volume driver Mount, send opaque ID
2016-05-05 18:00:15 +02:00
0d3d8d6416
Merge pull request #22505 from runcom/authz-load-import
...
integration-cli: test load/import with authz plugins
2016-05-05 11:37:20 -04:00
c37ca913ff
Merge pull request #22529 from objectified/22528-remove-trailing-comma-from-top-command
...
Documentation: docker volumes: remove trailing comma from top command
2016-05-05 17:26:06 +02:00
c7e738d641
remove trailing comma from top command
...
Signed-off-by: objectified <objectified@gmail.com>
2016-05-05 13:18:23 +02:00
af916d316a
Merge pull request #22519 from mlaventure/add-dockerd-to-rpm-packaged-files
...
Add dockerd to the list of files included in generated rpms
2016-05-05 13:16:06 +02:00
6dd4c3569c
Merge pull request #19651 from zhuguihua/add_disk_quota_for_btrfs
...
Add disk quota support for btrfs
2016-05-05 13:15:45 +02:00
4de672690c
Merge pull request #22270 from runcom/too-many-login
...
distribution: errors: do not retry if too many login attempts
2016-05-05 09:44:09 +02:00
378a8e7175
Merge pull request #22508 from Microsoft/jjh/arg
...
Windows: Support ARG in builder
2016-05-05 09:09:55 +02:00
401c8d1767
Add disk quota support for btrfs
...
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
2016-05-05 14:35:13 +08:00
6118952e44
Add dockerd to the list of files included in generated rpms
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-04 20:45:22 -07:00
85988b33d2
Use pivot_root instead of chroot for chrootarchive
...
This fixes one issue with Docker running under a grsec kernel, which
denies chmod and mknod under chroot.
Note, if pivot_root fails it will still fallback to chroot.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-04 19:55:34 -04:00
6870d9789a
Merge pull request #22166 from moxiegirl/device-mapper-update
...
Device mapper update
2016-05-05 00:02:02 +02:00
6dcadaa465
Merge pull request #22512 from tkopczynski/typos-supervisor
...
Docs: fixing typos in admin/supervisor
2016-05-04 23:57:55 +02:00
1fe9715f30
Merge pull request #22423 from mlaventure/rm-containers-if-rm-in-progress-on-restart
...
Reset RemovalInProgress flag on daemon restart
2016-05-04 23:57:16 +02:00
0c68402887
Merge pull request #22403 from mlaventure/fix-docker-build-pkgs
...
Update build-deb to make correct use of DOCKER_BUILD_PKGS
2016-05-04 17:55:20 -04:00
6b5c83bf18
Windows: Support ARG in builder
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-04 14:32:23 -07:00
Jess Frazelle
Vincent Demeester
Sebastiaan van Stijn
Yuan Sun
Alexander Morozov
Brian Goff
Sebastiaan van Stijn
Christopher Jones
unclejack
Lars Kellogg-Stedman
Aaron Lehmann
cyli
Doug Davis
allencloud
Antonio Murdaca
Mrunal Patel
Kenfe-Mickael Laventure
objectified
Zhu Guihua
Tibor Vass
John Howard