make semantic sense of _image functions
This commit is contained in:
1 parent
2cb957d1dd
commit
e74c6460fb
2 files changed
+10
-10
No files matched your search
@@ -110,8 +110,8 @@ verify_app_name() {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
verify_app_image() {
|
verify_image() {
|
||||||
local APP="$1"; local IMAGE="dokku/$APP"
|
local IMAGE="$1"
|
||||||
DOKKU_APP_IMAGES=$(docker images -q $IMAGE)
|
DOKKU_APP_IMAGES=$(docker images -q $IMAGE)
|
||||||
if [[ -n "$DOKKU_APP_IMAGES" ]]; then
|
if [[ -n "$DOKKU_APP_IMAGES" ]]; then
|
||||||
return 0
|
return 0
|
||||||
@@ -156,9 +156,9 @@ parse_args() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
copy_from_image() {
|
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)
|
CID=$(docker run -d $IMAGE bash)
|
||||||
docker cp "$CID:$SRC_FILE" "$DST_DIR"
|
docker cp "$CID:$SRC_FILE" "$DST_DIR"
|
||||||
docker rm -f "$CID" &> /dev/null
|
docker rm -f "$CID" &> /dev/null
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ release_and_deploy() {
|
|||||||
source "$(dirname $0)/../common/functions"
|
source "$(dirname $0)/../common/functions"
|
||||||
local APP="$1"; local IMAGE="dokku/$APP"
|
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
|
if is_image_buildstep_based "$IMAGE"; then
|
||||||
IMAGE_SOURCE_TYPE="buildstep"
|
IMAGE_SOURCE_TYPE="buildstep"
|
||||||
else
|
else
|
||||||
@@ -24,16 +24,16 @@ release_and_deploy() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
generate_scale_file() {
|
generate_scale_file() {
|
||||||
local APP="$1"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
|
local APP="$1"; local IMAGE="dokku/$APP"; 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 "$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
|
if [[ ! -f $DOKKU_SCALE_FILE ]]; then
|
||||||
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
|
||||||
|
|
||||||
|
|
||||||
if is_image_buildstep_based "$APP"; then
|
if is_image_buildstep_based "$IMAGE"; then
|
||||||
copy_from_image "$APP" /app/Procfile $TMP_WORK_DIR 2>/dev/null || true
|
copy_from_image "$IMAGE" /app/Procfile $TMP_WORK_DIR 2>/dev/null || true
|
||||||
copy_from_image "$APP" /app/.release $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
|
if [[ -f $TMP_WORK_DIR/Procfile ]];then
|
||||||
local PROCFILE="$TMP_WORK_DIR/Procfile"
|
local PROCFILE="$TMP_WORK_DIR/Procfile"
|
||||||
|
|||||||
Reference in new issue
Block a user