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