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

Pull the deploying app image name where necessary

Browse Source 
All of these commands should execute against the image that is in use versus the "latest" that dokku provides the system with.
This commit is contained in:
Jose Diaz-Gonzalez
2016-07-29 12:49:29 -04:00
parent 115b939071
commit 2474c87bbd
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/apps/pre-delete
View File

@@ -5,7 +5,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
apps_pre_delete() { apps_pre_delete() {
declare desc="apps pre-delete plugin trigger" declare desc="apps pre-delete plugin trigger"
local trigger="apps_pre_delete" local trigger="apps_pre_delete"
local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG"); local CACHE_DIR="$DOKKU_ROOT/$APP/cache" local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG"); local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
verify_app_name "$APP" verify_app_name "$APP"
if [[ -d $CACHE_DIR ]]; then if [[ -d $CACHE_DIR ]]; then

2
plugins/config/docker-args-deploy
View File

@@ -6,7 +6,7 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
config_docker_args() { config_docker_args() {
declare desc="config docker-args plugin trigger" declare desc="config docker-args plugin trigger"
local trigger="$0 config_docker_args" local trigger="$0 config_docker_args"
local STDIN=$(cat); local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG") local STDIN=$(cat); local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
local DOCKERFILE_ENV_FILE="$DOKKU_ROOT/$APP/DOCKERFILE_ENV_FILE" local DOCKERFILE_ENV_FILE="$DOKKU_ROOT/$APP/DOCKERFILE_ENV_FILE"
verify_app_name "$APP" verify_app_name "$APP"

2
plugins/enter/subcommands/default
View File

@@ -5,7 +5,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
enter_default_cmd() { enter_default_cmd() {
declare desc="enters running app container of specified proc type" declare desc="enters running app container of specified proc type"
local cmd="enter" local cmd="enter"
local APP="$2"; local CONTAINER_TYPE="$3"; local IMAGE_TAG=$(get_running_image_tag "$APP"); local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG") local APP="$2"; local CONTAINER_TYPE="$3"; local IMAGE_TAG=$(get_running_image_tag "$APP"); local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
verify_app_name "$APP" verify_app_name "$APP"
local AVAILABLE_CONTAINER_TYPES=($(get_app_running_container_types "$APP")) local AVAILABLE_CONTAINER_TYPES=($(get_app_running_container_types "$APP"))

2
plugins/nginx-vhosts/functions
View File

@@ -141,7 +141,7 @@ get_custom_nginx_template() {
local APP="$1"; verify_app_name "$APP" local APP="$1"; verify_app_name "$APP"
local DESTINATION="$2" local DESTINATION="$2"
local IMAGE_TAG="$(get_running_image_tag "$APP")" local IMAGE_TAG="$(get_running_image_tag "$APP")"
local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG") local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
local NGINX_TEMPLATE_NAME="nginx.conf.sigil" local NGINX_TEMPLATE_NAME="nginx.conf.sigil"
copy_from_image "$IMAGE" "$NGINX_TEMPLATE_NAME" "$DESTINATION" 2>/dev/null || true copy_from_image "$IMAGE" "$NGINX_TEMPLATE_NAME" "$DESTINATION" 2>/dev/null || true

4
plugins/ps/functions
View File

@@ -15,7 +15,7 @@ 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="$2" local IMAGE_TAG="$2"
local IMAGE="$(get_app_image_name "$APP" "$IMAGE_TAG")" local IMAGE="$(get_deploying_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"
@@ -38,7 +38,7 @@ remove_procfile() {
generate_scale_file() { generate_scale_file() {
declare desc="generates DOKKU_SCALE file" declare desc="generates DOKKU_SCALE file"
local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG"); local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE" local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG"); local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE" local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
verify_app_name "$APP" verify_app_name "$APP"

2
plugins/repo/subcommands/purge-cache
View File

@@ -9,7 +9,7 @@ repo_purge_cache() {
local APP="$2"; local APP="$2";
verify_app_name "$APP" verify_app_name "$APP"
local IMAGE=$(get_app_image_name "$APP"); local CACHE_DIR="$DOKKU_ROOT/$APP/cache" local IMAGE=$(get_deploying_app_image_name "$APP"); local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
if [[ -d $CACHE_DIR ]]; then if [[ -d $CACHE_DIR ]]; then
docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true