support for non-default docker host added #16477
Merged
Conversation
This file contains 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
AbrilRBS
reviewed
Jun 14, 2024
conan/internal/runner/docker.py
Outdated
| self.docker_client = docker.DockerClient(base_url=base_url, version='auto') | ||
| break | ||
| except: | ||
| continue |
There was a problem hiding this comment.
If every try fails, we could have a pretty error for the user in that case
There was a problem hiding this comment.
In that case, we rise this exception:
raise ConanException("Docker Client failed to initialize."
"\n - Check if docker is installed and running"
"\n - Run 'pip install conan[runners]'")
memsharded
approved these changes
Jun 14, 2024
conan/internal/runner/docker.py
Outdated
Comment on lines
71
to
77
| docker_base_urls = [ | ||
| os.environ.get('CONAN_RUNNER_DOCKER_HOST'), | ||
| os.environ.get('DOCKER_HOST'), | ||
| 'unix:///var/run/docker.sock', | ||
| f'unix://{os.path.expanduser("~")}/.rd/docker.sock' | ||
| ] | ||
| for base_url in docker_base_urls: |
There was a problem hiding this comment.
Sounds a bit hacky, some suggestions:
- Add some comment explaining the why. Explain the different URLs a bit
- Is it possible to unify the above
docker.from_env()and this call in a single one? so trying to connect the docker client looks like less like a workaround hack?
AbrilRBS
approved these changes
Jul 2, 2024
memsharded
reviewed
Jul 2, 2024
conan/internal/runner/docker.py
Outdated
| self.docker_api = self.docker_client.api | ||
| docker_base_urls = [ | ||
| None, # Default docker configuration, let the python library detect the socket | ||
| os.environ.get('CONAN_RUNNER_DOCKER_HOST'), # Connect to socket defined in CONAN_RUNNER_DOCKER_HOST |
There was a problem hiding this comment.
But why CONAN_RUNNER_DOCKER_HOST? This is not something defined by Rancher or anyone else, I suggest removing and leaving DOCKER_HOST if that is a "standard" docker env-var.
conan/internal/runner/docker.py
Outdated
Comment on lines
74
to
76
| for base_url in docker_base_urls: | ||
| try: | ||
| self.docker_client = docker.DockerClient(base_url=base_url, version='auto') |
There was a problem hiding this comment.
Some info message, maybe at least ConanOutput().verbose() of the things that are being tried would make sense.
memsharded
approved these changes
Jul 2, 2024
memsharded
approved these changes
Jul 2, 2024
|
Confirmed that I can now run ny own docker images from rancher without problems now :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changelog: Fix: Add support for non default docker hosts in conan runners
Docs: Omit