feat: add registries conf #1008

TerryHowe · 2025-09-13T21:52:16Z

Add support for registries.conf. This is not a full implementation it'll be a follow-up PR with more features for the file. This does contain basic support though.

Based on https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md
More detail https://man.archlinux.org/man/containers-registries.conf.5.en

This PR depends on #1006

Closes: #918
Closes: #1058

codecov · 2025-09-13T21:53:47Z

Codecov Report

❌ Patch coverage is 80.64516% with 30 lines in your changes missing coverage. Please review.
✅ Project coverage is 82.44%. Comparing base (0324380) to head (95e31f4).

Files with missing lines	Patch %	Lines
...gistry/remote/internal/configuration/registries.go	80.64%	17 Missing and 13 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1008      +/-   ##
==========================================
- Coverage   82.54%   82.44%   -0.11%     
==========================================
  Files          64       65       +1     
  Lines        4779     4934     +155     
==========================================
+ Hits         3945     4068     +123     
- Misses        510      529      +19     
- Partials      324      337      +13

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

registry/remote/credentials/registries_conf.go

Copilot

Pull Request Overview

This PR implements support for the registries.conf file format, extending the credentials package to handle both Docker config.json and containers registries.conf configurations. It introduces a Config interface to abstract different configuration formats and reorganizes the code structure for better modularity.

Key changes:

Introduces registriesConf type that implements TOML-based configuration handling
Adds a Config interface to abstract different configuration formats
Reorganizes the credentials package structure by moving types and splitting functionality
Adds the NewStoreFromRegistriesConf function for creating stores from registries.conf files

Reviewed Changes

Copilot reviewed 38 out of 40 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
registry/remote/credentials/registries_conf.go	Implements TOML-based registries.conf parsing and management
registry/remote/credentials/config.go	Defines the Config interface for abstracting configuration formats
registry/remote/credentials/auth_config.go	Extracted auth configuration handling from config_json.go
registry/remote/credentials/credential.go	Moved credential types and functions from auth package
registry/remote/credentials/store.go	Updated to use Config interface and added registries.conf support
registry/remote/credentials/config_json.go	Refactored to implement Config interface
Multiple test files	Updated imports and type references after package reorganization

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

registry/remote/credentials/registries_conf.go

Wwwsylvia · 2025-11-08T09:39:07Z

Looks like this depends on #1006

TerryHowe · 2025-11-08T12:36:28Z

Looks like this depends on #1006

Yes. I'm going to convert this to a draft for now.

TerryHowe · 2025-12-26T16:44:46Z

Rebased the commit on main instead of the credential change.

TerryHowe · 2026-01-01T21:55:53Z

Just moved the directory to internal and rebased

sabre1041

This looks good. Question regarding the TOML library implementation

sabre1041 · 2026-01-04T08:56:54Z

