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

make semantic sense of _image functions

Browse Source
This commit is contained in:
Michael Hobbs
2015-04-21 20:25:05 -07:00
parent 2cb957d1dd
commit e74c6460fb
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/common/functions
View File

@@ -110,8 +110,8 @@ verify_app_name() {
return 0
}
verify_app_image() {
local APP="$1"; local IMAGE="dokku/$APP"
verify_image() {
local IMAGE="$1"
DOKKU_APP_IMAGES=$(docker images -q $IMAGE)
if [[ -n "$DOKKU_APP_IMAGES" ]]; then
return 0
@@ -156,9 +156,9 @@ parse_args() {
}
copy_from_image() {
local APP="$1"; local IMAGE="dokku/$APP"; local SRC_FILE="$2"; local DST_DIR="$3"; verify_app_name $APP
local IMAGE="$1"; local SRC_FILE="$2"; local DST_DIR="$3"; verify_app_name $APP
if verify_app_image "$APP"; then
if verify_image "$IMAGE"; then
CID=$(docker run -d $IMAGE bash)
docker cp "$CID:$SRC_FILE" "$DST_DIR"
docker rm -f "$CID" &> /dev/null

12
plugins/ps/functions
View File

@@ -6,7 +6,7 @@ release_and_deploy() {
source "$(dirname $0)/../common/functions"
local APP="$1"; local IMAGE="dokku/$APP"
if verify_app_image "$APP"; then
if verify_image "$IMAGE"; then
if is_image_buildstep_based "$IMAGE"; then
IMAGE_SOURCE_TYPE="buildstep"
else
@@ -24,16 +24,16 @@ release_and_deploy() {
}
generate_scale_file() {
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"
local APP="$1"; local IMAGE="dokku/$APP"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
copy_from_image "$IMAGE" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || dokku_log_info1_quiet "DOKKU_SCALE not found in app image"
if [[ ! -f $DOKKU_SCALE_FILE ]]; then
local TMP_WORK_DIR=$(mktemp --tmpdir=/tmp -d DOKKU_SCALE.XXXXX)
trap 'rm -rf $TMP_WORK_DIR' EXIT
if is_image_buildstep_based "$APP"; then
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 is_image_buildstep_based "$IMAGE"; then
copy_from_image "$IMAGE" /app/Procfile $TMP_WORK_DIR 2>/dev/null || true
copy_from_image "$IMAGE" /app/.release $TMP_WORK_DIR 2>/dev/null || true
if [[ -f $TMP_WORK_DIR/Procfile ]];then
local PROCFILE="$TMP_WORK_DIR/Procfile"