tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 07:34:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #534 from bfirsh/use-bin-echo-for-intermediate-container

Browse Source 
Use /bin/echo for intermediate container
This commit is contained in:
Aanand Prasad 2014-10-10 13:12:33 +01:00
commit bf1c1b4c17
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fig/service.py
View File

@ -223,7 +223,7 @@ class Service(object):
intermediate_container = Container.create( intermediate_container = Container.create(
self.client, self.client,
image=container.image, image=container.image,
entrypoint=['echo'], entrypoint=['/bin/echo'],
command=[], command=[],
) )
intermediate_container.start(volumes_from=container.id) intermediate_container.start(volumes_from=container.id)

2
tests/integration/service_test.py
View File

@ -136,7 +136,7 @@ class ServiceTest(DockerClientTestCase):
intermediate_container = tuples[0][0] intermediate_container = tuples[0][0]
new_container = tuples[0][1] 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']['Entrypoint'], ['sleep'])
self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300']) self.assertEqual(new_container.dictionary['Config']['Cmd'], ['300'])