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

proxy: Fix logic error with auth_data switch #639

Merged
merged 1 commit into from
Jun 5, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/src/container/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -427,10 +427,10 @@ pub fn merge_default_container_proxy_opts_with_isolation(
if !auth_specified {
let root = &Dir::open_ambient_dir("/", cap_std::ambient_authority())?;
config.auth_data = crate::globals::get_global_authfile(root)?.map(|a| a.1);
// If there's no authfile, then force on anonymous pulls to ensure
// If there's no auth data, then force on anonymous pulls to ensure
// that the container stack doesn't try to find it in the standard
// container paths.
if config.authfile.is_none() {
if config.auth_data.is_none() {
config.auth_anonymous = true;
}
}
Expand Down
Loading