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

fix: ensure we can deploy code when there is no pre or post-deploy script defined

Browse Source 
Closes #3385
This commit is contained in:
Jose Diaz-Gonzalez
2019-01-09 07:42:16 -05:00
parent 924287c04f
commit 4ae280528e
8 changed files with 104 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/app-json/internal-functions
View File

@@ -28,7 +28,7 @@ get_release_cmd() {
extract_procfile "$APP" "$IMAGE_TAG" >/dev/null
trap 'remove_procfile $APP' RETURN INT TERM EXIT
get_cmd_from_procfile "$APP" "release" "5000" || true
get_cmd_from_procfile "$APP" "release" "5000"
}
execute_script() {
@@ -38,9 +38,9 @@ execute_script() {
IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
if [[ "$PHASE_SCRIPT_KEY" == "release" ]]; then
SCRIPT_CMD=$(get_release_cmd "$APP" "$IMAGE" 2>/dev/null)
SCRIPT_CMD=$(get_release_cmd "$APP" "$IMAGE" 2>/dev/null || true)
else
SCRIPT_CMD=$(get_phase_script "$IMAGE" "$PHASE_SCRIPT_KEY" 2>/dev/null)
SCRIPT_CMD=$(get_phase_script "$IMAGE" "$PHASE_SCRIPT_KEY" 2>/dev/null || true)
fi
if [[ -z "$SCRIPT_CMD" ]]; then