Skip to content

feat: allow selecting docker registry accounts from all registries #1083

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.

Sign up for GitHub

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

Open
carl-ac wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: allow selecting docker registry accounts from all registries #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 39 additions & 17 deletions frontend/src/components/config/util.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,26 +837,47 @@ export const AccountSelector = ({
: ["ListDockerRegistryAccounts", "ListDockerRegistriesFromConfig"];
const config_params =
type === "None" ? {} : { target: id ? { type, id } : undefined };
const db_accounts = useRead(db_request, {}).data?.filter(
(account) => account.domain === provider
);
const config_providers = useRead(config_request, config_params).data?.filter(
(_provider) => _provider.domain === provider
);

const _accounts = new Set<string>();

// For docker registry, get ALL accounts (cross-domain), not just for this provider
const db_accounts = account_type === "docker"
? useRead(db_request, {}).data
: useRead(db_request, {}).data?.filter((account) => account.domain === provider);

const config_providers = useRead(config_request, config_params).data;

const _accounts = new Map<string, { username: string; domain?: string }>();

for (const account of db_accounts ?? []) {
if (account.username) {
_accounts.add(account.username);
_accounts.set(account.username, { username: account.username, domain: account.domain });
}
}
for (const provider of config_providers ?? []) {
for (const account of provider.accounts ?? []) {
_accounts.add(account.username);

if (account_type === "docker") {
// Show accounts from all registries
for (const provider of config_providers ?? []) {
for (const account of provider.accounts ?? []) {
if (account.username) {
_accounts.set(account.username, { username: account.username, domain: provider.domain });
}
}
}
} else {
// For git, filter by provider as before
for (const provider_obj of config_providers ?? []) {
if (provider_obj.domain === provider) {
for (const account of provider_obj.accounts ?? []) {
if (account.username) {
_accounts.set(account.username, { username: account.username, domain: provider_obj.domain });
}
}
}
}
}
const accounts = [..._accounts];
accounts.sort();

const accounts = [..._accounts.values()];
accounts.sort((a, b) => a.username.localeCompare(b.username));

return (
<Select
value={selected}
Expand All @@ -879,15 +900,16 @@ export const AccountSelector = ({
<SelectContent>
<SelectItem value={"Empty"}>None</SelectItem>
{accounts
?.filter((account) => account)
?.filter((account) => account.username)
.map((account) => (
<SelectItem key={account} value={account}>
{account}
<SelectItem key={`${account.domain}:${account.username}`} value={account.username}>
{account_type === "docker" && account.domain ? `${account.username} (${account.domain})` : account.username}
</SelectItem>
))}
</SelectContent>
</Select>
);

};

export const AccountSelectorConfig = (params: {
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/components/resources/deployment/config/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,20 @@ export const DeploymentConfig = ({
),
image_registry_account: (account, set) => {
const image = update.image ?? config.image;
const provider =
const suggested_provider =
image?.type === "Image" && image.params.image
? extract_registry_domain(image.params.image)
: image?.type === "Build" && image.params.build_id
? builds?.find((b) => b.id === image.params.build_id)
?.info.image_registry_domain
: undefined;

return (
<AccountSelectorConfig
id={update.server_id ?? config.server_id ?? undefined}
type="Server"
type={update.server_id ?? config.server_id ? "Server" : "None"}
account_type="docker"
provider={provider ?? "docker.io"}
provider={suggested_provider ?? "docker.io"}
selected={account}
onSelect={(image_registry_account) =>
set({ image_registry_account })
Expand Down