diff --git a/docs/dokku-events-logs.md b/docs/dokku-events-logs.md index 8ff961adb..462855d53 100644 --- a/docs/dokku-events-logs.md +++ b/docs/dokku-events-logs.md @@ -21,10 +21,10 @@ Enabling dokku events logger Dokku will then write log entries to ``/var/log/syslog`` as well as a Dokku-specific logs sub-directory ``/var/log/dokku/events.log``, which can be easily displayed with the command `dokku events`: ``` -Jul 3 16:09:48 dokku.me dokku[127630]: INVOKED: pre-release-buildstep( pythonapp ) +Jul 3 16:09:48 dokku.me dokku[127630]: INVOKED: pre-release-buildpack( pythonapp ) Jul 3 16:10:02 dokku.me dokku[128095]: INVOKED: docker-args-run( rubyapp ) Jul 3 16:10:02 dokku.me dokku[128114]: INVOKED: docker-args-run( nhl ) -Jul 3 16:10:03 dokku.me dokku[128136]: INVOKED: post-release-buildstep( pythonapp ) +Jul 3 16:10:03 dokku.me dokku[128136]: INVOKED: post-release-buildpack( pythonapp ) Jul 3 16:10:03 dokku.me dokku[128195]: INVOKED: pre-deploy( pythonapp ) Jul 3 16:10:23 dokku.me dokku[129253]: INVOKED: docker-args-deploy( pythonapp ) Jul 3 16:10:24 dokku.me dokku[129337]: INVOKED: bind-external-ip( pythonapp ) @@ -47,10 +47,10 @@ docker-args-build pre-delete post-deploy receive-app -pre-release-buildstep +pre-release-buildpack nginx-pre-reload docker-args-deploy -post-build-buildstep +post-build-buildpack post-domains-update post-release-dockerfile check-deploy @@ -63,10 +63,10 @@ bind-external-ip pre-deploy post-delete dependencies -pre-build-buildstep +pre-build-buildpack docker-args-run pre-build-dockerfile -post-release-buildstep +post-release-buildpack post-build-dockerfile pre-release-dockerfile update diff --git a/docs/process-management.md b/docs/process-management.md index f7c5e6b4c..bf28f79e1 100644 --- a/docs/process-management.md +++ b/docs/process-management.md @@ -13,9 +13,6 @@ ps:start Start app container(s) ps:stop Stop app container(s) ``` -*NOTE*: As of v0.3.14, `dokku deploy:all` in now deprecated by `ps:restartall` and will be removed in a future version. - - ## Scaling Dokku allows you to run multiple process types at different container counts. For example, if you had an app that contained 1 web app listener and 1 background job processor, dokku can, spin up 1 container for each process type defined in the Procfile. By default we will only start the web process. However, if you wanted 2 job processors running simultaneously, you can modify this behavior in a few ways. diff --git a/dokku b/dokku index 49fade16e..662203a2e 100755 --- a/dokku +++ b/dokku @@ -85,8 +85,7 @@ case "$1" in DOKKU_PORT_FILE="$DOKKU_ROOT/$APP/PORT.$PROC_TYPE.$CONTAINER_INDEX" # start the app - DOCKER_ARGS=$(: | plugn trigger docker-args $APP deploy $IMAGE_TAG) - DOCKER_ARGS+=" -e DYNO='$PROC_TYPE.$CONTAINER_INDEX' " + DOCKER_ARGS=" -e DYNO='$PROC_TYPE.$CONTAINER_INDEX' " DOCKER_ARGS+=$(: | plugn trigger docker-args-deploy $APP $IMAGE_TAG) [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true " BIND_EXTERNAL=$(plugn trigger bind-external-ip $APP) diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands index 878690068..0175fe9f1 100755 --- a/plugins/00_dokku-standard/commands +++ b/plugins/00_dokku-standard/commands @@ -19,26 +19,15 @@ case "$1" in test "$(docker wait $id)" -eq 0 docker commit $id $IMAGE > /dev/null [[ -d $CACHE_DIR ]] || mkdir $CACHE_DIR - # *DEPRECATED* in v0.3.15: `plugn trigger pre-build` will be removed in future releases - plugn trigger pre-build "$APP" - # *DEPRECATED* in v0.3.22: `plugn trigger pre-build-buildstep` will be removed in future releases - plugn trigger pre-build-buildstep "$APP" plugn trigger pre-build-buildpack "$APP" - # *DEPRECATED* in v0.3.14: `plugn trigger docker-args` will be removed in future releases - # https://github.com/progrium/dokku/issues/896 & https://github.com/progrium/dokku/issues/906 - DOCKER_ARGS=$(: | plugn trigger docker-args $APP build) - DOCKER_ARGS+=$(: | plugn trigger docker-args-build $APP) + DOCKER_ARGS=$(: | plugn trigger docker-args-build $APP) [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true " id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build) docker attach $id test "$(docker wait $id)" -eq 0 docker commit $id $IMAGE > /dev/null - # *DEPRECATED* in v0.3.15: `plugn trigger post-build` will be removed in future releases - plugn trigger post-build "$APP" - # *DEPRECATED* in v0.3.22: `plugn trigger post-build-buildstep` will be removed in future releases - plugn trigger post-build-buildstep "$APP" plugn trigger post-build-buildpack "$APP" ;; @@ -66,10 +55,6 @@ case "$1" in case "$IMAGE_SOURCE_TYPE" in herokuish) - # *DEPRECATED* in v0.3.15: `plugn trigger pre-release` will be removed in future releases - plugn trigger pre-release "$APP" "$IMAGE_TAG" - # *DEPRECATED* in v0.3.22: `plugn trigger pre-release-buildstep` will be removed in future releases - plugn trigger pre-release-buildstep "$APP" "$IMAGE_TAG" plugn trigger pre-release-buildpack "$APP" "$IMAGE_TAG" if [[ -n $(config_export global) ]]; then id=$(config_export global | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh") @@ -81,10 +66,6 @@ case "$1" in test "$(docker wait $id)" -eq 0 docker commit $id $IMAGE > /dev/null fi - # *DEPRECATED* in v0.3.15: `plugn trigger post-release` will be removed in future releases - plugn trigger post-release "$APP" "$IMAGE_TAG" - # *DEPRECATED* in v0.3.22: `plugn trigger post-release-buildstep` will be removed in future releases - plugn trigger post-release-buildstep "$APP" "$IMAGE_TAG" plugn trigger post-release-buildpack "$APP" "$IMAGE_TAG" ;; @@ -176,8 +157,7 @@ case "$1" in shift 2 - DOCKER_ARGS=$(: | plugn trigger docker-args $APP run $IMAGE_TAG) - DOCKER_ARGS+=$(: | plugn trigger docker-args-run $APP $IMAGE_TAG) + DOCKER_ARGS=$(: | plugn trigger docker-args-run $APP $IMAGE_TAG) [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true " [[ $DOKKU_RM_CONTAINER ]] && DOKKU_RUN_OPTS="--rm" has_tty && DOKKU_RUN_OPTS+=" -i -t" diff --git a/plugins/build-env/pre-build b/plugins/build-env/pre-build-buildpack similarity index 88% rename from plugins/build-env/pre-build rename to plugins/build-env/pre-build-buildpack index 78870aa7b..6916ae0a7 100755 --- a/plugins/build-env/pre-build +++ b/plugins/build-env/pre-build-buildpack @@ -6,11 +6,6 @@ source "$PLUGIN_PATH/available/config/functions" APP="$1"; IMAGE=$(get_app_image_name $APP); BUILD_ENV="" verify_app_name "$APP" -[[ -f "$DOKKU_ROOT/BUILD_ENV" ]] && cat "$DOKKU_ROOT/BUILD_ENV" >> "$DOKKU_ROOT/ENV" && { - dokku_log_info2 "Using a global BUILD_ENV file is deprecated as of 0.3.26" - rm "$DOKKU_ROOT/BUILD_ENV" -} - config_get --global CURL_CONNECT_TIMEOUT > /dev/null 2>&1 || config_set --global CURL_CONNECT_TIMEOUT=5 config_get --global CURL_TIMEOUT > /dev/null 2>&1 || config_set --global CURL_TIMEOUT=30 diff --git a/plugins/config/commands b/plugins/config/commands index b259541ff..96955ae2b 100755 --- a/plugins/config/commands +++ b/plugins/config/commands @@ -20,18 +20,6 @@ case "$1" in config_unset "$@" ;; - config:set-norestart) - dokku_log_info2 "$1 is deprecated as of v0.3.22" - shift 1 - dokku config:set --no-restart "$@" - ;; - - config:unset-norestart) - dokku_log_info2 "$1 is deprecated as of v0.3.22" - shift 1 - dokku config:unset --no-restart "$@" - ;; - help | config:help) cat<|--global), Display all global or app-specific config vars diff --git a/plugins/shell/commands b/plugins/shell/commands index 686963ced..0d3b73fbd 100755 --- a/plugins/shell/commands +++ b/plugins/shell/commands @@ -30,15 +30,16 @@ case "$1" in [[ "$line" != "$(fc -ln -1 | trim)" ]] && history -s "$line" case $CMD in - # shell builtins + # shell builtins clear) clear ;; + quit|exit) break ;; - # Not a built-in, run as regular dokku command + # Not a built-in, run as regular dokku command *) dokku $line || true esac diff --git a/plugins/tar/commands b/plugins/tar/commands index 1032fd5fe..4388a1cc5 100755 --- a/plugins/tar/commands +++ b/plugins/tar/commands @@ -49,7 +49,6 @@ case "$1" in tar -x -C "$TMP_WORK_DIR" -f "$DOKKU_ROOT/$APP/src.tar" --strip-components=$BOGUS_PARTS chmod -R u+r "$TMP_WORK_DIR" - #find -name .git -prune -exec rm -rf {} \; > /dev/null if [[ -f Dockerfile ]] && [[ "$([[ -f .env ]] && grep -q BUILDPACK_URL .env; echo $?)" != "0" ]] && [[ ! -f ".buildpacks" ]]; then dokku receive "$APP" "dockerfile" "$TMP_WORK_DIR" | sed -u "s/^/"$'\e[1G'"/"