Backport #2116 to releases/2.5 #2122
Conversation
|
Can you cherry pick your original commit rather than the merge commit? |
|
I can, in |
|
@mstanleyjones no need to re-resolve, you can just edit the commit message. I have never seen it done that way in |
|
OK I changed the commit message. |
| storage: | ||
| filesystem: | ||
| rootdirectory: /var/lib/registry | ||
| maxthreads: 100 |
There was a problem hiding this comment.
This got moved, should be same level as rootdirectory
| You can use the `redirect` storage middleware to specify a custom URL to a | ||
| location of a proxy for the layer stored by the S3 storage driver. | ||
|
|
||
| |-----------|----------|-------------------------------------------------------------------------------------------------------------| |
There was a problem hiding this comment.
missing line for
| Parameter | Required | Description |
| |-----------|----------|-------------------------------------------------------------------------------------------------------------| | ||
| | `baseurl` | yes | `SCHEME://HOST` at which layers are served. Can also contain port. For example, `https://example.com:5443`. | | ||
|
|
||
| ## `reporting` | ||
|
|
There was a problem hiding this comment.
This must have been part of a different change in master, but in master this is surrounded by ```
| | `threshold`| no | The number of times the check must fail before the state is marked as unhealthy. If this field is not specified, a single failure marks the state as unhealthy. | | ||
|
|
||
|
|
||
| ## `proxy` | ||
|
|
||
| proxy: |
There was a problem hiding this comment.
Same with this section, is surrounded by ```
| privatekey: /path/to/asecret.pem | ||
| keypairid: asecret | ||
| duration: 60 | ||
|
|
Backported from master to release/2.5 Signed-off-by: Misty Stanley-Jones <misty@docker.com>
|
Addressed the feedback. Will double-check in #2123 as well. |
Current coverage is 52.62% (diff: 100%)
@@ release/2.5 #2122 diff @@
=============================================
Files 120 120
Lines 10496 10496
Methods 0 0
Messages 0 0
Branches 0 0
=============================================
- Hits 6589 5524 -1065
- Misses 3032 4232 +1200
+ Partials 875 740 -135
|
Improve formatting of configuration.md
Backported from master to release/2.5
Signed-off-by: Misty Stanley-Jones misty@docker.com