github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use /bin/sh instead of /bin/bash in order to support dockerfile images that don't include bash. fixes #1364

Browse Source
This commit is contained in:
Michael Hobbs
2015-08-03 11:40:30 -07:00
parent 466df88660
commit 8edea8512d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/common/functions
View File

@@ -134,7 +134,7 @@ verify_image() {
is_image_buildstep_based() { is_image_buildstep_based() {
# circleci can't support --rm as they run lxc in lxc # circleci can't support --rm as they run lxc in lxc
[[ ! -f "/home/ubuntu/.circlerc" ]] && local DOCKER_ARGS="--rm" [[ ! -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() { is_number() {

2
plugins/ps/commands
View File

@@ -12,7 +12,7 @@ case "$1" in
! (is_deployed $APP) && echo "App $APP has not been deployed" && exit 0 ! (is_deployed $APP) && echo "App $APP has not been deployed" && exit 0
for CID in $CONTAINER_IDS; do 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 done
;; ;;