Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

man containers-registries.conf: clarify mirror association #1525

Merged
merged 1 commit into from Apr 22, 2022

Conversation

vrothberg
Copy link
Member

Clarify that a [[registry.mirror]] is associated only with the
previous [[registry]].

Fixes: #1523
Signed-off-by: Valentin Rothberg vrothberg@redhat.com

@vrothberg
Copy link
Member Author

@mtrmac PTAL

@rhatdan
Copy link
Member

rhatdan commented Apr 21, 2022

LGTM
@TomSweeneyRedHat PTAL

Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Just some non-blocking suggestions to consider. I’ll fully defer to native speakers in all respects.

docs/containers-registries.conf.5.md Outdated Show resolved Hide resolved
docs/containers-registries.conf.5.md Outdated Show resolved Hide resolved
docs/containers-registries.conf.5.md Outdated Show resolved Hide resolved
location = "registry.com"

[[registry.mirror]]
location = "mirror.registry.com"
```
Given the above, a pull of `example.com/foo/image:latest` will try:
1. `example-mirror-0.local/mirror-for-foo/image:latest`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not part of this change, but it looks like there's an extra leading space on this line.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hum… the md2man output is an indented list of lines of some sort (https://github.com/russross/blackfriday/blob/e96880f42b9343aea6cbfd99693adae0e5fe2b2a/block.go#L81-L92 it seems). The GitHub markdown does not treat it as a list at all, and just folds the line into the preceding paragraph.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let’s fix that: #1527 (after this PR).

@vrothberg
Copy link
Member Author

@mtrmac @TomSweeneyRedHat PTAL

Clarify that a `[[registry.mirror]]` is associated only with the
previous `[[registry]]`.

Fixes: containers#1523
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks!

@rhatdan
Copy link
Member

rhatdan commented Apr 22, 2022

LGTM

@rhatdan rhatdan merged commit 7174541 into containers:main Apr 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clarify usage of registries.conf with different mirrors
4 participants