Move registries.conf files to v2 format #6801
Conversation
dosubot
Bot
added
the
size:XS
|
@containers/buildah-maintainers PTAL |
mtrmac
left a comment
mtrmac
left a comment
There was a problem hiding this comment.
ACK to the conversions. It’s not clear to me that removing the test-global registries.conf does not change semantics, but tests are passing and I can’t see any indication that this was added for any specific test.
Non-blocking: also documentation in docs/samples/registries.conf, install.md and troubleshooting.md. Feel free to merge as is, or update those and merge.
If any test actually depend on the custom global file in /etc/ they would have been already broken IMO. These tests should work locally, in podman CI, and all kinds of package gating envs, fedora, RHEL, debian... |
dosubot
Bot
added
size:L
|
updated the docs as well |
| ### [registries.conf](https://github.com/containers/container-libs/blob/main/image/registries.conf) | ||
|
|
||
| #### Man Page: [registries.conf.5](https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md) | ||
| #### Man Page: [containers-registries.conf.5](https://github.com/container-libs/blob/main/image/blob/main/docs/containers-registries.conf.5.md) |
There was a problem hiding this comment.
https://github.com/containers/container-libs/blob/main/image/docs/containers-registries.conf.5.md
There was a problem hiding this comment.
thanks not sure how I managed to screw this up
|
|
||
| * Verify that the `/etc/containers/registries.conf` file exists. If not, verify that the containers-common package is installed. | ||
| * Verify that the entries in the `[registries.search]` section of the /etc/containers/registries file are valid and reachable. | ||
| * Verify that a `registries.conf` file exists, see [containers-registries.conf(5)](https://github.com/container-libs/blob/main/image/blob/main/docs/containers-registries.conf.5.md). If not, verify that the containers-common package is installed. |
There was a problem hiding this comment.
https://github.com/containers/container-libs/blob/main/image/docs/containers-registries.conf.5.md
| # # location = "internal-registry-for-example.net/bar" | ||
| # # requests for the image example.com/foo/myimage:latest will actually work with the | ||
| # # internal-registry-for-example.net/bar/myimage:latest image. | ||
| # location = internal-registry-for-example.com/bar" |
There was a problem hiding this comment.
| # location = internal-registry-for-example.com/bar" | |
| # location = "internal-registry-for-example.com/bar" |
is wrong in the container-libs version as well.
There was a problem hiding this comment.
containers/container-libs#782 is the other fix.
|
(Merge without another review round.) |
|
LGTM once @mtrmac 's changes are incorporated, especially the links. |
All the tests use their own registries.conf from tests/registries.conf so there is no need to overwrite the global config on the CI system. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
The v1 format is no longer accepted. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Remove the old sample file from the repo and just like to main upstream one from the container-libs repo. We also already have the fedora example in the install.md files just below so no need for two files. Update the fedora file to the latest content to ensure it is using v2 syntax. Lastly, update the troubleshooting.md as well with the v2 references and a link to the main docs as it can be set in many different locations. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
4 participants
What type of PR is this?
What this PR does / why we need it:
the v1 format support is being dropped so we must use the v2 format going forward. Since this does not need the vendor as part of the same PR we might as well merge this now so the vendoring for others is easier.
How to verify it
#6799
Which issue(s) this PR fixes:
Special notes for your reviewer:
Does this PR introduce a user-facing change?