Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: docker/cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: thaJeztah/cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: refactor_proxy_config
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Dec 13, 2018

  1. Fix: proxy-configuration being ignored on docker create

    Proxies configured in config.json were only taking effect
    when using `docker run`, but were being ignored when
    using `docker create`.
    
    Before this change:
    
        echo '{"proxies":{"default":{"httpProxy":"httpProxy","httpsProxy":"httpsProxy","noProxy":"noProxy","ftpProxy":"ftpProxy"}}}' > config.json
        docker inspect --format '{{.Config.Env}}' $(docker --config=./ create busybox)
        [PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin]
    
    With this change applied:
    
        echo '{"proxies":{"default":{"httpProxy":"httpProxy","httpsProxy":"httpsProxy","noProxy":"noProxy","ftpProxy":"ftpProxy"}}}' > config.json
        docker inspect --format '{{.Config.Env}}' $(docker --config=./ create busybox)
        [NO_PROXY=noProxy no_proxy=noProxy FTP_PROXY=ftpProxy ftp_proxy=ftpProxy HTTP_PROXY=httpProxy http_proxy=httpProxy HTTPS_PROXY=httpsProxy https_proxy=httpsProxy PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin]
    
    Reported-by: Silvano Cirujano Cuesta <[email protected]>
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    cc6a92c View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. Refactor ProxyConfig

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    24e1f96 View commit details
    Browse the repository at this point in the history
Loading