Merge pull request #3561 from dokku/3544-ps-can-scale

feat: disable scaling if app contains DOKKU_SCALE file
This commit is contained in:
Jose Diaz-Gonzalez
2019-05-19 22:59:08 -07:00
committed by GitHub
13 changed files with 127 additions and 6 deletions

View File

@@ -384,7 +384,10 @@ copy_from_image() {
fi
fi
local CID=$(docker create "$DOKKU_GLOBAL_RUN_ARGS" "$IMAGE")
docker cp "$CID:$SRC_FILE" "$DST_DIR"
if ! docker cp "$CID:$SRC_FILE" "$DST_DIR"; then
docker rm -f "$CID" &>/dev/null
return 1
fi
docker rm -f "$CID" &>/dev/null
else
return 1