Proxy settings update #33
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
matthew-hagemann
force-pushed
the
proxy-settings-update
branch
2 times, most recently
from
844f5c1
to
70e470e
Compare
matthew-hagemann
force-pushed
the
proxy-settings-update
branch
from
70e470e
to
eb8faab
Compare
sminez
reviewed
Sep 30, 2024
sminez
reviewed
Sep 30, 2024
src/charm.py
Outdated
| if proxy_url: | ||
| os.environ["HTTP_PROXY"] = proxy_url | ||
| os.environ["HTTPS_PROXY"] = proxy_url | ||
| http_proxy_env = os.environ.get("JUJU_CHARM_HTTP_PROXY") |
There was a problem hiding this comment.
get supports a default value if the key is missing so you could combine these lines with the ones on 263, 264 as:
http_proxy_str = os.environ.get("JUJU_CHARM_HTTP_PROXY", "")
sminez
reviewed
Sep 30, 2024
sminez
reviewed
Sep 30, 2024
sminez
requested changes
Sep 30, 2024
matthew-hagemann
force-pushed
the
proxy-settings-update
branch
from
35f4b2c
to
0038b0e
Compare
matthew-hagemann
force-pushed
the
proxy-settings-update
branch
from
0038b0e
to
b6a708c
Compare
sminez
reviewed
Oct 2, 2024
src/container_runner.py
Outdated
| @@ -18,6 +18,32 @@ | |||
| DOCKER_DAEMON_CONFIG_PATH = Path("/etc/docker/daemon.json") | |||
|
|
|||
|
|
|||
| def _try_set_proxy_settings(): | |||
| """If Juju proxy environment variables are present, set procy environment variables and write Docker proxy settings to /etc/docker/daemon.json.""" | |||
There was a problem hiding this comment.
Ah, thanks! I'll fix that before I merge 🙂
sminez
approved these changes
Oct 2, 2024
sminez
approved these changes
Oct 2, 2024
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.
The Docker snap did not have an easy way to enable us to pass proxy settings to the docker daemon before starting. This prevented us from having a simple lifecycle to manage operating the charm from behind a proxy.
This PR aims to:
/etc/docker/daemon.json)/etc/docker/daemon.jsonbefore docker daemon is started