Skip to content

Commit

Permalink
Use /bin/echo for intermediate container
Browse files Browse the repository at this point in the history
In cases where the service is using a minimal container,
/bin/echo can be created but echo cannot.

See docker#517

Signed-off-by: Ben Firshman <[email protected]>
  • Loading branch information
bfirsh committed Oct 10, 2014
1 parent 872a1b5 commit 352062c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion fig/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def recreate_container(self, container, **override_options):
intermediate_container = Container.create(
self.client,
image=container.image,
entrypoint=['echo'],
entrypoint=['/bin/echo'],
command=[],
)
intermediate_container.start(volumes_from=container.id)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/service_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def test_recreate_containers(self):

intermediate_container = tuples[0][0]
new_container = tuples[0][1]
self.assertEqual(intermediate_container.dictionary['Config']['Entrypoint'], ['echo'])
self.assertEqual(intermediate_container.dictionary['Config']['Entrypoint'], ['/bin/echo'])

self.assertEqual(new_container.dictionary['Config']['Entrypoint'], ['sleep'])
self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300'])
Expand Down

0 comments on commit 352062c

Please sign in to comment.