From 8edea8512d757f61ec63859b1edcb91f1eb44ef8 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Mon, 3 Aug 2015 11:40:30 -0700 Subject: [PATCH] use /bin/sh instead of /bin/bash in order to support dockerfile images that don't include bash. fixes #1364 --- plugins/common/functions | 2 +- plugins/ps/commands | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/common/functions b/plugins/common/functions index be01f811e..de12200d3 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -134,7 +134,7 @@ verify_image() { is_image_buildstep_based() { # circleci can't support --rm as they run lxc in lxc [[ ! -f "/home/ubuntu/.circlerc" ]] && local DOCKER_ARGS="--rm" - docker run --entrypoint="/bin/bash" $DOCKER_ARGS "$@" -c "[[ -f /exec ]]" + docker run --entrypoint="/bin/sh" $DOCKER_ARGS "$@" -c "test -f /exec" } is_number() { diff --git a/plugins/ps/commands b/plugins/ps/commands index f0aea65b0..bc6d2ab52 100755 --- a/plugins/ps/commands +++ b/plugins/ps/commands @@ -12,7 +12,7 @@ case "$1" in ! (is_deployed $APP) && echo "App $APP has not been deployed" && exit 0 for CID in $CONTAINER_IDS; do - docker exec -ti "$CID" /bin/bash -c "ps auxwww" + docker exec -ti "$CID" /bin/sh -c "ps auxwww" done ;;