mirror of
https://github.com/dokku/dokku.git
synced 2026-02-23 19:50:34 +01:00
use /bin/sh instead of /bin/bash in order to support dockerfile images that don't include bash. fixes #1364
This commit is contained in:
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
;;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user