-
Notifications
You must be signed in to change notification settings - Fork 2
feat: add option to use local sdr-docker image #39
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ | |
| import base64 | ||
| import json | ||
| import logging | ||
| import os | ||
| import time | ||
| from pathlib import Path | ||
| from typing import Callable, Dict, Generator, List, Optional, Set, Tuple | ||
|
|
@@ -23,7 +24,7 @@ | |
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
| DOCKER_IMAGE = "ghcr.io/hubblenetwork/sdr-docker:latest" | ||
| DOCKER_IMAGE = os.environ.get("SDR_DOCKER_IMAGE", "ghcr.io/hubblenetwork/sdr-docker:latest") | ||
| CONTAINER_NAME = "hubble-pluto-sdr" | ||
| MOCK_CONTAINER_NAME = "hubble-pluto-sdr-mock" | ||
| API_PORT = 8050 | ||
|
|
@@ -103,8 +104,17 @@ def ensure_docker_available() -> None: | |
| raise DockerError("Docker daemon is not responding") | ||
|
|
||
|
|
||
| def _image_exists_locally(image: str) -> bool: | ||
| try: | ||
| _get_client().images.get(image) | ||
| return True | ||
| except Exception: | ||
| return False | ||
|
|
||
|
|
||
| def pull_image(image: str = DOCKER_IMAGE) -> None: | ||
| """Pull *image*, ensuring the latest version is fetched.""" | ||
| """Pull *image*, ensuring the latest version is fetched. | ||
| """ | ||
|
Comment on lines
+116
to
+117
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. since there is no change to |
||
| logger.info("Pulling %s …", image) | ||
| client = _get_client() | ||
| try: | ||
|
|
@@ -297,8 +307,11 @@ def scan( | |
|
|
||
| ensure_docker_available() | ||
|
|
||
| _emit("Pulling Docker image...") | ||
| pull_image(image) | ||
| if _image_exists_locally(image): | ||
| _emit(f"Using local image {image}...") | ||
| else: | ||
| _emit("Pulling Docker image...") | ||
| pull_image(image) | ||
|
|
||
| _emit("Starting container...") | ||
| container_name = MOCK_CONTAINER_NAME if mock else CONTAINER_NAME | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we update the doc / user guide? Is this env set by the program or by user?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a fair point. I didn't have the end-user in mind when making this, I was only thinking about how to integrate this into CI with new versions of sdr-docker before it gets updated into latest. I personally don't think we should advise the user to change our sdr-docker and use pyhubblenetwork with it, ideally they should only be using latest because that is what's validated.