Skip to content

Commit c8f9647

Browse files
author
Matthew Fisher
committed
Merge pull request #1600 from bacongobbler/deis-run-bash
fix(controller): run apps under /bin/bash
2 parents d7cc280 + fb983a2 commit c8f9647

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

client/deis.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,8 @@ def apps_logs(self, args):
601601

602602
def apps_run(self, args):
603603
"""
604-
Runs a command inside an ephemeral app container.
604+
Runs a command inside an ephemeral app container. Default environment is
605+
/bin/bash.
605606
606607
Usage: deis apps:run [options] [--] <command>...
607608

controller/api/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def run_command(c, command):
9191
if rc != 0:
9292
raise EnvironmentError('Could not pull image: {image}'.format(**locals()))
9393
# run the command
94-
docker_args = ' '.join(['--entrypoint=/bin/sh',
94+
docker_args = ' '.join(['--entrypoint=/bin/bash',
9595
'-a', 'stdout', '-a', 'stderr', '--rm', image])
9696
escaped_command = command.replace("'", "'\\''")
9797
command = r"docker run {docker_args} -c \'{escaped_command}\'".format(**locals())

0 commit comments

Comments
 (0)