From 352062c2dcd66072033e18a0a5281fbaf441c573 Mon Sep 17 00:00:00 2001 From: Ben Firshman Date: Fri, 10 Oct 2014 11:10:39 +0100 Subject: [PATCH] Use /bin/echo for intermediate container In cases where the service is using a minimal container, /bin/echo can be created but echo cannot. See #517 Signed-off-by: Ben Firshman --- fig/service.py | 2 +- tests/integration/service_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fig/service.py b/fig/service.py index 8645b5f3d..6c635dee0 100644 --- a/fig/service.py +++ b/fig/service.py @@ -223,7 +223,7 @@ class Service(object): intermediate_container = Container.create( self.client, image=container.image, - entrypoint=['echo'], + entrypoint=['/bin/echo'], command=[], ) intermediate_container.start(volumes_from=container.id) diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py index e2431f48e..c288edf6b 100644 --- a/tests/integration/service_test.py +++ b/tests/integration/service_test.py @@ -136,7 +136,7 @@ class ServiceTest(DockerClientTestCase): 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'])