b4d3175bf2
Merge pull request #17275 from vdemeester/17246-tags-to-repotags
...
Use RepoTags & RepoDigest in inspect
Upstream-commit: 4c253ddf204f0c8ebc58c1aa5796c689d623e16b
Component: engine
2015-10-22 17:14:49 -04:00
e1f1cd631a
Use RepoTags & RepoDigest in inspect
...
To be coherent with /images/json (images command)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f664f6e4b19d4e155d78af2eacddcd941dae4fce
Component: engine
2015-10-22 23:00:59 +02:00
14cf75b797
Merge pull request #17270 from albers/completion-network-ids
...
bash completion can be configured to complete network IDs
Upstream-commit: 4816626f3e84ef6452ecfed9d79ae537273bde31
Component: engine
2015-10-22 13:37:38 -07:00
95b57bebf2
Merge pull request #17274 from aboch/ai
...
Turn off discovery when icc == false
Upstream-commit: 2afdc6582b203c2beaeaca6ff14f61ae50f8cab9
Component: engine
2015-10-22 13:08:31 -07:00
8c31621591
Merge pull request #17269 from tonistiigi/trust-deprecation-warning
...
Show trust variable deprecation warning only if used
Upstream-commit: 09cd98462b0b9bae38806c7615ee17dd7afd5714
Component: engine
2015-10-22 22:05:29 +02:00
a580a5360e
Merge pull request #17268 from albers/completion-network-inspect-args
...
bash completion for `docker network inspect` supports multiple networks
Upstream-commit: 8b198a3bfbba37bd772702683d25dfdfe5e7ee79
Component: engine
2015-10-22 21:18:10 +02:00
553ed6afa5
Turn off service discovery when icc==false
...
- Turn off built-in service discovery on docker0 bridge
when icc is false
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 20faaaa872444b6fffbc5a6d30310a782caafe0f
Component: engine
2015-10-22 12:02:02 -07:00
da35e80d77
Show trust variable deprecation warning only if used
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: dfdee4130816cd5334330cc431d8200c1fa4e609
Component: engine
2015-10-22 11:01:30 -07:00
fa8ff6ad04
bash completion can be configured to complete network IDs
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1598500df8337a1fdde7954a7b0fc5688ae2acac
Component: engine
2015-10-22 18:58:34 +02:00
5bc0dcf27f
bash completion for docker network inspect supports multiple networks
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 10e485b3860516c23bc3efa43c62dd11ee912b3e
Component: engine
2015-10-22 17:53:17 +02:00
d91b6a5ec6
Merge pull request #17259 from SvenDowideit/fix-some-errant-links
...
Fix some errant links
Upstream-commit: bb19575d40b3ec679acd2aadeea37e7bba12179c
Component: engine
2015-10-22 07:26:15 -07:00
976823bb04
Fix some errant links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 9ed6cec8ff91ff100c268fa21817fdc111e77e43
Component: engine
2015-10-22 20:33:24 +10:00
a97ff526a8
Merge pull request #16784 from MHBauer/test-refactor
...
use gocheck asserts instead of fatal
Upstream-commit: 48fe12af0c785d62ac852ea8428a9789a4e9d7fd
Component: engine
2015-10-22 08:34:50 +02:00
5c1cc8ba8e
Merge pull request #17241 from gondor/docs-extend-plugins
...
docs: Add Netshare volume plugin to extend/plugins
Upstream-commit: c6ec33ea8f8a2691c9a43f02cc69fcd204e04b18
Component: engine
2015-10-21 19:24:32 -07:00
ce2218086c
changes from review - which -> that
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com >
Upstream-commit: a263709a9bce010082399fc539c385de3a059dda
Component: engine
2015-10-21 18:42:17 -07:00
bfa5462401
changes from review - move up to conform to alphabetical order
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com >
Upstream-commit: f8c0d4d0550836eaba0b41df560464f048c5fdfd
Component: engine
2015-10-21 18:07:55 -07:00
a221e0a530
Merge pull request #16971 from HuKeping/upgrade-test
...
Use checker on integration test when possible
Upstream-commit: fa2bf776a2fb5666531378699f826d24225f93ae
Component: engine
2015-10-21 20:49:38 -04:00
04eb439359
Use checker on integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 710817a71b40287acc546fe2e08367b2a02dae54
Component: engine
2015-10-22 15:53:17 +08:00
3a9331408c
Merge pull request #17153 from albers/completion-cp-args
...
[Fix 17029] docker cp completion not correct
Upstream-commit: 4786ac1ffe53c2229deb5fc14f1261fd33004afb
Component: engine
2015-10-21 14:58:11 -07:00
807b4a5c28
Merge pull request #17203 from hopkings2008/auth_token
...
In NewV2Repository, check the suffix of endpoint.URL and append 'v2' …
Upstream-commit: 697d4c9e7222a10995f46e6008137099da778402
Component: engine
2015-10-21 14:57:05 -07:00
03db45396b
Merge pull request #17055 from daehyeok/parse_utf8
...
ProcessWord support UTF-8
Upstream-commit: ab22fe0f7ce0c6211396030431506c64e1a5d57f
Component: engine
2015-10-21 23:42:50 +02:00
389b888060
Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest
...
RPM change install location of Fish completions
Upstream-commit: af6743a6c61b3c854d647975bca3f826ec654b20
Component: engine
2015-10-21 14:36:50 -07:00
9c590c0edb
Merge pull request #17227 from aaronlehmann/layer-compression
...
Fix layer compression regression
Upstream-commit: e319b122d34b88c8c450225b23515751f4d58d1b
Component: engine
2015-10-21 17:32:58 -04:00
dc90c0567e
Merge pull request #16908 from brahmaroutu/skip_oom_gccgo
...
Skipping two tests when running with GCCGO (CI)
Upstream-commit: bf8ba3d0c970c53890924bd1bf65cb593329df6f
Component: engine
2015-10-21 14:01:59 -07:00
7356782f88
Merge pull request #17145 from thaJeztah/deb-add-fish-completions
...
deb: add fish completions
Upstream-commit: 08fb49597563e66d708098b4391ad7e13d3e619d
Component: engine
2015-10-21 13:58:22 -07:00
c9ccdaace3
Merge pull request #17220 from calavera/fix_double_removal
...
Do not fail when a container is being removed and we request its delete again.
Upstream-commit: 70af70aa0b448b49940f9971bc87ca9ed7cdd9c4
Component: engine
2015-10-21 13:57:16 -07:00
64508b543f
Merge pull request #17251 from tiborvass/fix-release-script
...
release: fix bash bug in script
Upstream-commit: f33678d1bf8fcab91004f1a62cfc9453d82dd186
Component: engine
2015-10-21 13:08:50 -07:00
c0edcf2339
release: fix bash bug in script
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 420e07cc2c8189cb3c1f361aa0c1c1d1156b9eda
Component: engine
2015-10-21 16:02:14 -04:00
533bd1241f
Merge pull request #16890 from runcom/perf-boost
...
rmi and build cache miss performance improvements
Upstream-commit: 56ef47e881359776638903ef1636cb7030ca5eec
Component: engine
2015-10-21 16:00:25 -04:00
6f2afc4020
Merge pull request #17245 from dhiltgen/discovery_tls
...
Wire up libnetwork with TLS discovery options
Upstream-commit: 94a16c81f4b6f44c8ffd8974f71c2975d524d32a
Component: engine
2015-10-21 15:20:24 -04:00
64dbd1e1a8
Merge pull request #17213 from calavera/volume_driver_validate_name
...
Validate volume names for the local driver.
Upstream-commit: 8247eff8a807d88bb683251bdbb16de6a52f0402
Component: engine
2015-10-21 11:48:54 -07:00
77ceb17e18
Merge pull request #16992 from burke/fix-mqueue
...
Fix --ipc=host dependency on /dev/mqueue existing
Upstream-commit: 678acbcb3fc370e31f677c71a5f8615f2ad3a353
Component: engine
2015-10-21 11:25:37 -07:00
4a8a97b06e
Merge pull request #17218 from vdemeester/17023-network-multiple-inspect
...
Add support for multiple network in inspect
Upstream-commit: 9f031f70ce832a5f3fde7bd902e66abeb44f19a9
Component: engine
2015-10-21 11:09:02 -07:00
91b1ec8aba
Merge pull request #16940 from coolljt0725/default_tls_host
...
Make default tls host work
Upstream-commit: 6a7c38a57d865afc89e4d6ec388bae3b9bedb870
Component: engine
2015-10-21 14:02:22 -04:00
e3fa9b6aba
Skipping two tests when running with GCCGO (CI)
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: dc813c7d137d3e673b68ad4a2996f254d195f1d9
Component: engine
2015-10-21 17:53:59 +00:00
d9fd855cee
Merge pull request #17179 from tonistiigi/17178-dont-overwrite-layer-checksum
...
Don’t overwrite layer checksum on push
Upstream-commit: 10430fd334b7d53146a05083beddfc8c6a8cac91
Component: engine
2015-10-21 13:42:59 -04:00
6672204b41
Merge pull request #17136 from gesellix/change-route-volume-create
...
rename `POST /volumes` to `POST /volumes/create`
Upstream-commit: 492945235b6be7f2f7ff8721de0c01a93d0b0f6f
Component: engine
2015-10-21 10:21:27 -07:00
53531be5ba
Wire up libnetwork with TLS discovery options
...
This change exposes the TLS configuration settings to libnetwork so it can
communicate with a key/value store that has been set up with mutual TLS.
TLS options were introduced with https://github.com/docker/docker/pull/16644
Libnetwork support was introduced with https://github.com/docker/libnetwork/pull/602
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 10e7806984947304767690785b6fb329fd93283a
Component: engine
2015-10-21 09:38:58 -07:00
2bfb10b6f8
Vendoring in libnetwork for the anonymous endpoint
...
- commit f3c8ebf46b890d4612c5d98e792280d13abdb761
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 1be540b99bdf7557d4c3183b822b5bea230b0141
Component: engine
2015-10-21 09:32:48 -07:00
f1b2a78ca3
Move volume name validation to the local driver.
...
Delegate validation tasks to the volume drivers. It's up to them
to decide whether a name is valid or not.
Restrict volume names for the local driver to prevent creating
mount points outside docker's volumes directory.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d6d60287ee3a8a064340582d65c131181ae77127
Component: engine
2015-10-21 12:28:26 -04:00
566b3febc4
Fix layer compression regression
...
PR #15493 removed compression of layers when pushing them to a V2
registry. This this makes layer uploads larger than they should be.
This commit restores the compression. It uses an io.Pipe to turn the
gzip compressor output Writer into a Reader, so the ReadFrom method can
be used on the BlobWriter (which is very important for avoiding many
PATCH requests per layer).
Fixes #17209
Fixes #17038
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 4dce280d96797b6a82e3eb54243e21bce7f55e5d
Component: engine
2015-10-21 09:21:14 -07:00
954f6f9002
ProcessWord support UTF-8
...
modified PorcessWord to working normally for UTF-8 strings and added test cases
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
Upstream-commit: bb79b7eb9e1db83fd80121b088aa2e5a4c084ace
Component: engine
2015-10-21 10:10:10 -06:00
b1184809c8
Merge pull request #17229 from mavenugo/ds_fix
...
Fixing bootup inconsistencies due to invalid cluster-store config
Upstream-commit: bb5551746bdccc1b032fbf8c32914c282ff94668
Component: engine
2015-10-21 12:00:07 -04:00
4f80c1b7df
docs: Add Netshare volume plugin to extend/plugins
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com >
Upstream-commit: 95c053c56b8f8afffd7b2dac494b3cc2e71c4f6a
Component: engine
2015-10-21 08:28:37 -07:00
efb4544862
graph: ensure _tmp dir is always removed
...
Also remove unused func `newTempFile` and prevent a possible deadlock
between pull_v2 `attemptIDReuse` and graph `register`
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: f6577be1c93150149c291f9d18375d7bcae9ebb1
Component: engine
2015-10-21 17:13:45 +02:00
58dd738ff1
daemon: faster image cache miss detection
...
Lookup the graph parent reference to detect a builder cache miss before
looping the whole graph image index to build a parent-children tree.
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: f9e81b40f4065e3d0851172759ef58fda6572cce
Component: engine
2015-10-21 17:13:45 +02:00
d7d07ab148
graph: add parent img refcount for faster rmi
...
also fix a typo in pkg/truncindex package comment
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 56f5e3459f8d7477d2aa60dee02bc7cd8a8731ad
Component: engine
2015-10-21 17:13:45 +02:00
f13bda05a2
integration-cli: docker_cli_build_test: check error before defer
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 04ef69a1e963e0c9bc9b685188f2c584ef275e45
Component: engine
2015-10-21 17:13:45 +02:00
9086b77304
Add support for multiple network in inspect
...
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.
`docker network inspect host bridge none` is possible now.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7af9f988ac535e4ae2e87976db25d4f7047274db
Component: engine
2015-10-21 08:57:29 +02:00
9bceeb4321
In NewV2Repository, check the suffix of endpoint.URL and append 'v2' correctly.
...
Signed-off-by: yuzou <zouyu7@huawei.com >
Upstream-commit: 5f59f52c1413087735852a038ee459833734d8a2
Component: engine
2015-10-21 11:43:31 +08:00
