Merge branch 'upcoming' of github.com:dokku/dokku into upcoming

2019-10-07 18:55:29 -05:00
parent 94f5c04bf3 24c47e17f8
commit 844b86840a
154 changed files with 1998 additions and 1494 deletions
--- a/plugins/enter/subcommands/default
+++ b/plugins/enter/subcommands/default
@@ -60,7 +60,7 @@ enter_default_cmd() {
  has_tty && local DOKKU_RUN_OPTS+=" -i -t"
  is_image_herokuish_based "$IMAGE" && local EXEC_CMD="/exec"
  # shellcheck disable=SC2086
-  "$DOCKER_BIN" exec $DOKKU_RUN_OPTS $ID $EXEC_CMD "${@:-$DOKKU_APP_SHELL}"
+  "$DOCKER_BIN" container exec $DOKKU_RUN_OPTS $ID $EXEC_CMD "${@:-$DOKKU_APP_SHELL}"
 }

 enter_default_cmd "$@"