Commit Graph
23467 Commits
Author SHA1 Message Date
Alexander Morozov 7665d0c146 integration-cli: exit early if daemon immedately crashed
this reduces execution of TestInfoDiscoveryInvalidAdvertise from 11s to 0.2s

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 0f217cead8260ab45f9749074d954e5e9e76187b
Component: engine
2016-03-27 21:57:32 -07:00
Alexander Morozov 406cc47308 use router.Cancellable for pull and push
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c6ad1980a2eb2994940bdf7f79835ffdbed2b44d
Component: engine
2016-03-27 21:53:25 -07:00
Kai Qiang Wu(Kennan) 599b19642f Add man change for volume filter
It was forgetton to add change in man for new-added volume filters.
This change adds that.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: c70c0e4d0be94ab2e0944a16be08389d178003bc
Component: engine
2016-03-28 03:11:27 +00:00
John Howard 379ab3cb40 Windows: psignal alias not required
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 59d8878558f97055d8abb1fa347df437cf8f90aa
Component: engine
2016-03-27 17:23:34 -07:00
Liron Levin ccb887dc36 Extend Docker authorization with TLS user information
Currently Docker authorization framework does not use any user
information, which already available in the Docker context for TLS
connection.
The purpose of this CR is to complete the existing authz work by adding
the basic client certificate details (SUBJECT_NAME) and authentication
method (TLS) to the authz request.

