71d4646a90
Request pull credentials when using trusted reference
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: df9cc3d9228cb07474dd046736c6f83513c4923d
Component: engine
2016-03-31 10:56:19 -07: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
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
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
5f7e4a225f
Merge pull request #21597 from aaronlehmann/mention-docker-login
...
Mention "docker login" in push/pull documentation
Upstream-commit: 08db95161a1dc7c5bfe570652d4eb859025a62cb
Component: engine
2016-03-29 09:27:53 +02:00
2a9ea71f8e
Merge pull request #21576 from albers/docs-daemon--containerd
...
docs for `docker daemon --containerd`
Upstream-commit: b9d59e86d35bd2cfba0c77c323b14b05a238eae6
Component: engine
2016-03-29 09:25:16 +02:00
2d4bee9107
Merge pull request #21589 from tkopczynski/20784-builder-tests
...
Builder/dockerignore tests
Upstream-commit: 9021b048f5c2c92baddcefcfeedc731a32b5cca7
Component: engine
2016-03-29 09:20:15 +02:00
04b0094596
Merge pull request #21561 from HackToday/addman
...
Add man change for volume filter
Upstream-commit: 53f3248d90713b5d3209c6b931d99f58592691eb
Component: engine
2016-03-29 09:18:16 +02:00
57e1cc77d5
Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli
...
CLI flag for docker create(run) to change block device size.
Upstream-commit: e6aa40a017e0c11186fb9053b9e71e34b93ebe1c
Component: engine
2016-03-29 08:52:54 +02:00
98d00ddae5
Merge pull request #21596 from trumpcard/master
...
Fix a link in the volumes doc to the deprecated doc.
Upstream-commit: f95058aa0fee0b816aa84e51fd886528d2eb0afb
Component: engine
2016-03-28 19:25:10 -07:00
ce89a82639
Merge pull request #21541 from yongtang/20909-engine-api
...
Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9.
Upstream-commit: eeaf14395e05b331b82d429d161f5d76f7b1837d
Component: engine
2016-03-28 19:01:15 -07:00
46aef12c44
Merge pull request #21587 from Microsoft/jjh/bridgeconfig
...
Windows: bridgeConfig rework
Upstream-commit: 6114072ffc78adda9888b31c70b95e73a8ea3c2e
Component: engine
2016-03-28 18:45:41 -07:00
e439510d54
Fix flaky test TestTransfer (take 2)
...
TestTransfer failed in CI:
https://jenkins.dockerproject.org/job/Docker-PRs-experimental/17103/console
This is the same issue as https://github.com/docker/docker/pull/21233 ,
but only one of the code paths was fixed in that PR. The one which
handles the first progress update was not - it still assumed that the
progress indication should be 0/10.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 0dea21f4462706290c85e6d74b165ceae7e9cfee
Component: engine
2016-03-28 18:27:29 -07:00
300a77843c
Correct login debug log message
...
I noticed the following message in a daemon log:
```
attempting v2 login to registry endpoint {%!s(bool=false) https://registry:5000 v2 %!s(bool=false) %!s(bool=true) %!s(*tls.Config=&{<nil> <nil> [] map[] <nil> 0xc82075c030 [] 0 <nil> false [49196 49200 49195 49199 49162 49161 49172 49171 53 47] true false [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] <nil> 769 0 [] {{0 0} 0} {{0 0} 0 0 0 0} []})}
```
loginV2 tries to log an APIEndpoint as a string, but this struct does
not have a String method. Log the actual URL that will be used as the
endpoint, instead.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: e42f85080b8254ee025f30cf7860641836df649f
Component: engine
2016-03-28 18:22:24 -07:00
40995de161
Use separate exec-root for test daemons
...
Fixes #21545
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0d9b94c4c5d6b4f03a7a86e731e4110e9f27a51e
Component: engine
2016-03-28 17:38:14 -07:00
