From 61dda7f6d94155ffe0f16a76b45821fe99bbbae2 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Tue, 27 Feb 2024 08:49:32 -0700 Subject: [PATCH] Fixes for arm --- stack_orchestrator/build/fetch_containers.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/stack_orchestrator/build/fetch_containers.py b/stack_orchestrator/build/fetch_containers.py index c857d4af..4d4c4601 100644 --- a/stack_orchestrator/build/fetch_containers.py +++ b/stack_orchestrator/build/fetch_containers.py @@ -84,13 +84,14 @@ def _filter_for_platform(container: str, tag_list: List[str]) -> List[str] : filtered_tags = [] this_machine = platform.machine() - # Translate between Python platform names and docker + # Translate between Python and docker platform names if this_machine == "x86_64": this_machine = "amd64" + if this_machine == "aarch64": + this_machine = "arm64" if opts.o.debug: print(f"Python says the architecture is: {this_machine}") docker = DockerClient() - docker.login(registry_info.registry, registry_info.registry_username, registry_info.registry_token) for tag in tag_list: remote_tag = f"{registry_info.registry}/{container}:{tag}" manifest_cmd = ExtendedManifestCLI(docker.client_config) @@ -119,7 +120,6 @@ def _get_latest_image(container: str, registry_info: RegistryInfo): def _fetch_image(tag: str, registry_info: RegistryInfo): docker = DockerClient() - docker.login(registry_info.registry, registry_info.registry_username, registry_info.registry_token) remote_tag = f"{registry_info.registry}/{tag}" if opts.o.debug: print(f"Attempting to pull this image: {remote_tag}") @@ -148,6 +148,8 @@ def command(ctx, include, exclude, force_local_overwrite, image_registry, regist '''EXPERIMENTAL: fetch the images for a stack from remote registry''' registry_info = RegistryInfo(image_registry, registry_username, registry_token) + docker = DockerClient() + docker.login(registry_info.registry, registry_info.registry_username, registry_info.registry_token) # Generate list of target containers stack = ctx.obj.stack containers_in_scope = get_containers_in_scope(stack) @@ -161,7 +163,7 @@ def command(ctx, include, exclude, force_local_overwrite, image_registry, regist # images with the correct name and platform in the specified registry image_to_fetch = _get_latest_image(container, registry_info) if not image_to_fetch: - print(f"Warning: no image found to fetch for container {container}") + print(f"Warning: no image found to fetch for container: {container}") all_containers_found = False continue if opts.o.debug: