pass image tag from release_and_deploy down through extract_procfile. closed #2226

This commit is contained in:
Michael Hobbs committed 2016-06-06 11:31:59 -07:00
1 parent 74e861417e
commit 166f7f38e4
2 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -14,7 +14,7 @@ print_dokku_scale_file() {
extract_procfile() { extract_procfile() {
declare desc="extracts procfile from app image" declare desc="extracts procfile from app image"
local APP="$1" local APP="$1"
local IMAGE_TAG="$(get_running_image_tag "$APP")" local IMAGE_TAG="$2"
local IMAGE="$(get_app_image_name "$APP" "$IMAGE_TAG")" local IMAGE="$(get_app_image_name "$APP" "$IMAGE_TAG")"
local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE" local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
verify_app_name "$APP" verify_app_name "$APP"
+3 -3
View File
@@ -6,10 +6,10 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
ps_pre_deploy() { ps_pre_deploy() {
declare desc="ps pre-deploy plugin trigger" declare desc="ps pre-deploy plugin trigger"
local trigger="ps_pre_deploy" local trigger="ps_pre_deploy"
local APP="$1" local APP="$1"; local IMAGE_TAG="$2"
extract_procfile "$APP" extract_procfile "$APP" "$IMAGE_TAG"
generate_scale_file "$APP" generate_scale_file "$APP" "$IMAGE_TAG"
} }
ps_pre_deploy "$@" ps_pre_deploy "$@"