go.mod

 require (
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.1
+	github.com/pelletier/go-toml/v2 v2.2.4


Any thoughts about swapping the TOML parsing libraries to github.com/BurntSushi/toml? This is the library that is used by the container tools as well as Helm

Signed-off-by: Terry Howe <[email protected]>

sabre1041

LGTM

shizhMSFT

Is containers-registries.conf cross-platform? If not, you need to document the OS limitation.

shizhMSFT · 2026-01-07T15:27:03Z

go.mod

 go 1.24.0

 require (
+	github.com/BurntSushi/toml v1.4.0


The latest version is v1.6.0.

shizhMSFT · 2026-01-07T15:29:20Z

registry/remote/internal/configuration/registries.go

+limitations under the License.
+*/
+
+package configuration


It is better to be config instead of configuration.

shizhMSFT · 2026-01-07T15:32:07Z

registry/remote/internal/configuration/registries.go

+)
+
+// RegistriesConfig represents a registries.conf configuration file.
+// Reference: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md


use link from tags or commits and never with main branch as the link may easily break.

shizhMSFT · 2026-01-07T15:32:32Z

registry/remote/internal/configuration/registries.go

+limitations under the License.
+*/
+
+package configuration


What's the purpose of having this package in internal? Should it be registry/remote/config?

TerryHowe requested review from SteveLasker, Wwwsylvia, sajayantony and shizhMSFT as code owners September 13, 2025 21:52

gjenkins8 reviewed Sep 16, 2025

View reviewed changes

registry/remote/credentials/registries_conf.go Outdated Show resolved Hide resolved

gjenkins8 reviewed Sep 16, 2025

View reviewed changes

registry/remote/credentials/registries_conf.go Outdated Show resolved Hide resolved

gjenkins8 reviewed Sep 16, 2025

View reviewed changes

registry/remote/credentials/registries_conf.go Outdated Show resolved Hide resolved

Wwwsylvia requested a review from Copilot October 10, 2025 11:15

Copilot AI reviewed Oct 10, 2025

View reviewed changes

registry/remote/credentials/registries_conf.go Outdated Show resolved Hide resolved

shizhMSFT changed the title ~~Feature add registries conf~~ feat: add registries conf Oct 10, 2025

TerryHowe force-pushed the feature-add-registries-conf branch 3 times, most recently from 54dc638 to 43d3a29 Compare October 11, 2025 23:37

This was referenced Oct 14, 2025

Helm Registry only supports a single set of credentials per registry. helm/helm#13237

Closed

authentication failure with oci images when logged into multiple registries on the same domain at different subpaths helm/helm#11286

Open

TerryHowe marked this pull request as draft November 8, 2025 12:36

TerryHowe added the v3 Things belongs to version 3.x label Nov 17, 2025

TerryHowe added this to the v3.0.0 milestone Nov 17, 2025

TerryHowe force-pushed the feature-add-registries-conf branch from 43d3a29 to d118dd9 Compare November 24, 2025 02:08

TerryHowe force-pushed the feature-add-registries-conf branch 2 times, most recently from f25284d to 434bb45 Compare December 26, 2025 16:44

TerryHowe marked this pull request as ready for review December 26, 2025 16:46

TerryHowe requested a review from sabre1041 as a code owner December 26, 2025 16:46

TerryHowe force-pushed the feature-add-registries-conf branch from 434bb45 to af65a10 Compare January 1, 2026 21:55

sabre1041 reviewed Jan 6, 2026

View reviewed changes

feat: add support for registries.conf

95e31f4

Signed-off-by: Terry Howe <[email protected]>

TerryHowe force-pushed the feature-add-registries-conf branch from af65a10 to 95e31f4 Compare January 6, 2026 11:45

sabre1041 approved these changes Jan 6, 2026

View reviewed changes

TerryHowe mentioned this pull request Jan 6, 2026

Add support for registry attributes in registries.conf containers/container-libs#568

Open

shizhMSFT reviewed Jan 7, 2026

View reviewed changes

feat: add registries conf #1008

Are you sure you want to change the base?

feat: add registries conf #1008

Uh oh!

Conversation

TerryHowe commented Sep 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Sep 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Wwwsylvia commented Nov 8, 2025

Uh oh!

TerryHowe commented Nov 8, 2025

Uh oh!

TerryHowe commented Dec 26, 2025

Uh oh!

TerryHowe commented Jan 1, 2026

Uh oh!

sabre1041 left a comment

Choose a reason for hiding this comment

Uh oh!

sabre1041 Jan 4, 2026

Choose a reason for hiding this comment

Uh oh!

TerryHowe Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

sabre1041 left a comment

Choose a reason for hiding this comment

Uh oh!

shizhMSFT left a comment

Choose a reason for hiding this comment

Uh oh!

shizhMSFT Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

shizhMSFT Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

shizhMSFT Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

shizhMSFT Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

TerryHowe commented Sep 13, 2025 •

edited

Loading

codecov bot commented Sep 13, 2025 •

edited

Loading