Skip to content

Docker proxy config #1196

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.

Sign up for GitHub

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
sanathkr merged 3 commits into from
Jun 7, 2019
Merged

Docker proxy config #1196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
581a0b5
Updated docker create container kwargs to use global docker configura…
cooper3330 May 24, 2019
d19843c
Updated unit tests for docker proxy config changes to Container create
cooper3330 May 24, 2019
39a725f
Updated import order in samcli.local.docker.utils to resolve pylint e…
cooper3330 May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion samcli/local/docker/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ def create(self):
}
},
# We are not running an interactive shell here.
"tty": False
"tty": False,
# Set proxy configuration from global Docker config file
"use_config_proxy": True
}

if self._container_opts:
Expand Down
2 changes: 1 addition & 1 deletion samcli/local/docker/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"""

import os
import posixpath
import re
import posixpath
try:
import pathlib
except ImportError:
Expand Down
7 changes: 6 additions & 1 deletion tests/unit/local/docker/test_container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ def test_must_create_container_with_required_values(self):
command=self.cmd,
working_dir=self.working_dir,
volumes=expected_volumes,
tty=False)
tty=False,
use_config_proxy=True)
self.mock_docker_client.networks.get.assert_not_called()

def test_must_create_container_including_all_optional_values(self):
Expand Down Expand Up @@ -141,6 +142,7 @@ def test_must_create_container_including_all_optional_values(self):
working_dir=self.working_dir,
volumes=expected_volumes,
tty=False,
use_config_proxy=True,
environment=self.env_vars,
ports=self.exposed_ports,
entrypoint=self.entrypoint,
Expand Down Expand Up @@ -206,6 +208,7 @@ def test_must_create_container_translate_volume_path(self, os_mock):
working_dir=self.working_dir,
volumes=translated_volumes,
tty=False,
use_config_proxy=True,
environment=self.env_vars,
ports=self.exposed_ports,
entrypoint=self.entrypoint,
Expand Down Expand Up @@ -250,6 +253,7 @@ def test_must_connect_to_network_on_create(self):
command=self.cmd,
working_dir=self.working_dir,
tty=False,
use_config_proxy=True,
volumes=expected_volumes
)

Expand Down Expand Up @@ -292,6 +296,7 @@ def test_must_connect_to_host_network_on_create(self):
command=self.cmd,
working_dir=self.working_dir,
tty=False,
use_config_proxy=True,
volumes=expected_volumes,
network_mode='host'
)
Expand Down