Commit Graph

21836 Commits

Author SHA1 Message Date
91e6a2df59 Remove runconfig dependency from network routes.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3ca29823d42ab1e2b1ea76981ccc9aa11e858cb2
Component: engine
2016-03-28 16:23:50 -04:00
e7a45df591 Merge pull request #21553 from tonistiigi/test-repeat
Add support for repeating integration tests
Upstream-commit: cf91a1be45fc4f1d4e3338610f921d665d406b04
Component: engine
2016-03-28 11:39:22 -07:00
4d49388b9b Merge pull request #21566 from allencloud/upper-case-docker-info-display
upper case docker info details
Upstream-commit: dd7691423f685bc4d724224913556c7e2cf4bc56
Component: engine
2016-03-28 11:37:23 -07:00
6d41979085 Merge pull request #21556 from twistlock/basic_authn_client_cert
Extend Docker authorization with TLS user information
Upstream-commit: dd757deae06c55d7c2c1dcf5177dcfe7de386a61
Component: engine
2016-03-28 11:36:02 -07:00
a57d5675f0 Merge pull request #21579 from albers/completion-run--userns
bash completion for `docker {run,create} --userns`
Upstream-commit: d48b1c6de5440cb571737e914d50f434d860567a
Component: engine
2016-03-28 11:31:55 -07:00
13c92dc94b Merge pull request #21580 from sdurrheimer/zsh-completion-create-run-userns
Add zsh completion for 'docker {create,run} --userns'
Upstream-commit: 22ca91b08469be0143e8504e0599924380af28bd
Component: engine
2016-03-28 11:31:39 -07:00
1f1392075e Merge pull request #21584 from albers/completion-fix--security-opt
fix bash completion for `docker run --security-opt`
Upstream-commit: 20ab6700902ff516d387209eeec9057131390a0a
Component: engine
2016-03-28 11:29:31 -07:00
b6a76f6ed0 fix bash completion for docker run --security-opt
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 020998e24cc9bdf16204f1db18cf4886897c1541
Component: engine
2016-03-28 08:07:28 -07:00
c8b6e46487 bash completion for docker {run,create} --userns
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 62475684b9cb09ba5cc3f2dd3b3ad88031b391ba
Component: engine
2016-03-28 06:47:33 -07:00
0f9376bef8 Add zsh completion for 'docker {create,run} --userns'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 39d7ff233bbc2f333cce30124bfd6f52bba1ae2a
Component: engine
2016-03-28 15:39:27 +02:00
e155de707d Fix misspellings
Signed-off-by: Dmitri Logvinenko <dmitri.logvinenko@gmail.com>
Upstream-commit: 6dede879fd8e0c5f599631d125753d360ead3bc0
Component: engine
2016-03-28 16:21:02 +03:00
e174dcb4d2 Add zsh completion for 'docker daemon --containerd'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 63b29eda68683bad2e375fee97b4d106a5ca5a77
Component: engine
2016-03-28 14:40:56 +02:00
73e3eff64f bash completion for docker daemon --containerd
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: aeaba46c2c411523fc03ce5fcdf51f50e14b80ce
Component: engine
2016-03-28 04:30:02 -07:00
64bbcab7a5 upper case docker info details
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 276a20dd426524c254e8b2a4cc9047bcc62fd321
Component: engine
2016-03-28 18:47:04 +08:00
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
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
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
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
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
fb65f0385f Merge pull request #21544 from allencloud/fix-typo
fix typos
Upstream-commit: 98132f850b879a4c677c88b85f3c5e9771544678
Component: engine
2016-03-27 10:18:02 +02:00
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
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
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
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
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
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
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
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
35980664e6 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6983f05b42527dec87de9b2ecaf1d948038860fc
Component: engine
2016-03-26 22:06:45 +08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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