Commit 70e92f2
committed
fix(registry): use empty strings and not nil in config
In #1858, the LRU cache was activated for registry. This exposed
an issue with how config settings are handled by docker-registry -
specifically, it doesn't appear to handle the YAML nil (`~`) value
properly. In the config parser logic in docker-registry
(see: https://github.com/deis/docker-registry/blob/2d50c1c6f396ac68858135be05dbfe41fe1898e2/docker_registry/lib/config.py#L61),
values are expected to be strings, dicts, or non-existent. The default value
when an option exists but is unset is an empty string.
This commit changes the cache config settings in
registry to use an empty string instead of ~.
Additionally, this commit also ensures that deisctl starts cache
before registry to ensure the registry is using the LRU cache.
closes #28331 parent 579748b commit 70e92f2
2 files changed
Lines changed: 11 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
184 | 184 | | |
185 | 185 | | |
186 | 186 | | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
187 | 190 | | |
188 | | - | |
| 191 | + | |
189 | 192 | | |
190 | 193 | | |
191 | 194 | | |
| |||
269 | 272 | | |
270 | 273 | | |
271 | 274 | | |
272 | | - | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
273 | 278 | | |
274 | 279 | | |
275 | 280 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
30 | | - | |
| 29 | + | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
39 | | - | |
| 38 | + | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
0 commit comments