We think this should be the default behavior when no extended
authorization module is specified (currently WIP under #20883).

Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: 3c157713b31f542a4180e31da4cae7d677330a6f
Component: engine
2016-03-27 15:53:55 +03:00
Pierre Carrier ee66cdf051 docker.service: don't limit tasks
Signed-off-by: Pierre Carrier <pierre@meteor.com>
Upstream-commit: 33a8ab29ed9e51697772a0642b8d651b9a845532
Component: engine
2016-03-27 04:02:34 -07:00
Vincent Demeester 0e9114cf26 Merge pull request #21547 from sdurrheimer/zsh-completion-gelf-compression
Add zsh completion for gelf-compression log driver options
Upstream-commit: 4afeabfdadf1715a63d0efdb0891038141307913
Component: engine
2016-03-27 11:52:41 +02:00
Steve Durrheimer 32e443f541 Add zsh completion for gelf-compression log driver options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ff31f166f205432f07059dbce2b07e25a10abf1f
Component: engine
2016-03-27 11:31:04 +02:00
Vincent Demeester 0b74d68177 Merge pull request #21546 from sdurrheimer/zsh-completion-ps-filters
Add zsh completion for 'docker ps --filter' values
Upstream-commit: 1aa07d6f119d478bd1a60a0d56e67b0ccc092ffb
Component: engine
2016-03-27 10:22:50 +02:00
Vincent Demeester cbee126aa1 Merge pull request #21548 from sdurrheimer/zsh-completion-etwlogs-gcplogs-log-drivers
Add zsh completion for etwlogs and gcplogs log drivers
Upstream-commit: 49a73ca1211dbf9771bcdd578b31958708b0e628
Component: engine
2016-03-27 10:18:57 +02:00
Vincent Demeester fb65f0385f Merge pull request #21544 from allencloud/fix-typo
fix typos
Upstream-commit: 98132f850b879a4c677c88b85f3c5e9771544678
Component: engine
2016-03-27 10:18:02 +02:00
Sebastiaan van Stijn b7358edb69 Update AUTHORS
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: afeba190a5e533a6a276cd8f5889202389b8f9d3
Component: engine
2016-03-26 23:46:20 -07:00
Tõnis Tiigi d07223a5ed Merge pull request #21540 from senk/patch-containerd
Fixes typo in containerd-parameter usage instructions. Fixes #21538
Upstream-commit: 8dbecd5936499940f044016042319a24d81a9df6
Component: engine
2016-03-26 23:10:23 -07:00
Tonis Tiigi 4ae1bedbae Add support for repeating integration tests
`TEST_REPEAT=n` runs the test suite again n times or
until the first failure without doing building and
daemon setup. Useful for debugging flaky tests.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 477fe4846ac72a77d7b045d1b5619bc7cfdbb9aa
Component: engine
2016-03-26 23:05:55 -07:00
Tonis Tiigi a119fb7401 Protect aufs mounts with locks
Parallel aufs mount calls produce invalid argument error.

Fixes #21545


Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 824c24e6802ad3ed7e26b4f16e5ae81869b98185
Component: engine
2016-03-26 22:53:47 -07:00
Sebastiaan van Stijn 787815951d Merge pull request #21542 from sdurrheimer/zsh-completion-journald-tag
Add zsh completion for journald tag opt
Upstream-commit: d954186efb6e18a02ca401a77bde2637529a5e95
Component: engine
2016-03-26 18:04:53 -07:00
Sebastiaan van Stijn 49ac3e79e1 Merge pull request #21543 from sdurrheimer/zsh-completion-update-restart
Add zsh completion for 'docker update --restart'
Upstream-commit: a5dc6c3ca135b16d9a2b60b181ad7e2fcbb3b909
Component: engine
2016-03-26 18:03:27 -07:00
Sebastiaan van Stijn 56626fc3a8 Merge pull request #21549 from sdurrheimer/zsh-completion-pull-push-disable-content-trust
Add zsh completion for 'docker {pull,push} --disable-content-trust'
Upstream-commit: db00de5d378acd270211c55591dc28ce3fd4c8af
Component: engine
2016-03-26 17:57:46 -07:00
Steve Durrheimer 659564696f Add zsh completion for 'docker {pull,push} --disable-content-trust'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b0235ffdddede003b3e125ffdef796a185e8a43e
Component: engine
2016-03-26 22:49:53 +01:00
Steve Durrheimer 7b44e5909c Add zsh completion for etwlogs and gcplogs log drivers
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ca3ff89e56026d31ec0fdd2bf59b0db3ca5be3c1
Component: engine
2016-03-26 22:39:17 +01:00
Steve Durrheimer 67613bfe8f Add zsh completion for 'docker ps --filter' values
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f3a27a6fac8d32a2930821a83bcceb750ff8070a
Component: engine
2016-03-26 21:53:27 +01:00
Steve Durrheimer 50b9ee06ca Add zsh completion for 'docker update --restart'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ca2cca025579c92aaab0a27b6740c72f88788b1d
Component: engine
2016-03-26 15:07:02 +01:00
allencloud 35980664e6 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6983f05b42527dec87de9b2ecaf1d948038860fc
Component: engine
2016-03-26 22:06:45 +08:00
Steve Durrheimer 6eaab5297f Add zsh completion for journald tag opt
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 93ffc2d9544742f1c78043fd449fe7e7ef59bbf3
Component: engine
2016-03-26 14:54:11 +01:00
Robin Naundorf 0d92595efc Fixes #21538
typo corrected

Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
Upstream-commit: a1d6c60ee094e12b7373cc86b78d89ba0a3e5090
Component: engine
2016-03-26 09:38:00 +01:00
Sebastiaan van Stijn db5707e071 Merge pull request #21537 from senk/patch-1
Added 2nd experimental feature currently active
Upstream-commit: 6f9872180ca4a6f1c69e385025f1bbd3879e3edc
Component: engine
2016-03-26 00:02:02 -07:00
Robin Naundorf ca7bd33e58 Added 2nd experimental feature currently active
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
Upstream-commit: 65ab7fa2b3316bfe38b7f57fe2d5a9c6593ed075
Component: engine
2016-03-26 07:35:03 +01:00
Brian Goff 8a8affba81 Optimizations for StdWriter
Avoids allocations and copying by using a buffer pool for intermediate
writes.

```
benchmark            old ns/op     new ns/op     delta
BenchmarkWrite-8     996           175           -82.43%

benchmark            old MB/s     new MB/s     speedup
BenchmarkWrite-8     4414.48      25069.46     5.68x

benchmark            old allocs     new allocs     delta
BenchmarkWrite-8     2              0              -100.00%

benchmark            old bytes     new bytes     delta
BenchmarkWrite-8     4616          0             -100.00%
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2f3b6022858aab2d70e380d126e6dcec227c0d38
Component: engine
2016-03-25 22:14:27 -04:00
Sebastiaan van Stijn dc5b8789eb Merge pull request #21461 from thaJeztah/add-ubuntu-16.04-xenial
docs: add Ubuntu 16.04 "xenial"
Upstream-commit: 9f6322e497a63d5837841d89bb7c6b3cbb866283
Component: engine
2016-03-25 16:07:05 -07:00
David Calavera 4ed6181a41 Merge pull request #21527 from sdurrheimer/zsh-completion-build-network-volume-label
Add zsh completion for 'docker {build, volume create, network create}…
Upstream-commit: 8fabc9aee0c15f4a154febc46532b711b75b0f69
Component: engine
2016-03-25 14:58:56 -07:00
David Calavera ecee852fa8 Merge pull request #21508 from vdemeester/remove-client-unused-method
Removing DockerCli.pullImage as it's never used
Upstream-commit: 0524a9783d5210bf3e24794fb9a81c256393b83b
Component: engine
2016-03-25 13:52:49 -07:00
Steve Durrheimer 37495cafa8 Add zsh completion for 'docker {build, volume create, network create} --label'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 5bfd29b9fbc97392d540013a8225671e2f83c407
Component: engine
2016-03-25 20:43:43 +01:00
Vincent Demeester ba94f14ffd Merge pull request #21522 from albers/docs-labels-everywhere
docs for labels on build, networks and volumes
Upstream-commit: 64456f3c6d1712c939d1aefe0db1510b9c4841d3
Component: engine
2016-03-25 20:04:03 +01:00
Sebastiaan van Stijn 37f78983d9 Merge pull request #21516 from sdurrheimer/zsh-completion-logopt-fluentd
Add zsh completion for new fluentd log driver options
Upstream-commit: 7512d3ce3b074d5e6c91feb51efa36b9c4b255b4
Component: engine
2016-03-25 11:39:33 -07:00
Alexander Morozov 4948749e40 use router.Cancellable instead of direct CloseNotify
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 62c9e62edcf3d96d251fd06a48437b2fa2f56ad6
Component: engine
2016-03-25 11:33:54 -07:00
Steve Durrheimer 15c81cf230 Add zsh completion for new fluentd log driver options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 396ffa2faf4b16bf6d6dbd813e967038bb2b4034
Component: engine
2016-03-25 19:28:38 +01:00
Harald Albers 779c6aca92 docs for labels on build, networks and volumes
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 995e5beda74b99dfc920f6a79aee977ff5a15a72
Component: engine
2016-03-25 11:16:19 -07:00
David Calavera 2803dd9564 Merge pull request #21486 from Microsoft/jjh/execroot
Windows: Remove --exec-root
Upstream-commit: 786305ed0cd8f9b8b8a66b6b77907b2f8635e95b
Component: engine
2016-03-25 11:07:48 -07:00
David Calavera b7378f32b5 Merge pull request #21493 from Microsoft/jjh/nativeconsole2
Windows: Native console disableNewlineAutoReturn
Upstream-commit: 73f8654759a2a66448d548e37b20b735b45322d9
Component: engine
2016-03-25 11:07:18 -07:00
David Calavera 19919a5873 Merge pull request #21503 from AkihiroSuda/fix-Dockerfile-simple
Update Dockerfile.simple so that it can be successfuly built
Upstream-commit: e811dab6a9ee72ac6ddc7bef5f755ae426245553
Component: engine
2016-03-25 11:06:47 -07:00
David Calavera 74cf4ab6a4 Merge pull request #21517 from sdurrheimer/zsh-completion-load-quiet
Add zsh completion for 'docker load -q --quiet'
Upstream-commit: 4bd03fe71b3f5670b89d10f32ee02af666dfe7ae
Component: engine
2016-03-25 11:06:13 -07:00
David Calavera 5b51de2d40 Merge pull request #21520 from albers/completion-labels-everywhere
bash completion for labels on build, networks and volumes
Upstream-commit: aa7be04e525554c1c71e32ac57cda1f45c91d806
Component: engine
2016-03-25 11:05:45 -07:00
Harald Albers 071bb3598c bash completion for labels on build, networks and volumes
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a2958aa18f148ce2672b2f0c237c288d3f200add
Component: engine
2016-03-25 10:56:04 -07:00
Tõnis Tiigi f7d7f8e5e6 Merge pull request #21468 from coolljt0725/remove_useless_log
Do not return error on hijacked connection for docker exec
Upstream-commit: e2221d1f37d1204ccca51722aa21fc11939a41ba
Component: engine
2016-03-25 10:50:43 -07:00
Sebastiaan van Stijn 8fcbd21a4a docs: add Ubuntu 16.04 "xenial"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 62e7fde80fde2efda14d2b60061106ea48715c50
Component: engine
2016-03-25 10:48:51 -07:00
Tõnis Tiigi 5b69d4f4ab Merge pull request #21474 from jfrazelle/fastness-for-the-storage-driver-gods
set the default storage driver as the users current default
Upstream-commit: fc3d87f80fcf4eaf971a63b38a20227534645f3d
Component: engine
2016-03-25 10:47:40 -07:00
Brian Goff f97f5ba239 Merge pull request #21509 from kencochrane/add_better_unsupported_message
Added a better message for when we build an unsupported Docker version
Upstream-commit: 2c224fb06ad3c20ca9c32ee733904b3478c60a7b
Component: engine
2016-03-25 13:46:41 -04:00
Steve Durrheimer 068febd10f Add zsh completion for 'docker load -q --quiet'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f8009d10bba6bb179466456bf5564883d5b7deac
Component: engine
2016-03-25 18:36:45 +01:00
Arnaud Porterie eebd78388f Merge pull request #21511 from tiborvass/fix-release-scripts
Fix release scripts
Upstream-commit: ed95d753b45b24cb8f1b70e33ff6a4587a668477
Component: engine
2016-03-25 10:34:09 -07:00
Arnaud Porterie 7e5fc2836c Merge pull request #21514 from tonistiigi/disable-privileged-test-in-userns
Disable privileged test in user namespace
Upstream-commit: e2628176821d3c18f33b8c1c549d33d7b12cdb9b
Component: engine
2016-03-25 10:30:12 -07:00