Commit Graph

21930 Commits

Author SHA1 Message Date
e7c442dff1 Vendor Libnetwork v0.7.0-rc.1
- Fixes https://github.com/docker/libnetwork/issues/1051
- Fixes https://github.com/docker/libnetwork/issues/985
- Fixes https://github.com/docker/libnetwork/issues/945
- Log time taken to set sandbox key
- Limit number of concurrent DNS queries

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 90bb5301b51ec6a6c77b910855441feef10492ff
Component: engine
2016-03-30 18:12:23 -07:00
05c14e787f Merge pull request #21662 from anusha-ragunathan/ctrd_debugLogs
Redirect containerd stdout/stderr to the docker stream.
Upstream-commit: c43deb2ea159c02a5ece2394e7b77619e1aad3e3
Component: engine
2016-03-30 19:38:32 -04:00
9fa3adf0a8 Merge pull request #21309 from nalind/journal-error-reporting
Improve error reporting when following journals
Upstream-commit: 0dac5444489a34e86bd3e289b33fab3f17c1bf70
Component: engine
2016-03-30 16:15:34 -07:00
a27733f46d Merge pull request #21636 from calavera/remove_builder_from_api
Remove builder dependency from the api.
Upstream-commit: a7742e437943bb0c59cc9e01fd9f5e68259ad3ec
Component: engine
2016-03-30 15:20:05 -07:00
06ac452012 Merge pull request #21661 from twistlock/client_cert_auth_docs
Add short description about default authentication method in authorization docs
Upstream-commit: ea7d2192e2fedbf9e764a574b48498a95045cc00
Component: engine
2016-03-30 15:18:54 -07:00
d01eb0569f Un-deprecate auto-creation of host directories for mounts
Auto-creation of host-directories was marked deprecated in
Docker 1.9, but was decided to be too much of an backward-incompatible
change, so it was decided to keep the feature.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0f70f53826ac311ca1653827c0d6bc170f300e84
Component: engine
2016-03-30 15:00:09 -07:00
7c19f87137 Merge pull request #21625 from kencochrane/fix_tgz_directory
Change the directory inside of tgz files.
Upstream-commit: 8c06ba366555ef2ac98ca5372ea632a28e37c950
Component: engine
2016-03-30 13:11:55 -07:00
210579a75f Redirect containerd stdout/stderr to the docker stream.
Its useful to have containerd logs as part of docker.
Containerd metrics are too chatty, so set interval to 0.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: d9c3b653c0776bdfc4af9129ebbf41160a793cf3
Component: engine
2016-03-30 12:26:59 -07:00
939e159342 Add short description about default authentication method in authorization docs
Following the discussion in #21556, adding a short description of the
default user authentication mechanism (without requiring authentication
plugins)
Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: b2f2f162ad768a1e66d5921146f24bfd0698b302
Component: engine
2016-03-30 21:16:19 +03:00
055639ebe7 Merge pull request #21574 from tkopczynski/20784-builder-context-tests
Builder/context unit tests
Upstream-commit: 8dabc0c39b868e1c80f85541bbeeac17f05ca88f
Component: engine
2016-03-30 14:04:51 -04:00
a91cc2b7e4 Merge pull request #21640 from hqhq/hq_remove_tryit
Remove the tryit tutotial in README
Upstream-commit: a5e220b1e314489ecde4fdd7129296eaaaeb6f96
Component: engine
2016-03-30 17:17:33 +02:00
d3da834d23 Merge pull request #21648 from senk/21627-fix-api-docs
Fixed some differences between API and Docs
Upstream-commit: 450b472174affb0da266fc0c4d57705c454b8735
Component: engine
2016-03-30 08:07:46 -07:00
b403210556 Merge pull request #21624 from LK4D4/fix_store_races
volume/store: fix couple of races with accessing maps
Upstream-commit: 0bdcbe5dd2a6f917aa057ecdd0a3d3a33bad261f
Component: engine
2016-03-30 14:07:37 +02:00
7450a571b9 Fixed some differences between API and Docs in v1.22,v1.23,v1.24
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
Upstream-commit: 370dbe0cd98e924e8641a72a437281dd7bce9f3d
Component: engine
2016-03-30 14:04:25 +02:00
fdeeda1dbd Merge pull request #21645 from albers/completion-history--human
bash completion for `docker history --human`
Upstream-commit: 4745656e189de7f5ca2985c6c8c00392c458ad53
Component: engine
2016-03-30 12:19:47 +02:00
9eb1caaca3 Merge pull request #21491 from pcarrier/pcarrier/wtf
docker.service: don't limit tasks
Upstream-commit: 2f35c6b3fb4aad381ac3e47b17aef900600d7784
Component: engine
2016-03-30 11:08:15 +02:00
1df524adbf Merge pull request #21629 from thaJeztah/bump-runc
Bump runC to 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa
Upstream-commit: 71cab5b0dc904033f3869210441547a7e201c281
Component: engine
2016-03-29 23:07:12 -07:00
31defe9bca bash completion for docker history --human
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a2dbf7626c9950aab5049f0e485e053232be1e5f
Component: engine
2016-03-29 21:56:24 -07:00
a441822766 Merge pull request #21603 from aaronlehmann/testtransfer-flakiness-2
Fix flaky test TestTransfer (take 2)
Upstream-commit: d02e24f27d761c2f24c0a5f4dfe1fbfe692e5f14
Component: engine
2016-03-29 21:40:38 -07:00
b882239dcc Merge pull request #21591 from riyazdf/hardware-signing-non-experimental
move hardware signing out of experimental, remove yubico-piv-tool deps
Upstream-commit: d800be743db5bcd1bfdcd948619af5811ff7aec8
Component: engine
2016-03-30 00:09:22 -04:00
e912ffb0bc Merge pull request #21638 from yongtang/21605-docs-Warnings-in-volumes-API
Update documentations for `Warnings` fields in `GET /volumes` API
Upstream-commit: 457eb89bd50ebee912db5cf65cd7332d46d5e27c
Component: engine
2016-03-29 19:11:36 -07:00
93c7f3e4ce Update documentations for Warnings fields in GET /volumes API
This fix updated documentations to add the `Warnings` fields in
`GET /volumes` API.

