mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-04 14:09:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

By default, always try to auth to OCI remotes

Browse Source 
This makes for instance docker hub work.
This commit is contained in:
Alexander Larsson
2020-05-04 12:35:16 +02:00
committed by Alexander Larsson
parent d145723fe3
commit fdfcae7a91
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/flatpak-auth.c
View File

@@ -49,6 +49,10 @@ flatpak_auth_new_for_remote (FlatpakDir *dir,
if (!ostree_repo_get_remote_option (repo, remote, FLATPAK_REMOTE_CONFIG_AUTHENTICATOR_NAME, NULL, &name, error))
return NULL;
}
if (name == NULL && flatpak_dir_get_remote_oci (dir, remote))
name = g_strdup ("org.flatpak.Authenticator.Oci");
if (name == NULL || *name == 0 /* or if no repo */)
{
flatpak_fail (error, _("No authenticator configured for remote `%s`"), remote);

5
common/flatpak-dir.c
View File

@@ -10683,6 +10683,11 @@ _flatpak_dir_get_remote_state (FlatpakDir *self,
}
}
if (flatpak_dir_get_remote_oci (self, remote_or_uri))
{
state->default_token_type = 1;
}
if (state->summary != NULL) /* In the optional case we might not have a summary */
{
VarSummaryRef summary = var_summary_from_gvariant (state->summary);