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/builder-dockerfile/builder-build
+++ b/plugins/builder-dockerfile/builder-build
@@ -37,7 +37,7 @@ trigger-builder-build-builder-dockerfile() {
  declare -a ARG_ARRAY
  eval "ARG_ARRAY=($DOCKER_ARGS)"

-  "$DOCKER_BIN" build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS "${ARG_ARRAY[@]}" "${DOKKU_DOCKER_BUILD_OPTS[@]}" -t $IMAGE .
+  "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS "${ARG_ARRAY[@]}" "${DOKKU_DOCKER_BUILD_OPTS[@]}" -t $IMAGE .

  plugn trigger post-build-dockerfile "$APP"
 }