Michal Minář
67a7e47787
Try to cross-repo mount until success
...
Don't fallback back immediately to blob upload if the cross-repo mount
fails and layer upload is initiated by registry.
Instead cancel the upload and re-try cross-repo mount from different
source repository before doing full re-upload.
Signed-off-by: Michal Minář <miminar@redhat.com >
Upstream-commit: c6dd51c32cfccc06e77b4f7cb2358f788753df72
Component: engine
2016-09-29 14:16:00 +02:00
Michal Minář
fa7c15d2df
Compare V2Metadata with associated auth config
...
to avoid unnecessary blob re-uploads.
Cross repository mount from particular repo will most probably fail if
the user pushing to the registry is not the same as the one who pulled
or pushed to the source repo.
This PR attempts first to cross-repo mount from the source repositories
associated with the pusher's auth config. Then it falls back to other
repositories sorted from the most similar to the target repo to the
least.
It also prevents metadata deletion in cases where cross-repo mount fails
and the auth config hashes differ.
Signed-off-by: Michal Minář <miminar@redhat.com >
Upstream-commit: 0928f3f2e3eda75a295b651d27f9dd992fd951a4
Component: engine
2016-09-29 14:16:00 +02:00
Sebastiaan van Stijn
73717df772
Merge pull request #25817 from sfsmithcha/update_glossary
...
add swarm mode terms to the glossary
Upstream-commit: 027e7be3482ff314f22dafcb7a4a2ab26b1a7ad7
Component: engine
2016-09-13 12:08:32 +02:00
Sebastiaan van Stijn
afc1ccd008
Merge pull request #25466 from justincormack/deprecate-maintainer
...
Begin process of deprecating MAINTAINER
Upstream-commit: 4d187df277153bf704868d9a67b1e4fa29abf873
Component: engine
2016-09-13 12:07:04 +02:00
Justin Cormack
fea8e9cc1f
Merge pull request #26518 from SUSE/dont-write-aa-profile-to-etc
...
apparmor: do not save profile to /etc/apparmor.d
Upstream-commit: 379b02b48d185c3e91b0322cfcb3eb54223a8787
Component: engine
2016-09-13 10:37:11 +01:00
Vincent Demeester
9ac54a66eb
Merge pull request #26489 from yuexiao-wang/update-exec
...
update option for docker exec
Upstream-commit: 0c90f777b745263deb4be55250ac3d19ddd91cf2
Component: engine
2016-09-13 11:16:22 +02:00
Vincent Demeester
d3652a1d28
Merge pull request #26439 from lixiaobing10051267/masterReload
...
fix logruns.Warnf while daemon.networkOptions fails
Upstream-commit: eb0728a99313f11fc814e1529cd545f1cec66620
Component: engine
2016-09-13 11:03:52 +02:00
Vincent Demeester
5c9eaf9226
Merge pull request #26478 from sdurrheimer/zsh-completion-service-group-add-rm
...
Add zsh completion for 'service {create,update} --group-{add,rm}'
Upstream-commit: 0deae9f2fa3672bf7e5ce5899253e498800726b7
Component: engine
2016-09-13 10:18:27 +02:00
Steve Durrheimer
689d1a45e3
Add zsh completion for 'service {create,update} --group-{add,rm}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 1df220d51fcba1e6f0a03bb83f80a7d45137f385
Component: engine
2016-09-13 10:15:22 +02:00
Aleksa Sarai
d90edcd897
apparmor: do not save profile to /etc/apparmor.d
...
Writing the profile to /etc/apparmor.d, while also manually loading it
into the kernel results in quite a bit of confusion. In addition, it
means that people using apparmor but have /etc mounted read-only cannot
use apparmor at all on a Docker host.
Fix this by writing the profile to a temporary directory and deleting it
after it's been inserted.
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: 2f7596aaef3a9f8ec1f2d0937462d9263bee8b6b
Component: engine
2016-09-13 16:25:16 +10:00
lixiaobing10051267
7315cb0e38
fix logruns.Warnf while daemon.networkOptions fails
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 56916b5e8d8a22bc9590d28b9b752a2db4821441
Component: engine
2016-09-13 09:17:39 +08:00
Justin Cormack
3fe1e84cec
Merge pull request #26496 from riyazdf/trust-sandbox-fix
...
Use latest version of notary server in trust sandbox docs
Upstream-commit: 6fafd07282f950799613c2ffc8eac6ff86d48206
Component: engine
2016-09-12 23:56:41 +01:00
Tõnis Tiigi
5363845025
Merge pull request #26499 from LK4D4/health_containerd
...
libcontainerd: use healthcheck to track containerd conn
Upstream-commit: 6a50b673eb1aed482700b38b131eff61449ed306
Component: engine
2016-09-12 15:52:48 -07:00
Alexander Morozov
9ad17e2570
Merge pull request #26461 from crosbymichael/term-exec
...
Add TERM env var to exec
Upstream-commit: 036a8f77b066c8c72e395fc78b08d34c934f9c21
Component: engine
2016-09-12 14:57:37 -07:00
Sebastiaan van Stijn
00b74c2b97
Merge pull request #26508 from docker/stevvooe-patch-1
...
issues: re-order issue template for more clarity
Upstream-commit: 056bd44f6bdf35f039681e729089a9c3957fe260
Component: engine
2016-09-12 23:43:55 +02:00
Stephen Day
28ced8e507
issues: re-order issue template for more clarity
...
Triaging issues has become a little challenging since the meat
of the information is below a large amount of unstructured
command line output. These changes add a description and move
the reproduction and expected/received results above the
unstructured output.
This should help for initial triaging, as well as self-triaging.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: be3bc483c684be2b5e84914695372aa1b5054ada
Component: engine
2016-09-12 14:34:00 -07:00
Alexander Morozov
99577ad8e2
libcontainerd: use healthcheck to track containerd conn
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: e4ddcb37c1326e8eef7abbcc84effb016c7a3336
Component: engine
2016-09-12 14:22:38 -07:00
Sebastiaan van Stijn
eef9bfcd51
Merge pull request #26488 from vdemeester/26450-add-client-package-readme
...
Add a README to the client's package…
Upstream-commit: 6edf09cf5821aa947d9d52e21d72b065184fc421
Component: engine
2016-09-12 22:56:32 +02:00
Sebastiaan van Stijn
6b60b412a6
Merge pull request #26460 from icecrime/update_issue_triage
...
Update issue labels
Upstream-commit: 23d5b3be9b244aa3a175498a2a464e560a824603
Component: engine
2016-09-12 20:35:59 +02:00
Anusha Ragunathan
fe55b3f380
Merge pull request #25794 from chenchun/timeout
...
Add default timeout to pkg/plugins/client
Upstream-commit: a4d1365bce140df239746b436b6e7c6d4cc54cc3
Component: engine
2016-09-12 11:27:36 -07:00
Riyaz Faizullabhoy
7d2bc2d40d
Use latest version of notary server in trust sandbox docs
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 40f823ccd8ce0c07a27a287f665b4cc0c0084569
Component: engine
2016-09-12 09:42:12 -07:00
Michael Crosby
ace1c458e2
Add TERM env var to exec
...
When the `-t` flag is passed on exec make sure to add the TERM env var
to mirror the expected configuration from run.
Fixes #9299
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4633f15f13d51530de2438c298a1084c55e4fedf
Component: engine
2016-09-12 09:20:27 -07:00
Arnaud Porterie (icecrime)
1f6a545125
Update issue labels
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 19f0feadd6405176f7cbe94e0ad4b9dc1965da3e
Component: engine
2016-09-12 08:56:04 -07:00
Brian Goff
91d4a22ad9
Merge pull request #26103 from sakeven/fix-validate-build-arg
...
validate build-arg
Upstream-commit: e5544fbb0df01e679822352f49adc5c327ca6656
Component: engine
2016-09-12 09:15:58 -04:00
Antonio Murdaca
61ecf7906c
Merge pull request #26456 from dnephin/move_cli_command_registry
...
Remove registry/auth helper methods from the DockerCLI object
Upstream-commit: e8b9f38c7e2e249084c78c81f136c6d22432af6f
Component: engine
2016-09-12 15:11:04 +02:00
Brian Goff
23e3dc0dcd
Merge pull request #26472 from yongtang/09112016-docker-build-step-0
...
Fix documentation for `Step 0` to `Step 1` in `docker build`
Upstream-commit: e41839e8a154f1336b3a995dba3f5912dde7e0fe
Component: engine
2016-09-12 09:08:35 -04:00
Vincent Demeester
71716dd310
Merge pull request #26483 from miaoyq/optimized-debug-print-in-devicemapper
...
Optimized debug print in the 'deviceset.go'
Upstream-commit: ab2c9b373dbe0aee8441821a0e14bd66a58ba612
Component: engine
2016-09-12 15:08:12 +02:00
Brian Goff
0b4dde90a0
Merge pull request #26301 from albers/completion-service-groups
...
Add bash completion for `service {create,update} --group-{add,rm}`
Upstream-commit: 5ada5f129f8c845c11daf8167a92c4c92d2b917c
Component: engine
2016-09-12 09:05:49 -04:00
Vincent Demeester
6c92d44315
Merge pull request #26481 from AkihiroSuda/nit-fix-convention-26467
...
[nit] test: fix trivial code convention noncompliance
Upstream-commit: e391e838048e499327476e24aab49e5a04645330
Component: engine
2016-09-12 15:03:29 +02:00
yuexiao-wang
4e9a7b27fc
update option for docker commands
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 7084aa24c77bde6ed46b2a0b727d049b86ecffec
Component: engine
2016-09-12 19:10:45 +08:00
sakeven
c169c364de
validate build-arg
...
Signed-off-by: sakeven <jc5930@sina.cn >
Upstream-commit: 5426510bea290a8eff3842fdc32240ad33cc0ef1
Component: engine
2016-09-12 18:02:21 +08:00
Vincent Demeester
be3b58071a
Add a README to the client's package…
...
… taken from the old engine-api project.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a00106f9a5cf58cced011c93e98fbe1d7f65c4e7
Component: engine
2016-09-12 11:41:11 +02:00
Akihiro Suda
06f3b31b69
test: fix trivial code convention noncompliance
...
daemon/events/testutils: rename eventstestutils to testutils
volume/testutils: rename volumetestutils to testutils
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: e03cc68e3adb8aa584ed7db3cd70084fac0a2c4f
Component: engine
2016-09-12 07:36:52 +00:00
Yanqiang Miao
467aa61392
Optimized debug print in the 'deviceset.go'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 664ad19486b55a529ba2ba53b7d432b03dc5384a
Component: engine
2016-09-12 15:34:17 +08:00
Chun Chen
9a4ddab230
Add default timeout to pkg/plugins/client
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: 0699b00d26a60f4a8447572b34c4aad1ce73d2e1
Component: engine
2016-09-12 10:39:32 +08:00
Sven Dowideit
ec2041215e
Merge pull request #26306 from deployable/patch-1
...
Remote API documentation consistancy
Upstream-commit: 2cce7bf33a1af566670ec0fb2deeff8056b2798d
Component: engine
2016-09-12 10:52:30 +10:00
Sven Dowideit
4472545a05
Merge pull request #26458 from sfsmithcha/fix_vip_diagram
...
updates swarm overlay network diagram
Upstream-commit: ae4582dc28ba33f80f17e2cf47e62e464aac7ec5
Component: engine
2016-09-12 10:11:08 +10:00
Yong Tang
70a2fe1d7b
Fix documentation for Step 0 to Step 1 in docker build
...
The indexing of steps in the output of `docker build` starts with `Step 1`.
However, there are several places in the docs that start with `Step 0`.
This fix addresses the issue and changes `Step 0` to `Step 1` (and subsequent steps).
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 256dbe4b752ba1fde88e6fad76e3a6b08e4a8816
Component: engine
2016-09-11 10:52:40 -07:00
Madhu Venugopal
63c413223c
Merge pull request #26448 from michael-holzheu/PR-libnetwork-bump-to-fix-s390x-ci
...
Vendor libnetwork @51d88e9ae63f
Upstream-commit: 130db0a4894abea39f6e9503711804d2807628bd
Component: engine
2016-09-10 06:00:32 -07:00
Vincent Demeester
c47747e33c
Merge pull request #26426 from sfsmithcha/carry_pry_25414
...
Carry pr 25414
Upstream-commit: e6f76800f5880652382a6f9180bfdefe6aaad577
Component: engine
2016-09-10 11:50:28 +02:00
Vincent Demeester
7e3f0fe810
Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits
...
Restrict size to 2 fractional digits for `docker images`
Upstream-commit: 4c3f2e7c376c83593188f6548652e9261209c908
Component: engine
2016-09-10 11:32:45 +02:00
Matt Hoyle
f9b7ffdb90
Keep headings consistant in API documentation
...
The "Stream details" sections are currently a part of the Status codes list.
This change moves them out to the same level as other surrounding sections.
Use () for a paramaters
Remove query param from end point heading
Signed-off-by: Matt Hoyle <matt@deployable.co >
Upstream-commit: e0a552504e64192946c86d3bdd517ae7b3af348f
Component: engine
2016-09-10 12:27:41 +10:00
Brian Goff
c54b5bf8c4
Merge pull request #26457 from aboch/auto
...
Add fallback to resolveSystemAddr() in linux
Upstream-commit: ebae43efc2c1a13f0ff9b46ab568ba758e1a9b66
Component: engine
2016-09-09 20:46:29 -04:00
Charles Smith
0b9d5f508c
carries and closes 25414
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e7e85c7e067167f6ed14866b66afa461d2de32ba
Component: engine
2016-09-09 15:57:53 -07:00
Charles Smith
c4f625455b
updates swarm overlay network diagram
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 48f3aa7805fc935d1c07f9c697edcb6b274252da
Component: engine
2016-09-09 15:18:53 -07:00
Alessandro Boch
52c85142d9
Add fallback to resolveSystemAddr() in linux
...
- So that swarm init will still work w/o specifying the advertise
address when the daemon is running inside a container
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: c0b24c600e30656144522f85b053f015525022da
Component: engine
2016-09-09 13:27:57 -07:00
Daniel Nephin
be2034fe8c
Remove remaining registry methods from DockerCLI.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 1dd46e06444d1a0c73fc88dfccec4ae0b7f10bf6
Component: engine
2016-09-09 15:50:01 -04:00
Daniel Nephin
4d7122f63b
Remove cli/command/credentials
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e05fa5de480b7bf4c16df1624f85ecf96a42b3f7
Component: engine
2016-09-09 15:50:01 -04:00
Daniel Nephin
bfc42c3a59
Remove RetrieveAuthConfigs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5d335fbda7d32f06c8b3080a79018b9585cb83f1
Component: engine
2016-09-09 15:50:01 -04:00
Charles Smith
5ae8996c81
add swarm mode terms to the glossary
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 498f18de26cb8142323c64683699d9e6f10946ea
Component: engine
2016-09-09 11:18:30 -07:00
Michal Minář
Sebastiaan van Stijn
Justin Cormack
Vincent Demeester
Steve Durrheimer
Aleksa Sarai
lixiaobing10051267
Tõnis Tiigi
Alexander Morozov
Stephen Day
Alexander Morozov
Anusha Ragunathan
Riyaz Faizullabhoy
Michael Crosby
Arnaud Porterie (icecrime)
Brian Goff
Antonio Murdaca
yuexiao-wang
sakeven
Akihiro Suda
Yanqiang Miao
Chun Chen
Sven Dowideit
Yong Tang
Madhu Venugopal
Matt Hoyle
Charles Smith
Alessandro Boch
Daniel Nephin