这是indexloc提供的服务，不要输入任何密码
Skip to content

Pass image tag from release_and_deploy down through extract_procfile #2227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2016
Merged

Pass image tag from release_and_deploy down through extract_procfile #2227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/ps/functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ print_dokku_scale_file() {
extract_procfile() {
declare desc="extracts procfile from app image"
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 DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
verify_app_name "$APP"
Expand Down
6 changes: 3 additions & 3 deletions plugins/ps/pre-deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
ps_pre_deploy() {
declare desc="ps pre-deploy plugin trigger"
local trigger="ps_pre_deploy"
local APP="$1"
local APP="$1"; local IMAGE_TAG="$2"

extract_procfile "$APP"
generate_scale_file "$APP"
extract_procfile "$APP" "$IMAGE_TAG"
generate_scale_file "$APP" "$IMAGE_TAG"
}

ps_pre_deploy "$@"