Skip to content

image/docker: use unified configfile lookup for registries.d#748

Closed
jankaluza wants to merge 2 commits intocontainers:mainfrom
jankaluza:registries.d
Closed

image/docker: use unified configfile lookup for registries.d#748
jankaluza wants to merge 2 commits intocontainers:mainfrom
jankaluza:registries.d

Conversation

@jankaluza
Copy link
Copy Markdown
Member

@jankaluza jankaluza commented Apr 8, 2026

Switch registriesDirPath to use configfile.ContainersResourceDirs
for resolving registries.d directories, aligning lookup with unified
containers config search.

Signed-off-by: Jan Kaluza jkaluza@redhat.com

jankaluza added 2 commits April 7, 2026 13:37
@jankaluza
image/docker: use unified configfile search for cert directories
0df042b 
Switch `dockerCertDir` to use the new
`configfile.ContainersResourceDirs` for resolving certificate
directories.

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
@jankaluza
image/docker: use unified configfile lookup for registries.d
18b9834 
Switch `registriesDirPath` to use `configfile.ContainersResourceDirs`
for resolving registries.d directories, aligning lookup with unified
containers config search.

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
@github-actions github-actions bot added storage Related to "storage" package image Related to "image" package labels Apr 8, 2026
@jankaluza
Copy link
Copy Markdown
Member Author

jankaluza commented Apr 8, 2026

Note that this depends on #746.

@packit-as-a-service
Copy link
Copy Markdown

packit-as-a-service bot commented Apr 8, 2026

Packit jobs failed. @containers/packit-build please check.

3 similar comments
@packit-as-a-service
Copy link
Copy Markdown

packit-as-a-service bot commented Apr 8, 2026

Packit jobs failed. @containers/packit-build please check.

@packit-as-a-service
Copy link
Copy Markdown

packit-as-a-service bot commented Apr 8, 2026

Packit jobs failed. @containers/packit-build please check.

@packit-as-a-service
Copy link
Copy Markdown

packit-as-a-service bot commented Apr 8, 2026

Packit jobs failed. @containers/packit-build please check.

@jankaluza
Copy link
Copy Markdown
Member Author

jankaluza commented Apr 8, 2026

/packit build

Luap99
Luap99 reviewed Apr 8, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

This seems the wrong approach readiong a signle dir is wrong and non consitent with the parsing behavior of multiple different drop ins in the dirs.

The Read() API was design with registries.d in mind so using that should work.

@jankaluza
Copy link
Copy Markdown
Member Author

jankaluza commented Apr 9, 2026

Ah, that's my bad :-(. I completely missed your note in the design doc: For consistency it would be best if it uses all drop in paths like shown above without the "main" file as this only support drop-in locations..

I will rework this and open new PR.

@jankaluza jankaluza closed this Apr 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Luap99 Luap99 Luap99 left review comments

Assignees

No one assigned

Labels

image Related to "image" package storage Related to "storage" package

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jankaluza @Luap99