github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: set deploy-source and metadata at deploy time

Browse Source 
This ensures the value is correct, where previously it was computed based on a file - and therefore did not distinguish between git:from-archive and git:from-image.

Closes #4464
This commit is contained in:
Jose Diaz-Gonzalez
2021-10-09 23:37:53 -04:00
parent cd7b8afccb
commit c0b6942392
12 changed files with 112 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/appendices/0.26.0-migration-guide.md
View File

@@ -8,4 +8,5 @@
## Changes
- The `scheduler` plugin now controls the scheduler in use for deploys. Apps will have their `DOKKU_SCHEDULER` environment variables migrated to the scheduler plugin, after which that value will be removed from said app. Please see the [scheduler documentation](/docs/deployment/schedulers/scheduler-management.md) for more information.
- The `deploy-source` metadata from `apps:report` is now no longer computed on the fly, but hydrated at deploy time via the `deploy-source-set` trigger. This value may be empty until your next deploy.
- Additionally, the `deploy-source` trigger has now been removed.

26
docs/deployment/application-management.md
View File

@@ -243,17 +243,20 @@ dokku apps:report
```
=====> node-js-app app information
App dir: /home/dokku/node-js-app
App deploy source: git
App locked: false
App dir: /home/dokku/node-js-app
App deploy source: git
App deploy source metadata: cd7b8afccb202f222e7dc7b427553e71ba5ddafd
App locked: false
=====> python-sample app information
App dir: /home/dokku/python-sample
App dir: /home/dokku/python-sample
App deploy source:
App locked: false
App deploy source metadata:
App locked: false
=====> ruby-sample app information
App dir: /home/dokku/ruby-sample
App deploy source: git
App locked: false
App dir: /home/dokku/ruby-sample
App deploy source: git
App deploy source metadata: c60921ea2799ca108276414b95ea197f16798d51
App locked: false
```
You can run the command for a specific app also.
@@ -264,9 +267,10 @@ dokku apps:report node-js-app
```
=====> node-js-app app information
App dir: /home/dokku/node-js-app
App deploy source: git
App locked: false
App dir: /home/dokku/node-js-app
App deploy source: git
App deploy source metadata: cd7b8afccb202f222e7dc7b427553e71ba5ddafd
App locked: false
```
You can pass flags which will output only the value of the specific information you want. For example:

27
docs/development/plugin-triggers.md
View File

@@ -446,33 +446,6 @@ APP="$1" IMAGE_TAG="$2" PROC_TYPE="$3"
# TODO
```
### `deploy-source`
- Description: Used for reporting what the current detected deployment source is. The first detected source should always win.
- Invoked by: `dokku apps:report`
- Arguments: `$APP`
- Example:
```shell
#!/usr/bin/env bash
# Checks if the app should be deployed via git
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
APP="$1"
STDIN=$(cat)
# bail if another source is detected
if [[ -n "$STDIN" ]]; then
echo "$STDIN"
return
fi
if [[ -d "$DOKKU_ROOT/$APP/refs" ]]; then
echo "git"
fi
```
### `deployed-app-image-repo`
- Description: Used to manage the full repo of the image being deployed. Useful for deploying from an external registry where the repository name is not `dokku/$APP`