Rename image_name to image_name_pull and image_name_push

jupyterhub · Jan 14, 2025 · cdbc61f · cdbc61f
1 parent 1747e92
commit cdbc61f
Showing 1 changed file with 25 additions and 15 deletions.
diff --git a/binderhub/builder.py b/binderhub/builder.py
@@ -385,46 +385,56 @@ async def get(self, provider_prefix, _unescaped_spec):
 
         # generate a complete build name (for GitHub: `build-{user}-{repo}-{ref}`)
 
-        image_prefix = self.settings["image_prefix_push"]
+        image_prefix_push = self.settings["image_prefix_push"]
+        image_prefix_pull = self.settings["image_prefix_pull"]
 
         # Enforces max 255 characters before image
         safe_build_slug = _safe_build_slug(
-            provider.get_build_slug(), limit=255 - len(image_prefix)
+            provider.get_build_slug(),
+            limit=255 - max(len(image_prefix_push), len(image_prefix_pull))
         )
 
         build_name = _generate_build_name(
             provider.get_build_slug(), ref, prefix="build-"
         )
 
-        image_name = self.image_name = (
+        image_name_push = self.image_name_push = (
             "{prefix}{build_slug}:{ref}".format(
-                prefix=image_prefix, build_slug=safe_build_slug, ref=ref
+                prefix=image_prefix_push, build_slug=safe_build_slug, ref=ref
+            )
+            .replace("_", "-")
+            .lower()
+        )
+        image_name_pull = self.image_name_pull = (
+            "{prefix}{build_slug}:{ref}".format(
+                prefix=image_prefix_pull, build_slug=safe_build_slug, ref=ref
             )
             .replace("_", "-")
             .lower()
         )
 
-        image_without_tag, image_tag = _get_image_basename_and_tag(image_name)
+        image_push_without_tag, image_push_tag = _get_image_basename_and_tag(image_name_push)
+        image_pull_without_tag, image_pull_tag = _get_image_basename_and_tag(image_name_pull)
         if self.settings["use_registry"]:
             for _ in range(3):
                 try:
                     image_manifest = await self.registry.get_image_manifest(
-                        image_without_tag, image_tag
+                        image_pull_without_tag, image_pull_tag
                     )
                     image_found = bool(image_manifest)
                     break
                 except HTTPClientError:
                     app_log.exception(
                         "Failed to get image manifest for %s",
-                        image_name,
+                        image_name_pull,
                     )
                     image_found = False
         else:
             # Check if the image exists locally!
             # Assume we're running in single-node mode or all binder pods are assigned to the same node!
             docker_client = docker.from_env(version="auto")
             try:
-                docker_client.images.get(image_name)
+                docker_client.images.get(image_name_pull)
             except docker.errors.ImageNotFound:
                 # image doesn't exist, so do a build!
                 image_found = False
@@ -437,15 +447,15 @@ async def get(self, provider_prefix, _unescaped_spec):
                 await self.emit(
                     {
                         "phase": "ready",
-                        "imageName": image_name,
+                        "imageName": image_name_push,
                         "message": "Done! Found built image\n",
                     }
                 )
             else:
                 await self.emit(
                     {
                         "phase": "built",
-                        "imageName": image_name,
+                        "imageName": image_name_push,
                         "message": "Found built image, launching...\n",
                     }
                 )
@@ -490,12 +500,12 @@ async def get(self, provider_prefix, _unescaped_spec):
             name=build_name,
             repo_url=repo_url,
             ref=ref,
-            image_name=image_name,
+            image_name=image_name_push,
             git_credentials=provider.git_credentials,
         )
         if self.settings["use_registry"]:
             push_token = await self.registry.get_credentials(
-                image_without_tag, image_tag
+                image_push_without_tag, image_push_tag
             )
             if push_token:
                 build.registry_credentials = push_token
@@ -555,7 +565,7 @@ def _check_result(future):
                         event = {
                             "phase": phase,
                             "message": message,
-                            "imageName": image_name,
+                            "imageName": image_name_push,
                         }
                         BUILD_TIME.labels(status="success").observe(
                             time.perf_counter() - build_starttime
@@ -647,7 +657,7 @@ async def check_quota(self, provider):
         launch_quota = self.settings["launch_quota"]
         try:
             return await launch_quota.check_repo_quota(
-                self.image_name, repo_config, self.repo_url
+                self.image_name_pull, repo_config, self.repo_url
             )
         except LaunchQuotaExceeded as e:
             LAUNCH_COUNT.labels(
@@ -715,7 +725,7 @@ async def handle_progress_event(event):
                     "binder_persistent_request": self.binder_persistent_request,
                 }
                 server_info = await launcher.launch(
-                    image=self.image_name,
+                    image=self.image_name_pull,
                     username=username,
                     server_name=server_name,
                     repo_url=self.repo_url,