The `Warnings` has been part of the `GET /volumes` API response
since Docker 1.10 (v1.21). However, the `Warnings` field is not
in the documentation so there are some confusions (See #21606).

This fix updated the related documentations in v1.22, v1.23, and
v1.24 and added this field to the API.

This fix is related to #21605.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d77392798550e47fd3719ad658c6a92d1282d5b2
Component: engine
2016-03-30 01:35:39 +00:00
f4497ecd54 Remove the tryit tutotial in README
It's no longer there.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: ad03f920c93d2a5eea456bd17548bc591f7b0425
Component: engine
2016-03-30 08:47:24 +08:00
9d7bcf25f6 Merge pull request #21598 from aaronlehmann/not-found-error
Change v1 pull 404 message to include tag
Upstream-commit: eaf138af1fba339d13bc4cccd75e61e37603a51a
Component: engine
2016-03-29 17:28:12 -07:00
05c587d41d Bump runC to 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa
This includes fixes for;

- outputing errors for missing seccomp options on seccomp versions < 2.3
- cap set apply EPERM errors on ARM systems

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 752b31d3fe6fcbea9e14247c3896334734eba7f2
Component: engine
2016-03-29 17:10:05 -07:00
b960646c00 Remove builder dependency from the api.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d12b7c7e3e5566f49f81189b757bcd0e4ef09956
Component: engine
2016-03-29 17:02:36 -07:00
5888c28b47 Merge pull request #21592 from anusha-ragunathan/docker-systemd
When using systemd, pass expected cgroupsPath and cli options to runc.
Upstream-commit: 99adcaebc0aca57f2665f356e4a9b4218aa5d5f7
Component: engine
2016-03-29 17:00:10 -07:00
078c5f91c2 Merge pull request #21610 from albers/completion-no-new-privileges
bash completion for `docker {run,create} --security-opt no-new-privileges
Upstream-commit: 7e63ed90aa99caed7d9052263bb005807511fa00
Component: engine
2016-03-29 16:52:04 -07:00
c51f031827 Merge pull request #21623 from albers/completion-options-false
bash completions: Improve consistency for boolean options with default=true
Upstream-commit: bf18ab1869a3dfeb10b0d4d97e1c5e152321d548
Component: engine
2016-03-29 16:42:13 -07:00
d34cd4cf53 Merge pull request #21630 from LK4D4/fix_create_list_races
daemon: register container as late as possible
Upstream-commit: 34e05f5cb1449034e5fcbb8467be311bf0c2c6b7
Component: engine
2016-03-29 16:34:19 -07:00
c1d3b40917 Merge pull request #21620 from LK4D4/fix_libcd_race
libcontainerd: reuse our pkg/locker
Upstream-commit: 8899896992d855b3e039c5f11ecafd83e8e45757
Component: engine
2016-03-29 14:37:53 -07:00
3b9321568d When using systemd, pass expected cgroupsPath and cli options to runc.
runc expects a systemd cgroupsPath to be in slice:scopePrefix:containerName
format and the "--systemd-cgroup" option to be set. Update docker accordingly.

Fixes 21475

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 7ed3d265a4499ec03f10537fea0aac3ebaa0cec6
Component: engine
2016-03-29 14:20:10 -07:00
5b11bbb1cc daemon: register container as late as possible
fixes races between list and create

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 114be249f022535f0800bd45987c4e9cd1b321a4
Component: engine
2016-03-29 13:52:18 -07:00
d096d13747 Change the directory inside of tgz files.
Currently the directory inside of the tgz files is /usr/local/bin
and this is causing some confusion, and problems with people who already
have stuff in those directories. This commit changes the directory
to /docker to help remove the confusion.

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: 7df5b32834237eac4c338f0ce1cba65b86bbe642
Component: engine
2016-03-29 14:39:28 -04:00
693174fcad Merge pull request #21608 from albers/build-clone-https
Use https for `git clone` in build
Upstream-commit: d78f8f2796bd9b2370f817dacca0b27d8601ff4c
Component: engine
2016-03-29 11:30:35 -07:00
0610ad67ff Merge pull request #21593 from aboch/bdvnd
Vendoring boltb/bolt v1.2.0
Upstream-commit: 0fa96f246312661416bd8ea5010dc1a77a769323
Component: engine
2016-03-29 11:29:30 -07:00
403d945979 volume/store: fix couple of races with accessing maps
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e6d87c0706d178407ffccaab5c3ffc13a9e7b02e
Component: engine
2016-03-29 10:46:29 -07:00
9ab3dbe46e bash completions: Improve consistency for options with default=true
Completion of these options was not handled consistently.
Now all such options immediatly complete with =false appended.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 39b9b63e364dc5e2bbc3e73f29b75f9de5c5dbf0
Component: engine
2016-03-29 10:24:45 -07:00
eef44cf65d Change v1 pull 404 message to include tag
The current error message is "Error: image [name] not found". This makes
sense from the perspective of the v1 pull, since we found the repository
doesn't exist over the v1 protocol. However, in the vast majority of
cases, this error will be produced by fallback situations, where we
first try to pull the tag with the v2 protocol, and then fall back the
v1 protocol, which probably isn't even supported by the server.
Including the tag in the error message makes a lot more sense since the
actual repository may exist on v2, but not the tag.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 745892a7b271cf0f1770a8ec3698aaf61573e5f2
Component: engine
2016-03-29 10:04:59 -07:00
c23ab72e75 libcontainerd: reuse our pkg/locker
it fixes race with access to containerMutexes

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a7851e2556edb3e5333b6fe53160755fb5b7d616
Component: engine
2016-03-29 09:43:12 -07:00
335c28d503 Merge pull request #18747 from thaJeztah/update-authors
Update AUTHORS
Upstream-commit: e42c164763edc00cf41131ac0c1431fda27e6f21
Component: engine
2016-03-29 09:41:21 -07:00
c4243d21fc Merge pull request #21619 from mlaventure/use-debian-llvm-repo
Update the llvm repo to use the debian jessie url
Upstream-commit: c1706d722fdb0d5017ee0251cfaa4c352a26c986
Component: engine
2016-03-29 12:09:10 -04:00
922dd0a9e8 Merge pull request #21586 from calavera/remove_runconfig_from_routes
Remove runconfig package dependency from the API.
Upstream-commit: 1da40fb4badd116a7591dd2c19009146770c9a89
Component: engine
2016-03-29 08:40:49 -07:00
1a2b48337a Update the llvm repo to use the debian jessie url
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 73672c5bd8ad170224957734bd1eaf20b11680ba
Component: engine
2016-03-29 08:39:16 -07:00
ff692d79a4 Merge pull request #21599 from tonistiigi/separate-daemon-exec-root
Use separate exec-root for test daemons
Upstream-commit: d33480474f33523743ae49c1b96737fbfbeb1a6f
Component: engine
2016-03-29 07:52:18 -07:00
72387f3644 bash completion for docker {run,create} --security-opt no-new-privileges
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e96d086afdb111fc4b587d4e82c857dbfec4e87e
Component: engine
2016-03-29 09:59:04 +02:00
d37b8026f1 Merge pull request #21585 from tophj-ibm/ppc64le-bump-go1.6
ppc64le: bump golang back to 1.6
Upstream-commit: 78076d5cf9413476a8d4e27822b96fef7a55e055
Component: engine
2016-03-29 09:58:20 +02:00
cd7e028207 Merge pull request #21602 from aaronlehmann/login-log-message
Correct login debug log message
Upstream-commit: 4aa36da9ad35ff93db6420c3ffcc87c5ed64a7a5
Component: engine
2016-03-29 09:56:08 +02:00
eecbb6fc3c Use https for git clone in build
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a7e9bf6cb70117005dbcd4a987a7f30e3c605656
Component: engine
2016-03-29 09:35:42 +02:00
9f98018db6 Merge pull request #21529 from LK4D4/test_exit_early
integration-cli: exit early if daemon immedately crashed
Upstream-commit: 6eb38359954269103f2a3094283c4cb0a1cb63f9
Component: engine
2016-03-29 09:34:17 +02:00