diff --git a/docs/appendices/0.20.0-migration-guide.md b/docs/appendices/0.20.0-migration-guide.md index e217f8d7b..b3807adcb 100644 --- a/docs/appendices/0.20.0-migration-guide.md +++ b/docs/appendices/0.20.0-migration-guide.md @@ -45,6 +45,11 @@ Dokku will no longer distribute packages for Debian versions that are not `stabl - Debian 7 (wheezy) - Debian 8 (jessie) +### App report flags + +The following changes on the `apps:report` command were made in this release + +- The `--git-sha` flag was moved from the `apps:report` command to the `git:report` command. ## Deprecations - `nginx:show-conf` has been deprecated in favor of `nginx:show-config`. diff --git a/docs/deployment/application-management.md b/docs/deployment/application-management.md index b738caede..0ba5e7fd1 100644 --- a/docs/deployment/application-management.md +++ b/docs/deployment/application-management.md @@ -236,16 +236,14 @@ dokku apps:report ``` =====> node-js-app App dir: /home/dokku/node-js-app - Git sha: dbddc3f - Deploy source: git - Locked: false + App deploy source: git + App locked: false =====> python-sample not deployed =====> ruby-sample App dir: /home/dokku/ruby-sample - Git sha: a2d477c - Deploy source: git - Locked: false + App deploy source: git + App locked: false ``` You can run the command for a specific app also. @@ -257,13 +255,12 @@ dokku apps:report node-js-app ``` =====> node-js-app App dir: /home/dokku/node-js-app - Git sha: dbddc3f - Deploy source: git - Locked: false + App deploy source: git + App locked: false ``` You can pass flags which will output only the value of the specific information you want. For example: ```shell -dokku apps:report node-js-app --git-sha +dokku apps:report node-js-app --app-dir ``` diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions index d7a88e8ae..e1ec4189d 100755 --- a/plugins/git/internal-functions +++ b/plugins/git/internal-functions @@ -31,6 +31,7 @@ cmd-git-report() { cmd-git-report-single() { declare APP="$1" INFO_FLAG="$2" + local APP_DIR="$DOKKU_ROOT/$APP" if [[ "$INFO_FLAG" == "true" ]]; then INFO_FLAG="" fi @@ -40,6 +41,7 @@ cmd-git-report-single() { "--git-global-deploy-branch: $(fn-plugin-property-get "git" "--global" "deploy-branch" "master")" "--git-keep-git-dir: $(fn-plugin-property-get "git" "$APP" "keep-git-dir" "false")" "--git-rev-env-var: $(fn-plugin-property-get "git" "$APP" "rev-env-var" "GIT_REV")" + "--git-sha: $(GIT_DIR="$APP_DIR" git rev-parse --short HEAD 2>/dev/null || false)" ) if [[ -z "$INFO_FLAG" ]]; then