diff --git a/plugins/common/functions b/plugins/common/functions index 809d7435d..a58738e29 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -141,7 +141,7 @@ copy_from_image() { CID=$(docker run -d $IMAGE bash) docker cp "$CID:$SRC_FILE" "$DST_DIR" - docker rm -f "$CID" + docker rm -f "$CID" &> /dev/null } is_deployed() { diff --git a/plugins/ps/commands b/plugins/ps/commands index f1a25d7f0..e6e35c916 100755 --- a/plugins/ps/commands +++ b/plugins/ps/commands @@ -117,8 +117,8 @@ case "$1" in dokku_log_info2 "$(< $DOKKU_SCALE_FILE)" else set_scale "$APP" "$@" + release_and_deploy "$APP" fi - release_and_deploy "$APP" ;; help | ps:help) diff --git a/plugins/ps/functions b/plugins/ps/functions index 0feb92bd8..8b10b350d 100755 --- a/plugins/ps/functions +++ b/plugins/ps/functions @@ -4,7 +4,7 @@ source "$(dirname $0)/../common/functions" generate_scale_file() { local APP="$1"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE" - copy_from_image "$APP" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" || dokku_log_info1_quiet "DOKKU_SCALE not found in app image" + copy_from_image "$APP" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || dokku_log_info1_quiet "DOKKU_SCALE not found in app image" if [[ ! -f $DOKKU_SCALE_FILE ]]; then local TMP_WORK_DIR=$(mktemp -d DOKKU_SCALE.XXXXX) trap 'rm -rf $TMP_WORK_DIR' EXIT