unclejack
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
Tonis Tiigi
47c353eb46
Clean loopbacks in TestDaemonNoSpaceLeftOnDeviceError
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-05-06 14:19:27 -07:00
Dongluo Chen
34e3da3acd
Merge pull request #2215 from joelhandwell/patch-1
...
Krane project has been closed in favor of Machine
2016-05-06 13:45:29 -07:00
Nishant Totla
bc5217273a
Merge pull request #2213 from allencloud/fix-typos-in-cluster
...
fix typos in swarm/cluster.go
2016-05-06 13:29:42 -07:00
Lars Kellogg-Stedman
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
Nishant Totla
5bbecbc13b
Merge pull request #2212 from nishanttotla/update-release-checklist
...
Updating Release checklist
2016-05-06 13:25:31 -07:00
Vincent Demeester
16d0a89593
Merge pull request #22485 from tkopczynski/test-utils
...
Builder unit tests refactoring
2016-05-06 22:05:02 +02:00
Alexander Morozov
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
John Howard
faab71701f
Windows: Reduce CLI time, move some to unit tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-05-06 12:26:08 -07:00
Aaron Lehmann
b16fac959b
Merge pull request #22316 from brettdh/registry-socks-proxy
...
Respect ALL_PROXY during registry operations
2016-05-06 11:29:01 -07:00
Alexander Morozov
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
Alexander Morozov
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
cyli
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
cyli
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
cyli
88c6675ed2
Bump notary version to v0.3.0-RC1
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
2016-05-06 10:59:26 -07:00
Alexander Morozov
cf319e295a
Merge pull request #22537 from tophj-ibm/test-seccomp
...
ppc64le: build seccomp in dockerfile
2016-05-06 10:05:55 -07:00
Joel Handwell
3d24e74e4c
Krane project has been closed in favor of Machine
...
Reference: https://github.com/krane-io/krane
Signed-off-by: Joel Handwell <joelhandwell@gmail.com >
2016-05-06 10:00:45 -04:00
Sebastiaan van Stijn
83a6508af9
Merge pull request #22542 from thaJeztah/fix-outdated-supervisor-example
...
docs: update supervisord example
2016-05-06 14:58:13 +02:00
Doug Davis
cc01017bcf
Merge pull request #22550 from allencloud/fix-typos
...
fix typos in comments
2016-05-06 08:56:33 -04:00
Arthur Baars
eca581cf36
StorageDriver: GCS: allow Cancel on a closed FileWriter
...
Signed-off-by: Arthur Baars <arthur@semmle.com >
2016-05-06 13:04:30 +01:00
Arthur Baars
0490ff450b
Blobwriter: call BlobWriter.Size after BlobWriter.Close
...
Signed-off-by: Arthur Baars <arthur@semmle.com >
2016-05-06 13:04:30 +01:00
Arthur Baars
1d782c38f2
StorageDriver: Test case for #1698
...
Signed-off-by: Arthur Baars <arthur@semmle.com >
2016-05-06 13:04:30 +01:00
allencloud
3f77baf2ce
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2016-05-06 18:23:11 +08:00
allencloud
54d09c6c2d
close http response body when attaching
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2016-05-06 16:58:22 +08:00
Sebastiaan van Stijn
9a9ebc7f85
Merge pull request #22046 from cpuguy83/containerd_stdio
...
Set containerd pdeathsig
2016-05-06 09:26:16 +02:00
Vincent Demeester
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
Antonio Murdaca
a7d6a6c8a8
Merge pull request #22538 from mrunalp/update_engine_api
...
Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
2016-05-06 09:06:51 +02:00
Sun Hongliang
a28e2e7e30
fix typos in swarm/cluster.go
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io >
2016-05-06 11:16:37 +08:00
Nishant Totla
54863df074
Updating Release checklist
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2016-05-05 18:22:04 -07:00
Brian Goff
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
Nishant Totla
372ad21097
Merge pull request #2211 from nishanttotla/bump-1.2.2-rc1
...
Bump version to 1.2.2-rc1
2016-05-05 17:49:03 -07:00
David Lawrence
61ac085a26
Merge pull request #709 from docker/passphrase-caching-delegation
...
Be less strict for password caching for delegation keys
2016-05-05 17:03:15 -07:00
David Lawrence
64290ecfa9
Merge pull request #721 from docker/rethink-ca-flag
...
Add driver-tls-ca flag for rethink
2016-05-05 17:01:40 -07:00
Nishant Totla
777964583f
Bump version to 1.2.2-rc1
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2016-05-05 16:53:47 -07:00
Sebastiaan van Stijn
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
Nishant Totla
502c00b150
Merge pull request #2210 from dongluochen/swarm_hang
...
Do not allow double RLock() of RWMutex
2016-05-05 16:37:50 -07:00
Riyaz Faizullabhoy
b3ac5b62dc
Add driver-tls-ca flag for rethink
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-05-05 15:52:49 -07:00
Mrunal Patel
97d95604e0
Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2016-05-05 18:36:09 -04:00
Nathan LeClaire
c120a925f3
Merge pull request #3373 from leonhartX/issue-3191
...
#3191 add zsh completion
2016-05-05 15:31:11 -07:00
David Lawrence
905736adc7
Merge pull request #708 from docker/signer-rethink-cleanup
...
Allow for configurable notary signer db name, check allowed backends
2016-05-05 15:29:00 -07:00
Alexander Morozov
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
Christopher Jones
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
Kenfe-Mickael Laventure
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
David Lawrence
3dd79962fa
Merge pull request #715 from docker/rethink-bump
...
Update RethinkDB to 2.3.0, gorethink to v2
2016-05-05 11:39:58 -07:00
David Lawrence
be2020b484
Merge pull request #719 from docker/rethink-client-certs
...
Add client key and cert to rethink client tls config
2016-05-05 11:30:13 -07:00
Nathan LeClaire
cd650fcf0c
Bump VirtualBox version
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-05-05 10:55:42 -07:00
Ying Li
1f8e5d5863
Merge pull request #718 from twistlock/static_compile
...
Enable notary client static compile
2016-05-05 10:50:14 -07:00
Dong Chen
d6e6703e29
Prevent double RLock() of RWMutex. It may lead to deadlock if there is Lock() call from another goroutine in between.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-05-05 10:45:34 -07:00
Nathan LeClaire
336435062c
Bump Docker Compose version
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-05-05 09:14:55 -07:00
Nathan LeClaire
4d8cb18e4c
Merge pull request #480 from docker/bump-versions
...
Bump virtualbox and git versions
2016-05-05 09:11:02 -07:00