Commit graph

23398 commits

Author SHA1 Message Date
Vincent Demeester
0bdcbe5dd2 Merge pull request #21624 from LK4D4/fix_store_races
volume/store: fix couple of races with accessing maps
2016-03-30 14:07:37 +02:00
Vincent Demeester
4745656e18 Merge pull request #21645 from albers/completion-history--human
bash completion for `docker history --human`
2016-03-30 12:19:47 +02:00
Vincent Demeester
2f35c6b3fb Merge pull request #21491 from pcarrier/pcarrier/wtf
docker.service: don't limit tasks
2016-03-30 11:08:15 +02:00
Sebastiaan van Stijn
71cab5b0dc Merge pull request #21629 from thaJeztah/bump-runc
Bump runC to 40f4e7873d88a4f4d12c15d9536bb1e34aa2b7fa
2016-03-29 23:07:12 -07:00
Harald Albers
a2dbf7626c bash completion for docker history --human
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-29 21:56:24 -07:00
Alexander Morozov
d02e24f27d Merge pull request #21603 from aaronlehmann/testtransfer-flakiness-2
Fix flaky test TestTransfer (take 2)
2016-03-29 21:40:38 -07:00
Tibor Vass
d800be743d Merge pull request #21591 from riyazdf/hardware-signing-non-experimental
move hardware signing out of experimental, remove yubico-piv-tool deps
2016-03-30 00:09:22 -04:00
Sebastiaan van Stijn
457eb89bd5 Merge pull request #21638 from yongtang/21605-docs-Warnings-in-volumes-API
Update documentations for `Warnings` fields in `GET /volumes` API
2016-03-29 19:11:36 -07:00
Yong Tang
d773927985 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>
2016-03-30 01:35:39 +00:00
Sebastiaan van Stijn
eaf138af1f Merge pull request #21598 from aaronlehmann/not-found-error
Change v1 pull 404 message to include tag
2016-03-29 17:28:12 -07:00
Sebastiaan van Stijn
752b31d3fe 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>
2016-03-29 17:10:05 -07:00
David Calavera
99adcaebc0 Merge pull request #21592 from anusha-ragunathan/docker-systemd
When using systemd, pass expected cgroupsPath and cli options to runc.
2016-03-29 17:00:10 -07:00
Sebastiaan van Stijn
7e63ed90aa Merge pull request #21610 from albers/completion-no-new-privileges
bash completion for `docker {run,create} --security-opt no-new-privileges
2016-03-29 16:52:04 -07:00
Sebastiaan van Stijn
bf18ab1869 Merge pull request #21623 from albers/completion-options-false
bash completions: Improve consistency for boolean options with default=true
2016-03-29 16:42:13 -07:00
David Calavera
34e05f5cb1 Merge pull request #21630 from LK4D4/fix_create_list_races
daemon: register container as late as possible
2016-03-29 16:34:19 -07:00
Brian Goff
8899896992 Merge pull request #21620 from LK4D4/fix_libcd_race
libcontainerd: reuse our pkg/locker
2016-03-29 14:37:53 -07:00
Anusha Ragunathan
7ed3d265a4 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>
2016-03-29 14:20:10 -07:00
Alexander Morozov
114be249f0 daemon: register container as late as possible
fixes races between list and create

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-29 13:52:18 -07:00
David Calavera
d78f8f2796 Merge pull request #21608 from albers/build-clone-https
Use https for `git clone` in build
2016-03-29 11:30:35 -07:00
David Calavera
0fa96f2463 Merge pull request #21593 from aboch/bdvnd
Vendoring boltb/bolt v1.2.0
2016-03-29 11:29:30 -07:00
Alexander Morozov
e6d87c0706 volume/store: fix couple of races with accessing maps
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-29 10:46:29 -07:00
Harald Albers
39b9b63e36 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>
2016-03-29 10:24:45 -07:00
Aaron Lehmann
745892a7b2 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>
2016-03-29 10:04:59 -07:00
Alexander Morozov
a7851e2556 libcontainerd: reuse our pkg/locker
it fixes race with access to containerMutexes

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-29 09:43:12 -07:00
Sebastiaan van Stijn
e42c164763 Merge pull request #18747 from thaJeztah/update-authors
Update AUTHORS
2016-03-29 09:41:21 -07:00
Tibor Vass
c1706d722f Merge pull request #21619 from mlaventure/use-debian-llvm-repo
Update the llvm repo to use the debian jessie url
2016-03-29 12:09:10 -04:00
Arnaud Porterie
1da40fb4ba Merge pull request #21586 from calavera/remove_runconfig_from_routes
Remove runconfig package dependency from the API.
2016-03-29 08:40:49 -07:00
Kenfe-Mickael Laventure
73672c5bd8 Update the llvm repo to use the debian jessie url
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-03-29 08:39:16 -07:00
Alexander Morozov
d33480474f Merge pull request #21599 from tonistiigi/separate-daemon-exec-root
Use separate exec-root for test daemons
2016-03-29 07:52:18 -07:00
Harald Albers
e96d086afd bash completion for docker {run,create} --security-opt no-new-privileges
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-29 09:59:04 +02:00
Vincent Demeester
78076d5cf9 Merge pull request #21585 from tophj-ibm/ppc64le-bump-go1.6
ppc64le: bump golang back to 1.6
2016-03-29 09:58:20 +02:00
Vincent Demeester
4aa36da9ad Merge pull request #21602 from aaronlehmann/login-log-message
Correct login debug log message
2016-03-29 09:56:08 +02:00
Harald Albers
a7e9bf6cb7 Use https for git clone in build
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-29 09:35:42 +02:00
Vincent Demeester
6eb3835995 Merge pull request #21529 from LK4D4/test_exit_early
integration-cli: exit early if daemon immedately crashed
2016-03-29 09:34:17 +02:00
Vincent Demeester
08db95161a Merge pull request #21597 from aaronlehmann/mention-docker-login
Mention "docker login" in push/pull documentation
2016-03-29 09:27:53 +02:00
Vincent Demeester
b9d59e86d3 Merge pull request #21576 from albers/docs-daemon--containerd
docs for `docker daemon --containerd`
2016-03-29 09:25:16 +02:00
Vincent Demeester
9021b048f5 Merge pull request #21589 from tkopczynski/20784-builder-tests
Builder/dockerignore tests
2016-03-29 09:20:15 +02:00
Vincent Demeester
53f3248d90 Merge pull request #21561 from HackToday/addman
Add man change for volume filter
2016-03-29 09:18:16 +02:00
Vincent Demeester
e6aa40a017 Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli
CLI flag for docker create(run) to change block device size.
2016-03-29 08:52:54 +02:00
Sebastiaan van Stijn
f95058aa0f Merge pull request #21596 from trumpcard/master
Fix a link in the volumes doc to the deprecated doc.
2016-03-28 19:25:10 -07:00
Sebastiaan van Stijn
eeaf14395e Merge pull request #21541 from yongtang/20909-engine-api
Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9.
2016-03-28 19:01:15 -07:00
Sebastiaan van Stijn
6114072ffc Merge pull request #21587 from Microsoft/jjh/bridgeconfig
Windows: bridgeConfig rework
2016-03-28 18:45:41 -07:00
Aaron Lehmann
0dea21f446 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>
2016-03-28 18:27:29 -07:00
Aaron Lehmann
e42f85080b 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>
2016-03-28 18:22:24 -07:00
Tonis Tiigi
0d9b94c4c5 Use separate exec-root for test daemons
Fixes #21545

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-28 17:38:14 -07:00
Aaron Lehmann
fb5ea0c0ef Mention "docker login" in push/pull documentation
It was suggested to me that documentation for "docker pull" and "docker
push" should reference "docker login", to make clearer how to specify
credentials for a push or pull operation. Add a note to the manual pages
and reference documentation explaining how registry credentials are
managed.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-03-28 17:22:41 -07:00
Michael Crosby
051c5ddadc Merge pull request #21552 from tonistiigi/aufs-mount-locks
Protect aufs mounts with locks
2016-03-28 17:00:43 -07:00
Brian Trump
02f951b67a Fix a link in the volumes doc to the deprecated doc.
Signed-off-by: Brian Trump <btrump@opselite.org>
2016-03-28 16:55:24 -07:00
Sebastiaan van Stijn
1e1da2a29b Merge pull request #21582 from kamigerami/fixes-21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md
fixes-#21581-no--subnetwork-option-as-specified-in-docs
2016-03-28 16:25:52 -07:00
Tõnis Tiigi
553edd1d19 Merge pull request #21251 from cyphar/refactor-copyonbuild
pkg: archive: don't fail Untar if xattrs are not supported
2016-03-28 16:15:18 -07:00