refactor to explicitly set IMAGE via get_app_image_name()

2015-09-03 16:07:23 -07:00
parent 2f16b06a76
commit 495b1d2ba0
14 changed files with 122 additions and 107 deletions
--- a/plugins/config/docker-args-deploy
+++ b/plugins/config/docker-args-deploy
@@ -3,9 +3,9 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_PATH/common/functions"
 source "$PLUGIN_PATH/config/functions"

-STDIN=$(cat); APP="$1"; TAG="$2"
+STDIN=$(cat); APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
 DOCKERFILE_ENV_FILE="$DOKKU_ROOT/$APP/DOCKERFILE_ENV_FILE"
-verify_app_name "$APP" "$TAG"
+verify_app_name "$APP"

 if ! is_image_herokuish_based "$IMAGE"; then
  > "$DOCKERFILE_ENV_FILE"