Skip to content

Add a check to Build command for Docker if the --use-container flag i… #1075

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 2 commits into from
Apr 4, 2019
Merged

Add a check to Build command for Docker if the --use-container flag i… #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1296016
Add a check to Build command for Docker if the --use-container flag i…
gkrizek Mar 24, 2019
98c039f
Moving the Docker connectivity check to the build_container method
sanathkr Apr 4, 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
3 changes: 3 additions & 0 deletions samcli/lib/build/app_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,9 @@ def _build_function_on_container(self, # pylint: disable=too-many-locals
manifest_path,
runtime):

if not self._container_manager.is_docker_reachable:
raise BuildError("Docker is unreachable. Docker needs to be running to build inside a container.")

# If we are printing debug logs in SAM CLI, the builder library should also print debug logs
log_level = LOG.getEffectiveLevel()

Expand Down
16 changes: 16 additions & 0 deletions tests/unit/lib/build_module/test_app_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,22 @@ def test_must_raise_on_unsupported_container(self, LambdaBuildContainerMock):
self.assertEquals(str(ctx.exception), msg)
self.container_manager.stop.assert_called_with(container_mock)

def test_must_raise_on_docker_not_running(self):
config = Mock()

self.container_manager.is_docker_reachable = False

with self.assertRaises(BuildError) as ctx:
self.builder._build_function_on_container(config,
"source_dir",
"artifacts_dir",
"scratch_dir",
"manifest_path",
"runtime")

self.assertEquals(str(ctx.exception),
"Docker is unreachable. Docker needs to be running to build inside a container.")


class TestApplicationBuilder_parse_builder_response(TestCase):

Expand Down