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

move release_and_deploy to plugin functions. only attempt Procfile copy if we're buildstep based

Browse Source
This commit is contained in:
Michael Hobbs
2015-04-21 20:17:14 -07:00
parent 807e1b97b4
commit 2cb957d1dd
2 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/ps/commands
View File

@@ -3,27 +3,6 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname $0)/../common/functions" source "$(dirname $0)/../common/functions"
source "$(dirname $0)/functions" source "$(dirname $0)/functions"
release_and_deploy() {
source "$(dirname $0)/../common/functions"
local APP="$1"; local IMAGE="dokku/$APP"
if verify_app_image "$APP"; then
if is_image_buildstep_based "$IMAGE"; then
IMAGE_SOURCE_TYPE="buildstep"
else
IMAGE_SOURCE_TYPE="dockerfile"
fi
dokku_log_info1 "Releasing $APP ..."
dokku release "$APP" "$IMAGE_SOURCE_TYPE"
dokku_log_info1 "Deploying $APP ..."
dokku deploy "$APP"
dokku_log_info2 "Application deployed:"
dokku urls $APP | sed "s/^/ /"
echo
fi
}
case "$1" in case "$1" in
ps) ps)
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1 [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1

39
plugins/ps/functions
View File

@@ -2,6 +2,27 @@
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname $0)/../common/functions" source "$(dirname $0)/../common/functions"
release_and_deploy() {
source "$(dirname $0)/../common/functions"
local APP="$1"; local IMAGE="dokku/$APP"
if verify_app_image "$APP"; then
if is_image_buildstep_based "$IMAGE"; then
IMAGE_SOURCE_TYPE="buildstep"
else
IMAGE_SOURCE_TYPE="dockerfile"
fi
dokku_log_info1 "Releasing $APP ..."
dokku release "$APP" "$IMAGE_SOURCE_TYPE"
dokku_log_info1 "Deploying $APP ..."
dokku deploy "$APP"
dokku_log_info2 "Application deployed:"
dokku urls $APP | sed "s/^/ /"
echo
fi
}
generate_scale_file() { generate_scale_file() {
local APP="$1"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE" local APP="$1"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
copy_from_image "$APP" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || dokku_log_info1_quiet "DOKKU_SCALE not found in app image" copy_from_image "$APP" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || dokku_log_info1_quiet "DOKKU_SCALE not found in app image"
@@ -9,13 +30,18 @@ generate_scale_file() {
local TMP_WORK_DIR=$(mktemp --tmpdir=/tmp -d DOKKU_SCALE.XXXXX) local TMP_WORK_DIR=$(mktemp --tmpdir=/tmp -d DOKKU_SCALE.XXXXX)
trap 'rm -rf $TMP_WORK_DIR' EXIT trap 'rm -rf $TMP_WORK_DIR' EXIT
copy_from_image "$APP" /app/Procfile $TMP_WORK_DIR 2>/dev/null || true
copy_from_image "$APP" /app/.release $TMP_WORK_DIR 2>/dev/null || true
if [[ -f $TMP_WORK_DIR/Procfile ]];then if is_image_buildstep_based "$APP"; then
local PROCFILE="$TMP_WORK_DIR/Procfile" copy_from_image "$APP" /app/Procfile $TMP_WORK_DIR 2>/dev/null || true
elif [[ -f $TMP_WORK_DIR/.release ]];then copy_from_image "$APP" /app/.release $TMP_WORK_DIR 2>/dev/null || true
local PROCFILE="$TMP_WORK_DIR/.release"
if [[ -f $TMP_WORK_DIR/Procfile ]];then
local PROCFILE="$TMP_WORK_DIR/Procfile"
elif [[ -f $TMP_WORK_DIR/.release ]];then
local PROCFILE="$TMP_WORK_DIR/.release"
else
echo "web=1" >> $DOKKU_SCALE_FILE
fi
else else
echo "web=1" >> $DOKKU_SCALE_FILE echo "web=1" >> $DOKKU_SCALE_FILE
fi fi
@@ -54,3 +80,4 @@ set_scale() {
fi fi
done done
} }