mirror of
https://github.com/systemd/systemd.git
synced 2026-11-06 05:17:24 +00:00
oci-util: Don't fall back to default registry for explicit registries
When a reference specifies a registry like ghcr.io or quay.io for which
we don't have a registry config file, the fallback forced the default
registry which is wrong.
Only use the default as fallback when there is no explicit registry.
(cherry picked from commit a1c760c435)
This commit is contained in:
1 parent
92ea6ed698
commit
17dfd608f5
1 file changed
+1
-1
@@ -216,7 +216,7 @@ int oci_ref_normalize(char **protocol, char **registry, char **image, char **tag
|
||||
_cleanup_fclose_ FILE *f = NULL;
|
||||
_cleanup_free_ char *path = NULL;
|
||||
r = search_and_fopen_nulstr(fn, "re", /* root= */ NULL, CONF_PATHS_NULSTR("systemd/oci-registry"), &f, &path);
|
||||
if (r == -ENOENT)
|
||||
if (r == -ENOENT && isempty(*registry))
|
||||
r = search_and_fopen_nulstr("default.oci-registry", "re", /* root= */ NULL, CONF_PATHS_NULSTR("systemd/oci-registry"), &f, &path);
|
||||
if (r < 0 && r != -ENOENT)
|
||||
return log_debug_errno(r, "Failed to find suitable OCI registry file: %m");
|
||||
|
||||
Reference in new issue
Block a user